light9 Changeset - 9fe3052f8ced

Changeset - 9fe3052f8ced

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 8 years ago 2017-06-10 02:00:29
drewp@bigasterisk.com

theater values for capture
Ignore-this: d347d56278b7946bead3cecfd2bd3b8d

1 file changed with 21 insertions and 9 deletions:

bin/captureDevice

0 comments (0 inline, 0 general)

bin/captureDevice

➞

Show inline comments

@@ @@ -56,36 +56,48 @@ class Capture(object): @@
     settleTime = .5
     def __init__(self, graph, dev):
         self.graph = graph
         self.dev = dev
         def steps(a, b, n):
             return [round(a + (b - a) * i / n, 5) for i in range(n)]
         startTime = time.time()
         self.captureId = 'cap%s' % (int(startTime) - 1495170000)
         self.toGather = []
         #quantum
         rxSteps = steps(.06, .952, 10)
         rySteps = steps(0.1, .77, 5)
         zoomSteps = steps(.12, .85, 3)
         # aura
         rxSteps = steps(0.15, .95, 10)
         rySteps = steps(0, .9, 5)
         zoomSteps = steps(.6, .9, 3)
         row = 0
         for ry in steps(0.82, .92, 6):
             xSteps = steps(.23, .42, 12)
         for ry in rySteps:
             xSteps = rxSteps[:]
             if row % 2:
                 xSteps.reverse()
             row += 1
             for rx in xSteps:
                 self.toGather.append(DeviceSettings(graph, [
                     (dev, L9['rx'], rx),
                     (dev, L9['ry'], ry),
                     (dev, L9['color'], '#ffffff'),
                 ]))
                 for zoom in zoomSteps:
                     self.toGather.append(DeviceSettings(graph, [
                         (dev, L9['rx'], rx),
                         (dev, L9['ry'], ry),
                         (dev, L9['color'], '#ffffff'),
                         (dev, L9['zoom'], zoom),
                         #(dev, L9['focus'], 0.13),
                     ]))
         self.devTail = dev.rsplit('/')[-1]
         self.session = URIRef('/'.join([showconfig.showUri(),
                                    'capture', self.devTail, self.captureId]))
         self.ctx = URIRef(self.session + '/index')
         self.graph.patch(Patch(addQuads=[
             (self.session, RDF.type, L9['CaptureSession'], self.ctx),
         ]))
         self.numPics = 0
         self.settingsCache = set()
@@ @@ -118,35 +130,35 @@ class Capture(object): @@
         yield camera.takePic(uri, os.path.join(showconfig.root(), path))
         self.numPics += 1
         writeCaptureDescription(self.graph, self.ctx, self.session, uri,
                                 self.dev,
                                 path, self.settingsCache, settings)
         reactor.callLater(0, self.step)
-camera = Camera('http://dash:8200/picamserve/pic?res=480&resize=480&rotation=180&iso=800&redgain=1.6&bluegain=2&shutter=60000')
+camera = Camera('http://plus:8200/picamserve/pic?res=1080&resize=800&iso=800&redgain=1.6&bluegain=1.6&shutter=60000&x=0&w=1&y=0&h=.952')
 class Attrs(PrettyErrorHandler, cyclone.web.RequestHandler):
     def put(self):
         with stats.setAttr.time():
             client, clientSession, settings, sendTime = parseJsonMessage(self.request.body)
             self.set_status(202)
 def launch(graph):
-    cap = Capture(graph, dev=L9['device/moving1'])
+    cap = Capture(graph, dev=L9['device/aura5'])
     reactor.listenTCP(networking.captureDevice.port,
                       cyclone.web.Application(handlers=[
                           (r'/()', cyclone.web.StaticFileHandler,
                            {"path" : "light9/web", "default_filename" : "captureDevice.html"}),
                           (r'/stats', StatsForCyclone),
                       ]),
                       interface='::')
     log.info('serving http on %s', networking.captureDevice.port)
 def main():
     parser = optparse.OptionParser()
     parser.add_option("-v", "--verbose", action="store_true",

0 comments (0 inline, 0 general)