From e0faaa6ca8c515c502fe7e823867e5944875104f Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 29 Apr 2018 17:18:48 +0200
Subject: [PATCH] Bugs fixed with Line

---
 .vs/Plotters-Trading/v15/.suo | Bin 26112 -> 26112 bytes
 History.js                    | 110 +++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/.vs/Plotters-Trading/v15/.suo b/.vs/Plotters-Trading/v15/.suo
index ef729813fbb889af55e3dfe4f4f21100ff784d26..8b64b92127ef6e7b616acade86705e4a8f114ec2 100644
GIT binary patch
delta 1311
zcmd5*Ur19?7(eIirgwL{HJzE}bWUf8e_+#!l3GI-q$QJV-px&LsbmyUwuwp5pqC)Y
zx$ij`vxlIF>h##d4TBz17WC3vy_ZllA$w?j$A(Bm&9@Hs$N8P#cfUX9JLe>pX=0fs
zUA2r9hJ_FbDMkFq=kr1}z>6{KlhIF<)`NrDRafxie*OJhx*Kg?xW@Wm$>63DSYtQY
z6$-PZeNqXUV0o;qB!J`*h3|%j_FYI71V+v8#94$F!-Tv7As1{yQ+cmsV1;~-N4~DS
z-e$hi7S+5Zo)z43qgt~?F+x<<Bo`|Dx#XiMWu`(DB;Y`?0nvznIi<=X#8zCiA=-ub
zOi6-Mu~ZG=LPG=*A;d5ujDWPs2}x50+&2XmMx~Uw$4Es-MaSUHSTj8Xaq|s22y14)
zEcP#I-7uWyan(Tok5VA6-p=f0_@&BwV5#~jB+8e>SwqY^m$LcfCak)=P&veGe(15e
z!Nny0%_h@7`PBJj1O6|XD|X9cb$)83;=bXv+mIk<&x#a0*SwPgtLz4!)kRw%UO6c4
z6XYrrv>xJn{IWP5wcxeGj)cK_&B?#jbc+5fJI^&`St0#^v8dG4&eu9k($lVaiLDS=
z@H~Xe9y_ca3zS94I5|%)k#i(MVq_9G=sw$u7Ax2LrkQe>93<VOlN=!2dpto?p828!
zfcwNWtcE)Hr2m}(K4>baT7Oyd<|8J=gS-wdXaVpJ>c8h(^!Ar*dZn>-zea<uBdHc%
z+#As8q8_4|A<FeoltOgaF3yR7rPl?knxeEtgIV#MQF3U9Ko7f&6XfcKKwv%m3iRRV
z_PqFdm{TVqQ4A9!6J!eK2pJ$3$(`)2aW+HuUBCOqb|n4s0a!*pLnbf<9V4?vJ7gjZ
P?m29b?iwu$$y(=6^=gEg

delta 1704
zcmd5+Ur3Wt6#vfMoZI}qbZR<FbDNcw`*JJE1hWraIhQs|mzL(A{y<7(&=wU@lcIwD
z*-o!Pe;$j%z9Q&pmAwTcBIqITsi%kvW>gQZbLXaCWl_*W2Y%dh@A-f3xi|a_!p~sD
zg*la`!W=;`2!a5F$wVSSOOhYmbO$g2Es%xRN^IhWc*U{t7ciHkVLZ%y_(XKW08X$I
zj4?c-Yr-eYZRjNND~4Zn4%tj>Hi29wvS>A?cpgI{K0meR@;PdgUdKR(c2+9&<<$6U
zDAasXm^GA7q?83)${wFv7f#2`TqfnE&beO`x{YNL=h7r%zp=woNjfVudMnjO`f7-n
z59OEAsf}PK@Ju=IoY|VQj1DRY&XfS}nMX{UY12k%N4q&s-b&myLKmT%u$|CD=q2<K
z`UyJ-I|-9`KC2KWFKz0Ihz(M*;k>mxO<oXmU`RX;TW~`3i@aN+Rv1u2k`DgETsKO|
z3cgPkL(<tuL4ySPR1N7OF<2182Adm$h3BRf_^8aPVDpH%KR5sxL$)^KBCSc>7KSnm
z+5JBaNrr>;7=E$%B;XNrTC-rTf9jM!g>-y1o-67iRu7I@T^O|b`G}*7>DAAUW=LKO
zcR8&cEcQcEC0-Jna#p4l#}|n3OK054tj^T<q8OXa+mcq(Uo|9kH`@BZp-!yK(qDHP
zBDEJ;58$QRTW}kPn~rA$g+0OmK3-FYLu=}>Ua8989qb?2dtmwCfumHEz+V{?@V$4{
z-8uz+W4^i0rS4yA0JFQw<F2k*<(Aj0;pV9R5Bwfv8lxNGW&<isQB`SFKvmkJfMM@8
z%Ld@taB@V4h_~QdZvgweGRlFx>+MrYibkoEcsZ@4${kfep9vpWJ`PFRjn_)^aIB~*
zn;&!PjPcJ*z|-Y5k*zNNsR`={{6`~F6TQGxrNjPjJmLFV=XCokG6f-nV(i25u11V@
z=SJG|vA(hZM~deCa8nfvtCyC)yFWU-T7IZ}zEfO&h9}48N=rCg<ZLaW%zY#rp>;W}
zFKOkYT3`}{2lPrm(2w(p`oZYI87(tTNF_-ZVrO=-L$LVhm5;@>SI2H*Yx_y(!OMf=
ur(VO;9l=0zOXC|#e8w=H!IU|5@?u~<p7*v`cx`FQrke?*ZzjXT=j|J7H980Y

diff --git a/History.js b/History.js
index f5ac66335..476f8664e 100644
--- a/History.js
+++ b/History.js
@@ -13,7 +13,7 @@
         profile: {
             position: {
                 x: 0,
-                y: 0,
+                y: 0
             },
             visible: false
         }
@@ -34,6 +34,7 @@
 
     let files = [];                           // Here we keep the history records to be ploted every time the Draw() function is called by the AAWebPlatform.
     let plotElements = [];                    // This is where the elements to be plotted are stored before plotting.
+    let plotLines = [];                       // Here we store the lines of open positions.
 
     return thisObject;
 
@@ -107,12 +108,22 @@
         */
 
         plotElements = [];
+        plotLines = [];
+
+        let lastSellRate;
+        let lastSellDate;
+        let sellExecRate;
+
+        let lastBuyRate;
+        let lastBuyDate;
+        let buyExecRate;
 
         for (let j = 0; j < files.length; j++) {
 
             let file = files[j];
 
             let history = [];
+            let lines = [];
 
             let oneMin = 60000;
             let step = timePeriod / oneMin;
@@ -141,9 +152,57 @@
                 };
 
                 history.push(newHistoryRecord);
+
+                if (timePeriod === 60000) {
+
+                    /* Here we build the lines. */
+
+                    if (newHistoryRecord.lastSellRate > 0) {
+
+                        lastSellRate = newHistoryRecord.lastSellRate;
+                        lastSellDate = newHistoryRecord.date;
+
+                    }
+
+                    if (newHistoryRecord.sellExecRate > 0) {
+
+                        let newLine = {
+                            type: "sell",
+                            x1: lastSellDate,
+                            y1: lastSellRate,
+                            x2: newHistoryRecord.date,
+                            y2: newHistoryRecord.sellExecRate
+                        };
+
+                        lines.push(newLine);
+
+                    }
+
+                    if (newHistoryRecord.lastBuyRate > 0) {
+
+                        lastBuyRate = newHistoryRecord.lastBuyRate;
+                        lastBuyDate = newHistoryRecord.date;
+
+                    }
+
+                    if (newHistoryRecord.buyExecRate > 0) {
+
+                        let newLine = {
+                            type: "buy",
+                            x1: lastBuyDate,
+                            y1: lastBuyRate,
+                            x2: newHistoryRecord.date,
+                            y2: newHistoryRecord.buyExecRate
+                        };
+
+                        lines.push(newLine);
+
+                    }
+                }
             }
 
             plotElements.push(history);
+            plotLines.push(lines);
         }
 
         thisObject.container.eventHandler.raiseEvent("History Changed", history);
@@ -258,7 +317,6 @@
 
                 browserCanvasContext.stroke();
 
-
                 /* Draw a red inverted triangle on exec sell */
 
                 if (record.sellExecRate > 0) {
@@ -497,6 +555,54 @@
                 thisObject.profile.visible = true;
             }
 
+            /* Draw the lines connecting plot elements. */
+
+            let lines = plotLines[j];
+
+            for (let i = 0; i < lines.length; i++) {
+
+                let line = lines[i];
+
+                opacity = '0.5';
+
+                let point1 = {
+                    x: line.x1,
+                    y: line.y1
+                };
+
+                let point2 = {
+                    x: line.x2,
+                    y: line.y2
+                };
+
+                point1 = timeLineCoordinateSystem.transformThisPoint(point1);
+                point1 = transformThisPoint(point1, thisObject.container);
+                point1 = viewPort.fitIntoVisibleArea(point1);
+
+                point2 = timeLineCoordinateSystem.transformThisPoint(point2);
+                point2 = transformThisPoint(point2, thisObject.container);
+                point2 = viewPort.fitIntoVisibleArea(point2);
+
+                browserCanvasContext.beginPath();
+
+                browserCanvasContext.moveTo(point1.x, point1.y);
+                browserCanvasContext.lineTo(point2.x, point2.y);
+
+                browserCanvasContext.closePath();
+
+                if (line.type === "sell") {
+
+                    browserCanvasContext.strokeStyle = 'rgba(130, 9, 9, ' + opacity + ')';
+
+                } else {
+
+                    browserCanvasContext.strokeStyle = 'rgba(27, 105, 7, ' + opacity + ')';
+
+                }
+                
+                browserCanvasContext.stroke();
+
+            }
         }
 
         /*