light9 Changeset - 931d2dafca12

Changeset - 931d2dafca12

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

drewp@bigasterisk.com - 9 years ago 2016-06-11 22:08:37
drewp@bigasterisk.com

new feature: values can have their range remapped in the device processing
Ignore-this: 542047e6307a304f2aa52a69d134ba21

3 files changed with 22 insertions and 1 deletions:

light9/collector/collector.py

light9/collector/device.py

show/dance2016/theaterLightConfig.n3

0 comments (0 inline, 0 general)

light9/collector/collector.py

➞

Show inline comments

 from __future__ import division
 import time
 import logging
 from rdflib import Literal
 from light9.namespaces import L9, RDF, DEV
 from light9.collector.output import setListElem
 from light9.collector.device import toOutputAttrs, resolve
 log = logging.getLogger('collector')
 def outputMap(graph, outputs):
     """From rdf config graph, compute a map of
        (device, outputattr) : (output, index)
     that explains which output index to set for any device update.
     """
     ret = {}
@@ @@ -33,28 +34,35 @@ def outputMap(graph, outputs): @@
 class Collector(object):
     def __init__(self, graph, outputs, clientTimeoutSec=10):
         self.graph = graph
         self.outputs = outputs
         self.clientTimeoutSec = clientTimeoutSec
         self.graph.addHandler(self.rebuildOutputMap)
         self.lastRequest = {} # client : (session, time, {(dev,attr): latestValue})
     def rebuildOutputMap(self):
         self.outputMap = outputMap(self.graph, self.outputs) # (device, attr) : (output, index)
         self.deviceType = {} # uri: type that's a subclass of Device
         self.remapOut = {} # (device, deviceAttr) : (start, end)
         for dc in self.graph.subjects(RDF.type, L9['DeviceClass']):
             for dev in self.graph.subjects(RDF.type, dc):
                 self.deviceType[dev] = dc
                 for remap in self.graph.objects(dev, L9['outputAttrRange']):
                     attr = self.graph.value(remap, L9['outputAttr'])
                     start = float(self.graph.value(remap, L9['start']))
                     end = float(self.graph.value(remap, L9['end']))
                     self.remapOut[(dev, attr)] = start, end
     def _forgetStaleClients(self, now):
         staleClients = []
         for c, (_, t, _) in self.lastRequest.iteritems():
             if t < now - self.clientTimeoutSec:
                 staleClients.append(c)
         for c in staleClients:
             del self.lastRequest[c]
     def resolvedSettingsDict(self, settingsList):
         out = {}
         for d, a, v in settingsList:
             if (d, a) in out:
@@ @@ -81,32 +89,37 @@ class Collector(object): @@
             if row is not None:
                 sess, _, prevClientSettings = row
                 if sess != clientSession:
                     prevClientSettings = {}
             else:
                 prevClientSettings = {}
         else: # client always provides all the nonzero settings it wants
             prevClientSettings = {}
         prevClientSettings.update(self.resolvedSettingsDict(settings))
         self.lastRequest[client] = (clientSession, now, prevClientSettings)
         # inputs that are omitted, implying a zero, should be added
         # back here if they would remap to something nonzero.
         deviceAttrs = {} # device: {deviceAttr: value}
         for _, _, lastSettings in self.lastRequest.itervalues():
             for (device, deviceAttr), value in lastSettings.iteritems():
                 attrs = deviceAttrs.setdefault(device, {})
                 if deviceAttr in attrs:
                     value = resolve(device, deviceAttr, [attrs[deviceAttr],
                                                          value])
                 if (device, deviceAttr) in self.remapOut:
                     start, end = self.remapOut[(device, deviceAttr)]
                     value = Literal(start + float(value) * (end - start))
                 attrs[deviceAttr] = value
         outputAttrs = {} # device: {outputAttr: value}
         for d in deviceAttrs:
             try:
                 devType = self.deviceType[d]
             except KeyError:
                 log.warn("request for output to unconfigured device %s" % d)
                 continue
             outputAttrs[d] = toOutputAttrs(devType, deviceAttrs[d])
         pendingOut = {} # output : values

