Mercurial > code > home > repos > light9
changeset 1945:157985a971dc
non-working WIP for vidref web
Ignore-this: e4be7b5961222bedb5ffe53c46388b3
| author | drewp@bigasterisk.com |
|---|---|
| date | Wed, 05 Jun 2019 05:29:06 +0000 |
| parents | b0691e922fa1 |
| children | a362b892cb43 |
| files | bin/vidref light9/vidref/index.html light9/web/light9-vidref-live.js makefile package.json |
| diffstat | 5 files changed, 26 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/vidref Wed Jun 05 02:04:33 2019 +0000 +++ b/bin/vidref Wed Jun 05 05:29:06 2019 +0000 @@ -108,13 +108,13 @@ handlers=[ (r'/()', cyclone.web.StaticFileHandler, { 'path': 'light9/vidref', - 'default_filename': 'vidref.html' + 'default_filename': 'index.html' }), (r'/setup/()', cyclone.web.StaticFileHandler, { 'path': 'light9/vidref', 'default_filename': 'setup.html' }), - (r'/setup/live', Live), + (r'/live', Live), (r'/snapshot', Snapshot), (r'/snapshot/(.*)', SnapshotPic, { "path": snapshotDir()
--- a/light9/vidref/index.html Wed Jun 05 02:04:33 2019 +0000 +++ b/light9/vidref/index.html Wed Jun 05 05:29:06 2019 +0000 @@ -1,37 +1,23 @@ <!doctype html> <html> <head> - <title>picamserve</title> + <title>vidref</title> <meta charset="utf-8" /> <style> - .tile { - display: inline-block; - border: 1px solid gray; - margin: 3px; - padding: 2px; - } - .tile img { - } + </style> + <script src="/lib/jquery/dist/jquery.slim.min.js"></script> + + <script src="/websocket.js"></script> + <script type="module" src="/light9-vidref-live.js"></script> + + </head> <body> - <section> - Whole view - <div class="tile"> - <img src="pic?resize=500&awb_mode=auto&exposure_mode=auto&shutter=100000"> - </div> - </section> - <section> - Shutters - <div data-bind="foreach: shutters"> - <div class="tile"> - <div><img data-bind="attr: {src: 'pic?res=480&resize=200&x=.5&y=.3&w=.5&h=.2&awb_mode=auto&exposure_mode=auto&shutter='+$data}"></div> - <span data-bind="text: ($data / 1000) + ' ms'"></span> - </div> - </div> - </section> - <script src="/lib/knockout/dist/knockout.js"></script> - <script src="gui.js"></script> + Live: + <light9-vidref-live></light9-vidref-live> + + </body> </html>
--- a/light9/web/light9-vidref-live.js Wed Jun 05 02:04:33 2019 +0000 +++ b/light9/web/light9-vidref-live.js Wed Jun 05 05:29:06 2019 +0000 @@ -1,5 +1,7 @@ import { LitElement, TemplateResult, html, css } from '/node_modules/lit-element/lit-element.js'; - +import { debug } from '/lib/debug/debug-build-es6.js'; +debug.enable('*'); +log = debug('live') class Light9VidrefLive extends LitElement { @@ -26,6 +28,11 @@ } + disconnectedCallback() { + log('bye'); + + } + render() { return html` <div>
--- a/makefile Wed Jun 05 02:04:33 2019 +0000 +++ b/makefile Wed Jun 05 05:29:06 2019 +0000 @@ -36,6 +36,9 @@ node_modules/browserify/bin/cmd.js light9/web/lib/debug/src/browser.js -o light9/web/lib/debug/debug-build.js --standalone debug perl -pi -e "s,'lit-html,'/node_modules/lit-html,; s,lit-html',lit-html/lit-html.js'," node_modules/lit-element/lit-element.js perl -pi -e 's/module.exports = rounding/export { rounding }/' node_modules/significant-rounding/index.js + node_modules/browserify/bin/cmd.js light9/web/lib/debug/src/browser.js -o light9/web/lib/debug/debug-build-es6.js + node_modules/cjs-to-es6/index.js light9/web/lib/debug/debug-build-es6.js + bin/ascoltami2: gst_packages link_to_sys_packages