light9 Changeset - 29a1382de5c8

Changeset - 29a1382de5c8

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Drew Perttula - 9 years ago 2016-06-09 06:34:28
drewp@bigasterisk.com

introduce autodep handler tree; only rerun highest-level affected handler and let it rerun its children
Ignore-this: dfcc81bbab0d02c40cd79be86c1105d4

5 files changed with 29 insertions and 19 deletions:

light9/web/edit-choice.coffee

light9/web/graph.coffee

light9/web/timeline/adjustable.coffee

light9/web/timeline/light9-timeline-audio.html

light9/web/timeline/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/edit-choice.coffee

➞

Show inline comments

@@ @@ -53,13 +53,13 @@ Polymer @@
     ready: ->
       setupDrop @$.box, @$.box, null, (uri) =>
         @uri=uri
         @updateLabel()
     gotGraph: ->
       @graph.runHandler(@updateLabel.bind(@))
+      @graph.runHandler(@updateLabel.bind(@), "edit-choice #{@uri}")
     updateLabel: ->
       @label = try
           @graph.stringValue(@uri, RDFS + 'label')
         catch
           @uri

light9/web/graph.coffee

➞

Show inline comments

@@ @@ -56,25 +56,26 @@ class GraphWatchers # throw this one awa @@
     for quad in patch.addQuads
       for cb in @matchingHandlers(quad)
         cb({delQuads: [], addQuads: [quad]})
 class Handler
   # a function and the quad patterns it cared about
   constructor: (@func) ->
     patterns = [] # s,p,o,g quads that should trigger the next run
   constructor: (@func, @label) ->
     @patterns = [] # s,p,o,g quads that should trigger the next run
     @innerHandlers = [] # Handlers requested while this one was running
 class AutoDependencies
   constructor: () ->
     @handlers = [] # all known Handlers (at least those with non-empty patterns)
     @handlerStack = [] # currently running
     @handlers = new Handler(null) # tree of all known Handlers (at least those with non-empty patterns). Top node is not a handler.
     @handlerStack = [@handlers] # currently running
   runHandler: (func) ->
+  runHandler: (func, label) ->
     # what if we have this func already? duplicate is safe?
     h = new Handler(func)
     @handlers.push(h)
     h = new Handler(func, label)
     @handlerStack[@handlerStack.length - 1].innerHandlers.push(h)
     @_rerunHandler(h)
   _rerunHandler: (handler) ->
     handler.patterns = []
     @handlerStack.push(handler)
     try
@@ @@ -87,20 +88,25 @@ class AutoDependencies @@
       #log('done. got: ', handler.patterns)
       @handlerStack.pop()
     # handler might have no watches, in which case we could forget about it
   graphChanged: (patch) ->
     # SyncedGraph is telling us this patch just got applied to the graph.
     for h in @handlers
       @_rerunHandler(h)
     rerunInners = (cur) =>
       toRun = cur.innerHandlers.slice()
       for child in toRun
         child.innerHandlers = [] # let all children get called again
         @_rerunHandler(child)
     rerunInners(@handlers)
   askedFor: (s, p, o, g) ->
     # SyncedGraph is telling us someone did a query that depended on
     # quads in the given pattern.
     current = @handlerStack[@handlerStack.length - 1]
     if current?
+    if current? and current != @handlers
       current.patterns.push([s, p, o, g])
       #log('push', s,p,o,g)
 class window.SyncedGraph
   # Main graph object for a browser to use. Syncs both ways with
   # rdfdb. Meant to hide the choice of RDF lib, so we can change it
@@ @@ -190,29 +196,30 @@ class window.SyncedGraph @@
   patchObject: (s, p, newObject, g) ->
     @applyAndSendPatch(@getObjectPatch(s, p, newObject, g))
   subscribe: (s, p, o, onChange) -> # return subscription handle
     throw
     # onChange is called with a patch that's limited to the quads
     # that match your request.
     # We call you immediately on existing triples.
     handle = @_watchers.subscribe(s, p, o, onChange)
     immediatePatch = {delQuads: [], addQuads: @graph.findByIRI(s, p, o)}
     if immediatePatch.addQuads.length
       onChange(immediatePatch)
     return handle
   unsubscribe: (subscription) ->
     @_watchers.unsubscribe(subscription)
   runHandler: (func) ->
