Merge branch 'V3.2_191' of...

Merge branch 'V3.2_191' of https://code.ill.fr/instrument-control/nomad-special-modules.git into V3.2_191

src/controllers/vexp/VEXPController.cpp

@@ -506,44 +506,44 @@ std::string VEXPController::getSpyData() {
 
 	writer.StartObject();
 
-	writer.Key("as"); writer.Double(as());
-	writer.Key("bs"); writer.Double(bs());
-	writer.Key("cs"); writer.Double(cs());
-	writer.Key("aa"); writer.Double(aa());
-	writer.Key("bb"); writer.Double(bb());
-	writer.Key("cc"); writer.Double(cc());
-	writer.Key("ax"); writer.Double(ax());
-	writer.Key("ay"); writer.Double(ay());
-	writer.Key("az"); writer.Double(az());
-	writer.Key("bx"); writer.Double(bx());
-	writer.Key("by"); writer.Double(by());
-	writer.Key("bz"); writer.Double(bz());
-	writer.Key("qh"); writer.Double(qh());
-	writer.Key("qk"); writer.Double(qk());
-	writer.Key("ql"); writer.Double(ql());
-	writer.Key("en"); writer.Double(en());
-	writer.Key("qm"); writer.Double(qm());
+	writer.Key("as"); writer.Double(toDouble(as()));
+	writer.Key("bs"); writer.Double(toDouble(bs()));
+	writer.Key("cs"); writer.Double(toDouble(cs()));
+	writer.Key("aa"); writer.Double(toDouble(aa()));
+	writer.Key("bb"); writer.Double(toDouble(bb()));
+	writer.Key("cc"); writer.Double(toDouble(cc()));
+	writer.Key("ax"); writer.Double(toDouble(ax()));
+	writer.Key("ay"); writer.Double(toDouble(ay()));
+	writer.Key("az"); writer.Double(toDouble(az()));
+	writer.Key("bx"); writer.Double(toDouble(bx()));
+	writer.Key("by"); writer.Double(toDouble(by()));
+	writer.Key("bz"); writer.Double(toDouble(bz()));
+	writer.Key("qh"); writer.Double(toDouble(qh()));
+	writer.Key("qk"); writer.Double(toDouble(qk()));
+	writer.Key("ql"); writer.Double(toDouble(ql()));
+	writer.Key("en"); writer.Double(toDouble(en()));
+	writer.Key("qm"); writer.Double(toDouble(qm()));
 
 	writer.Key("fx"); writer.Int(fx());
 	writer.Key("ss"); writer.Int(ss());
 
-	writer.Key("ki"); writer.Double(ki());
-	writer.Key("kf"); writer.Double(kf());
+	writer.Key("ki"); writer.Double(toDouble(ki()));
+	writer.Key("kf"); writer.Double(toDouble(kf()));
 
-	writer.Key("qhScan"); writer.Double(qhScan());
-	writer.Key("qkScan"); writer.Double(qkScan());
-	writer.Key("qlScan"); writer.Double(qlScan());
-	writer.Key("enScan"); writer.Double(enScan());
+	writer.Key("qhScan"); writer.Double(toDouble(qhScan()));
+	writer.Key("qkScan"); writer.Double(toDouble(qkScan()));
+	writer.Key("qlScan"); writer.Double(toDouble(qlScan()));
+	writer.Key("enScan"); writer.Double(toDouble(enScan()));
 
-	writer.Key("dqhScan"); writer.Double(dqhScan());
-	writer.Key("dqkScan"); writer.Double(dqkScan());
-	writer.Key("dqlScan"); writer.Double(dqlScan());
-	writer.Key("denScan"); writer.Double(denScan());
+	writer.Key("dqhScan"); writer.Double(toDouble(dqhScan()));
+	writer.Key("dqkScan"); writer.Double(toDouble(dqkScan()));
+	writer.Key("dqlScan"); writer.Double(toDouble(dqlScan()));
+	writer.Key("denScan"); writer.Double(toDouble(denScan()));
 
 	writer.Key("nbPointsScan"); writer.Int(nbPointsScan());
 
-	writer.Key("kiScan"); writer.Double(kiScan());
-	writer.Key("kfScan"); writer.Double(kfScan());
+	writer.Key("kiScan"); writer.Double(toDouble(kiScan()));
+	writer.Key("kfScan"); writer.Double(toDouble(kfScan()));
 
 	writer.Key("fxScan"); writer.Int(fxScan());
 	writer.Key("ssScan"); writer.Int(ssScan());