highlights and values working

ChartingSpace/PlottersManager.js

@@ -137,11 +137,25 @@ function newPlottersManager () {
       let exchange = layer.definition.referenceParent.parentNode.referenceParent.parentNode.parentNode
       let plotterModule = layer.definition.referenceParent.referenceParent.referenceParent
       let session
+      let tradingSystem
+      let tradingEngine
 
+      /*
+      A layer can be referencing a Data Product in two different branches of the Network hiriatchy.
+      In one of those braches we can get the Session node, at the other we Cannot.
+      */
       if (layer.definition.referenceParent.parentNode.parentNode !== undefined) {
         if (layer.definition.referenceParent.parentNode.parentNode.type === 'Session Reference') {
           if (layer.definition.referenceParent.parentNode.parentNode.referenceParent !== undefined) {
             session = layer.definition.referenceParent.parentNode.parentNode.referenceParent
+
+            /* From the session we might be able to reach the Trading System or the Trading Engine */
+            if (session.tradingSystemReference !== undefined) {
+              tradingSystem = session.tradingSystemReference.referenceParent
+            }
+            if (session.tradingEngineReference !== undefined) {
+              tradingEngine = session.tradingEngineReference.referenceParent
+            }
           }
         }
       }
@@ -169,67 +183,97 @@ function newPlottersManager () {
       )
 
       function onProductStorageInitialized (err) {
-        try {
-          if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) {
+        if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) {
             /* Now we have all the initial data loaded and ready to be delivered to the new instance of the plotter. */
-            let plotter
+          let plotter
 
-            if (plotterModule.config.isLegacy !== true) {
-              plotter = newPlotter()
-            } else {
-              plotter = getNewPlotter(dataMine.config.codeName, plotterModule.parentNode.config.codeName, plotterModule.config.codeName)
+          if (plotterModule.config.isLegacy !== true) {
+            plotter = newPlotter()
+          } else {
+            plotter = getNewPlotter(dataMine.config.codeName, plotterModule.parentNode.config.codeName, plotterModule.config.codeName)
+          }
+
+          plotter.container.connectToParent(thisObject.container, true, true, false, true, true, true, false, false, true)
+          plotter.container.frame.position.x = thisObject.container.frame.width / 2 - plotter.container.frame.width / 2
+          plotter.container.frame.position.y = thisObject.container.frame.height / 2 - plotter.container.frame.height / 2
+          plotter.fitFunction = thisObject.fitFunction
+          plotter.initialize(storage, datetime, timeFrame, coordinateSystem, onPlotterInizialized, product)
+
+          function onPlotterInizialized () {
+            let connector = {
+              layer: layer,
+              plotter: plotter,
+              storage: storage
             }
+            /* Let the Plotter listen to the event of Cursor Files loaded, so that it can react recalculating if needed. */
+            plotter.onDailyFileLoadedPlotterEventsSubscriptionId = storage.eventHandler.listenToEvent('Daily File Loaded', plotter.onDailyFileLoaded)
+            /* Lets load now this plotter panels. */
+            connector.panels = []
 
-            plotter.container.connectToParent(thisObject.container, true, true, false, true, true, true, false, false, true)
-            plotter.container.frame.position.x = thisObject.container.frame.width / 2 - plotter.container.frame.width / 2
-            plotter.container.frame.position.y = thisObject.container.frame.height / 2 - plotter.container.frame.height / 2
-            plotter.fitFunction = thisObject.fitFunction
-            plotter.initialize(storage, datetime, timeFrame, coordinateSystem, onPlotterInizialized, product)
+            if (product !== undefined) {
+              /* Here we setup the panels associated with this plotter */
+              for (let i = 0; i < plotterModule.panels.length; i++) {
+                let panel = plotterModule.panels[i]
 
-            function onPlotterInizialized () {
-              try {
-                let connector = {
-                  layer: layer,
-                  plotter: plotter,
-                  storage: storage
-                }
-                /* Let the Plotter listen to the event of Cursor Files loaded, so that it can react recalculating if needed. */
-                plotter.onDailyFileLoadedPlotterEventsSubscriptionId = storage.eventHandler.listenToEvent('Daily File Loaded', plotter.onDailyFileLoaded)
-                /* Lets load now this plotter panels. */
-                connector.panels = []
-
-                if (product !== undefined) {
-                  /* Here we setup the panels associated with this plotter */
-                  for (let i = 0; i < plotterModule.panels.length; i++) {
-                    let panel = plotterModule.panels[i]
-
-                    let parameters = {
-                      dataMine: dataMine.config.codeName,
-                      plotterCodeName: plotterModule.parentNode.config.codeName,
-                      moduleCodeName: plotterModule.config.codeName,
-                      panelNode: panel
-                    }
-
-                    let owner = thisObject.payload.node.payload.parentNode.id // Panels are owned by the time machine.
-                    let plotterPanelHandle = canvas.panelsSpace.createNewPanel('Plotter Panel', parameters, owner, layer.session)
-                    let plotterPanel = canvas.panelsSpace.getPanel(plotterPanelHandle)
-
-                    /* Connect Panel to the Plotter via an Event. */
-                    connector.plotter.onRecordChangeEventsSubscriptionId = connector.plotter.container.eventHandler.listenToEvent('Current Record Changed', plotterPanel.onRecordChange)
-                    connector.panels.push(plotterPanelHandle)
-                  }
-
-                  connector.layer.panels = connector.panels
+                let parameters = {
+                  dataMine: dataMine.config.codeName,
+                  plotterCodeName: plotterModule.parentNode.config.codeName,
+                  moduleCodeName: plotterModule.config.codeName,
+                  panelNode: panel
                 }
 
-                thisObject.connectors.push(connector)
-              } catch (err) {
-                if (ERROR_LOG === true) { logger.write('[ERROR] initializePlotter -> onProductStorageInitialized -> onPlotterInizialized -> err = ' + err.stack) }
+                let owner = thisObject.payload.node.payload.parentNode.id // Panels are owned by the time machine.
+                let plotterPanelHandle = canvas.panelsSpace.createNewPanel('Plotter Panel', parameters, owner, layer.session)
+                let plotterPanel = canvas.panelsSpace.getPanel(plotterPanelHandle)
+
+                /* Connect Panel to the Plotter via an Event. */
+                connector.plotter.onRecordChangeEventsSubscriptionId = connector.plotter.container.eventHandler.listenToEvent('Current Record Changed', plotterPanel.onRecordChange)
+                connector.panels.push(plotterPanelHandle)
+              }
+              connector.layer.panels = connector.panels
+
+              /*
+              Next we will check the different types of Plotting related to connecting to an existing node branch.
+              */
+              if (plotterModule.nodesHighlights !== undefined) {
+                connector.nodesHighlights = newNodesHighlights()
+                switch (plotterModule.config.connectTo) {
+                  case 'Trading System':
+                    connector.nodesHighlights.initialize(tradingSystem)
+                    break
+                  case 'Trading Engine':
+                    connector.nodesHighlights.initialize(tradingEngine)
+                    break
+                }
+                connector.nodesHighlights.onRecordChangeEventsSubscriptionId = connector.plotter.container.eventHandler.listenToEvent('Current Record Changed', connector.nodesHighlights.onRecordChange)
+              }
+              if (plotterModule.nodesValues !== undefined) {
+                connector.nodesValues = newNodesValues()
+                switch (plotterModule.config.connectTo) {
+                  case 'Trading System':
+                    connector.nodesValues.initialize(tradingSystem)
+                    break
+                  case 'Trading Engine':
+                    connector.nodesValues.initialize(tradingEngine)
+                    break
+                }
+                connector.nodesValues.onRecordChangeEventsSubscriptionId = connector.plotter.container.eventHandler.listenToEvent('Current Record Changed', connector.nodesValues.onRecordChange)
+              }
+              if (plotterModule.nodesErrors !== undefined) {
+                connector.nodesErrors = newNodesErrors()
+                switch (plotterModule.config.connectTo) {
+                  case 'Trading System':
+                    connector.nodesErrors.initialize(tradingSystem)
+                    break
+                  case 'Trading Engine':
+                    connector.nodesErrors.initialize(tradingEngine)
+                    break
+                }
+                connector.nodesErrors.onRecordChangeEventsSubscriptionId = connector.plotter.container.eventHandler.listenToEvent('Current Record Changed', connector.nodesErrors.onRecordChange)
               }
             }
+            thisObject.connectors.push(connector)
           }
-        } catch (err) {
-          if (ERROR_LOG === true) { logger.write('[ERROR] initializePlotter -> onProductStorageInitialized -> err = ' + err.stack) }
         }
       }
     } catch (err) {
@@ -263,8 +307,8 @@ function newPlottersManager () {
           for (let j = 0; j < connector.panels.length; j++) {
             canvas.panelsSpace.destroyPanel(connector.panels[j])
           }
-                    /* Finally the Storage Objects */
-
+            /* Finally the Storage Objects */
+          finalizeNodesPlotting(connector)
           if (connector.plotter.finalize !== undefined) {
             connector.plotter.container.eventHandler.stopListening(connector.plotter.onRecordChangeEventsSubscriptionId)
             connector.plotter.container.finalize()
@@ -278,6 +322,21 @@ function newPlottersManager () {
     }
   }
 
+  function finalizeNodesPlotting (connector) {
+    if (connector.nodesHighlights !== undefined) {
+      connector.plotter.container.eventHandler.stopListening(connector.nodesHighlights.onRecordChangeEventsSubscriptionId)
+      connector.nodesHighlights.finalize()
+    }
+    if (connector.nodesValues !== undefined) {
+      connector.plotter.container.eventHandler.stopListening(connector.nodesValues.onRecordChangeEventsSubscriptionId)
+      connector.nodesValues.finalize()
+    }
+    if (connector.nodesErrors !== undefined) {
+      connector.plotter.container.eventHandler.stopListening(connector.nodesErrors.onRecordChangeEventsSubscriptionId)
+      connector.nodesErrors.finalize()
+    }
+  }
+
   function setTimeFrame (pTimeFrame) {
     timeFrame = pTimeFrame
     for (let i = 0; i < thisObject.connectors.length; i++) {

DesignSpace/Workspace/Workspace.js

@@ -14,6 +14,7 @@ function newWorkspace () {
     replaceWorkspaceByLoadingOne: replaceWorkspaceByLoadingOne,
     save: saveWorkspace,
     getHierarchyHeads: getHierarchyHeads,
+    getHierarchyHeadsById: getHierarchyHeadsById,
     getNodeThatIsOnFocus: getNodeThatIsOnFocus,
     getNodeByShortcutKey: getNodeByShortcutKey,
     stopAllRunningTasks: stopAllRunningTasks,
@@ -355,6 +356,16 @@ function newWorkspace () {
     return nodes
   }
 
+  function getHierarchyHeadsById (nodeId) {
+    let hiriatchyHeads = getHierarchyHeads()
+    for (let i = 0; i < hiriatchyHeads.length; i++) {
+      let hiriatchyHead = hiriatchyHeads[i]
+      if (hiriatchyHead.id === nodeId) {
+        return hiriatchyHead
+      }
+    }
+  }
+
   function replaceWorkspaceByLoadingOne (name) {
     let blobService = newFileStorage()
     blobService.getFileFromHost('LoadWorkspace' + '/' + name, onFileReceived, true)

Panels/Layer.js

@@ -157,6 +157,7 @@ function newLayer () {
                         'Session Reference->Session Independent Data->Session Based Data->Exchange Sessions->Session Based Data->Data Storage->Network Node->' +
                         'Data Storage->Network Node->' +
                         'Backtesting Session->Paper Trading Session->Fordward Testing Session->Live Trading Session->' +
+                        'Trading System Reference->Trading Engine Reference->Trading System->Trading Engine->' +
                         'Market->Market Base Asset->Asset->' +
                         'Market Quoted Asset->Asset->' +
                         'Exchange Markets->Crypto Exchange->' +
@@ -173,12 +174,13 @@ function newLayer () {
                         'Polygon->Polygon Condition->Polygon Body->Style->Style Condition->Style->' +
                         'Polygon Border->Style->Style Condition->Style->' +
                         'Polygon Vertex->Point->' +
-                        'Plotter Panel->Javascript Code->Panel Data->Data Formula->'
+                        'Plotter Panel->Javascript Code->Panel Data->Data Formula->' +
+                        'Nodes Highlights->Nodes Values->Nodes Errors->Nodes Status->Nodes Progress->Nodes Running->'
       thisObject.definition = functionLibraryProtocolNode.getProtocolNode(thisObject.payload.node, false, true, true, false, false, lightingPath)
 
       /* Here we validate that we have all the needed information */
-      if (thisObject.definition.referenceParent === undefined) { return }
-      if (thisObject.definition.referenceParent.parentNode === undefined) { return }
+      if (thisObject.definition.referenceParent === undefined) { return } // Data Product
+      if (thisObject.definition.referenceParent.parentNode === undefined) { return } // Single Market Data
       if (thisObject.definition.referenceParent.parentNode.referenceParent === undefined) { return }
       if (thisObject.definition.referenceParent.parentNode.referenceParent.parentNode === undefined) { return }
       if (thisObject.definition.referenceParent.parentNode.referenceParent.parentNode.parentNode === undefined) { return }
@@ -223,7 +225,6 @@ function newLayer () {
       }
 
       thisObject.plotterModule = thisObject.definition.referenceParent.referenceParent.referenceParent
-
       thisObject.exchangeIcon = getIcon(thisObject.exchange)
 
       if (thisObject.plotterModule.config.icon !== undefined) {

Panels/PlotterPanel.js

@@ -100,9 +100,7 @@ function newPlotterPanel () {
     const PANEL_HEIGHT = UI_PANEL.HEIGHT.NORMAL
 
     if (currentRecord === undefined) { return }
-    if (currentRecord.data === undefined) { return }
-
-    let record = currentRecord.data
+    let record = currentRecord
 
     /* First we execute code if provided. */
     if (panelNode.javascriptCode !== undefined) {

Plotting/NodesErrors.js

@@ -8,29 +8,38 @@ function newNodesErrors () {
     initialize: initialize,
     finalize: finalize
   }
-
-  let rootNode
+  let hiriarchyMap
   return thisObject
 
   function finalize () {
-    rootNode = undefined
+    hiriarchyMap = undefined
   }
 
   function initialize (pRootNode) {
-    rootNode = pRootNode
+    let rootNode = canvas.designSpace.workspace.getHierarchyHeadsById(pRootNode.id)
+    hiriarchyMap = getHiriarchyMap(rootNode)
   }
 
   function onRecordChange (currentRecord) {
-    evalNode(rootNode, currentRecord.array, 0, applyError)
+    if (currentRecord === undefined) { return }
+    let array = currentRecord.errors
+    if (array === undefined) { return }
+    for (let i = 0; i < array.length; i++) {
+      let arrayItem = array[0]
+      let nodeId = arrayItem[0]
+      let value = arrayItem[1]
+      applyValue(nodeId, value)
+    }
   }
 
-  function applyError (node, errorMessage) {
+  function applyValue (nodeId, value) {
+    let node = hiriarchyMap.get(nodeId)
     if (node.payload === undefined) { return }
     if (node.payload.uiObject === undefined) { return }
-    if (errorMessage === '') {
-      node.payload.uiObject.resetErrorMessage(errorMessage)
+    if (value === '') {
+      node.payload.uiObject.resetErrorMessage()
     } else {
-      node.payload.uiObject.setErrorMessage(errorMessage)
+      node.payload.uiObject.setErrorMessage(value)
     }
   }
 }

Plotting/NodesHighlights.js

@@ -9,23 +9,32 @@ function newNodesHighlights () {
     finalize: finalize
   }
 
-  let rootNode
+  let hiriarchyMap
   return thisObject
 
   function finalize () {
-    rootNode = undefined
+    hiriarchyMap = undefined
   }
 
   function initialize (pRootNode) {
-    rootNode = pRootNode
+    let rootNode = canvas.designSpace.workspace.getHierarchyHeadsById(pRootNode.id)
+    hiriarchyMap = getHiriarchyMap(rootNode)
   }
 
   function onRecordChange (currentRecord) {
-    evalNode(rootNode, currentRecord.array, 0, applyHighlight)
+    if (currentRecord === undefined) { return }
+    let array = currentRecord.highlights
+    if (array === undefined) { return }
+    for (let i = 0; i < array.length; i++) {
+      let arrayItem = array[0]
+      let nodeId = arrayItem[0]
+      let value = arrayItem[1]
+      applyValue(nodeId, value)
+    }
   }
 
-  function applyHighlight (node, value) {
-    if (value !== 1) { return }
+  function applyValue (nodeId, value) {
+    let node = hiriarchyMap.get(nodeId)
     if (node.payload === undefined) { return }
     if (node.payload.uiObject === undefined) { return }
     node.payload.uiObject.highlight()

Plotting/NodesValues.js

@@ -9,24 +9,37 @@ function newNodesValues () {
     finalize: finalize
   }
 
-  let rootNode
+  let hiriarchyMap
   return thisObject
 
   function finalize () {
-    rootNode = undefined
+    hiriarchyMap = undefined
   }
 
   function initialize (pRootNode) {
-    rootNode = pRootNode
+    let rootNode = canvas.designSpace.workspace.getHierarchyHeadsById(pRootNode.id)
+    hiriarchyMap = getHiriarchyMap(rootNode)
   }
 
   function onRecordChange (currentRecord) {
-    evalNode(rootNode, currentRecord.array, 0, applyValue)
+    if (currentRecord === undefined) { return }
+    let array = currentRecord.values
+    if (array === undefined) { return }
+    for (let i = 0; i < array.length; i++) {
+      let arrayItem = array[0]
+      let nodeId = arrayItem[0]
+      let value = arrayItem[1]
+      applyValue(nodeId, value)
+    }
   }
 
-  function applyValue (node, value) {
+  function applyValue (nodeId, value) {
+    let node = hiriarchyMap.get(nodeId)
     if (node.payload === undefined) { return }
     if (node.payload.uiObject === undefined) { return }
-    node.payload.uiObject.setValue(value)
+    if (value === true) { value = 'true' }
+    if (value === false) { value = 'false' }
+    node.payload.uiObject.setValue(value, 30)
   }
 }
+

Plotting/Plotter.js

@@ -245,9 +245,7 @@ function newPlotter () {
   function draw () {
     try {
       thisObject.container.frame.draw()
-      if (productDefinition.referenceParent.shapes !== undefined) {
-        plotShapes()
-      }
+      plot()
     } catch (err) {
       if (ERROR_LOG === true) { logger.write('[ERROR] draw -> err = ' + err.stack) }
     }
@@ -491,13 +489,10 @@ function newPlotter () {
     }
   }
 
-  function plotShapes () {
+  function plot () {
     try {
       /* Clean the pannel at places where there is no record. */
-      let currentRecord = {
-        data: undefined
-      }
-      thisObject.container.eventHandler.raiseEvent('Current Record Changed', currentRecord)
+      thisObject.container.eventHandler.raiseEvent('Current Record Changed', undefined)
 
       for (let i = 0; i < records.length; i++) {
         let record = records[i]
@@ -541,11 +536,7 @@ function newPlotter () {
         let atMousePosition = false
         if (userPositionDate >= record.begin && userPositionDate <= record.end) {
           atMousePosition = true
-
-          let currentRecord = {
-            data: record
-          }
-          thisObject.container.eventHandler.raiseEvent('Current Record Changed', currentRecord)
+          thisObject.container.eventHandler.raiseEvent('Current Record Changed', record)
         }
 
         /* If there is code we execute it now. */
@@ -794,7 +785,7 @@ function newPlotter () {
 
       logged = false
     } catch (err) {
-      if (ERROR_LOG === true) { logger.write('[ERROR] plotShapes -> err = ' + err.stack) }
+      if (ERROR_LOG === true) { logger.write('[ERROR] plot -> err = ' + err.stack) }
     }
   }
 

Utilities/HiriarchyMap.js

@@ -0,0 +1,47 @@
+/*
+This function scans a node hiriatchy recursively and creates a Map by Id of all the nodes of it.
+*/
+
+function getHiriarchyMap (rootNode) {
+  let hiriatchyMap = new Map()
+  evalNode(rootNode)
+  return hiriatchyMap
+
+  function evalNode (node) {
+    if (node === undefined) { return }
+
+    hiriatchyMap.set(node.id, node)
+
+  /* Now we go down through all this node children */
+    let nodeDefinition = APP_SCHEMA_MAP.get(node.type)
+    if (nodeDefinition === undefined) { return }
+
+    if (nodeDefinition.properties !== undefined) {
+      let previousPropertyName // Since there are cases where there are many properties with the same name,because they can hold nodes of different types but only one at the time, we have to avoind counting each property of those as individual children.
+      for (let i = 0; i < nodeDefinition.properties.length; i++) {
+        let property = nodeDefinition.properties[i]
+
+        switch (property.type) {
+          case 'node': {
+            if (property.name !== previousPropertyName) {
+              if (node[property.name] !== undefined) {
+                evalNode(node[property.name])
+              }
+              previousPropertyName = property.name
+            }
+            break
+          }
+          case 'array': {
+            if (node[property.name] !== undefined) {
+              let nodePropertyArray = node[property.name]
+              for (let m = 0; m < nodePropertyArray.length; m++) {
+                evalNode(nodePropertyArray[m])
+              }
+            }
+            break
+          }
+        }
+      }
+    }
+  }
+}

Utilities/RecursiveEvalNode.js

@@ -1,45 +0,0 @@
-/*
-This function scans a node hiriatchy recursively. At each node it calls the callback
-provided with the corresponfing value of the array.
-*/
-
-function evalNode (node, array, index, callback) {
-  if (node === undefined) { return }
-  if (array === undefined) { return }
-  if (index === undefined) { return }
-  if (callback === undefined) { return }
-
-  callback(node, array[index])
-
-  /* Now we go down through all this node children */
-  let nodeDefinition = APP_SCHEMA_MAP.get(node.type)
-  if (nodeDefinition === undefined) { return }
-
-  if (nodeDefinition.properties !== undefined) {
-    let previousPropertyName // Since there are cases where there are many properties with the same name,because they can hold nodes of different types but only one at the time, we have to avoind counting each property of those as individual children.
-    for (let i = 0; i < nodeDefinition.properties.length; i++) {
-      let property = nodeDefinition.properties[i]
-
-      switch (property.type) {
-        case 'node': {
-          if (property.name !== previousPropertyName) {
-            if (node[property.name] !== undefined) {
-              evalNode(node[property.name], array, index + 1, callback)
-            }
-            previousPropertyName = property.name
-          }
-          break
-        }
-        case 'array': {
-          if (node[property.name] !== undefined) {
-            let nodePropertyArray = node[property.name]
-            for (let m = 0; m < nodePropertyArray.length; m++) {
-              evalNode(nodePropertyArray[m], array, index + 1, callback)
-            }
-          }
-          break
-        }
-      }
-    }
-  }
-}