Axis zoom does not appear for timeline

engaging-computing · Feb 18, 2016 · 4233242 · 4233242
1 parent 3c0d292
commit 4233242
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/app/assets/javascripts/templates/visualizations/controls/scatter-tools.hbs b/app/assets/javascripts/templates/visualizations/controls/scatter-tools.hbs
@@ -39,34 +39,36 @@
     {{/each}}
   </div>
 </div>
-<div class="vis-ctrl-subblock">
-  <h4 class="vis-ctrl-subtitle">Axis Bounds</h4>
-  <div>
-      <label>X Axis Range:</label>
-      <div  class="inline-block">
-        <input id="x-axis-min" class="form-control axis" value="{{xAxisMin}}" placeholder="eg: 5,10">        
-        <span>to</span>       
-        <input id="x-axis-max" class="form-control axis" value="{{xAxisMax}}" placeholder="eg: 5,10">        
-      </div>
-      <label>Y Axis Range:</label>
-      <div  class="inline-block">
-        <input id="y-axis-min" class="form-control axis" value="{{yAxisMin}}" placeholder="eg: 5,10"> 
-        <span>to</span>
-        <input id="y-axis-max" class="form-control axis" value="{{yAxisMax}}" placeholder="eg: 5,10">       
-      </div>
+{{#if vis}}
+  <div class="vis-ctrl-subblock">
+    <h4 class="vis-ctrl-subtitle">Axis Bounds</h4>
+    <div>
+        <label>X Axis Range:</label>
+        <div  class="inline-block">
+          <input id="x-axis-min" class="form-control axis" value="{{xAxisMin}}" placeholder="eg: 5,10">
+          <span>to</span>
+          <input id="x-axis-max" class="form-control axis" value="{{xAxisMax}}" placeholder="eg: 5,10">
+        </div>
+        <label>Y Axis Range:</label>
+        <div  class="inline-block">
+          <input id="y-axis-min" class="form-control axis" value="{{yAxisMin}}" placeholder="eg: 5,10">
+          <span>to</span>
+          <input id="y-axis-max" class="form-control axis" value="{{yAxisMax}}" placeholder="eg: 5,10">
+        </div>
+    </div>
+      <button id="set-axis-button" data-log-id="set-axis-size" class="btn btn-default">Set Axis Size</button>
   </div>
-    <button id="set-axis-button" data-log-id="set-axis-size" class="btn btn-default">Set Axis Size</button>
-</div>
+{{/if}}
 <div class="vis-ctrl-subblock">
   <h4 class="vis-ctrl-subtitle">Other</h4>
-  <div> 
+  <div>
     <div class="checkbox">
       <label id="ckbx-lbl-tooltips" class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="ckbx-tooltips">Detailed Tooltips
         <input id="ckbx-tooltips" data-log-id="detailed-tooltips" type="checkbox" class="mdl-checkbox__input"/>
         <span class="mdl-checkbox__label">{{label}}</span>
-      </label> 
+      </label>
     </div>
-    <div class="checkbox">     
+    <div class="checkbox">
       <label id="ckbx-lbl-fulldetail" class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="ckbx-fulldetail">Show All Data
         <input id="ckbx-fulldetail" data-log-id="show-all-data" type="checkbox" class="mdl-checkbox__input"/>
         <span class="mdl-checkbox__label">{{label}}</span>

diff --git a/app/assets/javascripts/visualizations/highvis/scatter.coffee b/app/assets/javascripts/visualizations/highvis/scatter.coffee
@@ -46,6 +46,7 @@ $ ->
 
         @xGridSize = @yGridSize = @INITIAL_GRID_SIZE
 
+        @isScatter = true # To do add axis bounds feature that does time
         # Used for data reduction triggering
         @updateOnZoom = true
 
@@ -380,6 +381,7 @@ $ ->
         inctx = {}
         inctx.axes = ["Both", "X", "Y"]
         inctx.logSafe = data.logSafe
+        inctx.vis = @isScatter # To do add axis bounds feature that does time
         inctx.elapsedTime = elapsedTime and data.timeFields.length is 1
         inctx.modes = [
           { mode: @SYMBOLS_LINES_MODE, text: "Symbols and Lines" }
@@ -515,7 +517,7 @@ $ ->
             , 3000
 
           if thereIsAFailure then return
-         
+
           @configs.xBounds.min = xAxisMin
           @configs.xBounds.max = xAxisMax
 
@@ -943,4 +945,3 @@ $ ->
       globals.scatter = new Scatter "scatter-canvas"
     else
       globals.scatter = new DisabledVis "scatter-canvas"
-
diff --git a/app/assets/javascripts/visualizations/highvis/timeline.coffee b/app/assets/javascripts/visualizations/highvis/timeline.coffee
@@ -38,6 +38,8 @@ $ ->
       constructor: (@canvas) ->
         super @canvas
 
+        @isScatter = null # To do add axis bounds feature that does time
+
         @configs.mode = @LINES_MODE
         @configs.xAxis = data.timeFields[0]