From bb3e6f6836ed85a5a87c85616fd3104052995db3 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 17 Mar 2020 17:16:28 +0100 Subject: [PATCH] Minor improvements --- Strategies.js | 40 +++++++++++++++++--------- Trades.js | 4 +-- TradingSimulationAssetBalancesPanel.js | 2 +- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/Strategies.js b/Strategies.js index d6f84e9e4..68ff6566d 100644 --- a/Strategies.js +++ b/Strategies.js @@ -542,26 +542,40 @@ let imageToDraw = strategyImages[record.number]; - /* Draw the line that represents the duration of closed strategy */ + /* Draw the line that represents the duration of closed strategy */ - browserCanvasContext.beginPath(); + browserCanvasContext.beginPath(); - browserCanvasContext.moveTo(recordPoint3.x + imageSize / 2, recordPoint3.y); - browserCanvasContext.lineTo(recordPoint4.x - imageSize / 2, recordPoint4.y); + browserCanvasContext.moveTo(recordPoint3.x + imageSize / 2, recordPoint3.y); + browserCanvasContext.lineTo(recordPoint4.x - imageSize / 2, recordPoint4.y); - browserCanvasContext.closePath(); + browserCanvasContext.closePath(); - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.MANGANESE_PURPLE + ', 1)'; - browserCanvasContext.lineWidth = 1 + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.MANGANESE_PURPLE + ', 1)'; + browserCanvasContext.lineWidth = 1 - if (record.status === 1) { - browserCanvasContext.setLineDash([0, 0]) - } else { - browserCanvasContext.setLineDash([2, 4]) - } - browserCanvasContext.stroke() + if (record.status === 1) { + browserCanvasContext.setLineDash([0, 0]) + } else { + browserCanvasContext.setLineDash([2, 4]) + } + browserCanvasContext.stroke() + /* Draw the Area */ + /* + browserCanvasContext.beginPath(); + browserCanvasContext.moveTo(recordPoint1.x, recordPoint2.y); + browserCanvasContext.lineTo(recordPoint3.x, recordPoint3.y); + browserCanvasContext.lineTo(recordPoint4.x, recordPoint4.y); + browserCanvasContext.lineTo(recordPoint2.x, recordPoint2.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.LIGHT_GREY + ', ' + 0.5 + ')'; + browserCanvasContext.fill(); + */ + /* Draw the Sticks */ drawStick(recordPoint1, recordPoint3); drawStick(recordPoint2, recordPoint4); diff --git a/Trades.js b/Trades.js index 0973949d8..9c5e16f88 100644 --- a/Trades.js +++ b/Trades.js @@ -522,11 +522,11 @@ if (record.status === 1) { switch (record.exitType) { case 1: { - line1 = 'Exit: STOP'; + line1 = 'Stop Loss'; break; } case 2: { - line1 = 'Exit: TP'; + line1 = 'Take Profit'; break; } } diff --git a/TradingSimulationAssetBalancesPanel.js b/TradingSimulationAssetBalancesPanel.js index 1ad34ee54..3ca0292ff 100644 --- a/TradingSimulationAssetBalancesPanel.js +++ b/TradingSimulationAssetBalancesPanel.js @@ -23,7 +23,7 @@ function newMastersPlottersTradingSimulationTradingSimulationTradingSimulationAs let lastRecord; let upDownButton - const HEIGHT_FACTOR = 1 + const HEIGHT_FACTOR = 1.25 return thisObject;