Optionally pass figure number to figure() as argument

alexdewar · Benno Evers · commit c92ad4cd185a · 2019-01-11T19:43:04.000+01:00
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -816,14 +816,27 @@ void text(Numeric x, Numeric y, const std::string& s = "")
 }
 
 
-inline long figure()
+inline long figure(long number = -1)
 {
-    PyObject* res = PyObject_CallObject(detail::_interpreter::get().s_python_function_figure, detail::_interpreter::get().s_python_empty_tuple);
+    PyObject *res;
+    if (number == -1)
+        res = PyObject_CallObject(detail::_interpreter::get().s_python_function_figure, detail::_interpreter::get().s_python_empty_tuple);
+    else {
+        assert(number > 0);
+
+        // Make sure interpreter is initialised
+        detail::_interpreter::get();
+
+        PyObject *args = PyTuple_New(1);
+        PyTuple_SetItem(args, 0, PyLong_FromLong(number));
+        res = PyObject_CallObject(detail::_interpreter::get().s_python_function_figure, args);
+        Py_DECREF(args);
+    }
+
     if(!res) throw std::runtime_error("Call to figure() failed.");
 
     PyObject* num = PyObject_GetAttrString(res, "number");
     if (!num) throw std::runtime_error("Could not get number attribute of figure object");
-
     const long figureNumber = PyLong_AsLong(num);
 
     Py_DECREF(num);
