From afc95ec9f7277bc2361a494c9c834c7530eeb4da Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sat, 5 May 2018 13:07:45 +0200
Subject: [PATCH] Visibility Improved

---
 .vs/Plotters-Trading/v15/.suo | Bin 27136 -> 29184 bytes
 History.js                    |  96 +++++++++++++++++++++++++++-------
 2 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/.vs/Plotters-Trading/v15/.suo b/.vs/Plotters-Trading/v15/.suo
index 66b6f607e074b466776bb22996f226aa8dd33e3b..f7a2443e1ff908f97355adaec05d51fd7c4ad529 100644
GIT binary patch
delta 519
zcmZp;!r1VHae{#?69W_oFfgzHnT$aE@Bjb*AW`PYjG4k46L^@|8kG3|Bs|$%#B_*J
zR1hd51jHOb%mc(gjSO6yJz12Q*aTE>gO#x@Vq{bUX`YzCGFgX1!&L>S259JiRVb|h
zq}72~1IpKg(jYY;+mV43P)-tvxi`<`SjEH12r>&~_hf-gjm;&ZS6Em;rb2j97Z_PU
zZkx=Lsk6C6<~-x%!%T*gOXLDLxPYQs5Oq46f5>@5WfU%OC;>(JAu>Soy!~0gdcOFd
z-+WlbmT^%K%O)LXMs#a+*Dy_1kkUZ1+N6hZa$tJ&=4hj(jFSRRuz-vOJL-$dc_vOq
zkPks_012^zycDwer#U;<A~B{-F1MHkx5MK>=)h?pyKeJqcTuKEGA`J>;}pVz#VcL`
iEYctgKwkgi#lyTQ=$0@xb5liG7I`o&iep-o#sUCkO_t~Y

delta 535
zcmZ9JO-lk{5XYVMSy^pKEjGwZHuE*CwhqxX6nYl}>EfkJgxA<pCqIA(+vn6(=n@g+
z^9}L?DB&R@NTNgFrGtk$)Hb6lNCSWNKl98p`<va$J5)MQGv-~R2)JAx^nm)cZJWx#
zp*($mqDmg)F1p%%6X((cXj6C+L@6j0<wFI;E?dO5!;6nsZ1dCsVs!cPgz=1$;x&bB
z;ZU0<Q|Ndnfl8q$PdiWY$uUp)1m?4-xVTboRNj=<gsF8Hi(-uj$|+%n+Q5j0tL2O^
z!!7Va98&_N25v?Q%s)Ig#8+e=WQaNK+|=6&y=BR17Un`#swbqzMiaaPHrkKI$RRXE
z@txe0hY-uRlF(<mz>m&KqO^VuR%nOOCPONt3RXBb4pxQwrq7CG|KlALk(|hUAf()r
zJNSu1M)89tEqdFUWa-&)@O*&{&}iv?UUfHONDTB<M!WESyyb;StjwVXRQ-f1H;$kE
R!AJVhPQ0LB5xrB5{Q)bKo8SNd

diff --git a/History.js b/History.js
index b8305292c..19b51ad39 100644
--- a/History.js
+++ b/History.js
@@ -10,14 +10,16 @@
         setTimePeriod: setTimePeriod,
         setDatetime: setDatetime,
         draw: draw,
-        profile: {
-            position: {
-                x: 0,
-                y: 0
+        payload: {
+            profile: {
+                position: {
+                    x: 0,
+                    y: 0
+                },
+                visible: false
             },
-            visible: false
-        },
-        bubbles: undefined
+            bubbles: []
+        }
     };
 
     /* this is part of the module template */
@@ -38,6 +40,8 @@
     let plotLines = [];                       // Here we store the lines of open positions.
     let bubbles = [];                         // Here we store the bubbles with messages from the bot.
 
+    let bubblesChangedEventRaised = true;     // This controls when to raise the event that bubbles changed.
+
     return thisObject;
 
     function initialize(pStorage, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) {
@@ -51,6 +55,8 @@
         recalculateScale();
         callBackFunction();
 
+        canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
+
     }
 
     function getContainer(point) {
@@ -72,6 +78,12 @@
 
     }
 
+    function onDragFinished() {
+
+        recalculate();
+
+    }
+
     function setTimePeriod(pTimePeriod) {
 
         timePeriod = pTimePeriod;
@@ -127,6 +139,8 @@
             let oneMin = 60000;
             let step = timePeriod / oneMin;
 
+            /* First the small balls */
+
             for (let i = 0; i < file.length; i = i + step) {
 
                 let newHistoryRecord = {
@@ -202,36 +216,67 @@
 
                     }
                 }
+            }
 
-                /* Finally we process the text on the file. */
+            /* Second we process the text */
+
+            for (let i = 0; i < file.length; i++) {
+
+                let newHistoryRecord = {
+
+                    date: Math.trunc(file[i][0] / 60000) * 60000 + 30000,
+                    buyAvgRate: file[i][1],
+                    sellAvgRate: file[i][2],
+
+                    lastSellRate: file[i][3],
+                    sellExecRate: file[i][4],
+                    lastBuyRate: file[i][5],
+                    buyExecRate: file[i][6],
+
+                    marketRate: file[i][7],
+                    newPositions: file[i][8],
+                    newTrades: file[i][9],
+                    movedPositions: file[i][10],
+                    profitsAssetA: file[i][11],
+                    profitsAssetB: file[i][12],
+                    combinedProfitsA: file[i][13],
+                    combinedProfitsB: file[i][14],
+
+                    messageRelevance: file[i][15],
+                    messageTitle: file[i][16],
+                    messageBody: file[i][17]
+                };
 
-                /*
                 if (newHistoryRecord.messageTitle !== "" && newHistoryRecord.messageBody !== "") {
 
                     if (newHistoryRecord.messageRelevance >= 0 && newHistoryRecord.messageRelevance <= 10) {
 
-                        if (timePeriod <= dailyFilePeriods[newHistoryRecord.messageRelevance][0]) {
+                        let relevanceTimePeriod = (dailyFilePeriods[10 - newHistoryRecord.messageRelevance][0]);
+
+                        if (timePeriod <= relevanceTimePeriod) {
 
                             let bubble = {
                                 title: newHistoryRecord.messageTitle,
-                                body: newHistoryRecord.messageBody,
+                                body: newHistoryRecord.messageRelevance + ". " + newHistoryRecord.messageBody,
                                 date: newHistoryRecord.date,
                                 rate: newHistoryRecord.marketRate,
                                 position: {
                                     x: 0,
                                     y: 0
-                                }
+                                },
+                                visible: false
                             };
 
                             bubbles.push(bubble);
                         }
                     }
                 }
-                */
             }
 
             plotElements.push(history);
             plotLines.push(lines);
+
+            bubblesChangedEventRaised = false;
         }
 
         thisObject.container.eventHandler.raiseEvent("History Changed", history);
