ela 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21146e6ffd264872dbf29ff635f1d3603ce2dd39
-  data.tar.gz: 54b3f015f88caad0dfa844c8b3eb0212e2c6f467
+  metadata.gz: 931596436e4c496baf811835178c70761fe4e7b2
+  data.tar.gz: b548f627ac5a723a0f1ae3ee43afda8e525b5825
 SHA512:
-  metadata.gz: 887c157174d7f832890d381db79538e5ecf44bd23b9e1e9f4eee5fd74150e29e5a53fbfe81d759e92cf5337f45a1422b43a55845efa857388e3cecf73460590f
-  data.tar.gz: 4ac2252d34b224603c7d43548b0806417bdf0799129257b0524180e2b6734c07efe0feef77bc9872392eab0827e4cc10ab0a9c8cd3d59705f8134945bbbaa93a
+  metadata.gz: 827290ddd153f81e11049c5096feba7ac9fbeeeff00d034cd047a337cbd73c8a6c1c2ef00ec96b6590655e196e056cea2706c4a88d4fcc09747534c779d83997
+  data.tar.gz: ce6769b30ce2a1acf84265feaec2c703714eac5140f9698179466ab2cfce4179f4b43534a6c28ed83f39044e162a0e31e09059cb11b7b855450aaa2b7cba5c1a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ela (3.1.1)
+    ela (3.2.0)
       andand (~> 1.3, >= 1.3.3)
       bundler (~> 1.13)
       coffee-script (~> 2.4, >= 2.4.1)
@@ -36,12 +36,12 @@ GEM
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.5)
     execjs (2.7.0)
-    ffi (1.9.18)
+    ffi (1.9.23)
     formatador (0.2.5)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -83,7 +83,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
+    lumberjack (1.0.13)
     method_source (0.9.0)
     multi_json (1.13.1)
     nenv (0.3.0)
@@ -97,10 +97,10 @@ GEM
     rack (1.6.9)
     rack-protection (1.5.5)
       rack
