light9 Changeset - c756638275d6

Changeset - c756638275d6

Parent rev.

Child rev.

[Not reviewed]

default

0 5 2

Drew Perttula - 11 years ago 2014-06-02 07:04:40
drewp@bigasterisk.com

quneo input demo. optimize curve display a little.
Ignore-this: 4cf5b4b5853a94842c9fa8e2916bc6f4

7 files changed with 103 insertions and 26 deletions:

bin/inputdemo

bin/inputquneo

light9/curvecalc/client.py

light9/curvecalc/curve.py

light9/curvecalc/curveedit.py

light9/curvecalc/curveview.py

makefile

0 comments (0 inline, 0 general)

bin/inputdemo

➞

Show inline comments

@@ @@ -3,24 +3,25 @@ import sys @@
 sys.path.append('/usr/lib/python2.7/dist-packages') # For gtk
 from twisted.internet import gtk3reactor
 gtk3reactor.install()
 from twisted.internet import reactor
 from rdflib import URIRef
 import optparse, logging, urllib, time
 from gi.repository import Gtk
 from run_local import log
 from light9 import showconfig, networking
 from light9.rdfdb import clientsession
 from light9.rdfdb.syncedgraph import SyncedGraph
 import cyclone.httpclient
 from light9.curvecalc.client import sendLiveInputPoint
 class App(object):
     def __init__(self):
         parser = optparse.OptionParser()
         parser.set_usage("%prog [opts] [curve uri]")
         parser.add_option("--debug", action="store_true",
                           help="log at DEBUG")
         clientsession.add_option(parser)
         opts, args = parser.parse_args()
         log.setLevel(logging.DEBUG if opts.debug else logging.INFO)
@@ @@ -40,29 +41,19 @@ class App(object): @@
         slider = Gtk.Scale.new_with_range(orientation=Gtk.Orientation.VERTICAL,
                                           min=0, max=1, step=.001)
         slider.props.inverted = True
         slider.connect('value-changed', self.onChanged)
         win.add(slider)
         win.parse_geometry('50x250')
         win.connect("delete-event", lambda *a: reactor.crash())
         win.connect("destroy", lambda *a: reactor.crash())
         win.show_all()
     def onChanged(self, scale):
         f = cyclone.httpclient.fetch(
             networking.curveCalc.path('liveInputPoint'),
             method='POST', timeout=1,
             postdata=urllib.urlencode({
                 'curve': self.curve,
                 'value': str(scale.get_value()),
             }))
         @f.addCallback
         def cb(result):
             if result.code // 100 != 2:
                 log.error("curveCalc said %s: %s", result.code, result.body)
         t1 = time.time()
         d = sendLiveInputPoint(self.curve, scale.get_value())
         @d.addCallback
         def done(result):
             print "posted in %.1f ms" % (1000 * (time.time() - t1))
         @f.addErrback
         def eb(err):
             print "err", err
 App()

bin/inputquneo

➞

Show inline comments

