fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Detaching Sensors, Indicators and Trading Engines

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-10-08 12:02:01 +02:00
1 parent 4e41f695e2
commit 4f5fc17b20
3 files changed
+78 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

FloatingSpace/StrategyPartConstructor.js
+69 -9
View File
@@ -707,6 +707,11 @@ function newStrategyPartConstructor () {
break
}
case 'Sensor': {
strategyPart.codeEditor = newCodeEditor()
strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
strategyPart.codeEditor.initialize()
strategyPart.codeEditor.container.connectToParent(strategyPart.container, false, false, true, true, false, false, false, false)
addLeftIcons(menuItemsInitialValues, floatingObject)
menuItemsInitialValues.push(
{
@@ -718,9 +723,24 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -40
angle: -45
}
)
menuItemsInitialValues.push(
{
action: 'Edit Sensor',
actionFunction: strategyPart.codeEditor.activate,
label: 'Edit Sensor',
visible: true,
iconPathOn: 'html',
iconPathOff: 'html',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -15,
dontShowAtFullscreen: true
}
)
menuItemsInitialValues.push(
{
action: 'Delete Sensor',
@@ -734,7 +754,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 0
angle: 15
}
)
menuItemsInitialValues.push(
@@ -748,12 +768,17 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 40
angle: 45
}
)
break
}
case 'Indicator': {
strategyPart.codeEditor = newCodeEditor()
strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
strategyPart.codeEditor.initialize()
strategyPart.codeEditor.container.connectToParent(strategyPart.container, false, false, true, true, false, false, false, false)
addLeftIcons(menuItemsInitialValues, floatingObject)
menuItemsInitialValues.push(
{
@@ -765,9 +790,24 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -40
angle: -45
}
)
menuItemsInitialValues.push(
{
action: 'Edit Indicator',
actionFunction: strategyPart.codeEditor.activate,
label: 'Edit Indicator',
visible: true,
iconPathOn: 'html',
iconPathOff: 'html',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -15,
dontShowAtFullscreen: true
}
)
menuItemsInitialValues.push(
{
action: 'Delete Indicator',
@@ -781,7 +821,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 0
angle: 15
}
)
menuItemsInitialValues.push(
@@ -795,12 +835,17 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 40
angle: 45
}
)
break
}
case 'Trading Engine': {
strategyPart.codeEditor = newCodeEditor()
strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
strategyPart.codeEditor.initialize()
strategyPart.codeEditor.container.connectToParent(strategyPart.container, false, false, true, true, false, false, false, false)
addLeftIcons(menuItemsInitialValues, floatingObject)
menuItemsInitialValues.push(
{
@@ -812,7 +857,22 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -40
angle: -45
}
)
menuItemsInitialValues.push(
{
action: 'Edit Trading Engine',
actionFunction: strategyPart.codeEditor.activate,
label: 'Edit Trading Engine',
visible: true,
iconPathOn: 'html',
iconPathOff: 'html',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: -15,
dontShowAtFullscreen: true
}
)
menuItemsInitialValues.push(
@@ -828,7 +888,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 0
angle: 15
}
)
menuItemsInitialValues.push(
@@ -842,7 +902,7 @@ function newStrategyPartConstructor () {
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
angle: 40
angle: 45
}
)
break
StrategySpace/Workspace/FunctionLibraries/AttachDetach.js
+3 -3
View File
@@ -104,17 +104,17 @@ function newAttachDetach () {
return
}
case 'Sensor': {
node.payload.parentNode.sensor = undefined
node.payload.parentNode.bot = undefined
completeDetachment(node, rootNodes)
return
}
case 'Indicator': {
node.payload.parentNode.indicator = undefined
node.payload.parentNode.bot = undefined
completeDetachment(node, rootNodes)
return
}
case 'Trading Engine': {
node.payload.parentNode.tradingEngine = undefined
node.payload.parentNode.bot = undefined
completeDetachment(node, rootNodes)
return
}
StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js
+6 -3
View File
@@ -565,7 +565,8 @@ function newPartsFromNodes () {
function addSensor (node) {
if (node.bot === undefined) {
node.bot = {
processes: []
processes: [],
code: '{}'
}
createPart('Sensor', '', node.bot, node, node)
}
@@ -575,7 +576,8 @@ function newPartsFromNodes () {
function addIndicator (node) {
if (node.bot === undefined) {
node.bot = {
processes: []
processes: [],
code: '{}'
}
createPart('Indicator', '', node.bot, node, node)
}
@@ -585,7 +587,8 @@ function newPartsFromNodes () {
function addTradingEngine (node) {
if (node.bot === undefined) {
node.bot = {
processes: []
processes: [],
code: '{}'
}
createPart('Trading Engine', '', node.bot, node, node)
}