From c70ad9613c67f7ecb7f369fb04750cbb22176726 Mon Sep 17 00:00:00 2001
From: Cooper Harasyn <coop.rocks.123e@gmail.com>
Date: Fri, 5 Oct 2018 16:05:25 -0400
Subject: [PATCH 1/3] Added text and suptitle

---
 examples/subplot.cpp | 31 +++++++++++++++++++++++++++++++
 matplotlibcpp.h      | 43 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 examples/subplot.cpp

diff --git a/examples/subplot.cpp b/examples/subplot.cpp
new file mode 100644
index 0000000..bee322e
--- /dev/null
+++ b/examples/subplot.cpp
@@ -0,0 +1,31 @@
+#define _USE_MATH_DEFINES
+#include <cmath>
+#include "../matplotlibcpp.h"
+
+using namespace std;
+namespace plt = matplotlibcpp;
+
+int main() 
+{
+    // Prepare data
+	int n = 500;
+	std::vector<double> x(n), y(n), z(n), w(n,2);
+	for(int i=0; i<n; ++i) {
+		x.at(i) = i;
+		y.at(i) = sin(2*M_PI*i/360.0);
+		z.at(i) = 100.0 / i;
+	}
+
+    // Set the "super title"
+    plt::suptitle("My plot");
+    plt::subplot(1, 2, 1);
+	plt::plot(x, y, "r-");
+    plt::subplot(1, 2, 2);
+    plt::plot(x, z, "k-");
+    // Add some text to the plot
+    plt::text(100, 90, "Hello!");
+
+
+	// Show plots
+	plt::show();
+}
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
index 94bc5e1..a71bf8a 100644
--- a/matplotlibcpp.h
+++ b/matplotlibcpp.h
@@ -61,6 +61,8 @@ struct _interpreter {
     PyObject *s_python_empty_tuple;
     PyObject *s_python_function_stem;
     PyObject *s_python_function_xkcd;
+    PyObject *s_python_function_text;
+    PyObject *s_python_function_suptitle;
 
     /* For now, _interpreter is implemented as a singleton since its currently not possible to have
        multiple independent embedded python interpreters without patching the python source code
@@ -163,6 +165,8 @@ struct _interpreter {
         s_python_function_tight_layout = PyObject_GetAttrString(pymod, "tight_layout");
         s_python_function_stem = PyObject_GetAttrString(pymod, "stem");
         s_python_function_xkcd = PyObject_GetAttrString(pymod, "xkcd");
+        s_python_function_text = PyObject_GetAttrString(pymod, "text");
+        s_python_function_suptitle = PyObject_GetAttrString(pymod, "suptitle");
 
         if(    !s_python_function_show
             || !s_python_function_close
@@ -192,6 +196,8 @@ struct _interpreter {
             || !s_python_function_tight_layout
             || !s_python_function_stem
             || !s_python_function_xkcd
+            || !s_python_function_text
+            || !s_python_function_suptitle
         ) { throw std::runtime_error("Couldn't find required function!"); }
 
         if (   !PyFunction_Check(s_python_function_show)
@@ -221,6 +227,8 @@ struct _interpreter {
             || !PyFunction_Check(s_python_function_errorbar)
             || !PyFunction_Check(s_python_function_stem)
             || !PyFunction_Check(s_python_function_xkcd)
+            || !PyFunction_Check(s_python_function_text)
+            || !PyFunction_Check(s_python_function_suptitle)
         ) { throw std::runtime_error("Python object is unexpectedly not a PyFunction."); }
 
         s_python_empty_tuple = PyTuple_New(0);
@@ -750,6 +758,22 @@ bool stem(const std::vector<Numeric>& y, const std::string& format = "")
     return stem(x, y, format);
 }
 
+template<typename Numeric>
+void text(Numeric x, Numeric y, const std::string& format = "")
+{
+    PyObject* args = PyTuple_New(3);
+    PyTuple_SetItem(args, 0, PyFloat_FromDouble(x));
+    PyTuple_SetItem(args, 1, PyFloat_FromDouble(y));
+    PyTuple_SetItem(args, 2, PyString_FromString(format.c_str()));
+
+    PyObject* res = PyObject_CallObject(detail::_interpreter::get().s_python_function_text, args);
+    if(!res) throw std::runtime_error("Call to text() failed.");
+
+    Py_DECREF(args);
+    Py_DECREF(res);
+}
+
+
 inline void figure()
 {
     PyObject* res = PyObject_CallObject(detail::_interpreter::get().s_python_function_figure, detail::_interpreter::get().s_python_empty_tuple);
@@ -769,7 +793,7 @@ inline void figure_size(size_t w, size_t h)
     PyDict_SetItemString(kwargs, "figsize", size);
     PyDict_SetItemString(kwargs, "dpi", PyLong_FromSize_t(dpi));
 
-    PyObject* res = PyObject_Call(detail::_interpreter::get().s_python_function_figure,
+    PyObject* res = PyObject_Call(detail::_interpreter::get().s_python_function_figure, 
             detail::_interpreter::get().s_python_empty_tuple, kwargs);
 
     Py_DECREF(kwargs);
@@ -893,7 +917,7 @@ inline void xticks(const std::vector<Numeric> &ticks, const std::vector<std::str
     Py_DECREF(args);
     Py_DECREF(kwargs);
     if(!res) throw std::runtime_error("Call to xticks() failed");
-
+    
     Py_DECREF(res);
 }
 
@@ -940,7 +964,7 @@ inline void yticks(const std::vector<Numeric> &ticks, const std::vector<std::str
     Py_DECREF(args);
     Py_DECREF(kwargs);
     if(!res) throw std::runtime_error("Call to yticks() failed");
-
+    
     Py_DECREF(res);
 }
 
@@ -978,6 +1002,19 @@ inline void title(const std::string &titlestr)
     Py_DECREF(res);
 }
 
+inline void suptitle(const std::string &suptitlestr)
+{
+    PyObject* pysuptitlestr = PyString_FromString(suptitlestr.c_str());
+    PyObject* args = PyTuple_New(1);
+    PyTuple_SetItem(args, 0, pysuptitlestr);
+
+    PyObject* res = PyObject_CallObject(detail::_interpreter::get().s_python_function_suptitle, args);
+    if(!res) throw std::runtime_error("Call to suptitle() failed.");
+
+    Py_DECREF(args);
+    Py_DECREF(res);
+}
+
 inline void axis(const std::string &axisstr)
 {
     PyObject* str = PyString_FromString(axisstr.c_str());

From a359085297719abb972a66f84c151d2ba832a631 Mon Sep 17 00:00:00 2001
From: Cooper Harasyn <coop.rocks.123e@gmail.com>
Date: Fri, 5 Oct 2018 16:08:40 -0400
Subject: [PATCH 2/3] Fixed whitespace

---
 matplotlibcpp.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/matplotlibcpp.h b/matplotlibcpp.h
index a71bf8a..c3153e7 100644
--- a/matplotlibcpp.h
+++ b/matplotlibcpp.h
@@ -793,7 +793,7 @@ inline void figure_size(size_t w, size_t h)
     PyDict_SetItemString(kwargs, "figsize", size);
     PyDict_SetItemString(kwargs, "dpi", PyLong_FromSize_t(dpi));
 
-    PyObject* res = PyObject_Call(detail::_interpreter::get().s_python_function_figure, 
+    PyObject* res = PyObject_Call(detail::_interpreter::get().s_python_function_figure,
             detail::_interpreter::get().s_python_empty_tuple, kwargs);
 
     Py_DECREF(kwargs);
@@ -917,7 +917,7 @@ inline void xticks(const std::vector<Numeric> &ticks, const std::vector<std::str
     Py_DECREF(args);
     Py_DECREF(kwargs);
     if(!res) throw std::runtime_error("Call to xticks() failed");
-    
+
     Py_DECREF(res);
 }
 
@@ -964,7 +964,7 @@ inline void yticks(const std::vector<Numeric> &ticks, const std::vector<std::str
     Py_DECREF(args);
     Py_DECREF(kwargs);
     if(!res) throw std::runtime_error("Call to yticks() failed");
-    
+
     Py_DECREF(res);
 }
 

From 28620374c34d11abb2369ddbfc96c4a03e84c0ae Mon Sep 17 00:00:00 2001
From: Cooper Harasyn <coop.rocks.123e@gmail.com>
Date: Fri, 5 Oct 2018 16:10:17 -0400
Subject: [PATCH 3/3] Chose a better name for the parameter to text

---
 matplotlibcpp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matplotlibcpp.h b/matplotlibcpp.h
index c3153e7..7b5f88d 100644
--- a/matplotlibcpp.h
+++ b/matplotlibcpp.h
@@ -759,12 +759,12 @@ bool stem(const std::vector<Numeric>& y, const std::string& format = "")
 }
 
 template<typename Numeric>
-void text(Numeric x, Numeric y, const std::string& format = "")
+void text(Numeric x, Numeric y, const std::string& s = "")
 {
     PyObject* args = PyTuple_New(3);
     PyTuple_SetItem(args, 0, PyFloat_FromDouble(x));
     PyTuple_SetItem(args, 1, PyFloat_FromDouble(y));
-    PyTuple_SetItem(args, 2, PyString_FromString(format.c_str()));
+    PyTuple_SetItem(args, 2, PyString_FromString(s.c_str()));
 
     PyObject* res = PyObject_CallObject(detail::_interpreter::get().s_python_function_text, args);
     if(!res) throw std::runtime_error("Call to text() failed.");