ela 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd24a913ce3b0478b22f51fe288628f098589012e0d3639e1a5b3b9808f6674
-  data.tar.gz: 057e1f3257684cb9140f7820b14f78f2269bb6d2489a81f33fef1b183785696d
+  metadata.gz: c64b64f369d8208adc4ca837614a1c4aa5d3234c1ae22fdab8eb8f209973ec00
+  data.tar.gz: 96a808ce8df7c572ea2338e0dcb538a5ca407315524613eb4dd97d9363e39642
 SHA512:
-  metadata.gz: 124c0db803497139033fe8a35e9c9a18776a2121b88f9c802c5436b0f8be041abd7484122458f7a05718f9f858b8bfed645396e11c9e89bfd37d367ce668c768
-  data.tar.gz: 832416b20e2a4226c4af1a56486bceaa733b78a20dd489adcab7cdbdb182d0130edc65adb033e80f74b92bc9c68b2794f6c8355d94d158eefc9a5587a0b19c59
+  metadata.gz: 7f787de4b452df33ffc34b5c6a6d690219b6fc925142211ce80325070a7f11f2ab9dab606aa2ee0b08e095c59be6c159621a99e9c7075a686216785ba285d47b
+  data.tar.gz: d4a24f33704fce88710b846f00a91ec59b30004432af0281bc3d9889d03fd256ab4a7e8278f355125015ceb2371563e3bf45aa77c3932f4b059cefa0073b0313

data/app/js/lib/collections/00_limited_collection.coffee

@@ -56,7 +56,7 @@ class ELA.Collections.LimitedCollection extends Backbone.Collection
   removeFromHistory: (model) ->
     while @inHistory(model)
       @history.splice(@history.indexOf(model), 1)
-      @trigger('historyChange')
+      @trigger('historyRemove')
 
   # Rebuilds history leaving old history entries untouched. Entries
   # are being added in collection order.
@@ -66,7 +66,7 @@ class ELA.Collections.LimitedCollection extends Backbone.Collection
     @each (model) =>
       @manageHistory(model, silent: true)
     unless _.isEqual(oldHistory, @history)
-      @trigger('historyChange')
+      @trigger('historyReset')
 
   # Whenever a model is changing its `activeState` the history is
   # checked. If the model is `activated` and the history is at its
@@ -79,7 +79,7 @@ class ELA.Collections.LimitedCollection extends Backbone.Collection
         while @atLimit()
           @history.shift().set(@attribute, not @activeState)
         @history.push(model)
-        @trigger('historyChange') unless options.silent
+        @trigger('historyAdd') unless options.silent
     else
       @removeFromHistory(model)
     this

data/app/js/lib/models/graph_params.coffee

@@ -45,12 +45,31 @@ class ELA.Models.GraphParams extends ELA.Models.CanvasParams
     @on('change:yScale', @calculateRanges)
 
     @calculateRanges()
+    @ensureCurveForAxisLabeling(initialCall: true)
     @bindCalculatorEvents()
     @listenTo(@app.curves, 'change:selected', @bindCalculatorEvents)
+    @listenTo(@app.curves, 'historyRemove historyReset', @ensureCurveForAxisLabeling)
+    @listenTo @app.curves, 'historyAdd', ->
+      @ensureCurveForAxisLabeling(reset: true)
     @listenTo @app, 'change:calculators', ->
       @calculateRanges()
       @bindCalculatorEvents()
 
+  ensureCurveForAxisLabeling: (options = {}) ->
+    currentAxisLabelingCurve = @get('axisLabelingForCurve')
+    curves = @filteredCurves()
+
+    if curves.indexOf(currentAxisLabelingCurve) < 0 or options.reset
+      if curves.length > 0
+        newLabelCurve = if options.initialCall
+          # First curve in legend
+          curves[0]
+        else
+          # Curve that has been selected recently (last curve in legend)
+          curves[curves.length - 1]
+
+      @set(axisLabelingForCurve: newLabelCurve)
+
   bindCalculatorEvents: ->
     # Remove current callbacks, add new ones for each curve
     @stopListening(@app.previous('calculators'))
@@ -65,6 +84,8 @@ class ELA.Models.GraphParams extends ELA.Models.CanvasParams
       @listenTo(calc, 'change:maxY change:yRange', @calculateRangeY)
       # TODO: Add dynamic dependencies to calculator, so that we can
       # actually only listen to maxY changes and recalculate ranges.
+      # TODO: is this block required?! change:xRange and change:yRange
+      # above should be enough.
       oldestCurve = filteredCurves[0]
       if oldestCurve?
         @listenTo(calc,

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

@@ -41,12 +41,7 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
         orientation: 'horizontal'
         attribute: @leftAxisHandler.attribute
 
-    if options.graph?.curves?
-      @curves = options.graph.curves.slice()
-      @axisLabelingForCurve = @model.curves.find (curve) =>
-        curve.get('function') is @curves[0]
-    else
-      @axisLabelingForCurve = @model.curves.first()
+    @curves = options.graph.curves.slice() if options.graph?.curves?
 
     if options.graph?.view
       @GraphView = options.graph.view.toFunction()
@@ -55,7 +50,6 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
     @displayParams = @model.displayParams[options.name] ?= new @GraphView.Params
       guides: @guides
       curves: @curves
-      axisLabelingForCurve: @axisLabelingForCurve
       xAxisY: @xAxisY
       xAxisScale: @xAxisScale
       yAxisX: @yAxisX

data/lib/ela/version.rb

@@ -1,3 +1,3 @@
 module ELA
-  VERSION = '4.1.5'
+  VERSION = '4.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ela
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Franz Kißig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler