Added colormap attribute to af::Window

pradeep · pradeep · commit ad07a2da5116 · 2015-05-29T16:34:37.000-04:00
This attribute will affect rendering of images currently.
diff --git a/include/af/defines.h b/include/af/defines.h
@@ -272,6 +272,16 @@ typedef enum {
     AF_MAT_BLOCK_DIAG = 8192  ///< Matrix is block diagonal
 } af_mat_prop;
 
+typedef enum {
+    AF_COLORMAP_DEFAULT = 0,    ///< Default grayscale map
+    AF_COLORMAP_SPECTRUM= 1,    ///< Spectrum map
+    AF_COLORMAP_COLORS  = 2,    ///< Colors
+    AF_COLORMAP_RED     = 3,    ///< Red hue map
+    AF_COLORMAP_MOOD    = 4,    ///< Mood map
+    AF_COLORMAP_HEAT    = 5,    ///< Heat map
+    AF_COLORMAP_BLUE    = 6     ///< Blue hue map
+} af_colormap;
+
 // Below enum is purely added for example purposes
 // it doesn't and shoudn't be used anywhere in the
 // code. No Guarantee's provided if it is used.
@@ -296,6 +306,7 @@ namespace af
     typedef af_conv_mode convMode;
     typedef af_conv_domain convDomain;
     typedef af_mat_prop matProp;
+    typedef af_colormap ColorMap;
 }
 
 #endif
diff --git a/include/af/graphics.h b/include/af/graphics.h
@@ -18,6 +18,7 @@ typedef struct {
     int row;
     int col;
     const char* title;
+    af_colormap cmap;
 } af_cell;
 
 #ifdef __cplusplus
@@ -32,6 +33,7 @@ class AFAPI Window {
          * cell in the grid is being rendered currently */
         int _r;
         int _c;
+        ColorMap _cmap;
 
         void initWindow(const int width, const int height, const char* const title);
 
@@ -45,6 +47,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 setColorMap(const ColorMap cmap);
 
         void image(const array& in, const char* title=NULL);
         void plot(const array& X, const array& Y, const char* const title=NULL);
diff --git a/src/api/c/image.cpp b/src/api/c/image.cpp
@@ -81,6 +81,7 @@ af_err af_draw_image(const af_window wind, const af_array in, const af_cell* con
             default:  TYPE_ERROR(1, type);
         }
 
+        window->setColorMap((fg::ColorMap)props->cmap);
         if (props->col>-1 && props->row>-1)
             window->draw(props->col, props->row, *image, props->title);
         else
diff --git a/src/api/cpp/graphics.cpp b/src/api/cpp/graphics.cpp
@@ -20,25 +20,25 @@ void Window::initWindow(const int width, const int height, const char* const tit
 }
 
 Window::Window()
-    : wnd(0), _r(-1), _c(-1)
+    : wnd(0), _r(-1), _c(-1), _cmap(AF_COLORMAP_DEFAULT)
 {
     initWindow(1280, 720, "ArrayFire");
 }
 
 Window::Window(const char* const title)
-    : wnd(0), _r(-1), _c(-1)
+    : wnd(0), _r(-1), _c(-1), _cmap(AF_COLORMAP_DEFAULT)
 {
     initWindow(1280, 720, title);
 }
 
 Window::Window(const int width, const int height, const char* const title)
-    : wnd(0), _r(-1), _c(-1)
+    : wnd(0), _r(-1), _c(-1), _cmap(AF_COLORMAP_DEFAULT)
 {
     initWindow(width, height, title);
 }
 
 Window::Window(const af_window window)
-    : wnd(window), _r(-1), _c(-1)
+    : wnd(window), _r(-1), _c(-1), _cmap(AF_COLORMAP_DEFAULT)
 {
 }
 
@@ -57,21 +57,26 @@ void Window::setTitle(const char* const title)
     AF_THROW(af_set_title(get(), title));
 }
 