@@ new file 100644 @@
 #!bin/python
 """
 read Quneo midi events, write to curvecalc and maybe to effects
 """
 from __future__ import division
 from run_local import log
 import cyclone.web, cyclone.httpclient
 from rdflib import URIRef
 from twisted.internet import reactor, task
 from light9.curvecalc.client import sendLiveInputPoint
 import sys
 sys.path.append('/usr/lib/python2.7/dist-packages') # For pygame
 import pygame.midi
 curves = {
 : URIRef('http://light9.bigasterisk.com/show/dance2014/song1/curve/c-2'),
 : URIRef('http://light9.bigasterisk.com/show/dance2014/song1/curve/c-3'),
 : URIRef('http://light9.bigasterisk.com/show/dance2014/song1/curve/c-4'),
 :URIRef('http://light9.bigasterisk.com/show/dance2014/song1/curve/c-5'),
 : URIRef('http://light9.bigasterisk.com/show/dance2014/song1/curve/c-6'),
+}
 class WatchMidi(object):
     def __init__(self):
         pygame.midi.init()
         dev = self.findQuneo()
         self.inp = pygame.midi.Input(dev)
         task.LoopingCall(self.step).start(.05)
         self.noteOn = {}
     def findQuneo(self):
         for dev in range(pygame.midi.get_count()):
             interf, name, isInput, isOutput, opened = pygame.midi.get_device_info(dev)
             if 'QUNEO' in name and isInput:
                 return dev
         raise ValueError("didn't find quneo input device")
     def step(self):
         if not self.inp.poll():
             return
         for ev in self.inp.read(999):
             (status, d1, d2, _), _ = ev
             print status, d1, d2
             for group in [(23,24,25), (6, 18)]:
                 if d1 in group:
                     if not self.noteOn.get(group):
                         print "start zero"
                         for d in group:
                             sendLiveInputPoint(curves[d], 0)
                         self.noteOn[group] = True
                     else: # miss first update
                         sendLiveInputPoint(curves[d1], d2 / 127)
                 if status == 128: #noteoff
                     for d in group:
                         sendLiveInputPoint(curves[d], 0)
                     self.noteOn[group] = False
 wm = WatchMidi()
 reactor.run()

light9/curvecalc/client.py

➞

Show inline comments

@@ new file 100644 @@
 """
 client code for talking to curvecalc
 """
 import cyclone.httpclient
 from light9 import networking
 import urllib
 from run_local import log
 def sendLiveInputPoint(curve, value):
     f = cyclone.httpclient.fetch(
         networking.curveCalc.path('liveInputPoint'),
         method='POST', timeout=1,
         postdata=urllib.urlencode({
             'curve': curve,
             'value': str(value),
         }))
     @f.addCallback
     def cb(result):
         if result.code // 100 != 2:
             raise ValueError("curveCalc said %s: %s", result.code, result.body)
     return f

light9/curvecalc/curve.py

➞

Show inline comments

@@ @@ -91,27 +91,27 @@ class Curve(object): @@
         frac = (t-p1[0])/(p2[0]-p1[0])
         y = p1[1]+(p2[1]-p1[1])*frac
         return y
     __call__=eval
     def insert_pt(self, new_pt):
         """returns index of new point"""
         i = bisect(self.points, (new_pt[0],None))
         self.points.insert(i,new_pt)
         # missing a check that this isn't the same X as the neighbor point
         return i
     def live_input_point(self, new_pt):
+    def live_input_point(self, new_pt, clear_ahead_secs=.01):
         x, y = new_pt
-        exist = self.points_between(x, x + .01)
+        exist = self.points_between(x, x + clear_ahead_secs)
         for pt in exist:
             self.remove_point(pt)
         self.insert_pt(new_pt)
         dispatcher.send("points changed", sender=self)
         # now simplify to the left
     def set_points(self, updates):
         for i, pt in updates:
             self.points[i] = pt
         x = None
         for p in self.points:

light9/curvecalc/curveedit.py

➞

Show inline comments

