From 00e15ad28a959a0c071ede4eec0cbc662605153f Mon Sep 17 00:00:00 2001
From: hyhuang <hyhuang1995@gmail.com>
Date: Sat, 9 Sep 2017 23:29:09 +0800
Subject: [PATCH] add nonblock mode of show and an example

---
 examples/nonblock.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++
 matplotlibcpp.h       | 33 ++++++++++++++++++++-----------
 2 files changed, 68 insertions(+), 11 deletions(-)
 create mode 100644 examples/nonblock.cpp

diff --git a/examples/nonblock.cpp b/examples/nonblock.cpp
new file mode 100644
index 0000000..ca535a4
--- /dev/null
+++ b/examples/nonblock.cpp
@@ -0,0 +1,46 @@
+#define _USE_MATH_DEFINES
+#include <cmath>
+#include "matplotlibcpp.h"
+
+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();
+}
\ No newline at end of file
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
index 2ad734d..ef32308 100644
--- a/matplotlibcpp.h
+++ b/matplotlibcpp.h
@@ -648,16 +648,27 @@ namespace matplotlibcpp {
 		// if PyDeCRFF, the function doesn't work on Mac OS
 	}
 
-	inline void show()
-	{
-		PyObject* res = PyObject_CallObject(
-			detail::_interpreter::get().s_python_function_show,
-			detail::_interpreter::get().s_python_empty_tuple);
-
-		if (!res) throw std::runtime_error("Call to show() failed.");
-
-		Py_DECREF(res);
-	}
+    inline void show(const bool bBlock = true)
+    {
+        PyObject* res;
+        if(bBlock)
+        {
+            res = PyObject_CallObject(
+                    detail::_interpreter::get().s_python_function_show,
+                    detail::_interpreter::get().s_python_empty_tuple);
+        }
+        else
+        {
+            PyObject *kwargs = PyDict_New();
+            PyDict_SetItemString(kwargs, "block", Py_False);
+            res = PyObject_Call( detail::_interpreter::get().s_python_function_show, detail::_interpreter::get().s_python_empty_tuple, kwargs);
+        }
+
+
+        if (!res) throw std::runtime_error("Call to show() failed.");
+
+        Py_DECREF(res);
+    }
 
 	inline void draw()
 	{
@@ -743,7 +754,7 @@ namespace matplotlibcpp {
 			template<typename U, U> struct Check;
 
 			template<typename U>
-			static std::true_type test( ... ); // use a variadic function to make sure (1) it accepts everything and (2) its always the worst match
+			static std::true_type test( ... ); // use a variadic function to makemake sure (1) it accepts everything and (2) its always the worst match
 
 			template<typename U>
 			static std::false_type test( Check<void(Fallback::*)(), &U::operator()>* );