light9 Changeset - 8eca565811b3

Changeset - 8eca565811b3

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 9 years ago 2016-06-16 06:11:18
drewp@bigasterisk.com

tint notes according to effect. other minor TL fixes
Ignore-this: 26bb112653f627d4ac409478c508d937

1 file changed with 20 insertions and 6 deletions:

light9/web/timeline/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/timeline/timeline.coffee

➞

Show inline comments

 log = console.log
 RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
-ROW_COUNT = 4
+ROW_COUNT = 7
 # polymer dom-repeat is happy to shuffle children by swapping their
 # attribute values, and it's hard to correctly setup/teardown your
 # side effects if your attributes are changing before the detach
 # call. This alternative to dom-repeat never reassigns
 # attributes. But, it can't set up property bindings.
@@ @@ -47,12 +47,13 @@ Polymer @@
+    ]
   _onIronResize: ->
     @width(@offsetWidth)
   _onSongTime: (t) ->
     @viewState.cursor.t(t)
   _onSongDuration: (d) ->
     d = 700 if d < 1 # bug is that asco isn't giving duration, but 0 makes the scale corrupt
     @viewState.zoomSpec.duration(d)
   setSong: (s) ->
     @song = @playerSong if @followPlayerSong
   ready: ->
     window.debug_zoomOrLayoutChangedCount = 0
@@ @@ -424,17 +425,18 @@ Polymer @@
     # update our note DOM and SVG elements based on the graph
     U = (x) -> @graph.Uri(x)
     yForV = (v) => @offsetTop + (1 - v) * @offsetHeight
     originTime = @graph.floatValue(@uri, U(':originTime'))
     effect = @graph.uriValue(@uri, U(':effectClass'))
     for curve in @graph.objects(@uri, U(':curve'))
       if @graph.uriValue(curve, U(':attr')) == U(':strength')
         @updateStrengthCurveEtc(originTime, curve, yForV)
+        @updateStrengthCurveEtc(originTime, curve, yForV, effect)
   updateStrengthCurveEtc: (originTime, curve, yForV) ->
+  updateStrengthCurveEtc: (originTime, curve, yForV, effect) ->
     U = (x) -> @graph.Uri(x)
     worldPts = getCurvePoints(@graph, curve, originTime) # (song time, value)
     curveWidth = =>
       tMin = @graph.floatValue(worldPts[0].uri, U(':time'))
       tMax = @graph.floatValue(worldPts[3].uri, U(':time'))
@@ @@ -452,13 +454,13 @@ Polymer @@
       top: @offsetTop + @offsetHeight - h - 5,
       width: w,
       height: h,
       display: if rightX - leftX > w then 'block' else 'none'
+      }
-    if screenPts[3].e(1) - screenPts[0].e(1) < 50
+    if screenPts[3].e(1) - screenPts[0].e(1) < 100
       @clearAdjusters()
       # also kill their connectors
       return
     @makeCurveAdjusters(curveWidth, yForV, worldPts)
@@ @@ -746,22 +748,34 @@ Polymer @@
   anyPointsInView: (pts) ->
     for pt in pts
       if pt.e(1) > -100 && pt.e(1) < 2500
         return true
     return false
   setNote: (uri, curvePts) ->
+  setNote: (uri, curvePts, effect) ->
     areaId = uri + '/area'
     labelId = uri + '/label'
     if not @anyPointsInView(curvePts)
       @clearElem(uri, ['/area', '/label'])
       return
     # for now these need to be pretty transparent since they're
     # drawing on top of the inline-attrs widget :(
     if effect in ['http://light9.bigasterisk.com/effect/blacklight',
       'http://light9.bigasterisk.com/effect/strobewarm']
       hue = 0
       sat = 100
     else
       hash = 0
       for i in [(effect.length-10)...effect.length]
         hash += effect.charCodeAt(i)
       hue = (hash * 8) % 360
       sat = 40 + (hash % 20) # don't conceal colorscale too much
     elem = @getOrCreateElem(areaId, 'notes', 'path',
-      {style:"fill:#53774b50; stroke:#000000; stroke-width:1.5;"})
+      {style:"fill:hsla(#{hue}, #{sat}%, 58%, 0.313); stroke:#000000; stroke-width:1.5;"})
     elem.setAttribute('d', svgPathFromPoints(curvePts))
     #elem = @getOrCreateElem(uri+'/label', 'noteLabels', 'text', {style: "font-size:13px;line-height:125%;font-family:'Verana Sans';text-align:start;text-anchor:start;fill:#000000;"})
     #elem.setAttribute('x', curvePts[0].e(1)+20)
     #elem.setAttribute('y', curvePts[0].e(2)-10)
     #elem.innerHTML = effectLabel;

0 comments (0 inline, 0 general)