@@ -599,7 +644,7 @@
 
                 /* Since there is at least some point plotted, then the profile should be visible. */
 
-                thisObject.profile.visible = true;
+                thisObject.payload.profile.visible = true;
             }
 
             /* Draw the lines connecting plot elements. */
@@ -653,7 +698,7 @@
 
             /* Now we calculate the anchor position of bubbles. */
 
-            /*
+            
             for (let i = 0; i < bubbles.length; i++) {
 
                 let bubble = bubbles[i];
@@ -667,12 +712,25 @@
 
                 bubble.position = timeLineCoordinateSystem.transformThisPoint(bubble.position);
                 bubble.position = transformThisPoint(bubble.position, thisObject.container);
+
+                if (bubble.position.x < (viewPort.visibleArea.bottomRight.x) * (-1) || bubble.position.x > (viewPort.visibleArea.bottomRight.x) * (2)) {
+                    bubble.visible = false;
+                } else {
+                    bubble.visible = true;
+                }
+
                 bubble.position = viewPort.fitIntoVisibleArea(bubble.position);
 
             }
 
-            thisObject.bubbles = bubbles;
-            */
+            if (bubblesChangedEventRaised === false) {
+
+                thisObject.container.eventHandler.raiseEvent("Bubbles Changed", bubbles);
+                thisObject.payload.bubbles = bubbles;
+
+                bubblesChangedEventRaised = true;
+            }
+
         }
 
         /*
@@ -682,8 +740,8 @@
 
         */
 
-        thisObject.profile.position.x = point.x;
-        thisObject.profile.position.y = point.y;
+        thisObject.payload.profile.position.x = point.x;
+        thisObject.payload.profile.position.y = point.y;
     }
 
 }