Rolling 20210719

README.md

@@ -47,6 +47,14 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
+##### Rolling (2021-07-19)
+
+* Saving of rounded prevalue
+
+* based on v8.0.1 (2021-07-08)
+
+  
+
 ##### 8.0.1 - Multi Meter Support (2021-07-18)
 
 * NEW 8.0.1: bug fix html handling of parameter `FixedExposure` and `ImageSize`

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -208,7 +208,7 @@ void ClassFlowPostProcessing::SavePreValue()
         strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
         NUMBERS[j]->timeStamp = std::string(buffer);
 
-        _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + to_string(NUMBERS[j]->PreValue) + "\n";
+        _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + "\n";
         printf("Write PreValue Zeile: %s\n", _zw.c_str());
 
         fputs(_zw.c_str(), pFile);
@@ -594,7 +594,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
             if ((!NUMBERS[j]->AllowNegativeRates) && (NUMBERS[j]->Value < NUMBERS[j]->PreValue))
             {
-                NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + std::to_string(NUMBERS[j]->Value) + " "; 
+                NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " "; 
                 NUMBERS[j]->Value = NUMBERS[j]->PreValue;
                 zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift);
             }

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="03b5e36";
+const char* GIT_REV="025c2b8";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-14 19:54";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-07-19 21:46";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v8.0.0 - 2021-07-14";
+const char* GIT_BASE_BRANCH = "master - v8.0.1 - 2021-07-18";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="03b5e36";
+const char* GIT_REV="025c2b8";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-14 19:53";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-07-19 21:45";