+void Window::setColorMap(const ColorMap cmap)
+{
+    _cmap = cmap;
+}
+
 void Window::image(const array& in, const char* const title)
 {
-    af_cell temp{_r, _c, title};
+    af_cell temp{_r, _c, title, _cmap};
     AF_THROW(af_draw_image(get(), in.get(), &temp));
 }
 
 void Window::plot(const array& X, const array& Y, const char* const title)
 {
-    af_cell temp{_r, _c, title};
+    af_cell temp{_r, _c, title, AF_COLORMAP_DEFAULT};
     AF_THROW(af_draw_plot(get(), X.get(), Y.get(), &temp));
 }
 
 void Window::hist(const array& X, const double minval, const double maxval, const char* const title)
 {
-    af_cell temp{_r, _c, title};
+    af_cell temp{_r, _c, title, AF_COLORMAP_DEFAULT};
     AF_THROW(af_draw_hist(get(), X.get(), minval, maxval, &temp));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ af_err af_draw_image(const af_window wind, const af_array in, const af_cell* con`
`81`	`81`	`default: TYPE_ERROR(1, type);`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ window->setColorMap((fg::ColorMap)props->cmap);`
`84`	`85`	`if (props->col>-1 && props->row>-1)`
`85`	`86`	`window->draw(props->col, props->row, *image, props->title);`
`86`	`87`	`else`
Original file line number	Diff line number	Diff line change
`@@ -20,25 +20,25 @@ void Window::initWindow(const int width, const int height, const char* const tit`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`Window::Window()`
`23`		`- : wnd(0), _r(-1), _c(-1)`
	`23`	`+ : wnd(0), _r(-1), _c(-1), _cmap(AF_COLORMAP_DEFAULT)`
`24`	`24`	`{`
`25`	`25`	`initWindow(1280, 720, "ArrayFire");`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`Window::Window(const char* const title)`
`29`		`- : wnd(0), _r(-1), _c(-1)`
	`29`	`+ : wnd(0), _r(-1), _c(-1), _cmap(AF_COLORMAP_DEFAULT)`
`30`	`30`	`{`
`31`	`31`	`initWindow(1280, 720, title);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`Window::Window(const int width, const int height, const char* const title)`
`35`		`- : wnd(0), _r(-1), _c(-1)`
	`35`	`+ : wnd(0), _r(-1), _c(-1), _cmap(AF_COLORMAP_DEFAULT)`
`36`	`36`	`{`
`37`	`37`	`initWindow(width, height, title);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`Window::Window(const af_window window)`
`41`		`- : wnd(window), _r(-1), _c(-1)`
	`41`	`+ : wnd(window), _r(-1), _c(-1), _cmap(AF_COLORMAP_DEFAULT)`
`42`	`42`	`{`
`43`	`43`	`}`
`44`	`44`
`@@ -57,21 +57,26 @@ void Window::setTitle(const char* const title)`
`57`	`57`	`AF_THROW(af_set_title(get(), title));`
`58`	`58`	`}`
`59`	`59`
	`60`	`+void Window::setColorMap(const ColorMap cmap)`
	`61`	`+{`
	`62`	`+ _cmap = cmap;`
	`63`	`+}`
	`64`	`+`
`60`	`65`	`void Window::image(const array& in, const char* const title)`
`61`	`66`	`{`
`62`		`- af_cell temp{_r, _c, title};`
	`67`	`+ af_cell temp{_r, _c, title, _cmap};`
`63`	`68`	`AF_THROW(af_draw_image(get(), in.get(), &temp));`
`64`	`69`	`}`
`65`	`70`
`66`	`71`	`void Window::plot(const array& X, const array& Y, const char* const title)`
`67`	`72`	`{`
`68`		`- af_cell temp{_r, _c, title};`
	`73`	`+ af_cell temp{_r, _c, title, AF_COLORMAP_DEFAULT};`
`69`	`74`	`AF_THROW(af_draw_plot(get(), X.get(), Y.get(), &temp));`
`70`	`75`	`}`
`71`	`76`
`72`	`77`	`void Window::hist(const array& X, const double minval, const double maxval, const char* const title)`
`73`	`78`	`{`
`74`		`- af_cell temp{_r, _c, title};`
	`79`	`+ af_cell temp{_r, _c, title, AF_COLORMAP_DEFAULT};`
`75`	`80`	`AF_THROW(af_draw_hist(get(), X.get(), minval, maxval, &temp));`
`76`	`81`	`}`
`77`	`82`