+  runHandler: (func, label) ->
     # runs your func once, tracking graph calls. if a future patch
     # matches what you queried, we runHandler your func again (and
     # forget your queries from the first time).
     @_autoDeps.runHandler(func)
+    @_autoDeps.runHandler(func, label)
   _singleValue: (s, p) ->
     @_autoDeps.askedFor(s, p, null, null)
     quads = @graph.findByIRI(s, p)
     switch quads.length
       when 0

light9/web/timeline/adjustable.coffee

➞

Show inline comments

@@ @@ -90,13 +90,13 @@ class window.AdjustableFloatObject exten @@
     #   pred
     #   ctx
     #   getTargetTransform(value) -> getTarget result for value
     #   getValueForPos
     super(@config)
     @config.graph.runHandler(@_syncValue.bind(@))
+    @config.graph.runHandler(@_syncValue.bind(@), "adj sync #{@config.subj}")
   _syncValue: () ->
     @_currentValue = @config.graph.floatValue(@config.subj, @config.pred)
     @_onChange() if @_onChange
   _getValue: () ->
@@ @@ -114,9 +114,10 @@ class window.AdjustableFloatObject exten @@
   continueDrag: (pos) ->
     # pos is vec2 of pixels relative to the drag start
     newValue = @config.getValueForPos(@_editorCoordinates())
     @config.graph.patchObject(@config.subj, @config.pred,
                               @config.graph.LiteralRoundedFloat(newValue),
                               @config.ctx)

light9/web/timeline/light9-timeline-audio.html

➞

Show inline comments

@@ @@ -59,13 +59,13 @@ @@
                        this.song, this.graph.Uri(':songFilename'));
                } catch(e) {
                    return;
+               }
                this.imgSrc = root + '/' + filename.replace('.wav', '.png');
            }.bind(this));
+           }.bind(this), "timeline-audio " + this.song);
        },
        _imgWidth: function(zoom) {
            if (!zoom.duration) {
                return "100%";
+           }

light9/web/timeline/timeline.coffee

➞

Show inline comments

@@ @@ -289,13 +289,13 @@ Polymer @@
     rowIndex: { type: Object, notify: true }
   observers: [
     'onGraph(graph)'
     'update(song)'
+    ]
   onGraph: ->
     @graph.runHandler(@update.bind(@))
+    @graph.runHandler(@update.bind(@), "row notes #{@rowIndex}")
   update: ->
     U = (x) -> @graph.Uri(x)
     @noteUris = []
     for note in @graph.objects(@song, U(':note'))
       @push('noteUris', note)
@@ @@ -316,13 +316,13 @@ Polymer @@
   ready: ->
   detached: ->
     @dia.clearElem(@uri)
   onUri: ->
     @graph.runHandler(@update.bind(@))
+    @graph.runHandler(@update.bind(@), "note updates #{@uri}")
   update: ->
     # update our note DOM and SVG elements based on the graph
     U = (x) -> @graph.Uri(x)
     try
       worldPts = [] # (song time, value)
@@ @@ -358,13 +358,13 @@ Polymer @@
     dia: { type: Object }
   observers: [
     'update(parentAdjs, graph, song, dia)'
     'onGraph(graph, song)'
+    ]
   onGraph: (graph, song, zoomInX) ->
     graph.runHandler(@update.bind(@))
+    graph.runHandler(@update.bind(@), "adjuster update")
   update: (parentAdjs, graph, song, dia) ->
     U = (x) -> @graph.Uri(x)
     @adjs = (@parentAdjs || []).slice()
     for note in @graph.objects(@song, U(':note'))
       @push('adjs', new AdjustableFloatObject({
         graph: @graph
@@ @@ -399,16 +399,18 @@ Polymer @@
       type: Object
     spanClass:
       type: String
       value: ''
   onAdj: (adj) ->
     # currently I think this subscription never gets to matter since
     # we might be rebuilding all adj elements on every update
     @adj.subscribe(@updateDisplay.bind(this))
     @updateDisplay()
   updateDisplay: () ->
     window.adjDragUpdates++ if window.adjDragUpdates?
     @spanClass = if @adj.config.emptyBox then 'empty' else ''
     @displayValue = @adj.getDisplayValue()
     center = @adj.getCenter()
     target = @adj.getTarget()
     return if isNaN(center.e(1))
     @centerStyle = {x: center.e(1), y: center.e(2)}

0 comments (0 inline, 0 general)