Rolling 20220215

This commit is contained in:
jomjol
2022-02-15 21:26:38 +01:00
parent 1371be6f2c
commit 1f5486e8cc
16 changed files with 106 additions and 97 deletions

View File

@@ -327,7 +327,7 @@ string ClassFlowControll::getReadoutAll(int _type)
out = out + (*numbers)[i]->name + "\t";
switch (_type) {
case READOUT_TYPE_VALUE:
out = out + (*numbers)[i]->ReturnValueNoError;
out = out + (*numbers)[i]->ReturnValue;
break;
case READOUT_TYPE_PREVALUE:
if (flowpostprocessing->PreValueUse)
@@ -643,8 +643,8 @@ string ClassFlowControll::getJSON()
{
json += "\"" + (*NUMBERS)[i]->name + "\":\n";
json += " {\n";
if ((*NUMBERS)[i]->ReturnValueNoError.length() > 0)
json += " \"value\": " + (*NUMBERS)[i]->ReturnValueNoError + ",\n";
if ((*NUMBERS)[i]->ReturnValue.length() > 0)
json += " \"value\": " + (*NUMBERS)[i]->ReturnValue + ",\n";
else
json += " \"value\": \"\",\n";
json += " \"raw\": \"" + (*NUMBERS)[i]->ReturnRawValue + "\",\n";