From 027dea3441660b19d33fd514cb7a8687d6f602e5 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 9 Jan 2020 15:01:42 +0100
Subject: [PATCH] Code cleaning

---
 Canvas.js                  |  1 -
 ChartsSpace/TimeMachine.js | 18 ------------------
 Scales/RateScale.js        |  2 +-
 Scales/TimeFrameScale.js   |  2 +-
 Scales/TimeScale.js        |  2 +-
 Spaces/ChartSpace.js       | 21 +++++++++------------
 6 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/Canvas.js b/Canvas.js
index 5f7f1125e..b7f51fbbc 100644
--- a/Canvas.js
+++ b/Canvas.js
@@ -128,7 +128,6 @@ function newCanvas () {
 
       /* Spcaces Drawing */
       animation.addCallBackFunction('Floating Space Draw', thisObject.floatingSpace.draw)
-      animation.addCallBackFunction('Chart Space Background', thisObject.chartSpace.drawBackground)
       animation.addCallBackFunction('Chart Space Draw', thisObject.chartSpace.draw)
       animation.addCallBackFunction('Panels Space', thisObject.panelsSpace.draw)
       animation.addCallBackFunction('ViewPort Animate', viewPort.animate)
diff --git a/ChartsSpace/TimeMachine.js b/ChartsSpace/TimeMachine.js
index b081be5de..7343385d7 100644
--- a/ChartsSpace/TimeMachine.js
+++ b/ChartsSpace/TimeMachine.js
@@ -371,8 +371,6 @@ function newTimeMachine () {
   }
 
   function drawBackground () {
-    thisBackground()
-
     if (thisObject.container.frame.isInViewPort()) {
       for (let i = 0; i < this.timelineCharts.length; i++) {
         let chart = this.timelineCharts[i]
@@ -395,22 +393,6 @@ function newTimeMachine () {
     }
   }
 
-  function thisBackground () {
-    return
-    let params = {
-      cornerRadius: 15,
-      lineWidth: 5,
-      opacity: 1,
-      container: thisObject.container,
-      borderColor: UI_COLOR.RUSTED_RED,
-      backgroundColor: UI_COLOR.WHITE,
-      fitFunction: thisObject.fitFunction,
-      coordinateSystem: timeLineCoordinateSystem
-    }
-
-    roundedCornersBackground(params)
-  }
-
   function recalculateScale () {
     let minValue = {
       x: MIN_PLOTABLE_DATE.valueOf(),
diff --git a/Scales/RateScale.js b/Scales/RateScale.js
index d2db7ffe5..5158fe3b7 100644
--- a/Scales/RateScale.js
+++ b/Scales/RateScale.js
@@ -26,7 +26,7 @@ function newRateScale () {
   thisObject.container.isWheelable = true
   thisObject.container.detectMouseOver = true
 
-  thisObject.container.frame.width = 190
+  thisObject.container.frame.width = 250
   thisObject.container.frame.height = 30
 
   let isMouseOver
diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js
index 87d3cfde3..8f4d63f14 100644
--- a/Scales/TimeFrameScale.js
+++ b/Scales/TimeFrameScale.js
@@ -39,7 +39,7 @@ function newTimeFrameScale () {
     thisObject.container.isWheelable = true
     thisObject.container.detectMouseOver = true
 
-    thisObject.container.frame.width = 190
+    thisObject.container.frame.width = 250
     thisObject.container.frame.height = 30
   }
 
diff --git a/Scales/TimeScale.js b/Scales/TimeScale.js
index fb7d75e33..689185e49 100644
--- a/Scales/TimeScale.js
+++ b/Scales/TimeScale.js
@@ -25,7 +25,7 @@ function newTimeScale () {
   thisObject.container.isWheelable = true
   thisObject.container.detectMouseOver = true
 
-  thisObject.container.frame.width = 190
+  thisObject.container.frame.width = 250
   thisObject.container.frame.height = 30
 
   let isMouseOver
diff --git a/Spaces/ChartSpace.js b/Spaces/ChartSpace.js
index 2879666d3..85daf0772 100644
--- a/Spaces/ChartSpace.js
+++ b/Spaces/ChartSpace.js
@@ -23,7 +23,6 @@ function newChartSpace () {
     fitIntoVisibleArea: fitIntoVisibleArea,
     isThisPointVisible: isThisPointVisible,
     physics: physics,
-    drawBackground: drawBackground,
     draw: draw,
     getContainer: getContainer,     // returns the inner most container that holds the point received by parameter.
     initialize: initialize,
@@ -281,9 +280,17 @@ function newChartSpace () {
     }
   }
 
-  function drawBackground () {
+  function draw () {
     if (thisObject.visible !== true) { return }
+    drawBackground()
 
+    for (let i = 0; i < thisObject.timeMachines.length; i++) {
+      let timeMachine = thisObject.timeMachines[thisObject.timeMachines.length - i - 1]
+      timeMachine.draw()
+    }
+  }
+
+  function drawBackground () {
     drawSpaceBackground()
 
     for (let i = 0; i < thisObject.timeMachines.length; i++) {
@@ -291,7 +298,6 @@ function newChartSpace () {
       timeMachine.drawBackground()
     }
   }
-
   function drawSpaceBackground () {
     let opacity = '1'
     let fromPoint = {
@@ -310,13 +316,4 @@ function newChartSpace () {
     browserCanvasContext.closePath()
     browserCanvasContext.fill()
   }
-
-  function draw () {
-    if (thisObject.visible !== true) { return }
-
-    for (let i = 0; i < thisObject.timeMachines.length; i++) {
-      let timeMachine = thisObject.timeMachines[thisObject.timeMachines.length - i - 1]
-      timeMachine.draw()
-    }
-  }
 }