light9 Changeset - 8897ce2c48bf

Changeset - 8897ce2c48bf

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Drew Perttula - 8 years ago 2017-06-10 05:58:57
drewp@bigasterisk.com

limit timeline zoom to song
Ignore-this: 49eda54d69d4e8d1695ed3866ff4a47d

1 file changed with 12 insertions and 5 deletions:

light9/web/timeline/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/timeline/timeline.coffee

➞

Show inline comments

@@ @@ -56,25 +56,25 @@ Polymer @@
   setSong: (s) ->
     @song = @playerSong if @followPlayerSong
   ready: ->
     ko.options.deferUpdates = true;
     @selection = {hover: ko.observable(null), selected: ko.observable([])}
     window.debug_zoomOrLayoutChangedCount = 0
     window.debug_adjUpdateDisplay = 0
     @viewState =
       zoomSpec:
         duration: ko.observable(100)
+        duration: ko.observable(100) # current song duration
         t1: ko.observable(0) # need validation to stay in bounds and not go too close
         t2: ko.observable(100)
       cursor:
         t: ko.observable(20)
       mouse:
         pos: ko.observable($V([0,0]))
     @fullZoomX = d3.scaleLinear()
     @zoomInX = d3.scaleLinear()
     @setAdjuster = @$.adjustersCanvas.setAdjuster.bind(@$.adjustersCanvas)
     setInterval(@updateDebugSummary.bind(@), 100)
@@ @@ -103,31 +103,38 @@ Polymer @@
     @forwardMouseEventsToAdjustersCanvas()
     @makeZoomAdjs()
     zoomed = @$.zoomed
     setupDrop(@$.dia.querySelector('svg'), zoomed.$.rows, @, zoomed.onDrop.bind(zoomed))
   zoomOrLayoutChanged: ->
     log('zoomOrLayoutChanged')
     # not for cursor updates
     vs = @viewState
     if vs.zoomSpec.t1() < 0
       vs.zoomSpec.t1(0)
     if vs.zoomSpec.duration() and vs.zoomSpec.t2() > vs.zoomSpec.duration()
       vs.zoomSpec.t2(vs.zoomSpec.duration())
     window.debug_zoomOrLayoutChangedCount++
-    @fullZoomX.domain([0, @viewState.zoomSpec.duration()])
+    @fullZoomX.domain([0, vs.zoomSpec.duration()])
     @fullZoomX.range([0, @width()])
     # had trouble making notes update when this changes
     zoomInX = d3.scaleLinear()
-    zoomInX.domain([@viewState.zoomSpec.t1(), @viewState.zoomSpec.t2()])
+    zoomInX.domain([vs.zoomSpec.t1(), vs.zoomSpec.t2()])
     zoomInX.range([0, @width()])
     @zoomInX = zoomInX
     # todo: these run a lot of work purely for a time change
     @dia.setTimeAxis(@width(), @$.zoomed.$.audio.offsetTop, @zoomInX)
     @$.adjustersCanvas.updateAllCoords()
     # cursor needs update when layout changes, but I don't want
     # zoom/layout to depend on the playback time
     setTimeout(@songTimeChanged.bind(@), 1)
   songTimeChanged: ->
@@ @@ -226,33 +233,33 @@ Polymer @@
   makeZoomAdjs: ->
     yMid = => @$.audio.offsetTop + @$.audio.offsetHeight / 2
     dur = @viewState.zoomSpec.duration
     valForPos = (pos) =>
         x = pos.e(1)
         t = @fullZoomX.invert(x)
     @setAdjuster('zoom-left', => new AdjustableFloatObservable({
       observable: @viewState.zoomSpec.t1,
       getTarget: () =>
         $V([@fullZoomX(@viewState.zoomSpec.t1()), yMid()])
-      getSuggestedTargetOffset: () => $V([-50, 0])
       getSuggestedTargetOffset: () => $V([50, 0])
       getValueForPos: valForPos
     }))
     @setAdjuster('zoom-right', => new AdjustableFloatObservable({
       observable: @viewState.zoomSpec.t2,
       getTarget: () =>
         $V([@fullZoomX(@viewState.zoomSpec.t2()), yMid()])
       getSuggestedTargetOffset: () => $V([50, 0])
+      getSuggestedTargetOffset: () => $V([-50, 0])
       getValueForPos: valForPos
     }))
     panObs = ko.pureComputed({
         read: () =>
           (@viewState.zoomSpec.t1() + @viewState.zoomSpec.t2()) / 2
         write: (value) =>
           zs = @viewState.zoomSpec
           span = zs.t2() - zs.t1()
           zs.t1(value - span / 2)
           zs.t2(value + span / 2)
       })

0 comments (0 inline, 0 general)