light9 Changeset - c4e990d1dacf

Changeset - c4e990d1dacf

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 8 years ago 2017-06-09 08:48:29
drewp@bigasterisk.com

delete key deletes selected notes. Try to fix mem leak in timeline.
Ignore-this: c122fe14883cfda925c1bd66c13773b2

2 files changed with 37 insertions and 20 deletions:

light9/web/timeline/adjustable.coffee

light9/web/timeline/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/timeline/adjustable.coffee

➞

Show inline comments

@@ @@ -85,12 +85,13 @@ class window.AdjustableFloatObservable e @@
     super(pos)
     epos = @_editorCoordinates()
     newValue = @config.getValueForPos(epos)
     @config.observable(newValue)
   subscribe: (onChange) ->
     log('AdjustableFloatObservable subscribe', @config)
     ko.computed =>
       @config.observable()
       onChange()
 class window.AdjustableFloatObject extends Adjustable
   constructor: (@config) ->

light9/web/timeline/timeline.coffee

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ updateChildren = (parent, newUris, makeC @@
   for e in parent.children
     childUris.push(e.uri)
     childByUri[e.uri] = e
   for uri in _.difference(childUris, newUris)
     childByUri[uri].detached()
-    childByUri[uri].remove()
+    ko.removeNode(childByUri[uri])
   for uri in _.difference(newUris, childUris)
     parent.appendChild(makeChild(uri))
 Polymer
   is: 'light9-timeline-editor'
@@ @@ -106,25 +106,26 @@ Polymer @@
     zoomed = @$.zoomed
     setupDrop(@$.dia.querySelector('svg'), zoomed.$.rows, @, zoomed.onDrop.bind(zoomed))
   zoomOrLayoutChanged: ->
     log('zoomOrLayoutChanged')
     # not for cursor updates
     window.debug_zoomOrLayoutChangedCount++
     @fullZoomX.domain([0, @viewState.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.range([0, @width()])
     @zoomInX = zoomInX
-    # todo: these run a lot of work purely for a time change
     # 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)
@@ @@ -216,12 +217,16 @@ Polymer @@
       if @songTime < zs.t1() or @songTime > zs.t2() - visSeconds * .6
         newCenter = @songTime + margin
         @animatedZoom(newCenter - visSeconds / 2,
                       newCenter + visSeconds / 2, zoomAnimSec)
     shortcut.add "L", =>
       @$.adjustersCanvas.updateAllCoords()
     shortcut.add 'Delete', =>
       for note in @selection.selected()
         deleteNote(@graph, @song, note, @selection)
   makeZoomAdjs: ->
     yMid = => @$.audio.offsetTop + @$.audio.offsetHeight / 2
     dur = @viewState.zoomSpec.duration
     valForPos = (pos) =>
@@ @@ -275,12 +280,13 @@ Polymer @@
     zoomInX: { type: Object, notify: true }
     rows: { value: [0...ROW_COUNT] }
     zoom: { type: Object, notify: true, observer: 'onZoom' }
     zoomFlattened: { type: Object, notify: true }
   onZoom: ->
     updateZoomFlattened = ->
       log('updateZoomFlattened')
       @zoomFlattened = ko.toJS(@zoom)
     ko.computed(updateZoomFlattened.bind(@))
   ready: ->
   attached: ->
     root = @closest('light9-timeline-editor')
@@ @@ -519,13 +525,13 @@ Polymer @@
       width: w,
       height: h,
       display: if rightX - leftX > w then 'block' else 'none'
+      }
     if @inlineRect.display != 'none'
       @async =>
         @querySelector('light9-timeline-note-inline-attrs').displayed()
+        @querySelector('light9-timeline-note-inline-attrs')?.displayed()
     if screenPts[screenPts.length - 1].e(1) - screenPts[0].e(1) < 100
       @clearAdjusters()
       # also kill their connectors
       return
@@ @@ -597,24 +603,32 @@ Polymer @@
   displayed: ->
     @querySelector('light9-color-picker').displayed()
   onColorScale: ->
     U = (x) => @graph.Uri(x)
     if @colorScale == @colorScaleFromGraph
       return
     quad = (s, p, o) => {subject: s, predicate: p, object: o, graph: @song}
     log('ch', ko.toJS(@selection))
     settingValue = @graph.Literal(@colorScale)
     if @existingColorScaleSetting
       @graph.patchObject(@existingColorScaleSetting, U(':value'), settingValue, @song)
     @editAttr(@song, @uri, U(':colorScale'), @graph.Literal(@colorScale))
   editAttr: (song, note, attr, value) ->
     U = (x) => @graph.Uri(x)
     quad = (s, p, o) => {subject: s, predicate: p, object: o, graph: song}
     existingColorScaleSetting = null
     for setting in @graph.objects(note, U(':setting'))
       ea = @graph.uriValue(setting, U(':effectAttr'))
       if ea == attr
         existingColorScaleSetting = setting
     if existingColorScaleSetting
       @graph.patchObject(existingColorScaleSetting, U(':value'), value, song)
     else
-      setting = @graph.nextNumberedResource(@uri + 'set')
+      setting = @graph.nextNumberedResource(note + 'set')
       patch = {delQuads: [], addQuads: [
         quad(@uri, U(':setting'), setting)
         quad(setting, U(':effectAttr'), U(':colorScale'))
         quad(setting, U(':value'), settingValue)
         quad(note, U(':setting'), setting)
         quad(setting, U(':effectAttr'), attr)
         quad(setting, U(':value'), value)
         ]}
       @graph.applyAndSendPatch(patch)
   addHandler: ->
     @graph.runHandler(@update.bind(@))
@@ @@ -622,33 +636,35 @@ Polymer @@
     console.time('attrs update')
     U = (x) => @graph.Uri(x)
     @effect = @graph.uriValue(@uri, U(':effectClass'))
     @effectLabel = @graph.stringValue(@effect, U('rdfs:label')) or (@effect.replace(/.*\//, ''))
     @noteLabel = @uri.replace(/.*\//, '')
-    @existingColorScaleSetting = null
     existingColorScaleSetting = null
     for setting in @graph.objects(@uri, U(':setting'))
       ea = @graph.uriValue(setting, U(':effectAttr'))
       value = @graph.stringValue(setting, U(':value'))
       if ea == U(':colorScale')
         @colorScaleFromGraph = value
         @colorScale = value
         @existingColorScaleSetting = setting
     if @existingColorScaleSetting == null
         existingColorScaleSetting = setting
     if existingColorScaleSetting == null
       @colorScaleFromGraph = '#ffffff'
       @colorScale = '#ffffff'
     console.timeEnd('attrs update')
   onDel: ->
     deleteNote(@graph, @song, @uri)
+    deleteNote(@graph, @song, @uri, @selection)
 deleteNote = (graph, song, note) ->
+deleteNote = (graph, song, note, selection) ->
   patch = {delQuads: [{subject: song, predicate: graph.Uri(':note'), object: note, graph: song}], addQuads: []}
   graph.applyAndSendPatch(patch)
   if note in selection.selected()
     selection.selected(_.without(selection.selected(), note))
 Polymer
   is: 'light9-cursor-canvas'
   behaviors: [ Polymer.IronResizableBehavior ]
   listeners: 'iron-resize': 'update'
@@ @@ -868,13 +884,13 @@ Polymer @@
     # l/r arrows
     # mouse arrow cursor upon hover, and accent the hovered adjuster
     # connector
 Polymer
-  # note boxes. Page selection.
+  # note boxes.
   is: 'light9-timeline-diagram-layer'
   properties: {
     selection: {type: Object, notify: true}
+  }
   ready: ->
     @elemById = {}
@@ @@ -900,13 +916,13 @@ Polymer @@
     return elem
   clearElem: (uri, suffixes) -> # todo: caller shouldn't have to know suffixes!
     for suff in suffixes
       elem = @elemById[uri+suff]
       if elem
-        elem.remove()
+        ko.removeNode(elem)
         delete @elemById[uri+suff]
   anyPointsInView: (pts) ->
     for pt in pts
       # wrong:
       if pt.e(1) > -100 && pt.e(1) < 2500

0 comments (0 inline, 0 general)