Extract annotate

gmrukwa · gmrukwa · commit 57bcbbd57ccd · 2018-04-20T07:36:17.000+02:00
diff --git a/annotate.h b/annotate.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "_python.h"
+#include "interpreter.h"
+
+namespace matplotlibcpp {
+inline bool annotate(std::string annotation, double x, double y)
+{
+    PyObject * xy = PyTuple_New(2);
+    PyObject * str = PyString_FromString(annotation.c_str());
+
+    PyTuple_SetItem(xy,0,PyFloat_FromDouble(x));
+    PyTuple_SetItem(xy,1,PyFloat_FromDouble(y));
+
+    PyObject* kwargs = PyDict_New();
+    PyDict_SetItemString(kwargs, "xy", xy);
+
+    PyObject* args = PyTuple_New(1);
+    PyTuple_SetItem(args, 0, str);
+
+    PyObject* res = PyObject_Call(detail::_interpreter::get().s_python_function_annotate, args, kwargs);
+
+    Py_DECREF(args);
+    Py_DECREF(kwargs);
+
+    if(res != nullptr) Py_DECREF(res);
+
+    return res != nullptr;
+}
+} // end namespace matplotlibcpp
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -15,33 +15,10 @@
 #include "_python.h"
 #include "interpreter.h"
 #include "helpers.h"
+#include "annotate.h"
 
 
 namespace matplotlibcpp {
-inline bool annotate(std::string annotation, double x, double y)
-{
-    PyObject * xy = PyTuple_New(2);
-    PyObject * str = PyString_FromString(annotation.c_str());
-
-    PyTuple_SetItem(xy,0,PyFloat_FromDouble(x));
-    PyTuple_SetItem(xy,1,PyFloat_FromDouble(y));
-
-    PyObject* kwargs = PyDict_New();
-    PyDict_SetItemString(kwargs, "xy", xy);
-
-    PyObject* args = PyTuple_New(1);
-    PyTuple_SetItem(args, 0, str);
-
-    PyObject* res = PyObject_Call(detail::_interpreter::get().s_python_function_annotate, args, kwargs);
-
-    Py_DECREF(args);
-    Py_DECREF(kwargs);
-
-    if(res != nullptr) Py_DECREF(res);
-
-    return res != nullptr;
-}
-
 #ifndef WITHOUT_NUMPY
 // Type selector for numpy array conversion
 template <typename T> struct select_npy_type { const static NPY_TYPES type = NPY_NOTYPE; }; //Default
