light9 Changeset - 97e4f1b5ff19

Changeset - 97e4f1b5ff19

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Drew Perttula - 8 years ago 2017-06-06 06:37:09
drewp@bigasterisk.com

choice UI support on live editor
Ignore-this: e9bb570f128b05a498d05b4c6b6bcf86

4 files changed with 83 insertions and 12 deletions:

light9/web/lib/bower.json

light9/web/live/index.html

light9/web/live/live.coffee

show/dance2017/deviceClass.n3

0 comments (0 inline, 0 general)

light9/web/lib/bower.json

➞

Show inline comments

@@ @@ -18,13 +18,15 @@ @@
     "async": "https://github.com/caolan/async.git#^1.5.2",
     "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.3",
     "paper-radio-button": "PolymerElements/paper-radio-button#^1.2.2",
     "paper-button": "PolymerElements/paper-button#^1.0.12",
     "paper-dialog": "PolymerElements/paper-dialog#^1.0.4",
     "paper-radio-group": "PolymerElements/paper-radio-group#^1.2.2",
     "color": "https://github.com/One-com/one-color.git#^3.0.4"
     "color": "https://github.com/One-com/one-color.git#^3.0.4",
     "paper-listbox": "PolymerElements/paper-listbox#1.1.3",
     "paper-item": "PolymerElements/paper-item#1.2.2"
   },
   "resolutions": {
     "paper-styles": "^1.1.4",
     "rdflib.js": "920e59fe37",
     "d3": "e7194db33090a0afc06c77a959594361ffb949df",
     "webcomponentsjs": "^0.7.24",

light9/web/live/index.html

➞

Show inline comments

@@ @@ -4,12 +4,14 @@ @@
     <title>device control</title>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="/style.css">
     <script src="/lib/webcomponentsjs/webcomponents-lite.min.js"></script>
     <link rel="import" href="/lib/polymer/polymer.html">
     <link rel="import" href="/lib/paper-slider/paper-slider.html">
     <link rel="import" href="/lib/paper-listbox/paper-listbox.html">
     <link rel="import" href="/lib/paper-item/paper-item.html">
     <link rel="import" href="/lib/iron-ajax/iron-ajax.html">
     <link rel="import" href="../light9-collector-client.html">
     <script src="/lib/d3/build/d3.min.js"></script>
     <script src="/lib/N3.js-pull61/browser/n3-browser.js"></script>
     <script src="/lib/async/dist/async.js"></script>
@@ @@ -17,25 +19,95 @@ @@
     <link rel="import" href="../rdfdb-synced-graph.html">
     <link rel="import" href="/resource-display.html">
     <link rel="import" href="/light9-color-picker.html">
   </head>
   <body>
     <dom-module id="light9-listbox">
       <template>
         <style>
          paper-listbox {
              --paper-listbox-background-color: none;
              --paper-listbox-color: white;
              --paper-listbox: {
                  /* measure biggest item? use flex for columns? */
                  column-width: 9em;
+             }
+         }
          paper-item {
              --paper-item-min-height: 0;
              --paper-item: {
                  display: block;
                  border: 1px outset #0f440f;
                  margin: 0 1px 5px 0;
                  background: #0b1d0b;
+             }
+         }
         </style>
         <paper-listbox id="list"
                        selected="{{value}}"
                        attr-for-selected="uri"
                        on-focus-changed="selectOnFocus"
+        >
           <paper-item on-focus="selectOnFocus">None</paper-item>
           <template is="dom-repeat" items="{{choices}}">
             <paper-item on-focus="selectOnFocus" uri="{{item.uri}}">{{item.label}}</paper-item>
           </template>
         </paper-listbox>
       </template>
       <script>
        HTMLImports.whenReady(function () {
            Polymer({
                is: "light9-listbox",
                properties: {
                    choices: { type: Array },
                    value: { type: String, notify: true },
                },
                observers: ['onValue(value)'],
                selectOnFocus: function(ev) {
                    if (ev.target.uri === undefined) {
                        // *don't* clear for this, or we can't cycle through all choices (including none) with up/down keys
                        //this.clear();
                        //return;
+                   }
                    this.value = ev.target.uri;
                },
                onValue: function(value) {
                    if (value === null) {
                        this.clear();
+                   }
                },
                clear: function() {
                    this.async(function() {
                        this.querySelectorAll('paper-item').forEach(
                            function(item) { item.blur(); });
                        this.value = undefined;
                    }.bind(this));
                },
            });
        });
       </script>
     </dom-module>
     <dom-module id="light9-live-control">
       <template>
         <style>
          #colorControls {
              display: flex;
              align-items: center;
+         }
          #colorControls > * {
              margin: 0 3px;
