light9 Changeset - 8406a9fbeb9d

Changeset - 8406a9fbeb9d

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Drew Perttula - 9 years ago 2016-06-04 09:27:38
drewp@bigasterisk.com

note shape can be edited
Ignore-this: 1d4957c88191336d7b61a7c782897f59

3 files changed with 40 insertions and 17 deletions:

light9/web/graph.coffee

light9/web/timeline-elements.html

light9/web/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/graph.coffee

➞

Show inline comments

@@ @@ -15,15 +15,22 @@ class GraphWatchers @@
   unsubscribe: (subscription) ->
     throw Error('not implemented')
   matchingHandlers: (quad) ->
     matches = []
     for subjDict in [@handlersSp[quad.subject] || {}, @handlersSp[null] || {}]
       for subjPredMatches in [subjDict[quad.predicate] || [], subjDict[null] || []]
         matches = matches.concat(subjPredMatches)
     return matches
   graphChanged: (patch) ->
     for quad in patch.delQuads
-      for cb in ((@handlersSp[quad.subject] || {})[quad.predicate] || [])
+      for cb in @matchingHandlers(quad)
         # currently calls multiple times, which is ok, but we might
         # group things into fewer patches
         cb({delQuads: [quad], addQuads: []})
     for quad in patch.addQuads
-      for cb in ((@handlersSp[quad.subject] || {})[quad.predicate] || [])
+      for cb in @matchingHandlers(quad)
         cb({delQuads: [], addQuads: [quad]})

light9/web/timeline-elements.html

➞

Show inline comments

@@ @@ -47,7 +47,7 @@ @@
          Zoom all .. ctrl+esc
        -->
     <light9-timeline-audio id="audio"></light9-timeline-audio>
     <light9-timeline-time-zoomed id="zoomed" zoom="{{viewState.zoomSpec}}"></light9-timeline-time-zoomed>
+    <light9-timeline-time-zoomed id="zoomed" graph="{{graph}}" zoom="{{viewState.zoomSpec}}" zoom-in-x="{{zoomInX}}"></light9-timeline-time-zoomed>
     <light9-timeline-diagram-layer id="dia"></light9-timeline-diagram-layer>
     <light9-timeline-adjusters id="adjusters" dia="{{dia}}" adjs="{{adjs}}"></light9-timeline-adjusters>
     <div id="debug">[[debug]]</div>
@@ @@ -81,7 +81,7 @@ @@
       <light9-timeline-time-axis id="time"></light9-timeline-time-axis>
       <light9-timeline-audio id="audio" zoom="{{zoomFlattened}}"></light9-timeline-audio>
       <template is="dom-repeat" items="{{rows}}">
         <light9-timeline-graph-row></light9-timeline-graph-row>
+        <light9-timeline-graph-row graph="{{graph}}" zoom-in-x="{{zoomInX}}"></light9-timeline-graph-row>
       </template>
     </div>
   </template>
@@ @@ -92,7 +92,9 @@ @@
            Polymer.IronResizableBehavior
        ],
        properties: {
            rows: {value: [0, 1, 2, 3]},
            graph: { type: Object, notify: true },
            zoomInX: { type: Object, notify: true },
            rows: {value: [0]},
            zoom: {type: Object, notify: true, observer: 'onZoom'},
            zoomFlattened: {type: Object, notify: true}
        },
@@ @@ -178,8 +180,8 @@ @@
          display: flex;
+     }
     </style>
     <template is="dom-repeat" items="[1,2,3]">
       <light9-timeline-note></light9-timeline-note>
     <template is="dom-repeat" items="[1]">
       <light9-timeline-note graph="{{graph}}" zoom-in-x="{{zoomInX}}"></light9-timeline-note>
     </template>
   </template>
 </dom-module>
@@ @@ -194,7 +196,7 @@ @@
      :host {
          display: block;
          background: green;
          outline: 2px solid red;
+         /* outline: 2px solid red; */
+     }
     </style>
     <light9-timeline-note-inline-attrs></light9-timeline-note-inline-attrs>
@@ @@ -228,16 +230,19 @@ @@
 <dom-module id="light9-timeline-adjuster">
   <template>
     <style>
      /*
      #top {outline: 2px solid rgba(255, 0, 0, 0.25);}
      table {outline: 2px solid rgba(0, 0, 255, 0.19);}
      */
      #top {
          position: absolute;
          display: inline-block;
          outline: 2px solid rgba(255, 0, 0, 0.25);
+     }
      table {
          position: relative;
          left: -50%;
          top: -40px; /* percent had no effect */
          outline: 2px solid rgba(0, 0, 255, 0.19);
          z-index: 2;
          border-collapse: collapse;
+     }

light9/web/timeline.coffee

➞

Show inline comments

@@ @@ -56,18 +56,18 @@ Polymer @@
         subj: subj
         pred: @graph.Uri(':startTime')
         ctx: ctx
-        getTargetTransform: (value) => $V([@zoomInX(value), 300])
+        getTargetTransform: (value) => $V([@zoomInX(value), 600])
         getValueForPos: (pos) => @zoomInX.invert(pos.e(1))
-        getSuggestedTargetOffset: () => $V([-30, 80])
+        getSuggestedTargetOffset: () => $V([0, -80])
       }))
       adjs.push(new AdjustableFloatObject({
         graph: @graph
         subj: subj
         pred: @graph.Uri(':endTime')
         ctx: ctx
-        getTargetTransform: (value) => $V([@zoomInX(value), 300])
+        getTargetTransform: (value) => $V([@zoomInX(value), 600])
         getValueForPos: (pos) => @zoomInX.invert(pos.e(1))
-        getSuggestedTargetOffset: () => $V([30, 100])
+        getSuggestedTargetOffset: () => $V([0, -80])
       }))
     return adjs
@@ @@ -124,7 +124,9 @@ Polymer @@
 Polymer
   is: 'light9-timeline-graph-row'
   behaviors: [ Polymer.IronResizableBehavior ]
   properties: {}
   properties:
     graph: { type: Object, notify: true }
     zoomInX: { type: Object, notify: true }
 window.xserial = 0
@@ @@ -132,9 +134,18 @@ Polymer @@
   is: 'light9-timeline-note'
   behaviors: [ Polymer.IronResizableBehavior ]
   listeners: 'iron-resize': '_onIronResize'
   properties: {}
   properties:
     graph: { type: Object, notify: true }
     zoomInX: { type: Object, notify: true, observer: '_onIronResize' }
   ready: ->
     @graph.subscribe("http://light9.bigasterisk.com/demoResource6", null, null, @_onIronResize.bind(@))
   _onIronResize: ->
     setNote 'myuri', 60 + 150 * window.xserial++, 180, @offsetTop, @offsetTop + @offsetHeight
     return if !@zoomInX
     subj = "http://light9.bigasterisk.com/demoResource6"
     setNote(subj,
             @zoomInX(@graph.floatValue(subj, @graph.Uri(':startTime'))),
             @zoomInX(@graph.floatValue(subj, @graph.Uri(':endTime'))),
             @offsetTop, @offsetTop + @offsetHeight)
 Polymer
   is: "light9-timeline-adjusters"

0 comments (0 inline, 0 general)