Cleaning + bug fixed

This commit is contained in:
Luis Fernando Molina committed 2019-10-09 12:13:03 +02:00
1 parent 9775609471
commit 2f86fe585d
4 files changed
+10 -140

No files matched your search

+6 -57
View File
@@ -386,34 +386,6 @@ function newStrategyPartConstructor () {
}
case 'Layer Manager': {
addLeftIcons(menuItemsInitialValues, floatingObject)
menuItemsInitialValues.push(
{
action: 'Turn All Layers On',
actionFunction: payload.onMenuItemClick,
label: 'Turn All Layers On',
visible: true,
iconPathOn: 'paper-plane',
iconPathOff: 'paper-plane',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -70
}
)
menuItemsInitialValues.push(
{
action: 'Turn All Layers Off',
actionFunction: payload.onMenuItemClick,
label: 'Turn All Layers Off',
visible: true,
iconPathOn: 'stop',
iconPathOff: 'stop',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -30
}
)
menuItemsInitialValues.push(
{
action: 'Add Layer',
@@ -424,7 +396,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 0
angle: -40
}
)
menuItemsInitialValues.push(
@@ -440,7 +412,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 30
angle: 0
}
)
menuItemsInitialValues.push(
@@ -454,7 +426,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 70
angle: 40
}
)
break
@@ -465,29 +437,6 @@ function newStrategyPartConstructor () {
strategyPart.codeEditor.initialize()
strategyPart.codeEditor.container.connectToParent(strategyPart.container, false, false, true, true, false, false, false, false)
addLeftIcons(menuItemsInitialValues, floatingObject)
menuItemsInitialValues.push(
{
action: 'Turn Layer On',
actionFunction: payload.onMenuItemClick,
label: 'Turn On',
workingLabel: 'Turning On',
workDoneLabel: 'Turned On',
workFailedLabel: 'Layer Cannot be On',
secondaryAction: 'Turn Layer Off',
secondaryLabel: 'Turn Off',
secondaryWorkingLabel: 'Turning Off',
secondaryWorkDoneLabel: 'Turned Off',
secondaryWorkFailedLabel: 'Layer Cannot be Off',
secondaryIcon: 'stop',
visible: true,
iconPathOn: 'paper-plane',
iconPathOff: 'paper-plane',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -60
}
)
menuItemsInitialValues.push(
{
action: 'Edit Layer',
@@ -499,7 +448,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -20,
angle: -40,
dontShowAtFullscreen: true
}
)
@@ -516,7 +465,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 20
angle: 0
}
)
menuItemsInitialValues.push(
@@ -530,7 +479,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 60
angle: 40
}
)
break
+4 -1
View File
@@ -139,6 +139,8 @@ function newProductsPanel () {
/* Listen to Status Changes Events */
productCard.container.eventHandler.listenToEvent('Status Changed', onProductCardStatusChanged)
productCard.container.eventHandler.listenToEvent('onMouseWheel', onMouseWheel)
return productCard
}
function onMouseWheel (event) {
@@ -325,7 +327,8 @@ function newProductsPanel () {
let cardCode = exchange + '-' + market.assetB + '/' + market.assetA + '-' + devTeam.codeName + '-' + bot.codeName + '-' + product.codeName + '-' + process.session.id
let cardFound = removeFromLocalProductCards(cardCode)
if (cardFound !== true) {
addProductCard(devTeam, bot, product, process.session)
productCard = addProductCard(devTeam, bot, product, process.session)
onProductCardStatusChanged(productCard)
}
}
}
@@ -1,61 +0,0 @@
function newLayerFunctions () {
thisObject = {
turnLayerOn: turnLayerOn,
turnLayerOff: turnLayerOff,
turnAllLayersOn: turnAllLayersOn,
turnAllLayersOff: turnAllLayersOff
}
return thisObject
function turnLayerOn (node, functionLibraryProtocolNode, callBackFunction) {
/* Check if it is possible to turn on or not */
let code
try {
code = JSON.parse(node.code)
} catch (err) {
{
callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE)
return
}
}
/* Ok, we are going to turn the layer on */
}
function turnLayerOff (node, functionLibraryProtocolNode, callBackFunction) {
let event = {
taskId: node.id,
taskName: node.name
}
systemEventHandler.raiseEvent('Layer Manager', 'Turn Layer Off', event)
node.payload.uiObject.stop(callBackFunction)
if (node.bot === undefined) { return }
if (node.bot.processes.length === 0) { return }
for (let i = 0; i < node.bot.processes.length; i++) {
let process = node.bot.processes[i]
process.payload.uiObject.stop()
}
}
function turnAllLayersOn (taskManager, functionLibraryProtocolNode) {
for (let i = 0; i < taskManager.tasks.length; i++) {
let node = taskManager.tasks[i]
let menu = node.payload.uiObject.menu
menu.internalClick('Turn Layer On')
}
}
function turnAllLayersOff (taskManager, functionLibraryProtocolNode) {
for (let i = 0; i < taskManager.tasks.length; i++) {
let node = taskManager.tasks[i]
let menu = node.payload.uiObject.menu
menu.internalClick('Turn Layer Off')
}
}
}
-21
View File
@@ -48,7 +48,6 @@ function newWorkspace () {
let functionLibraryProtocolNode = newProtocolNode()
let functionLibraryWorkspaceNodes = newStringifyNode()
let functionLibraryTaskFunctions = newTaskFunctions()
let functionLibraryLayerFunctions = newLayerFunctions()
let functionLibrarySessionFunctions = newSessionFunctions()
thisObject.nodeChildren = newNodeChildren()
@@ -262,26 +261,6 @@ function newWorkspace () {
download(fileName, text)
}
break
case 'Turn Layer On':
{
functionLibraryLayerFunctions.turnLayerOn(payload.node, functionLibraryProtocolNode, callBackFunction)
}
break
case 'Turn Layer Off':
{
functionLibraryLayerFunctions.turnLayerOff(payload.node, functionLibraryProtocolNode, callBackFunction)
}
break
case 'Turn All Layers On':
{
functionLibraryLayerFunctions.turnAllLayersOn(payload.node, functionLibraryProtocolNode)
}
break
case 'Turn All Layers Off':
{
functionLibraryLayerFunctions.turnAllLayersOff(payload.node, functionLibraryProtocolNode)
}
break
case 'Run Task':
{