Merge pull request arrayfire#728 from shehzan10/devel

umar456 · umar456 · commit 647bde877bcf · 2015-05-28T18:01:48.000-04:00
Added wrapper for setTitle for window
diff --git a/include/af/graphics.h b/include/af/graphics.h
@@ -44,6 +44,7 @@ class AFAPI Window {
 
         af_window get() const { return wnd; }
         void setPos(const unsigned x, const unsigned y);
+        void setTitle(const char* const title);
 
         void image(const array& in, const char* title=NULL);
         void plot(const array& X, const array& Y, const char* const title=NULL);
@@ -70,6 +71,8 @@ AFAPI af_err af_create_window(af_window *out, const int width, const int height,
 
 AFAPI af_err af_set_position(const af_window wind, const unsigned x, const unsigned y);
 
+AFAPI af_err af_set_title(const af_window wind, const char* const title);
+
 AFAPI af_err af_draw_image(const af_window wind, const af_array in, const af_cell* const props);
 
 AFAPI af_err af_draw_plot(const af_window wind, const af_array X, const af_array Y, const af_cell* const props);
diff --git a/src/api/c/image.cpp b/src/api/c/image.cpp
@@ -143,6 +143,25 @@ af_err af_set_position(const af_window wind, const unsigned x, const unsigned y)
 #endif
 }
 
+af_err af_set_title(const af_window wind, const char* const title)
+{
+#if defined(WITH_GRAPHICS)
+    if(wind==0) {
+        std::cerr<<"Not a valid window"<<std::endl;
+        return AF_SUCCESS;
+    }
+
+    try {
+        fg::Window* wnd = reinterpret_cast<fg::Window*>(wind);
+        wnd->setTitle(title);
+    }
+    CATCHALL;
+    return AF_SUCCESS;
+#else
+    return AF_ERR_NO_GFX;
+#endif
+}
+
 af_err af_grid(const af_window wind, const int rows, const int cols)
 {
 #if defined(WITH_GRAPHICS)
diff --git a/src/api/cpp/graphics.cpp b/src/api/cpp/graphics.cpp
@@ -52,6 +52,11 @@ void Window::setPos(const unsigned x, const unsigned y)
     AF_THROW(af_set_position(get(), x, y));
 }
 
+void Window::setTitle(const char* const title)
+{
+    AF_THROW(af_set_title(get(), title));
+}
+
 void Window::image(const array& in, const char* const title)
 {
     af_cell temp{_r, _c, title};

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,11 @@ void Window::setPos(const unsigned x, const unsigned y)`
`52`	`52`	`AF_THROW(af_set_position(get(), x, y));`
`53`	`53`	`}`
`54`	`54`
	`55`	`+void Window::setTitle(const char* const title)`
	`56`	`+{`
	`57`	`+ AF_THROW(af_set_title(get(), title));`
	`58`	`+}`
	`59`	`+`
`55`	`60`	`void Window::image(const array& in, const char* const title)`
`56`	`61`	`{`
`57`	`62`	`af_cell temp{_r, _c, title};`