Enable dynamically changing device color using libmapper object prope…

…rties.
libmapper · Aug 29, 2024 · 8e166bb · 8e166bb
1 parent 5fbace3
commit 8e166bb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/js/Graph.js b/js/Graph.js
@@ -91,6 +91,24 @@ NodeArray.prototype = {
         let key = obj.key;
         if (!key)
             return null;
+
+        if ('color.rgb' in obj && 3 == obj['color.rgb'].length) {
+            let rgb = obj['color.rgb'];
+            let hsl = Raphael.rgb2hsl({r:rgb[0], g:rgb[1], b:rgb[2]});
+            obj.hue = hsl.h;
+        }
+        else if ('color.hue' in obj) {
+            let hue = obj['color.hue'];
+            if (Array.isArray(hue))
+                obj.hue = hue[0];
+            else
+                obj.hue = hue;
+            if (obj.hue > 1) {
+                // constrain and normalize
+                obj.hue = (obj.hue & 0xFFFFFF) / 0xFFFFFF;
+            }
+        }
+
         if (key in this.contents) {
             let prop, existing = this.contents[key];
             let updated = false;
@@ -109,23 +127,7 @@ NodeArray.prototype = {
             if (this.obj_type == 'device') {
                 obj.signals = new NodeArray('signal', this.cb_func);
 
-                if ('color.rgb' in obj && 3 == obj['color.rgb'].length) {
-                    let rgb = obj['color.rgb'];
-                    let hsl = Raphael.rgb2hsl({r:rgb[0], g:rgb[1], b:rgb[2]});
-                    obj.hue = hsl.h;
-                }
-                else if ('color.hue' in obj) {
-                    let hue = obj['color.hue'];
-                    if (1 == hue.length)
-                        obj.hue = hue;
-                    else
-                        obj.hue = hue[0];
-                    if (obj.hue > 1) {
-                        // constrain and normalize
-                        obj.hue = (obj.hue & 0xFFFFFF) / 0xFFFFFF;
-                    }
-                }
-                else {
+                if (!('hue' in obj) || obj.hue == 'undefined') {
                     // create hue hash
                     hueHash = function(str) {
                         var hash = 0, i, chr;

diff --git a/js/ViewManager.js b/js/ViewManager.js
@@ -227,6 +227,8 @@ class ViewManager
             if (repaint)
                 this.views[this.currentView].update('devices');
         }
+        else if (event == 'modified' && repaint)
+            this.views[this.currentView].update('devices');
         else if (event == 'removed' && repaint)
             this.views[this.currentView].update('devices');
     }