Rename stage to dashboard

ewowi · Mar 4, 2024 · ab2c8dc · ab2c8dc
1 parent 6d5b1d4
commit ab2c8dc
Show file tree

Hide file tree

Showing 13 changed files with 843 additions and 841 deletions.
diff --git a/data/index.htm b/data/index.htm
@@ -37,7 +37,7 @@
     <h1>StarMod💫 LEDs 🎨 by MoonModules 🌔</h1>
     <h2><div id="instanceName"></div></h2>
     <input type="button" value="App" id="vApp" onclick="setView(this)">
-    <input type="button" value="Stage" id="vStage" onclick="setView(this)">
+    <input type="button" value="DashBoard" id="vDash" onclick="setView(this)">
     <input type="button" value="User" id="vUser" onclick="setView(this)">
     <input type="button" value="System" id="vSys" onclick="setView(this)">
     <input type="button" value="All" id="vAll" onclick="setView(this)">

diff --git a/data/index.js b/data/index.js
@@ -1302,7 +1302,7 @@ function setInstanceTableColumns() {
 
   let tbl = gId("insTbl");
   if (!tbl) return;
-  let isStageView = gId("vStage").classList.contains("selected");
+  let isDashView = gId("vDash").classList.contains("selected");
   let thead = tbl.querySelector("thead");
   let tbody = tbl.querySelector("tbody");
 
@@ -1318,13 +1318,13 @@ function setInstanceTableColumns() {
   // console.log("setInstanceTableColumns", tbl, thead, tbody);
   columnNr = 2;
   for (; columnNr<6; columnNr++) {
-    showHideColumn(columnNr, isStageView);
+    showHideColumn(columnNr, isDashView);
   }
   for (; columnNr<thead.querySelector("tr").childNodes.length; columnNr++) {
-    showHideColumn(columnNr, !isStageView);
+    showHideColumn(columnNr, !isDashView);
   }
 
-  if (gId("sma")) gId("sma").parentNode.hidden = isStageView; //hide sync master label field and comment
+  if (gId("sma")) gId("sma").parentNode.hidden = isDashView; //hide sync master label field and comment
 }
 
 function changeHTMLView(value) {
@@ -1333,7 +1333,7 @@ function changeHTMLView(value) {
 
   gId("vAI").classList.remove("selected");
   gId("vApp").classList.remove("selected");
-  gId("vStage").classList.remove("selected");
+  gId("vDash").classList.remove("selected");
   gId("vUser").classList.remove("selected");
   gId("vSys").classList.remove("selected");
   gId("vAll").classList.remove("selected");
@@ -1359,7 +1359,7 @@ function changeHTMLView(value) {
               found = true;
             if (value=="vUser" && moduleNode.className == "usermod")
               found = true;
-            if (value=="vStage" && moduleNode.id == "Instances")
+            if (value=="vDash" && moduleNode.id == "Instances")
               found = true;
           }
           // console.log(mdlColumnNode, moduleNode, moduleNode.className);

diff --git a/src/App/AppEffects.h b/src/App/AppEffects.h
@@ -49,7 +49,7 @@ class Effect {
       default: return false;
     }});
     //tbd: check if memory is freed!
-    // currentVar["stage"] = true;
+    // currentVar["dash"] = true;
   }
 
   CRGBPalette16 getPalette() {

diff --git a/src/App/AppFixture.cpp b/src/App/AppFixture.cpp
@@ -329,7 +329,8 @@ void Fixture::projectAndMap() {
                         for (size_t i = leds->mappingTable.size(); i <= indexV; i++) {
                           // USER_PRINTF("mapping %d,%d,%d add physMap before %d %d\n", pixel.y, pixel.y, pixel.z, indexV, leds->mappingTable.size());
                           std::vector<unsigned16> physMap;
-                          physMap.push_back(0);
+                          if (i != indexV)
+                            physMap.push_back(0);
                           leds->mappingTable.push_back(physMap); //abort() was called at PC 0x40191473 on core 1 std::allocator<unsigned short> >&&)
                         }
                       }

diff --git a/src/App/AppModEffects.h b/src/App/AppModEffects.h
@@ -117,7 +117,7 @@ class AppModEffects:public SysModule {
         return true;
       default: return false;
     }});
