From 87e8a108f7bff193fce261c5c16d4429f8c50c2f Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Fri, 3 May 2019 19:36:29 +0200
Subject: [PATCH] Phases linked

---
 Animation.js                            |  2 --
 FloatingSpace/StrategyParts.js          |  2 +-
 StrategySpace/StrategyCollectionItem.js | 33 +++++++++++++++++++++++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/Animation.js b/Animation.js
index 063725ada..d27dc114c 100644
--- a/Animation.js
+++ b/Animation.js
@@ -131,8 +131,6 @@ function newAnimation () {
   }
 
   function clearBrowserCanvas () {
-    if (INFO_LOG === true) { logger.write('[INFO] clearBrowserCanvas -> Entering function.') }
-
     browserCanvasContext.beginPath()
 
     browserCanvasContext.rect(0, 0, browserCanvas.width, browserCanvas.height)
diff --git a/FloatingSpace/StrategyParts.js b/FloatingSpace/StrategyParts.js
index e37a09ccd..81b524ad5 100644
--- a/FloatingSpace/StrategyParts.js
+++ b/FloatingSpace/StrategyParts.js
@@ -37,7 +37,7 @@ function newStrategyParts () {
     floatingObject.initialize('Strategy Part', floatingLayer, onInitialized)
 
     function onInitialized (err) {
-      const FRICTION = 0.98
+      const FRICTION = 0.97
       floatingObject.payload = pPayload
 
       switch (type) {
diff --git a/StrategySpace/StrategyCollectionItem.js b/StrategySpace/StrategyCollectionItem.js
index 118a528f0..4a93b2c1f 100644
--- a/StrategySpace/StrategyCollectionItem.js
+++ b/StrategySpace/StrategyCollectionItem.js
@@ -91,6 +91,7 @@ function newStrategyCollectionItem () {
   }
 
   function generateStrategyParts () {
+    let lastPhase
     let strategy = thisObject.strategy
     createPart('Strategy', strategy.name, strategy, undefined)
 
@@ -130,7 +131,15 @@ function newStrategyCollectionItem () {
     createPart('Stop', '', strategy.stopLoss, strategy)
     for (let p = 0; p < strategy.stopLoss.phases.length; p++) {
       let phase = strategy.stopLoss.phases[p]
-      createPart('Phase', phase.name, phase, strategy.stopLoss, 'Phase' + ' ' + (p + 1))
+
+      let parent
+      if (p === 0) {
+        parent = strategy.stopLoss
+      } else {
+        parent = lastPhase
+      }
+      lastPhase = phase
+      createPart('Phase', phase.name, phase, parent, 'Phase' + ' ' + (p + 1))
 
       for (let k = 0; k < phase.situations.length; k++) {
         let situation = phase.situations[k]
@@ -146,7 +155,14 @@ function newStrategyCollectionItem () {
     createPart('Take Profit', '', strategy.buyOrder, strategy)
     for (let p = 0; p < strategy.buyOrder.phases.length; p++) {
       let phase = strategy.buyOrder.phases[p]
-      createPart('Phase', phase.name, phase, strategy.buyOrder, 'Phase' + ' ' + (p + 1))
+      let parent
+      if (p === 0) {
+        parent = strategy.buyOrder
+      } else {
+        parent = lastPhase
+      }
+      lastPhase = phase
+      createPart('Phase', phase.name, phase, parent, 'Phase' + ' ' + (p + 1))
 
       for (let k = 0; k < phase.situations.length; k++) {
         let situation = phase.situations[k]
@@ -246,6 +262,19 @@ function newStrategyCollectionItem () {
     text()
     arrow()
     icon()
+    floatingBackground()
+  }
+
+  function floatingBackground () {
+    if (visible === false) { return }
+
+    browserCanvasContext.beginPath()
+
+    browserCanvasContext.rect(SIDE_PANEL_WIDTH, 0, browserCanvas.width - SIDE_PANEL_WIDTH, browserCanvas.height)
+    browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.DARK + ', 1)'
+
+    browserCanvasContext.closePath()
+    browserCanvasContext.fill()
   }
 
   function text () {