Update Rolling 20210118

code/components/jomjol_flowcontroll/ClassFlowAnalog.cpp

@@ -25,7 +25,7 @@ void ClassFlowAnalog::SetInitialParameter(void)
     previousElement = NULL;   
     SaveAllFiles = false; 
     disabled = false;
-
+    extendedResolution = false;
 }   
 
 ClassFlowAnalog::ClassFlowAnalog(std::vector<ClassFlow*>* lfc) : ClassFlowImage(lfc, TAG)
@@ -44,15 +44,40 @@ ClassFlowAnalog::ClassFlowAnalog(std::vector<ClassFlow*>* lfc) : ClassFlowImage(
 }
 
 
+int ClassFlowAnalog::AnzahlROIs()
+{
+    int zw = ROI.size();
+    if (extendedResolution)
+        zw++;
+    
+    return zw;
+} 
+
+
 string ClassFlowAnalog::getReadout()
 {
+    string result = "";    
+    if (ROI.size() == 0)
+        return result;
+
+
+    float zahl = ROI[ROI.size() - 1]->result;
+    int ergebnis_nachkomma = ((int) floor(zahl * 10)) % 10;
+
     int prev = -1;
-    string result = "";
-    for (int i = ROI.size() - 1; i >= 0; --i)
+
+    prev = ZeigerEval(ROI[ROI.size() - 1]->result, prev);
+    result = std::to_string(prev);
+
+    if (extendedResolution)
+        result = result + std::to_string(ergebnis_nachkomma);
+
+    for (int i = ROI.size() - 2; i >= 0; --i)
     {
         prev = ZeigerEval(ROI[i]->result, prev);
         result = std::to_string(prev) + result;
     }
+
     return result;
 }
 
@@ -143,6 +168,12 @@ bool ClassFlowAnalog::ReadParameter(FILE* pfile, string& aktparamgraph)
             if (toUpper(zerlegt[1]) == "TRUE")
                 SaveAllFiles = true;
         }
+
+        if ((toUpper(zerlegt[0]) == "EXTENDEDRESOLUTION") && (zerlegt.size() > 1))
+        {
+            if (toUpper(zerlegt[1]) == "TRUE")
+                extendedResolution = true;
+        }
     }
 
     for (int i = 0; i < ROI.size(); ++i)

code/components/jomjol_flowcontroll/ClassFlowAnalog.h

@@ -21,11 +21,14 @@ protected:
     int ZeigerEval(float zahl, int ziffer_vorgaenger);
     bool SaveAllFiles;    
 
+
     ClassFlowAlignment* flowpostalignment;
 
 	void SetInitialParameter(void);        
 
 public:
+    bool extendedResolution;
+
     ClassFlowAnalog(std::vector<ClassFlow*>* lfc);
 
     bool ReadParameter(FILE* pfile, string& aktparamgraph);
@@ -38,7 +41,7 @@ public:
     bool doNeuralNetwork(string time); 
     bool doAlignAndCut(string time);
    	std::vector<HTMLInfo*> GetHTMLInfo();   
-    int AnzahlROIs(){return ROI.size();}; 
+    int AnzahlROIs(); 
 
     string name(){return "ClassFlowAnalog";}; 
 };

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9bb715f";
+const char* GIT_REV="c65de27";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-01-17 12:21";
+const char* BUILD_TIME="2021-01-18 20:57";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9bb715f";
+const char* GIT_REV="c65de27";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-01-17 12:21";
+const char* BUILD_TIME="2021-01-18 20:57";