From efc2b13703fbdd75cc04dc3a62bde85826c2ad7b Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sat, 10 Mar 2018 19:27:41 +0100
Subject: [PATCH] Update to Cloud.1.0

---
 .vs/Plotters-Trading/v15/.suo | Bin 22016 -> 15360 bytes
 History.js                    |  46 +++++++++++-----------------------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/.vs/Plotters-Trading/v15/.suo b/.vs/Plotters-Trading/v15/.suo
index 98af444ac5da635f59b8065cdf0091e5fef1d94a..8079e31e521845176451af6bcdbe870e5ee28194 100644
GIT binary patch
delta 778
zcmZWn&ubG=5Z>8r+n2bTZZvJOc9*0fQV+&%s#cI5ED_m5X=^DS1gn38Y^5Sd!CwXU
z(jD|F#e+R4guIJ*@Dh(=QvC}=y?7GL!3tGp(p{3$2Osm^H}lQ+cHXYPg7vlfoC+F_
ztA(Vy`}WKIH=m)1tLjHX8CMi#fbfqN?l@(<IHBR%&;|$uZ48T=menc!m(osDW>MU{
z;*O-EGfR0D=$w>y#A686Ida=kiz2*x`vI99m8<F#2t^i5+!DE2Ba)^m4ihqjBZNW1
zF+!FwLKr3F2zkPB0^5vHwB?q#0h>3^Hd3A{%qYY6mwq;Y(Dnqk=JM`G`F6_yK5?TS
z>ja1N=<CaZE#oTL(RB!CJfZfH*lozS<J-ig=sQ7}_ryVy`~o)BDt4miTR~&A1_p3H
z?$A@`f-qe(lq8WnfL<cq)=Nb2q<Z9V*NdkXbJEW*f}S8|sE@^twWtds?0(WW+dAvG
zZ>&c@6NIHpI-AFjy+6~^0$_8nI>5b`<*v~J!Os*6Wv8I4jj~AM&&d>?nLLRXD)+GM
zPT`MA5OZ?-^i#+zkt|-fXmd)=yU)OS6mt|`M|=M75_0eSWx$$UML)McNZ&D~HZ_w7
zPYCqReK0F8et-JDF}u>d_O<cu>Ys;Lp01k{_3d=aegA9T3in>FTz@XVP22Dv7n%^?

delta 918
zcmZpuXjsFz!H0=aWU?ZYJZD0J%ml8@ml*{&m$G#;GICC4WRaejz%q%8MV60&fq@%{
zd4N~|i2wcn|DOv;^8zvdWJfM>UU48x0*EDnSZeb^mUzaA2{x0Md?04CC1^KJ;@Uj9
zh$(RLVP?b0U)atAY1>I0BAjeM4bng?KiQDQcw&MKuMCjG4#XfkWH(o`v@>qv@?hc+
z1quO0{!eb?SD9SGb78WJ@SaIh&YPW;S{WywkhYj4=fVSW8pshab&~{GCRfOv;Q={c
z2}yi%iG0r{E@viQ21cMLNEb}U<`SMB#!V8=jJym?P+^!9*f7bCNn#!xAR!O{xdkY^
zxkAQ=aq<yy8;~17!9=VZCh>Vp_Au3%T*7yLva^Kk<OcqRO-e@?d02pEFeAI_i!u+>
zBn1~9P}m3~OOz=1Gx9QuL4{y$Vg+dq+5A(LpL6mBBcsVy`gM~(7;;T+FwmI%O1}pr
zwt0oYR7S!1Ky@&%8pyEU>}NEMQF0kf3`lPTVpbpqMLqN8zoyR2lN;1HCVN<(5e$)A
zTdw%*;w4tS<_mUupWiV6qfmIVh1DFvE#d`gCc>6Y3;q~x+!_=*6)dy)hZP6oCKJ42
d>jL&WC{4ipf)c(W9vmD<a>xO<NM)FW5C9&^DLViF

diff --git a/History.js b/History.js
index d641a245b..b540a3ed8 100644
--- a/History.js
+++ b/History.js
@@ -103,10 +103,16 @@
             let newHistoryRecord = {
 
                 date: Math.trunc(file[i][0] / 60000) * 60000 + 30000,
-                rate: file[i][1],                    
-                newPositions: file[i][2],
-                newTrades: file[i][3],
-                movedPositions: file[i][4]
+                buyAvgRate: file[i][1],    
+                sellAvgRate: file[i][2], 
+                marketRate: file[i][3],
+                newPositions: file[i][4],
+                newTrades: file[i][5],
+                movedPositions: file[i][6],
+                profitsAssetA: file[i][7],
+                profitsAssetB: file[i][8],
+                combinedProfitsA: file[i][9],
+                combinedProfitsB: file[i][10]
             };
 
             history.push(newHistoryRecord);
@@ -145,7 +151,7 @@
 
             for (let i = 0; i < file.length; i++) {
 
-                let currentMax = file[i][1];   // 1 = rates.
+                let currentMax = file[i][1] + file[i][2];   // 1 = rates.
 
                 if (maxValue < currentMax) {
                     maxValue = currentMax;
@@ -166,29 +172,22 @@
 
             let point = {
                 x: record.date,
-                y: record.rate
+                y: record.sellAvgRate
             };
 
             point = timeLineCoordinateSystem.transformThisPoint(point);
-
             point = transformThisPoint(point, thisObject.container);
 
-            if (point.x < viewPort.visibleArea.bottomLeft.x || point.x > viewPort.visibleArea.bottomRight.x) {
-                continue;
-            }
+            if (point.x < viewPort.visibleArea.bottomLeft.x || point.x > viewPort.visibleArea.bottomRight.x) { continue;}
 
             point = viewPort.fitIntoVisibleArea(point);
 
             let isCurrentRecord = false;
 
             if (datetime !== undefined) {
-
                 let dateValue = datetime.valueOf();
-
                 if (dateValue >= record.date - timePeriod / 2 && dateValue <= record.date + timePeriod / 2 - 1) {
-
                     isCurrentRecord = true;
-
                 } 
             } 
 
@@ -208,42 +207,32 @@
             browserCanvasContext.strokeStyle = 'rgba(27, 105, 7, ' + opacity + ')';
 
             if (isCurrentRecord === false) {
-
                 browserCanvasContext.fillStyle = 'rgba(64, 217, 26, ' + opacity + ')';
-
             } else {
-
                 browserCanvasContext.fillStyle = 'rgba(255, 233, 31, ' + opacity + ')';  /* highlight the current record */
-
             }
 
             browserCanvasContext.arc(point.x, point.y, radius3, 0, Math.PI * 2, true);
-
             browserCanvasContext.closePath();
 
             if (point.x < viewPort.visibleArea.topLeft.x + 50 || point.x > viewPort.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
                 browserCanvasContext.fill();
             }
+
             browserCanvasContext.stroke();
 
             /* Middle Circle */
 
             browserCanvasContext.beginPath();
-
             browserCanvasContext.strokeStyle = 'rgba(44, 61, 89, ' + opacity + ')';
 
             if (isCurrentRecord === false) {
-
                 browserCanvasContext.fillStyle = 'rgba(50, 108, 201, ' + opacity + ')';
-
             } else {
-
                 browserCanvasContext.fillStyle = 'rgba(255, 233, 31, ' + opacity + ')';  /* highlight the current record */
-
             }
 
             browserCanvasContext.arc(point.x, point.y, radius2, 0, Math.PI * 2, true);
-
             browserCanvasContext.closePath();
 
             if (point.x < viewPort.visibleArea.topLeft.x + 50 || point.x > viewPort.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
@@ -254,28 +243,21 @@
             /* Inner Circle */
 
             browserCanvasContext.beginPath();
-
             browserCanvasContext.strokeStyle = 'rgba(27, 7, 105, ' + opacity + ')';
 
             if (isCurrentRecord === false) {
-
                 browserCanvasContext.fillStyle = 'rgba(64, 26, 217, ' + opacity + ')';
-
             } else {
-
                 browserCanvasContext.fillStyle = 'rgba(255, 233, 31, ' + opacity + ')';  /* highlight the current record */
-
             }
 
             browserCanvasContext.arc(point.x, point.y, radius1, 0, Math.PI * 2, true);
-
             browserCanvasContext.closePath();
 
             if (point.x < viewPort.visibleArea.topLeft.x + 50 || point.x > viewPort.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
                 browserCanvasContext.fill();
             }
             browserCanvasContext.stroke();
-
         }
     }