arrayfire · shehzan10 · May 30, 2015 · May 29, 2015 · May 29, 2015 · May 29, 2015
diff --git a/docs/details/graphics.dox b/docs/details/graphics.dox
@@ -0,0 +1,23 @@
+/**
+
+\addtogroup  graphics_func
+@{
+
+A list of graphics functions to visualize data
+
+\defgroup gfx_func_window Window Functions
+@{
+
+Window creation, modification and destruction functions.
+
+@}
+
+\defgroup gfx_func_draw Rendering Functions
+@{
+
+Rendering functions to draw images, plots etc.
+
+@}
+
+@}
+*/
diff --git a/examples/graphics/conway_pretty.cpp b/examples/graphics/conway_pretty.cpp
@@ -40,6 +40,8 @@ int main(int argc, char *argv[])
 
         af::Window simpleWindow(512, 512, "Conway's Game Of Life - Current State");
         af::Window prettyWindow(512, 512, "Conway's Game Of Life - Visualizing States");
+        simpleWindow.setPos(25, 25);
+        prettyWindow.setPos(125, 15);
 
         int frame_count = 0;
 
@@ -50,7 +52,7 @@ int main(int argc, char *argv[])
 
         array display = tile(state, 1, 1, 3, 1);
 
-        while(!simpleWindow.close() || !prettyWindow.close()) {
+        while(!simpleWindow.close() && !prettyWindow.close()) {
             af::timer delay = timer::start();
 
             if(!simpleWindow.close())   simpleWindow.image(state);

diff --git a/examples/graphics/fractal.cpp b/examples/graphics/fractal.cpp
@@ -73,10 +73,11 @@ int main(int argc, char **argv)
         info();
         printf("** ArrayFire Fractals Demo **\n");
         af::Window wnd("Fractal Demo");
+        wnd.setColorMap(AF_COLORMAP_SPECTRUM);
 
         float center[] = {-0.5, 0};
         // Keep zomming out for each frame
-        for (int zoom = 1000; zoom > 10; zoom -= 5) {
+        for (int zoom = 1000; zoom > 100; zoom -= 1) {
             // Generate the grid at the current zoom factor
             array c = complex_grid(WIDTH, HEIGHT, zoom, center);
 

diff --git a/examples/image_processing/brain_segmentation.cpp b/examples/image_processing/brain_segmentation.cpp
@@ -91,6 +91,7 @@ array segment_volume(array A, int k)
 void brain_seg(bool console)
 {
     af::Window wnd("Brain Segmentation Demo");
+    wnd.setColorMap(AF_COLORMAP_HEAT);
 
     double time_total = 30; // run for N seconds
 

diff --git a/examples/image_processing/optical_flow.cpp b/examples/image_processing/optical_flow.cpp
@@ -38,6 +38,7 @@ static void diffs(array& Ix, array& Iy, array& It, array I1, array I2)
 static void optical_flow_demo(bool console)
 {
     af::Window wnd("Horn-Schunck Optical Flow Demo");
+    wnd.setColorMap(AF_COLORMAP_COLORS);
 
     double time_total = 10; // run for N seconds
 

diff --git a/include/af/defines.h b/include/af/defines.h
@@ -285,6 +285,16 @@ typedef enum {
     AF_NORM_EUCLID = AF_NORM_VECTOR_2, ///< The default. Same as AF_NORM_VECTOR_2
 } af_norm_type;
 
+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.
@@ -309,6 +319,7 @@ namespace af
     typedef af_conv_mode convMode;
     typedef af_conv_domain convDomain;
     typedef af_mat_prop matProp;
+    typedef af_colormap ColorMap;
     typedef af_norm_type normType;
 }