From cd540eca4eecf1492ce7b48bbb57242fbd8354d1 Mon Sep 17 00:00:00 2001
From: tzim <tzim@tzim.net>
Date: Mon, 18 May 2015 15:44:48 +0000
Subject: [PATCH] modif script control pour multi-circuits

---
 loupiottes.js | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/loupiottes.js b/loupiottes.js
index 9477e49..05cd926 100644
--- a/loupiottes.js
+++ b/loupiottes.js
@@ -18,18 +18,28 @@ control.regMode = "OFF";
 control.regUniv = 0;
 control.regPage = 0;
 control.regPageCount=32;
+control.reglmem={};
+
+control.clearRegl = function()
+{
+	control.reglmem={};
+	control.regPage = 0;
+	control.changeRegPage();
+}
 
 control.modeFunc = function(p1){
 
   if( control.regMode == "CIR")
   {
-     oscManager.sendOSC(["/circuitTel/off","i",1]);
+     oscManager.sendOSC(["/circuitTel/alloff","i",1]);
   }
   if( control.regMode == "UNI")
   {
-     oscManager.sendOSC(["/universe/"+control.regUniv+"/off","i",1]);
+     oscManager.sendOSC(["/universe/"+control.regUniv+"/alloff","i",1]);
   }
 
+  control.clearRegl();
+
   if(p1 == "OFF"){     
          control.regMode = "OFF";
 	control.regUniv=0;
@@ -74,34 +84,42 @@ control.reglValChange = function(val){
   return false;
 }
 
+
 control.btnRegl = function(id,val)
 {
-    if(val==0)return;
-    for(var i = 0;i<control.regPageCount;i++){
+    //if(val==0)return;
+    /*for(var i = 0;i<control.regPageCount;i++){
        if(i!=id && mulButton.children[i].value !=0)
        mulButton.children[i].setValue(0);
-    }
-   reglval.setValue(0);
+    }*/
+//   reglval.setValue(0);
    id = id + control.regPageCount *control.regPage +1;
+   if(val==0) onoff= "/off/";
+   else onoff="/on/";
+   
    if( control.regMode == "UNI")
    {
-     var addr = "/universe/"+ control.regUniv + "/on/" + (id);
+     var addr = "/universe/"+ control.regUniv + onoff + (id-1);
      oscManager.sendOSC([addr,"f",val]);
    }
    if( control.regMode == "CIR")
    {
-     var addr = "/circuitTel/on/" + (id);
+     var addr = "/circuitTel" + onoff + (id);
      oscManager.sendOSC([addr,"f",val]);
    }   
+	control.reglmem[id]=val;	
 }
 
 
 control.changeRegPage = function(){
     var base = control.regPage *control.regPageCount +1;
+    var val=0;
     for(var i = 0;i<control.regPageCount;i++){
         mulButton.children[i].label.setValue(base + i);
-       if(mulButton.children[i].value !=0)
-	       mulButton.children[i].setValue(0);
+        if(control.reglmem[base+i] !=undefined) val = control.reglmem[base+i];
+        else val=0;
+       if(mulButton.children[i].value !=val)
+	       mulButton.children[i].setValue(val);
     }
 }