Update to v0.9.0

code/lib/jomjol_flowcontroll/ClassFlow.cpp

@@ -72,6 +72,10 @@ bool ClassFlow::doFlow(string time)
 	return false;
 }
 
+string ClassFlow::getHTMLSingleStep(string host){
+	return "";
+}
+
 string ClassFlow::getReadout()
 {
 	return string();

code/lib/jomjol_flowcontroll/ClassFlow.h

@@ -33,6 +33,7 @@ public:
 	ClassFlow(std::vector<ClassFlow*> * lfc);
 	virtual bool ReadParameter(FILE* pfile, string &aktparamgraph);
 	virtual bool doFlow(string time);
+	virtual string getHTMLSingleStep(string host);
 	virtual string getReadout();
 	virtual string name(){return "ClassFlow";};
 

code/lib/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -60,6 +60,17 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
 
 }
 
+string ClassFlowAlignment::getHTMLSingleStep(string host)
+{
+    string result;
+
+    result =          "<p>Rotated Image: </p> <p><img src=\"" + host + "/img_tmp/rot.jpg\"></p>\n";
+    result = result + "<p>Found Alignment: </p> <p><img src=\"" + host + "/img_tmp/rot_roi.jpg\"></p>\n";
+    result = result + "<p>Aligned Image: </p> <p><img src=\"" + host + "/img_tmp/alg.jpg\"></p>\n";
+    return result;
+}
+
+
 bool ClassFlowAlignment::doFlow(string time)
 {
     string input = namerawimage;

code/lib/jomjol_flowcontroll/ClassFlowAlignment.h

@@ -23,6 +23,7 @@ public:
     ClassFlowAlignment(std::vector<ClassFlow*>* lfc);
     bool ReadParameter(FILE* pfile, string& aktparamgraph);
     bool doFlow(string time);
+    string getHTMLSingleStep(string host);
     string name(){return "ClassFlowAlignment";};
 };
 

code/lib/jomjol_flowcontroll/ClassFlowAnalog.cpp

@@ -113,6 +113,31 @@ bool ClassFlowAnalog::ReadParameter(FILE* pfile, string& aktparamgraph)
 }
 
 
+string ClassFlowAnalog::getHTMLSingleStep(string host)
+{
+    string result, zw;
+    std::vector<HTMLInfo*> htmlinfo;
+
+    result = "<p>Found ROIs: </p> <p><img src=\"" + host + "/img_tmp/alg_roi.jpg\"></p>\n";
+    result = result + "Analog Pointers: <p> ";
+
+    htmlinfo = GetHTMLInfo();
+    for (int i = 0; i < htmlinfo.size(); ++i)
+    {
+        std::stringstream stream;
+        stream << std::fixed << std::setprecision(1) << htmlinfo[i]->val;
+        zw = stream.str();
+
+        result = result + "<img src=\"" + host + "/img_tmp/" +  htmlinfo[i]->filename + "\"> " + zw;
+        delete htmlinfo[i];
+    }
+    htmlinfo.clear();         
+
+    return result;
+}
+
+
+
 bool ClassFlowAnalog::doFlow(string time)
 {
     doAlignAndCut(time);

code/lib/jomjol_flowcontroll/ClassFlowAnalog.h

@@ -25,6 +25,7 @@ public:
     ClassFlowAnalog(std::vector<ClassFlow*>* lfc);
     bool ReadParameter(FILE* pfile, string& aktparamgraph);
     bool doFlow(string time);
+    string getHTMLSingleStep(string host);
     string getReadout();    
 
     bool doNeuralNetwork(string time); 

code/lib/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -1,8 +1,39 @@
 #include "ClassFlowControll.h"
 
 #include "ClassLogFile.h"
+#include "time_sntp.h"
 #include "Helper.h"
 
+std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _host){
+    bool found = false;
+    std::string _classname = "";
+    std::string result = "";
+    if (_stepname.compare("[MakeImage]") == 0){
+        _classname = "ClassFlowMakeImage";
+    }
+    if (_stepname.compare("[Alignment]") == 0){
+        _classname = "ClassFlowAlignment";
+    }
+    if (_stepname.compare("[Digits]") == 0){
+        _classname = "ClassFlowDigit";
+    }
+    if (_stepname.compare("[Analog]") == 0){
+        _classname = "ClassFlowAnalog";
+    }
+//    std::string zw = "Classname: " + _classname + "\n";
+//    printf(zw.c_str());
+
+    for (int i = 0; i < FlowControll.size(); ++i)
+        if (FlowControll[i]->name().compare(_classname) == 0){
+ //           printf(FlowControll[i]->name().c_str()); printf("\n");
+            FlowControll[i]->doFlow("");
+            result = FlowControll[i]->getHTMLSingleStep(_host);
+            found = true;
+        }
+
+    return result;
+}
+
 std::vector<HTMLInfo*> ClassFlowControll::GetAllDigital()
 {
     for (int i = 0; i < FlowControll.size(); ++i)
@@ -67,8 +98,6 @@ ClassFlow* ClassFlowControll::CreateClassFlow(std::string _type)
 
 void ClassFlowControll::InitFlow(std::string config)
 {
-    int aktFlow;
-    bool handeled;
     string line;
 
     flowpostprocessing = NULL;
@@ -79,8 +108,6 @@ void ClassFlowControll::InitFlow(std::string config)
     pFile = fopen(config.c_str(), "r");
 
     line = "";
-    handeled = true;
-
 
     char zw[1024];
     if (pFile != NULL)
@@ -109,15 +136,24 @@ void ClassFlowControll::InitFlow(std::string config)
 
 }
 
+std::string ClassFlowControll::getActStatus(){
+    return aktstatus;
+}
+
 bool ClassFlowControll::doFlow(string time)
 {
     bool result = true;
+    std::string zw_time;
     for (int i = 0; i < FlowControll.size(); ++i)
     {
+        zw_time = gettimestring("%Y%m%d-%H%M%S");
+        aktstatus = zw_time + ": " + FlowControll[i]->name();
         string zw = "FlowControll.doFlow - " + FlowControll[i]->name();
         LogFile.WriteToFile(zw);
         result = result && FlowControll[i]->doFlow(time);
     }
+    zw_time = gettimestring("%Y%m%d-%H%M%S");    
+    aktstatus = zw_time + ": Flow is done";
     return result;
 }
 

code/lib/jomjol_flowcontroll/ClassFlowControll.h

@@ -21,6 +21,7 @@ protected:
 	bool AutoStart;
 	float AutoIntervall;
 	void SetInitialParameter(void);	
+	std::string aktstatus;
 
 
 public:
@@ -31,8 +32,12 @@ public:
 	string GetPrevalue();	
 	bool ReadParameter(FILE* pfile, string& aktparamgraph);	
 
+	std::string doSingleStep(std::string _stepname, std::string _host);
+
 	bool isAutoStart(long &_intervall);
 
+	std::string getActStatus();
+
 	std::vector<HTMLInfo*> GetAllDigital();
 	std::vector<HTMLInfo*> GetAllAnalog();	
 

code/lib/jomjol_flowcontroll/ClassFlowDigit.cpp

@@ -91,6 +91,32 @@ bool ClassFlowDigit::ReadParameter(FILE* pfile, string& aktparamgraph)
 }
 
 
