preliminary change to support #244 (#247)

facontidavide · Feb 9, 2020 · 0b453ae · 0b453ae
1 parent bf121c1
commit 0b453ae
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/plotter_gui/transforms/custom_function.cpp b/plotter_gui/transforms/custom_function.cpp
@@ -152,7 +152,22 @@ PlotData::Point CustomFunction::calculatePoint(QJSValue& calcFct,
     {
         throw std::runtime_error("JS Engine : " + jsData.toString().toStdString());
     }
-    new_point.y = jsData.toNumber();
+
+    if( jsData.isArray() )
+    {
+      const int length = jsData.property("length").toInt();
+      if( length == 2 )
+      {
+        new_point.x = jsData.property(0).toNumber();
+        new_point.y = jsData.property(1).toNumber();
+      }
+      else{
+        throw std::runtime_error("JS Engine : if you return an array, the size must be 2 (time/value pair)");
+      }
+    }
+    else{
+      new_point.y = jsData.toNumber();
+    }
 
     return new_point;
 }