cnkalman: upgrade to sciplot 0.3.1

Author: bl4ckb0ne

libs/cnkalman/CMakeLists.txt

@@ -24,12 +24,12 @@ if(UNIX)
   endif()
 endif()
 
-find_package(sciplot)
+find_package(sciplot 0.3.1)
 if(sciplot_FOUND)
-  message("Using sciplot...")
   add_compile_definitions(HAS_SCIPLOT)
+  message("Using sciplot")
 else()
-  message("Can't use sciplot...")
+  message("Could not find sciplot")
 endif()
 
 add_subdirectory(src)

libs/cnkalman/include/cnkalman/ModelPlot.h

@@ -13,8 +13,8 @@ namespace cnkalman {
         std::string name;
         int cnt = 0;
 #ifdef HAS_SCIPLOT
-        sciplot::Plot plot;
-        sciplot::Plot map;
+        sciplot::Plot2D plot;
+        sciplot::Plot2D map;
 #endif
         ModelPlot(const std::string &name = "plot", bool show = false);
 
@@ -28,4 +28,4 @@ namespace cnkalman {
 
         ~ModelPlot();
     };
-}
+}

libs/cnkalman/src/ModelPlot.cc

@@ -63,12 +63,19 @@ namespace cnkalman {
         map.yrange(range[2], range[3]);
 
         if (show) {
-            plot.show();
-            map.show();
+            sciplot::Figure figs = {{plot, map}};
+            sciplot::Canvas canvas {{figs}};
+            canvas.show();
         }
-        plot.save(name + "-plot.svg");
-        map.save(name + ".svg");
-        map.save(name + ".png");
+
+        sciplot::Figure fig_plot = {{plot}};
+        sciplot::Canvas canvas_plot = {{fig_plot}};
+        canvas_plot.save(name + "-plot.svg");
+
+        sciplot::Figure fig_map = {{map}};
+        sciplot::Canvas canvas_map = {{fig_map}};
+        canvas_plot.save(name + ".svg");
+        canvas_plot.save(name + ".png");
 #endif
     }