light9/collector/device.py

➞

Show inline comments

@@ @@ -49,24 +49,26 @@ def resolve(deviceType, deviceAttr, valu @@
         return values[0]
     if deviceAttr == L9['color']:
         rgbs = [hex_to_rgb(v) for v in values]
         return rgb_to_hex([max(*component) for component in zip(*rgbs)])
     # angles should perhaps use average; gobo choice use the most-open one
     return max(values)
 def toOutputAttrs(deviceType, deviceAttrSettings):
     """
     Given device attr settings like {L9['color']: Literal('#ff0000')},
     return a similar dict where the keys are output attrs (like
     L9['red']) and the values are suitable for Collector.setAttr
     :outputAttrRange happens before we get here.
     """
     def floatAttr(attr, default=0):
         out = deviceAttrSettings.get(attr)
         if out is None:
             return default
         return float(out.toPython())
     def rgbAttr(attr):
         color = deviceAttrSettings.get(attr, '#000000')
         r, g, b = hex_to_rgb(color)
         return r, g, b

show/dance2016/theaterLightConfig.n3

➞

Show inline comments

@@ @@ -12,26 +12,32 @@ dev:house1 a :SimpleDimmer; rdfs:label " @@
 dev:house4 a :SimpleDimmer; rdfs:label "house4"; :dmxUniverse dmxA:; :dmxBase 70 .
 dev:house3 a :SimpleDimmer; rdfs:label "house3"; :dmxUniverse dmxA:; :dmxBase 71 .
 dev:house2 a :SimpleDimmer; rdfs:label "house2"; :dmxUniverse dmxA:; :dmxBase 72 .
 dev:f1 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 4 .
 dev:f2 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 8 .
 dev:f3 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 10 .
 dev:cycR a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 42 .
 dev:cycL a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 44 .
 dev:q1 a :MacQuantum; :dmxUniverse udmxB:; :dmxBase 325 .
 dev:q1 :outputAttrRange dev:q1rx . dev:q1rx :outputAttr :rx; :start 0.143; :end 0.271 .
 dev:q1 :outputAttrRange dev:q1ry . dev:q1ry :outputAttr :ry; :start 0.71; :end 0.821 .
 dev:q2 a :MacQuantum; :dmxUniverse udmxB:; :dmxBase 352 .
 dev:q2 :outputAttrRange dev:q2rx . dev:q2rx :outputAttr :rx; :start 0.097; :end 0.227 .
 dev:q2 :outputAttrRange dev:q2ry . dev:q2ry :outputAttr :ry; :start 0.739; :end 0.824 .
 dev:q3 a :MacQuantum; :dmxUniverse udmxB:; :dmxBase 379 .
 dev:q3 :outputAttrRange dev:q3rx . dev:q3rx :outputAttr :rx; :start 0.064; :end 0.198 .
 dev:q3 :outputAttrRange dev:q3ry . dev:q3ry :outputAttr :ry; :start 0.765; :end 0.822 .
 dev:aura1 a :MacAura; :dmxUniverse udmxB:; :dmxBase 406 .
 dev:aura2 a :MacAura; :dmxUniverse udmxB:; :dmxBase 420 .
 dev:aura3 a :MacAura; :dmxUniverse udmxB:; :dmxBase 434 .
 dev:aura4 a :MacAura; :dmxUniverse udmxB:; :dmxBase 448 .
 dev:aura5 a :MacAura; :dmxUniverse udmxB:; :dmxBase 462 .
 dev:auraStage a :MacAura; :dmxUniverse udmxB:; :dmxBase 476; rdfs:comment "rx=.5 ry<.45" .
 dev:down2 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 157 .
 dev:down3 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 193 .
 dev:down4 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 169 .
 dev:down5Edge a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 175 .

0 comments (0 inline, 0 general)