+string ClassFlowDigit::getHTMLSingleStep(string host)
+{
+    string result, zw;
+    std::vector<HTMLInfo*> htmlinfo;
+
+    result = "<p>Found ROIs: </p> <p><img src=\"" + host + "/img_tmp/alg_roi.jpg\"></p>\n";
+    result = result + "Digital Counter: <p> ";
+
+    htmlinfo = GetHTMLInfo();
+    for (int i = 0; i < htmlinfo.size(); ++i)
+    {
+        if (htmlinfo[i]->val == 10)
+            zw = "NaN";
+        else
+        {
+            zw = to_string((int) htmlinfo[i]->val);
+        }
+        result = result + "<img src=\"" + host + "/img_tmp/" +  htmlinfo[i]->filename + "\"> " + zw;
+        delete htmlinfo[i];
+    }
+    htmlinfo.clear();    
+
+    return result;
+}
+
+
 bool ClassFlowDigit::doFlow(string time)
 {
     doAlignAndCut(time);

code/lib/jomjol_flowcontroll/ClassFlowDigit.h

@@ -29,6 +29,7 @@ public:
     ClassFlowDigit(std::vector<ClassFlow*>* lfc);
     bool ReadParameter(FILE* pfile, string& aktparamgraph);
     bool doFlow(string time);
+    string getHTMLSingleStep(string host); 
     string getReadout();
    	std::vector<HTMLInfo*> GetHTMLInfo();
 

code/lib/jomjol_flowcontroll/ClassFlowMakeImage.cpp

@@ -120,6 +120,12 @@ void ClassFlowMakeImage::CopyFile(string input, string output)
     printf("Copy done\n");
 }
 
+string ClassFlowMakeImage::getHTMLSingleStep(string host)
+{
+    string result;
+    result = "Raw Image: <br>\n<img src=\"" + host + "/img_tmp/raw.jpg\">\n";
+    return result;
+}
 
 bool ClassFlowMakeImage::doFlow(string zwtime)
 {

code/lib/jomjol_flowcontroll/ClassFlowMakeImage.h

@@ -35,6 +35,7 @@ public:
     ClassFlowMakeImage(std::vector<ClassFlow*>* lfc);
     bool ReadParameter(FILE* pfile, string& aktparamgraph);
     bool doFlow(string time);
+    string getHTMLSingleStep(string host);
     time_t getTimeImageTaken();
     string name(){return "ClassFlowMakeImage";};
 };