With edited fermentation profile make sure the steps values are handled as string and double/integer values when loaded in a fermenter.

Fri, 21 Oct 2022 15:49:10 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Fri, 21 Oct 2022 15:49:10 +0200
changeset 414
6582a2a95583
parent 413
8ea791d4cab6
child 415
dd4ab5c2a8e5

With edited fermentation profile make sure the steps values are handled as string and double/integer values when loaded in a fermenter.

src/DetailFermenter.cpp file | annotate | diff | comparison | revisions
--- a/src/DetailFermenter.cpp	Mon Oct 10 12:55:05 2022 +0200
+++ b/src/DetailFermenter.cpp	Fri Oct 21 15:49:10 2022 +0200
@@ -556,11 +556,26 @@
 		    QJsonObject obj = steps.array().at(i).toObject();
 		    if (i > 0)
 			payload.append(QString(","));
-		    payload.append(QString("{\"steptime\":%1").arg(obj["steptime"].toString().toDouble()));
-		    payload.append(QString(",\"resttime\":%1").arg(obj["resttime"].toString().toDouble()));
-		    payload.append(QString(",\"target_lo\":%1").arg(obj["target_lo"].toString().toDouble()));
-		    payload.append(QString(",\"target_hi\":%1").arg(obj["target_hi"].toString().toDouble()));
-		    payload.append(QString(",\"fridgemode\":%1").arg(obj["fridgemode"].toString().toInt()));
+	    	    if (obj["steptime"].isString())
+			payload.append(QString("{\"steptime\":%1").arg(obj["steptime"].toString().toDouble()));
+		    else
+			payload.append(QString("{\"steptime\":%1").arg(obj["steptime"].toDouble()));
+		    if (obj["resttime"].isString())
+		    	payload.append(QString(",\"resttime\":%1").arg(obj["resttime"].toString().toDouble()));
+		    else
+			payload.append(QString(",\"resttime\":%1").arg(obj["resttime"].toDouble()));
+		    if (obj["target_lo"].isString())
+		    	payload.append(QString(",\"target_lo\":%1").arg(obj["target_lo"].toString().toDouble()));
+		    else
+			payload.append(QString(",\"target_lo\":%1").arg(obj["target_lo"].toDouble()));
+		    if (obj["target_hi"].isString())
+		    	payload.append(QString(",\"target_hi\":%1").arg(obj["target_hi"].toString().toDouble()));
+		    else
+			payload.append(QString(",\"target_hi\":%1").arg(obj["target_hi"].toDouble()));
+		    if (obj["fridgemode"].isString())
+		    	payload.append(QString(",\"fridgemode\":%1").arg(obj["fridgemode"].toString().toInt()));
+		    else
+			payload.append(QString(",\"fridgemode\":%1").arg(obj["fridgemode"].toInt()));
 		    payload.append(QString(",\"name\":\"") + obj["name"].toString() + QString("\"}"));
 		}
 	    }

mercurial