-    currentVar["stage"] = true;
+    currentVar["dash"] = true;
 
     currentVar = ui->initSelect(tableVar, "pro", 2, false, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
       case f_ValueFun:
@@ -190,7 +190,7 @@ class AppModEffects:public SysModule {
         return true;
       default: return false;
     }});
-    currentVar["stage"] = true;
+    currentVar["dash"] = true;
 
     ui->initCoord3D(tableVar, "fxStart", {0,0,0}, 0, NUM_LEDS_Max, false, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
       case f_ValueFun:
@@ -296,7 +296,7 @@ class AppModEffects:public SysModule {
           // e131mod->patchChannel(3, "pro", Projections::count);
           // e131mod->patchChannel(4, "fixture", 5); //assuming 5!!!
 
-          // ui->stageVarChanged = true;
+          // ui->dashVarChanged = true;
           // //rebuild the table
           for (JsonObject childVar: mdl->varChildren("e131Tbl"))
             ui->callVarFun(childVar, UINT8_MAX, f_ValueFun);

diff --git a/src/App/AppModFixture.h b/src/App/AppModFixture.h
@@ -29,7 +29,7 @@ class AppModFixture:public SysModule {
         return true;
       default: return false;
     }});
-    currentVar["stage"] = true;
+    currentVar["dash"] = true;
 
     //logarithmic slider (10)
     currentVar = ui->initSlider(parentVar, "bri", 10, 0, 255, false, [](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
@@ -48,7 +48,7 @@ class AppModFixture:public SysModule {
       default: return false; 
     }});
     currentVar["log"] = true; //logarithmic