-    rack-test (0.8.3)
+    rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rake (10.5.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     ruby_dep (1.5.0)
@@ -127,7 +127,7 @@ GEM
     stylus-source (0.54.5)
     thor (0.20.0)
     tilt (1.4.1)
-    uglifier (4.1.8)
+    uglifier (4.1.9)
       execjs (>= 0.3.0, < 3)
 
 PLATFORMS

data/app/js/lib/views/base_graph.coffee

@@ -43,6 +43,8 @@ class ELA.Views.BaseGraph extends ELA.Views.Canvas
     xPinchLocked: false
     yPinchLocked: false
     scaleLink: false
+    xAxis: { y: 0 }
+    yAxis: { x: 0 }
 
   initialize: ->
     super
@@ -321,7 +323,7 @@ class ELA.Views.BaseGraph extends ELA.Views.Canvas
   renderCurves: ->
     # stub
 
-  renderXAxis: ->
+  renderXAxis: (y) ->
     @context.setLineDash []
     @context.font = @defaultFont
     @context.strokeStyle = "#999999"
@@ -329,29 +331,30 @@ class ELA.Views.BaseGraph extends ELA.Views.Canvas
     @context.lineWidth = 2
 
     @context.beginPath()
-    @context.moveTo(0, @yOrigin)
-    @context.lineTo(@width, @yOrigin)
+    yPos = @yOrigin - y * @height / @yRange
+    @context.moveTo(0, yPos)
+    @context.lineTo(@width, yPos)
 
     unless @params.get('xLabelPosition') is 'none'
       labelY = dashY = 0
       if @params.get('xLabelPosition') is 'bottom'
-        labelY = @yOrigin + 15
-        dashY = @yOrigin + 5
+        labelY = yPos + 15
+        dashY = yPos + 5
       else
-        labelY = @yOrigin - 15
-        dashY = @yOrigin - 5
+        labelY = yPos - 15
+        dashY = yPos - 5
 
       @context.textBaseline = 'middle'
       @context.textAlign = 'center'
 
-      xRange = @maxRangeX() unless xRange?
+      xRange = @maxRangeX()
       xMin = -@xOrigin * xRange / @width
       xMax = (@width - @xOrigin) * xRange / @width
       xStepSize = @roundStepSize(100 * xRange / @width)
       for x in [(xMin - xMin % xStepSize) .. xMax] by xStepSize
         if x <= (0 - xStepSize / 2) or (0 + xStepSize / 2) <= x
           xPos = @xOrigin + x * @width / xRange
-          @context.moveTo(xPos, @yOrigin)
+          @context.moveTo(xPos, yPos)
           @context.lineTo(xPos, dashY)
           @context.fillText("#{@xAxisValueLabel(x, xStepSize)}", xPos, labelY)
 
@@ -361,14 +364,14 @@ class ELA.Views.BaseGraph extends ELA.Views.Canvas
     else
       @xOrigin/2
     xPos = Math.round(xPos) if @context.pixelRatio is 1
-    @context.translate(xPos, @yOrigin + 15)
+    @context.translate(xPos, yPos + 15)
     MarkupText.render(@context, @xAxisLabel(), @defaultFont)
     @context.restore()
 
     @context.stroke()
     @context.closePath()
 
-  renderYAxis: (yRange) ->
+  renderYAxis: (x) ->
     @context.setLineDash []
     @context.font = @defaultFont
     @context.strokeStyle = "#999999"
@@ -376,29 +379,30 @@ class ELA.Views.BaseGraph extends ELA.Views.Canvas
     @context.lineWidth = 2
 
     @context.beginPath()
-    @context.moveTo(@xOrigin, 0)
-    @context.lineTo(@xOrigin, @height)
+    xPos = @xOrigin + x * @width / @xRange
+    @context.moveTo(xPos, 0)
+    @context.lineTo(xPos, @height)
 
     unless @params.get('yLabelPosition') is 'none'
       labelX = dashX = 0
       if @params.get('yLabelPosition') is 'right'
-        labelX = @xOrigin + 10
-        dashX = @xOrigin + 5
+        labelX = xPos + 10
+        dashX = xPos + 5
         @context.textAlign = 'left'
       else
-        labelX = @xOrigin - 10
-        dashX = @xOrigin - 5
+        labelX = xPos - 10
+        dashX = xPos - 5
         @context.textAlign = 'right'
       @context.textBaseline = 'middle'
 
-      yRange = @maxRangeY() unless yRange?
+      yRange = @maxRangeY()
       yMin = -(@height - @yOrigin) * yRange / @height
       yMax = @yOrigin * yRange / @height
       yStepSize = @roundStepSize(100 * yRange / @height)
       for y in [(yMin - yMin % yStepSize) .. yMax] by yStepSize
         if y <= (0 - yStepSize / 2) or y >= (0 + yStepSize / 2)
           yPos = @yOrigin - y * @height / yRange
-          @context.moveTo(@xOrigin, yPos)
+          @context.moveTo(xPos, yPos)
           @context.lineTo(dashX, yPos)
           @context.fillText(@yAxisValueLabel(y, yStepSize), labelX, yPos)
 
@@ -408,7 +412,7 @@ class ELA.Views.BaseGraph extends ELA.Views.Canvas
     else
       @yOrigin/2
     yPos = Math.round(yPos) if @context.pixelRatio is 1
-    @context.translate(@xOrigin - 15, yPos);
+    @context.translate(xPos - 15, yPos);
     @context.rotate(-Math.PI / 2);
     MarkupText.render(@context, @yAxisLabel(), @defaultFont)
     @context.restore()
@@ -470,8 +474,16 @@ class ELA.Views.BaseGraph extends ELA.Views.Canvas
     @beforeRender()
 
     @renderGrid()
-    @renderXAxis()
-    @renderYAxis()
+    xAxis = @params.get('xAxis')
+    if $.isArray(xAxis.y)
+      @renderXAxis(y) for y in xAxis.y
+    else
+      @renderXAxis(xAxis.y)
+    yAxis = @params.get('yAxis')
+    if $.isArray(yAxis.x)
+      @renderYAxis(x) for x in yAxis.x
+    else
+      @renderYAxis(yAxis.x)
     @renderCurves()
 
     this

data/app/js/lib/views/graph_view.coffee

@@ -22,10 +22,15 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
     if options.graphOverlay?.view?
       @GraphOverlayView = options.graphOverlay.view.toFunction()
 
+    if options.graph?.axes?.x?.y?
+      @xAxis = _.pick(options.graph.axes.x, 'y')
+
+    if options.graph?.axes?.y?.x?
+      @yAxis = _.pick(options.graph.axes.y, 'x')
+
     for axis, props of options.graph?.axes
       if props.handler
-        attribute: props.attribute
-        position: switch axis
+        switch axis
           when 'x' then @bottomAxisHandler = attribute: props.attribute
           when 'y' then @leftAxisHandler = attribute: props.attribute
 
@@ -105,6 +110,8 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
           guides: guides
           curves: @curves
           axisLabelingForCurve: @axisLabelingForCurve
+          xAxis: @xAxis
+          yAxis: @yAxis
         localePrefix: @localePrefix
       if @leftAxisHandler?
         view.$el.on('tap', @subviews.leftAxisHandler.updateValue)

data/lib/ela/version.rb

@@ -1,3 +1,3 @@
 module ELA
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ela
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Franz Kißig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler