From a5d20861595491775611d65e1f8ff8af09356ab6 Mon Sep 17 00:00:00 2001
From: CaCO3 <caco@ruinelli.ch>
Date: Sun, 30 Apr 2023 22:47:09 +0200
Subject: [PATCH] add example UI

---
 .../ClassFlowCNNGeneral.cpp                   | 17 ++++++++++
 .../jomjol_flowcontroll/ClassFlowCNNGeneral.h |  4 ++-
 .../jomjol_flowcontroll/ClassFlowControll.cpp | 12 ++++---
 sd-card/html/websocket.html                   | 31 +++++++++++++++++--
 4 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
index 821fc89a..2ff0d3ff 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
@@ -37,6 +37,23 @@ ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNTy
     imagesRetention = 5;
 }
 
+ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, std::string _cnn_name) : ClassFlowImage(NULL, TAG)
+{
+    string cnnmodelfile = "";
+    modelxsize = 1;
+    modelysize = 1;
+    CNNGoodThreshold = 0.0;
+    ListFlowControll = NULL;
+    previousElement = NULL;   
+    SaveAllFiles = false; 
+    disabled = false;
+    isLogImageSelect = false;
+    CNNType = AutoDetect;
+    flowpostalignment = _flowalign;
+    imagesRetention = 5;
+    cnn_name = _cnn_name;
+}
+
 
 string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution, int prev, float _before_narrow_Analog, float analogDigitalTransitionStart)
 {
diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h
index 8c3baac6..4c6afc94 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h
+++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h
@@ -25,6 +25,7 @@ protected:
     t_CNNType CNNType;
     std::vector<general*> GENERAL;
     float CNNGoodThreshold;
+    std::string cnn_name = "ClassFlowCNNGeneral";
 
 	//moved to define.h
     //float Analog_error = 3.0;
@@ -56,6 +57,7 @@ protected:
 
 public:
     ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNType _cnntype = AutoDetect);
+    ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, std::string _cnn_name);
 
     bool ReadParameter(FILE* pfile, string& aktparamgraph);
     bool doFlow(string time);
@@ -81,7 +83,7 @@ public:
 
     t_CNNType getCNNType(){return CNNType;};
 
-    string name(){return "ClassFlowCNNGeneral";}; 
+    string name(){return "ClassFlowCNNGeneral " + cnn_name;}; 
 };
 
 #endif
diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
index b1193f76..25cb7244 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
@@ -86,8 +86,10 @@ std::string ClassFlowControll::TranslateAktstatus(std::string _input)
         return ("Take Image");
     if (_input.compare("ClassFlowAlignment") == 0)
         return ("Aligning");
-    if (_input.compare("ClassFlowCNNGeneral") == 0)
-        return ("Digitalization of ROIs");
+    if (_input.compare("ClassFlowCNNGeneral Digital") == 0)
+        return ("Digitalization of Digital ROIs");
+    if (_input.compare("ClassFlowCNNGeneral Analog") == 0)
+        return ("Digitalization of Analog ROIs");
     #ifdef ENABLE_MQTT
         if (_input.compare("ClassFlowMQTT") == 0)
             return ("Sending MQTT");
@@ -101,7 +103,7 @@ std::string ClassFlowControll::TranslateAktstatus(std::string _input)
     if (_input.compare("ClassFlowPostProcessing") == 0)
         return ("Post-Processing");
 
-    return "Unkown Status";
+    return "Unkown Status: " + _input +"";
 }
 
 
@@ -223,12 +225,12 @@ ClassFlow* ClassFlowControll::CreateClassFlow(std::string _type)
     }
     if (toUpper(_type).compare("[ANALOG]") == 0)
     {
-        cfc = new ClassFlowCNNGeneral(flowalignment);
+        cfc = new ClassFlowCNNGeneral(flowalignment, std::string("Analog"));
         flowanalog = (ClassFlowCNNGeneral*) cfc;
     }
     if (toUpper(_type).compare(0, 7, "[DIGITS") == 0)
     {
-        cfc = new ClassFlowCNNGeneral(flowalignment);
+        cfc = new ClassFlowCNNGeneral(flowalignment, std::string("Digital"));
         flowdigit = (ClassFlowCNNGeneral*) cfc;
     }
     #ifdef ENABLE_MQTT
diff --git a/sd-card/html/websocket.html b/sd-card/html/websocket.html
index 71b1e257..054a9a7d 100644
--- a/sd-card/html/websocket.html
+++ b/sd-card/html/websocket.html
@@ -10,7 +10,11 @@
 </head>
 <body>
 
-<div id="rx"></div>
+<div id="state">State: Please wait...</div>
+<hr>
+<div id="img">Image: Please wait...</div>
+<hr>
+<div id="rx">Events:<br></div>
 
 
 <script>
@@ -45,7 +49,14 @@
   
   function onMessage(event) {
       console.log(event);
-      addToLog(event.data);              
+      addToLog(event.data);   
+      
+      data = JSON.parse(event.data)
+
+      // State
+      if (data.hasOwnProperty("state")) {
+        processStateChange(data.state);
+      }
   }
   
   
@@ -56,9 +67,23 @@
   
   
   function addToLog(msg) {
-      document.getElementById('rx').innerHTML += "[" + new Date().toLocaleTimeString() + "] " +msg + "<br>\n";
+      document.getElementById('rx').innerHTML += "[" + new Date().toLocaleTimeString() + "] " + msg + "<br>\n";
       window.scrollBy(0,document.body.scrollHeight);
   }
+
+  function processStateChange(state) {
+    document.getElementById('state').innerHTML = "State: <b>" + data.state + "</b>";
+
+    // TODO only reload image for those steps where it changed...
+    var d = new Date();
+    var timestamp = d.getTime();
+    document.getElementById('img').innerHTML = 'Image: <br><img src=' + getDomainname() + '/img_tmp/alg_roi.jpg?timestamp='+ timestamp +'" height=200px;"></img>';
+  }
+
+
+  function updateImage() {
+
+  }
   
 </script>
 </body>