-    currentVar["stage"] = true; //these values override model.json???
+    currentVar["dash"] = true; //these values override model.json???
 
     ui->initCanvas(parentVar, "pview", UINT16_MAX, false, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
       case f_UIFun:

diff --git a/src/Sys/SysModModel.cpp b/src/Sys/SysModModel.cpp
@@ -90,7 +90,7 @@ void SysModModel::setup() {
 
     StarModJson starModJson("/model.json", "w"); //open fileName for deserialize
     starModJson.addExclusion("fun");
-    starModJson.addExclusion("stage");
+    starModJson.addExclusion("dash");
     starModJson.writeJsonDocToFile(model);
 
     // print->printJson("Write model", *model); //this shows the model before exclusion
@@ -206,8 +206,8 @@ void SysModModel::varToValues(JsonObject var, JsonArray row) {
 void SysModModel::callChangeFun(JsonObject var, unsigned8 rowNr) {
 
   //done here as ui cannot be used in SysModModel.h
-  if (var["stage"])
-    ui->stageVarChanged = true;
+  if (var["dash"])
+    ui->dashVarChanged = true;
 
   ui->callVarFun(var, rowNr, f_ChangeFun);
 

diff --git a/src/Sys/SysModUI.cpp b/src/Sys/SysModUI.cpp
@@ -16,7 +16,7 @@
 //init static variables (https://www.tutorialspoint.com/cplusplus/cpp_static_members.htm)
 std::vector<VarFun> SysModUI::varFunctions;
 std::vector<VarLoop> SysModUI::loopFunctions;
-bool SysModUI::stageVarChanged = false;
+bool SysModUI::dashVarChanged = false;
 
 SysModUI::SysModUI() :SysModule("UI") {
 };

diff --git a/src/Sys/SysModUI.h b/src/Sys/SysModUI.h
@@ -56,7 +56,7 @@ static unsigned8 linearToLogarithm(JsonObject var, unsigned8 value) {
 class SysModUI:public SysModule {
 
 public:
-  static bool stageVarChanged;// = false; //tbd: move mechanism to UserModInstances as there it will be used
+  static bool dashVarChanged;// = false; //tbd: move mechanism to UserModInstances as there it will be used
   static std::vector<VarFun> varFunctions; //static because of static functions callChangeFun, processJson...
 
   SysModUI();

diff --git a/src/User/UserModE131.h b/src/User/UserModE131.h
@@ -48,7 +48,7 @@ class UserModE131:public SysModule {
         return true;
       default: return false;
     }});
-    currentVar["stage"] = true;
+    currentVar["dash"] = true;
 
     JsonObject tableVar = ui->initTable(parentVar, "e131Tbl", nullptr, true, [](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
       case f_UIFun:

diff --git a/src/User/UserModInstances.h b/src/User/UserModInstances.h
@@ -183,7 +183,7 @@ class UserModInstances:public SysModule {
   //   row.add(instance->version);
   //   row.add(instance->sys.upTime);
 
-  //   mdl->findVars("stage", true, [instance, row](JsonObject var) { //findFun
+  //   mdl->findVars("dash", true, [instance, row](JsonObject var) { //findFun
   //     //look for value in instance
   //     int value = instance->app.getVar(var["id"]);
   //     // USER_PRINTF("insTbl %s %s: %d\n", instance->name, varID, value);
@@ -298,12 +298,12 @@ class UserModInstances:public SysModule {
       }
       default: return false;
     }}); //syncMaster
-    currentVar["stage"] = true;
+    currentVar["dash"] = true;
 
-    //find stage variables and add them to the table
-    mdl->findVars("stage", true, [tableVar, this](JsonObject var) { //findFun
+    //find dash variables and add them to the table
+    mdl->findVars("dash", true, [tableVar, this](JsonObject var) { //findFun
 
-      USER_PRINTF("stage %s %s found\n", mdl->varID(var), var["value"].as<String>().c_str());
+      USER_PRINTF("dash %s %s found\n", mdl->varID(var), var["value"].as<String>().c_str());
 
       char columnVarID[32] = "ins";
       strcat(columnVarID, var["id"]);
@@ -314,7 +314,7 @@ class UserModInstances:public SysModule {
         case f_ValueFun:
           //should not trigger chFun
           for (unsigned8 rowNrL = 0; rowNrL < instances.size() && (rowNr == UINT8_MAX || rowNrL == rowNr); rowNrL++) {
-            // USER_PRINTF("initVar stage %s[%d]\n", mdl->varID(insVar), rowNrL);
+            // USER_PRINTF("initVar dash %s[%d]\n", mdl->varID(insVar), rowNrL);
             //do what setValue is doing except calling changeFun
             // insVar["value"][rowNrL] = instances[rowNrL].app.getVar(mdl->varID(var)); //only int values...
             web->addResponse(insVar["id"], "value", instances[rowNrL].app.getVar(mdl->varID(var)), rowNrL); //only int values...);
@@ -412,8 +412,8 @@ class UserModInstances:public SysModule {
 
     handleNotifications();
 
-    if (ui->stageVarChanged) {
-      ui->stageVarChanged = false;
+    if (ui->dashVarChanged) {
+      ui->dashVarChanged = false;
       sendSysInfoUDP(); 
     }
   }
@@ -573,11 +573,11 @@ class UserModInstances:public SysModule {
       }
     #endif
 
-    //stage values default 0
+    //dash values default 0
     starModMessage.app.initVars();
 
-    //send stage values
-    mdl->findVars("stage", true, [&starModMessage](JsonObject var) { //varFun
+    //send dash values
+    mdl->findVars("dash", true, [&starModMessage](JsonObject var) { //varFun
       // print->printJson("setVar", var);
       JsonArray valArray = mdl->varValArray(var);
       if (valArray.isNull())
@@ -629,7 +629,7 @@ class UserModInstances:public SysModule {
         instance.sys.dmx.start = 0;
         instance.sys.dmx.count = 0;
         instance.sys.syncMaster = 0;
-        //stage values default 0
+        //dash values default 0
         instance.app.initVars();
       }