diff --git a/Panels/ProductsPanel.js b/Panels/ProductsPanel.js index 9465e5a5a..f49910b91 100644 --- a/Panels/ProductsPanel.js +++ b/Panels/ProductsPanel.js @@ -159,6 +159,9 @@ function newProductsPanel () { continue } + if (plotterModuleNode.code === undefined) { continue } + if (plotterModuleNode.code.code === undefined) { continue } + /* Conversion to fit old format */ product.plotter = plotter product.plotter.devTeam = plotterTeam.codeName @@ -175,7 +178,7 @@ function newProductsPanel () { /* We take a snapwhot of the current product definition to be used by the plotter. */ let functionLibraryProtocolNode = newProtocolNode() - product.definition = functionLibraryProtocolNode.getProtocolNode(productNode, false, true, true) + product.definition = functionLibraryProtocolNode.getProtocolNode(productNode, false, true, true, false, false, true) for (let m = 0; m < productNode.datasets.length; m++) { let dataset = productNode.datasets[m] diff --git a/Plotter.js b/Plotter.js index 957744b3d..6259c3d3d 100644 --- a/Plotter.js +++ b/Plotter.js @@ -442,108 +442,45 @@ function newPlotter () { let userPositionDate = userPosition.point.x /* Clean the pannel at places where there is no record. */ - let record = { - direction: '', - period: '' - } - let currentRecord = { - innerChannel: record + innerChannel: undefined } - thisObject.container.eventHandler.raiseEvent('Current Record Changed', currentRecord) - if (records.length > 0) { - for (let i = 0; i < records.length; i++) { - record = records[i] + for (let i = 0; i < records.length; i++) { + let record = records[i] - let channelPoint1 - let channelPoint2 - let channelPoint3 - let channelPoint4 - - channelPoint1 = { - x: record.begin, - y: record.firstMovingAverage - record.firstDeviation - } - - channelPoint2 = { - x: record.end, - y: record.lastMovingAverage - record.lastDeviation - } - - channelPoint3 = { - x: record.end, - y: record.lastMovingAverage + record.lastDeviation - } - - channelPoint4 = { - x: record.begin, - y: record.firstMovingAverage + record.firstDeviation - } - - channelPoint1 = timeLineCoordinateSystem.transformThisPoint(channelPoint1) - channelPoint2 = timeLineCoordinateSystem.transformThisPoint(channelPoint2) - channelPoint3 = timeLineCoordinateSystem.transformThisPoint(channelPoint3) - channelPoint4 = timeLineCoordinateSystem.transformThisPoint(channelPoint4) - - channelPoint1 = transformThisPoint(channelPoint1, thisObject.container) - channelPoint2 = transformThisPoint(channelPoint2, thisObject.container) - channelPoint3 = transformThisPoint(channelPoint3, thisObject.container) - channelPoint4 = transformThisPoint(channelPoint4, thisObject.container) - - if (channelPoint2.x < viewPort.visibleArea.bottomLeft.x || channelPoint1.x > viewPort.visibleArea.bottomRight.x) { - continue - } - - channelPoint1 = viewPort.fitIntoVisibleArea(channelPoint1) - channelPoint2 = viewPort.fitIntoVisibleArea(channelPoint2) - channelPoint3 = viewPort.fitIntoVisibleArea(channelPoint3) - channelPoint4 = viewPort.fitIntoVisibleArea(channelPoint4) - - browserCanvasContext.beginPath() - - browserCanvasContext.moveTo(channelPoint1.x, channelPoint1.y) - browserCanvasContext.lineTo(channelPoint2.x, channelPoint2.y) - browserCanvasContext.lineTo(channelPoint3.x, channelPoint3.y) - browserCanvasContext.lineTo(channelPoint4.x, channelPoint4.y) - - browserCanvasContext.closePath() - - let opacity = '0.25' - - if (record.direction === 'Side') { browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.LIGHT + ', ' + opacity + ')' } - if (record.direction === 'Up') { browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.GREEN + ', ' + opacity + ')' } - if (record.direction === 'Down') { browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', ' + opacity + ')' } - - if (userPositionDate >= record.begin && userPositionDate <= record.end) { - browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 0.1)' // Current record accroding to time - - let currentRecord = { - innerChannel: record - } - thisObject.container.eventHandler.raiseEvent('Current Record Changed', currentRecord) - } - - browserCanvasContext.fill() - - browserCanvasContext.beginPath() - - browserCanvasContext.moveTo(channelPoint1.x, channelPoint1.y) - browserCanvasContext.lineTo(channelPoint2.x, channelPoint2.y) - browserCanvasContext.moveTo(channelPoint3.x, channelPoint3.y) - browserCanvasContext.lineTo(channelPoint4.x, channelPoint4.y) - - browserCanvasContext.closePath() - - if (record.direction === 'Side') { browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.DARK + ', ' + opacity + ')' } - if (record.direction === 'Up') { browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', ' + opacity + ')' } - if (record.direction === 'Down') { browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RED + ', ' + opacity + ')' } - - browserCanvasContext.lineWidth = 1 - browserCanvasContext.setLineDash([0, 0]) - browserCanvasContext.stroke() + let beginPoint = { + x: record.begin, + y: 0 } + + let endPoint = { + x: record.end, + y: 0 + } + + beginPoint = timeLineCoordinateSystem.transformThisPoint(beginPoint) + endPoint = timeLineCoordinateSystem.transformThisPoint(endPoint) + + beginPoint = transformThisPoint(beginPoint, thisObject.container) + endPoint = transformThisPoint(endPoint, thisObject.container) + + if (endPoint.x < viewPort.visibleArea.bottomLeft.x || beginPoint.x > viewPort.visibleArea.bottomRight.x) { + continue + } + + let atMousePosition = false + if (userPositionDate >= record.begin && userPositionDate <= record.end) { + atMousePosition = true + + let currentRecord = { + innerChannel: record + } + thisObject.container.eventHandler.raiseEvent('Current Record Changed', currentRecord) + } + + eval(productDefinition.referenceParent.code.code) } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] plotChart -> err = ' + err) }