light9 Changeset - 468a13c4b910

Changeset - 468a13c4b910

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 7 years ago 2018-05-24 06:23:28
drewp@bigasterisk.com

fix dropping effect into timeline
Ignore-this: 9d9b651de46b3d33cd9109b321ec4c5d

2 files changed with 11 insertions and 13 deletions:

light9/web/graph.coffee

light9/web/timeline/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/graph.coffee

➞

Show inline comments

@@ @@ -214,13 +214,13 @@ class window.SyncedGraph @@
   _validatePatch: (patch) ->
     for qs in [patch.addQuads, patch.delQuads]
       for q in qs
         if not q.equals
           throw new Error("doesn't look like a proper Quad")
         if not q.subject.id or not q.graph.id?
+        if not q.subject.id or not q.graph.id? or not q.predicate.id?
           throw new Error("corrupt patch: #{JSON.stringify(q)}")
   _applyPatch: (patch) ->
     # In most cases you want applyAndSendPatch.
+    #
     # This is the only method that writes to @graph!

light9/web/timeline/timeline.coffee

➞

Show inline comments

 log = console.log
 RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
 Drawing = window.Drawing
 ROW_COUNT = 7
 class Project
   constructor: (@graph) ->
@@ @@ -35,25 +34,25 @@ class Project @@
     @graph.applyAndSendPatch({delQuads: [], addQuads: quads})
     return effect
   makeNewNote: (song, effect, dropTime, desiredWidthT) ->
     U = (x) => @graph.Uri(x)
-    quad = (s, p, o) => {subject: s, predicate: p, object: o, graph: song}
+    quad = (s, p, o) => @graph.Quad(s, p, o, song)
-    newNote = @graph.nextNumberedResource("#{@song.value}/n")
     newNote = @graph.nextNumberedResource("#{song.value}/n")
     newCurve = @graph.nextNumberedResource("#{newNote.value}c")
     points = @graph.nextNumberedResources("#{newCurve.value}p", 4)
     curveQuads = [
         quad(song, U(':note'), newNote)
-        quad(newNote, RDF + 'type', U(':Note'))
+        quad(newNote, U('rdf:type'), U(':Note'))
         quad(newNote, U(':originTime'), @graph.LiteralRoundedFloat(dropTime))
         quad(newNote, U(':effectClass'), effect)
         quad(newNote, U(':curve'), newCurve)
-        quad(newCurve, RDF + 'type', U(':Curve'))
+        quad(newCurve, U('rdf:type'), U(':Curve'))
         quad(newCurve, U(':attr'), U(':strength'))
+      ]
     pointQuads = []
@@ @@ -142,15 +141,14 @@ coffeeElementSetup(class TimelineEditor @@
     setInterval(@updateDebugSummary.bind(@), 100)
     @addEventListener('iron-resize', @_onIronResize.bind(@))
     Polymer.RenderStatus.afterNextRender(this, @_onIronResize.bind(@))
     #zoomed = @$.zoomed
     #setupDrop(@dia.shadowRoot.querySelector('svg'),
     #          zoomed.$.rows, @, zoomed.onDrop.bind(zoomed))
     Polymer.RenderStatus.afterNextRender this, =>
       setupDrop(@$.zoomed.$.rows, @$.zoomed.$.rows, @, @$.zoomed.onDrop.bind(@$.zoomed))
   _onIronResize: ->
     @viewState.setWidth(@offsetWidth)
     @viewState.coveredByDiagramTop(@$.coveredByDiagram.offsetTop)
     @viewState.rowsY(@$.zoomed.$.rows.offsetTop) if @$.zoomed?.$?.rows?
     @viewState.audioY(@$.audio.offsetTop)
@@ @@ -370,25 +368,25 @@ coffeeElementSetup(class TimeZoomed exte @@
     return unless effect and effect.match(/^http/)
     # we could probably accept some initial overrides right on the
     # effect uri, maybe as query params
     if not @graph.contains(effect, RDF + 'type', U(':Effect'))
       if @graph.contains(effect, RDF + 'type', U(':LightSample'))
     if not @graph.contains(effect, U('rdf:type'), U(':Effect'))
       if @graph.contains(effect, U('rdf:type'), U(':LightSample'))
         effect = @project.makeEffect(effect)
       else
         log("drop #{effect} is not an effect")
         return
     dropTime = @viewState.zoomInX.invert(pos.e(1))
     desiredWidthX = @offsetWidth * .3
     desiredWidthT = @viewState.zoomInX.invert(desiredWidthX) - @viewState.zoomInX.invert(0)
     desiredWidthT = Math.min(desiredWidthT, @zoom.duration() - dropTime)
     @project.makeNewNote(U(@song), effect, dropTime, desiredWidthT)
     desiredWidthT = Math.min(desiredWidthT, @viewState.zoomSpec.duration() - dropTime)
     @project.makeNewNote(U(@song), U(effect), dropTime, desiredWidthT)
   updateInlineAttrs: (note, config) ->
     if not config?
       index = 0
       for c in @inlineAttrConfigs
         if c.uri.equals(note)

0 comments (0 inline, 0 general)