Nightly

- implementation mirroring
- index.hthml

code/lib/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -8,6 +8,7 @@ ClassFlowAlignment::ClassFlowAlignment()
     anz_ref = 0;
     suchex = 40;
     suchey = 40;
+    initialmirror = false;
     namerawimage =  "/sdcard/img_tmp/raw.jpg";
     ListFlowControll = NULL;
 }
@@ -18,6 +19,7 @@ ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow*>* lfc)
     anz_ref = 0;
     suchex = 40;
     suchey = 40;
+    initialmirror = false;
     namerawimage =  "/sdcard/img_tmp/raw.jpg";    
     ListFlowControll = lfc;
 }
@@ -38,7 +40,12 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
     while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
     {
         zerlegt = this->ZerlegeZeile(aktparamgraph);
-        if ((zerlegt[0] == "InitalRotate") && (zerlegt.size() > 1))
+        if ((zerlegt[0] == "InitialMirror") && (zerlegt.size() > 1))
+        {
+            if (toUpper(zerlegt[1]) == "TRUE")
+                initialmirror = true;
+        }
+        if (((zerlegt[0] == "InitalRotate") || (zerlegt[0] == "InitialRotate")) && (zerlegt.size() > 1))
         {
             this->initalrotate = std::stod(zerlegt[1]);
         }
@@ -80,26 +87,38 @@ bool ClassFlowAlignment::doFlow(string time)
     string output3 = "/sdcard/img_tmp/rot_roi.jpg";
     string output2 = "/sdcard/img_tmp/alg.jpg";
     string output4 = "/sdcard/img_tmp/alg_roi.jpg";
+    string output1 = "/sdcard/img_tmp/mirror.jpg";
 
     input = FormatFileName(input);
     output = FormatFileName(output);
     output2 = FormatFileName(output2);
 
 
+    if (initialmirror){
+        CRotate *rt;
+        rt = new CRotate(input);
+        if (!rt->ImageOkay()){
+            LogFile.WriteToFile("ClassFlowAlignment::doFlow CRotate Inital Mirror raw.jpg not okay!");
+            delete rt;
+            return false;
+        }
+        printf("do mirror\n");
+        rt->Mirror();
+        rt->SaveToFile(output1);
+        input = output1;
+        delete rt;
+    }
+
+
     if (initalrotate != 0)
     {
-        CRotate *rt;
+        CRotate *rt = NULL;
+        printf("Load rotationfile: %s\n", input.c_str());
         rt = new CRotate(input);
         if (!rt->ImageOkay()){
             LogFile.WriteToFile("ClassFlowAlignment::doFlow CRotate raw.jpg not okay!");
             delete rt;
-            LogFile.WriteToFile("ClassFlowAlignment::doFlow 1x reload.");
-            rt = new CRotate(input);
-            if (!rt->ImageOkay()){
-                LogFile.WriteToFile("ClassFlowAlignment::doFlow Reload auch nicht erfolgreich!");
-                delete rt;
-                return false;
-            }
+            return false;
         }
         rt->Rotate(this->initalrotate);
         rt->SaveToFile(output);

code/lib/jomjol_flowcontroll/ClassFlowAlignment.h

@@ -12,6 +12,7 @@ class ClassFlowAlignment :
 {
 protected:
     float initalrotate;
+    bool initialmirror;
     string reffilename[2];
     int ref_x[2], ref_y[2];
     int anz_ref;

code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -12,7 +12,21 @@
 
 string ClassFlowPostProcessing::GetPreValue()
 {
-    return to_string(PreValue);
+    std::string result;
+    result = to_string(PreValue);
+
+    for (int i = 0; i < ListFlowControll->size(); ++i)
+    {
+        if (((*ListFlowControll)[i])->name().compare("ClassFlowAnalog") == 0)
+        {
+            int AnzahlNachkomma = ((ClassFlowAnalog*)(*ListFlowControll)[i])->AnzahlROIs();
+            std::stringstream stream;
+            stream << std::fixed << std::setprecision(AnzahlNachkomma) << PreValue;
+            result = stream.str();
+        }
+    }
+
+    return result;
 }
 
 bool ClassFlowPostProcessing::LoadPreValue(void)