@@ @@ -35,14 +35,14 @@ def serveCurveEdit(port, hoverTimeRespon @@
 class CurveEdit(object):
     def __init__(self, curveset):
         self.curveset = curveset
         dispatcher.connect(self.inputTime, "input time")
         self.currentTime = 0
     def inputTime(self, val):
         self.currentTime = val
     def liveInputPoint(self, curveUri, value):
         curve = self.curveset.curveFromUri(curveUri)
         curve.live_input_point((self.currentTime, value))
+        curve.live_input_point((self.currentTime, value), clear_ahead_secs=.5)

light9/curvecalc/curveview.py

➞

Show inline comments

@@ @@ -726,32 +726,30 @@ class Curveview(object): @@
         visible_idxs = self.curve.indices_between(visible_x[0], visible_x[1],
                                                   beyond=1)
         visible_points = [self.curve.points[i] for i in visible_idxs]
         if getattr(self, 'curveGroup', None):
             self.curveGroup.remove()
         self.curveGroup = GooCanvas.CanvasGroup(parent=self.canvas.get_root_item())
         self.canvas.set_property("background-color",
                                  "gray20" if self.curve.muted else "black")
         self.update_time_bar(self._time)
         if self.canvas.props.y2 < 40:
             self._draw_line(visible_points, area=True)
         else:
         self._draw_line(visible_points, area=True)
         self._draw_markers(
             self.markers.points[i] for i in
             self.markers.indices_between(visible_x[0], visible_x[1]))
         if self.canvas.props.y2 > 80:
             self._draw_time_tics(visible_x)
             self._draw_line(visible_points)
             self._draw_markers(
                 self.markers.points[i] for i in
                 self.markers.indices_between(visible_x[0], visible_x[1]))
             self.dots = {} # idx : canvas rectangle
             if len(visible_points) < 50 and not self.curve.muted:
                 self._draw_handle_points(visible_idxs,visible_points)
         self.selectionChanged()
     def is_music(self):
         """are we one of the music curves (which might be drawn a bit
         differently)"""
         return self._isMusic
@@ @@ -1062,25 +1060,25 @@ class CurveRow(object): @@
     please pack self.box
     """
     def __init__(self, graph, name, curve, markers, slider, knobEnabled, zoomControl):
         self.graph = graph
         self.name = name
         self.box = Gtk.Box.new(Gtk.Orientation.VERTICAL, 0)
         self.box.set_border_width(1)
         self.cols = Gtk.Box.new(Gtk.Orientation.HORIZONTAL, 0)
         self.box.add(self.cols)
         controls = Gtk.Frame()
-        controls.set_size_request(115, -1)
+        controls.set_size_request(160, -1)
         controls.set_shadow_type(Gtk.ShadowType.OUT)
         self.cols.pack_start(controls, expand=False, fill=True, padding=0)
         self.setupControls(controls, name, curve, slider)
         self.curveView = Curveview(curve, markers, knobEnabled=knobEnabled,
                                    isMusic=name in ['music', 'smooth_music'],
                                    zoomControl=zoomControl)
         self.initCurveView()
         dispatcher.connect(self.rebuild, "all curves rebuild")
     def isFocus(self):
@@ @@ -1095,24 +1093,26 @@ class CurveRow(object): @@
     def destroy(self):
         self.curveView.entered = False  # help suppress bad position events
         del self.curveView
         self.box.destroy()
     def initCurveView(self):
         self.curveView.widget.show()
         self.setHeight(100)
         self.cols.pack_start(self.curveView.widget, expand=True, fill=True, padding=0)
     def setHeight(self, h):
         self.curveView.widget.set_size_request(-1, h)
         # the event watcher wasn't catching these
         reactor.callLater(.5, self.curveView.update_curve)
     def setupControls(self, controls, name, curve, slider):
         box = Gtk.Box.new(Gtk.Orientation.HORIZONTAL, 0)
         controls.add(box)
         curve_name_label = Gtk.LinkButton()
         def update_label():
             # todo: abort if we don't still exist...
             p = curve_name_label.props
             p.uri = curve.uri
             p.label = self.graph.label(curve.uri)
         self.graph.addHandler(update_label)

makefile

➞

Show inline comments

@@ @@ -43,13 +43,13 @@ tkdnd_build: @@
 	# get tkdnd r95 with subversion
 	# then apply tkdnd-patch-on-r95 to that
 	cd tkdnd/trunk
 	./configure
 	make
 bin/ascoltami2: gst_packages link_to_sys_packages
 gst_packages:
 	sudo aptitude install python-gi gir1.2-gst-plugins-base-1.0 libgirepository-1.0-1 gir1.2-gstreamer-1.0 gstreamer1.0-tools gstreamer1.0-plugins-good gstreamer1.0-pulseaudio gir1.2-goocanvas-2.0-9
 packages:
 	sudo aptitude install coffeescript freemind normalize-audio audacity python-pygoocanvas
+	sudo aptitude install coffeescript freemind normalize-audio audacity python-pygoocanvas python-pygame

0 comments (0 inline, 0 general)