remove support for named_plot (obsolete), see message 4 commits earlier

Cryoris · Cryoris · commit 7c1a3ba3b62a · 2019-06-10T17:08:38.000+02:00
diff --git a/examples/animation.cpp b/examples/animation.cpp
@@ -1,36 +1,35 @@
 #define _USE_MATH_DEFINES
-#include <cmath>
 #include "../matplotlibcpp.h"
+#include <cmath>
 
 namespace plt = matplotlibcpp;
 
-int main()
-{
-	int n = 1000;
-	std::vector<double> x, y, z;
+int main() {
+  int n = 1000;
+  std::vector<double> x, y, z;
 
-	for(int i=0; i<n; i++) {
-		x.push_back(i*i);
-		y.push_back(sin(2*M_PI*i/360.0));
-		z.push_back(log(i));
+  for (int i = 0; i < n; i++) {
+    x.push_back(i * i);
+    y.push_back(sin(2 * M_PI * i / 360.0));
+    z.push_back(log(i));
 
-		if (i % 10 == 0) {
-			// Clear previous plot
-			plt::clf();
-			// Plot line from given x and y data. Color is selected automatically.
-			plt::plot(x, y);
-			// Plot a line whose name will show up as "log(x)" in the legend.
-			plt::named_plot("log(x)", x, z);
+    if (i % 10 == 0) {
+      // Clear previous plot
+      plt::clf();
+      // Plot line from given x and y data. Color is selected automatically.
+      plt::plot(x, y);
+      // Plot a line whose name will show up as "log(x)" in the legend.
+      plt::plot(x, z, {{"label", "log(x)"}});
 
-			// Set x-axis to interval [0,1000000]
-			plt::xlim(0, n*n);
+      // Set x-axis to interval [0,1000000]
+      plt::xlim(0, n * n);
 
-			// Add graph title
-			plt::title("Sample figure");
-			// Enable legend.
-			plt::legend();
-			// Display plot continuously
-			plt::pause(0.01);
-		}
-	}
+      // Add graph title
+      plt::title("Sample figure");
+      // Enable legend.
+      plt::legend();
+      // Display plot continuously
+      plt::pause(0.01);
+    }
+  }
 }
diff --git a/examples/basic.cpp b/examples/basic.cpp
@@ -1,44 +1,44 @@
 #define _USE_MATH_DEFINES
-#include <iostream>
-#include <cmath>
 #include "../matplotlibcpp.h"
+#include <cmath>
+#include <iostream>
 
 namespace plt = matplotlibcpp;
 
-int main() 
-{
-    // Prepare data.
-    int n = 5000;
-    std::vector<double> x(n), y(n), z(n), w(n,2);
-    for(int i=0; i<n; ++i) {
-        x.at(i) = i*i;
-        y.at(i) = sin(2*M_PI*i/360.0);
-        z.at(i) = log(i);
-    }
-    
-    // Set the size of output image = 1200x780 pixels
-    plt::figure_size(1200, 780);
-
-    // Plot line from given x and y data. Color is selected automatically.
-    plt::plot(x, y);
-
-    // Plot a red dashed line from given x and y data.
-    plt::plot(x, w,"r--");
-
-    // Plot a line whose name will show up as "log(x)" in the legend.
-    plt::named_plot("log(x)", x, z);
-
-    // Set x-axis to interval [0,1000000]
-    plt::xlim(0, 1000*1000);
-
-    // Add graph title
-    plt::title("Sample figure");
-
-    // Enable legend.
-    plt::legend();
-
-    // save figure
-    const char* filename = "./basic.png";
-    std::cout << "Saving result to " << filename << std::endl;;
-    plt::save(filename);
+int main() {
+  // Prepare data.
+  int n = 5000;
+  std::vector<double> x(n), y(n), z(n), w(n, 2);
+  for (int i = 0; i < n; ++i) {
+    x.at(i) = i * i;
+    y.at(i) = sin(2 * M_PI * i / 360.0);
+    z.at(i) = log(i);
+  }
+
+  // Set the size of output image = 1200x780 pixels
+  plt::figure_size(1200, 780);
+
+  // Plot line from given x and y data. Color is selected automatically.
+  plt::plot(x, y);
+
+  // Plot a red dashed line from given x and y data.
+  plt::plot(x, w, "r--");
+
+  // Plot a line whose name will show up as "log(x)" in the legend.
+  plt::plot(x, z, {{"label", "log(x)"}});
+
+  // Set x-axis to interval [0,1000000]
+  plt::xlim(0, 1000 * 1000);
+
+  // Add graph title
+  plt::title("Sample figure");
+
+  // Enable legend.
+  plt::legend();
+
+  // save figure
+  const char *filename = "./basic.png";
+  std::cout << "Saving result to " << filename << std::endl;
+  ;
+  plt::save(filename);
 }
diff --git a/examples/nonblock.cpp b/examples/nonblock.cpp
@@ -1,46 +1,44 @@
 #define _USE_MATH_DEFINES
-#include <cmath>
 #include "../matplotlibcpp.h"
+#include <cmath>
 
 namespace plt = matplotlibcpp;
 
-
 using namespace matplotlibcpp;
 using namespace std;
 
-int main()
-{
-    // Prepare data.
-    int n = 5000;
-    std::vector<double> x(n), y(n), z(n), w(n,2);
-    for(int i=0; i<n; ++i) {
-        x.at(i) = i*i;
-        y.at(i) = sin(2*M_PI*i/360.0);
-        z.at(i) = log(i);
-    }
-
-    // Plot line from given x and y data. Color is selected automatically.
-    plt::subplot(2,2,1);
-    plt::plot(x, y);
-
-    // Plot a red dashed line from given x and y data.
-    plt::subplot(2,2,2);
-    plt::plot(x, w,"r--");
-
-    // Plot a line whose name will show up as "log(x)" in the legend.
-    plt::subplot(2,2,3);
-    plt::named_plot("log(x)", x, z);
-
-    // Set x-axis to interval [0,1000000]
-    plt::xlim(0, 1000*1000);
-
-    // Add graph title
-    plt::title("Sample figure");
-    // Enable legend.
-    plt::legend();
-
-    plt::show(false);
-
-    cout << "matplotlibcpp::show() is working in an non-blocking mode" << endl;
-    getchar();
+int main() {
+  // Prepare data.
+  int n = 5000;
+  std::vector<double> x(n), y(n), z(n), w(n, 2);
+  for (int i = 0; i < n; ++i) {
+    x.at(i) = i * i;
+    y.at(i) = sin(2 * M_PI * i / 360.0);
+    z.at(i) = log(i);
+  }
+
+  // Plot line from given x and y data. Color is selected automatically.
+  plt::subplot(2, 2, 1);
+  plt::plot(x, y);
+
+  // Plot a red dashed line from given x and y data.
+  plt::subplot(2, 2, 2);
+  plt::plot(x, w, "r--");
+
+  // Plot a line whose name will show up as "log(x)" in the legend.
+  plt::subplot(2, 2, 3);
+  plt::plot(x, z, {{"label", "log(x)"}});
+
+  // Set x-axis to interval [0,1000000]
+  plt::xlim(0, 1000 * 1000);
+
+  // Add graph title
+  plt::title("Sample figure");
+  // Enable legend.
+  plt::legend();
+
+  plt::show(false);
+
+  cout << "matplotlibcpp::show() is working in an non-blocking mode" << endl;
+  getchar();
 }
diff --git a/examples/update.cpp b/examples/update.cpp
@@ -36,7 +36,7 @@ int main() {
   plt::axis("equal");
 
   // Plot sin once and for all.
-  plt::named_plot("sin", x, y);
+  plt::plot(x, y, {{"label", "sin"}});
 
   // Prepare plotting the tangent.
   plt::Plot plot("tangent");
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -1039,59 +1039,6 @@ bool errorbar(const std::vector<NumericX> &x, const std::vector<NumericY> &y,
   return res;
 }
 
-template <typename Numeric>
-bool named_plot(const std::string &name, const std::vector<Numeric> &y,
-                const std::string &format = "") {
-  PyObject *kwargs = PyDict_New();
-  PyDict_SetItemString(kwargs, "label", PyString_FromString(name.c_str()));
-
-  PyObject *yarray = get_array(y);
-
-  PyObject *pystring = PyString_FromString(format.c_str());
-
-  PyObject *plot_args = PyTuple_New(2);
-
-  PyTuple_SetItem(plot_args, 0, yarray);
-  PyTuple_SetItem(plot_args, 1, pystring);
-
-  PyObject *res = PyObject_Call(
-      detail::_interpreter::get().s_python_function_plot, plot_args, kwargs);
-
-  Py_DECREF(kwargs);
-  Py_DECREF(plot_args);
-  if (res)
-    Py_DECREF(res);
-
-  return res;
-}
-
-template <typename Numeric>
-bool named_plot(const std::string &name, const std::vector<Numeric> &x,
-                const std::vector<Numeric> &y, const std::string &format = "") {
-  PyObject *kwargs = PyDict_New();
-  PyDict_SetItemString(kwargs, "label", PyString_FromString(name.c_str()));
-
-  PyObject *xarray = get_array(x);
-  PyObject *yarray = get_array(y);
-
-  PyObject *pystring = PyString_FromString(format.c_str());
-
-  PyObject *plot_args = PyTuple_New(3);
-  PyTuple_SetItem(plot_args, 0, xarray);
-  PyTuple_SetItem(plot_args, 1, yarray);
-  PyTuple_SetItem(plot_args, 2, pystring);
-
-  PyObject *res = PyObject_Call(
-      detail::_interpreter::get().s_python_function_plot, plot_args, kwargs);
-
-  Py_DECREF(kwargs);
-  Py_DECREF(plot_args);
-  if (res)
-    Py_DECREF(res);
-
-  return res;
-}
-
 template <typename Numeric>
 bool named_semilogx(const std::string &name, const std::vector<Numeric> &x,
                     const std::vector<Numeric> &y,