+         }
          #colorControls paper-slider {
+             }
+         }
          paper-slider { width: 100%; height: 25px; }
         </style>
         <style is="custom-style">
          paper-slider {
              --paper-slider-knob-color: var(--paper-red-500);
@@ @@ -45,13 +117,14 @@ @@
              --paper-slider-input: {
                  width: 75px;
                  background: black;
+             }
+         }
          </style>
         </style>
         <template is="dom-if" if="{{deviceAttr.useSlider}}">
           <paper-slider min="0"
                         max="{{deviceAttr.max}}"
                         step=".001"
                         editable
@@ @@ -63,18 +136,14 @@ @@
           <button on-click="goBlack">0.0</button>
           <light9-color-picker color="{{value}}"></light9-color-picker>
         </div>
         </template>
         <template is="dom-if" if="{{deviceAttr.useChoice}}">
           <select size$="{{deviceAttr.choiceSize}}" value="{{pickedChoice::change}}">
             <option value="">None</option>
             <template is="dom-repeat" items="{{deviceAttr.choices}}">
               <option value="{{item.uri}}">{{item.label}}</option>
             </template>
           </select>
           <light9-listbox choices="{{deviceAttr.choices}}" value="{{value}}">
           </light9-listbox>
         </template>
       </template>
     </dom-module>

light9/web/live/live.coffee

➞

Show inline comments

@@ @@ -98,13 +98,13 @@ Polymer @@
       [dev, devAttr, value] = sent[0]
       key = dev + " " + devAttr
       # this is a bug for zoom=0, since collector will default it to
       # stick at the last setting if we don't explicitly send the
       # 0. rx/ry similar though not the exact same deal because of
       # their remap.
       if value == 0 or value == '#000000'
+      if value == 0 or value == '#000000' or value == null or value == undefined
         delete @currentSettings[key]
       else
         @currentSettings[key] = [dev, devAttr, value]
       @effectPreview = JSON.stringify(v for k,v of @currentSettings)
       @debounce('send', @sendAll.bind(@), 2)

show/dance2017/deviceClass.n3

➞

Show inline comments

@@ @@ -12,15 +12,15 @@ @@
 :iris               a :DeviceAttr; rdfs:label "iris"; :dataType :scalar .
 :prism              a :DeviceAttr; rdfs:label "prism"; :dataType :scalar .
 :strobe             a :DeviceAttr; rdfs:label "strobe"; :dataType :scalar;
   rdfs:comment "0=none, 1=fastest" .
 :goboSpeed          a :DeviceAttr; rdfs:label "goboSpeed"; :dataType :scalar ;
   rdfs:comment "0=stopped, 1=rotate the fastest".
-:quantumGoboChoice  a :DeviceAttr; rdfs:label "quantumGoboChoice"; :dataType :choice;
+:quantumGoboChoice  a :DeviceAttr; rdfs:label "gobo"; :dataType :choice;
   :choice :open, :spider, :windmill, :limbo, :brush, :whirlpool, :stars .
-:mini15GoboChoice   a :DeviceAttr; rdfs:label "mini15GoboChoice"; :dataType :choice;
+:mini15GoboChoice   a :DeviceAttr; rdfs:label "gobo"; :dataType :choice;
   :choice :mini15Gobo1, :mini15Gobo2, :mini15Gobo3, :mini15Gobo4, :mini15Gobo5, :mini15Gobo6, :mini15Gobo7, :mini15Gobo8, :mini15Gobo9, :mini15Gobo10 .
 :goboShake          a :DeviceAttr; rdfs:label "goboShake"; :dataType :scalar .
 :mini15Gobo1 :value 3 .
 :mini15Gobo2 :value 10 .

0 comments (0 inline, 0 general)