diff --git a/ChartsSpace/TimeMachine.js b/ChartsSpace/TimeMachine.js index 30ebe0d87..e523d0f5e 100644 --- a/ChartsSpace/TimeMachine.js +++ b/ChartsSpace/TimeMachine.js @@ -493,8 +493,6 @@ function newTimeMachine () { if (thisObject.timeFrameScale !== undefined) { thisObject.timeFrameScale.draw() } if (thisObject.rateScale !== undefined) { thisObject.rateScale.draw() } } - - thisObject.container.frame.draw(false, true, false, thisObject.fitFunction) } else { let icon = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type) if (icon !== undefined) { @@ -531,6 +529,14 @@ function newTimeMachine () { if (thisObject.timeFrameScale !== undefined) { thisObject.timeFrameScale.drawForeground() } if (thisObject.rateScale !== undefined) { thisObject.rateScale.drawForeground() } } + + let style = { + color: UI_COLOR.BLACK, + opacity: 1, + lineWidth: 1, + lineDash: [1, 3] + } + thisObject.container.frame.draw(false, true, false, thisObject.fitFunction, style) } } diff --git a/Frame.js b/Frame.js index 0c4023664..ed8a0a25d 100644 --- a/Frame.js +++ b/Frame.js @@ -237,9 +237,9 @@ function newFrame () { } } - function draw (drawGrid, drawBorders, drawBackground, fitFunction) { + function draw (drawGrid, drawBorders, drawBackground, fitFunction, style) { if (drawBorders === true) { - borders(fitFunction) + borders(fitFunction, style) } if (drawGrid === true) { @@ -331,7 +331,7 @@ function newFrame () { browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) } - function borders (fitFunction) { + function borders (fitFunction, style) { /* Lest get the important points of the drawing so as to apply the needed transformations. */ let point1 @@ -359,8 +359,7 @@ function newFrame () { y: thisObject.height } - /* Now the transformations. */ - + /* Now the transformations. */ point1 = transformThisPoint(point1, thisObject.container) point2 = transformThisPoint(point2, thisObject.container) point3 = transformThisPoint(point3, thisObject.container) @@ -373,8 +372,7 @@ function newFrame () { point4 = fitFunction(point4) } - /* Lets start the drawing. */ - + /* Lets start the drawing. */ browserCanvasContext.beginPath() browserCanvasContext.moveTo(point1.x, point1.y) browserCanvasContext.lineTo(point2.x, point2.y) @@ -383,9 +381,9 @@ function newFrame () { browserCanvasContext.lineTo(point1.x, point1.y) browserCanvasContext.closePath() - browserCanvasContext.strokeStyle = 'rgba(150, 150, 150, 1)' - browserCanvasContext.lineWidth = 1 - browserCanvasContext.setLineDash([0, 0]) + browserCanvasContext.strokeStyle = 'rgba(' + style.color + ', ' + style.opacity + ')' + browserCanvasContext.lineWidth = style.lineWidth + browserCanvasContext.setLineDash(style.lineDash) browserCanvasContext.stroke() browserCanvasContext.closePath()