[Plplot-cvs] SF.net SVN: plplot:[11419] trunk

[<hez...@us...>]

Revision: 11419
          http://plplot.svn.sourceforge.net/plplot/?rev=11419&view=rev
Author:   hezekiahcarty
Date:     2011-01-02 00:43:35 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
Add support for custom tick mark spacing, custom labeling in plcolorbar

Custom tick mark support works like plbox/plaxes (major tick spacing +
minor tick count).

Custom labeling goes with shade color bars.  If a user wants, labels and
tick marks can be placed at the breaks between shades
(PL_COLORBAR_SHADE_LAEL).  The actual text used in the labeling could use
some work, as it currently just uses the %g printf format.

Modified Paths:
--------------
    trunk/include/plplot.h
    trunk/src/pllegend.c

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2011-01-02 00:42:59 UTC (rev 11418)
+++ trunk/include/plplot.h	2011-01-02 00:43:35 UTC (rev 11419)
@@ -1241,6 +1241,7 @@
 #define PL_COLORBAR_GRADIENT        1024
 #define PL_COLORBAR_CAP_LOW       2048
 #define PL_COLORBAR_CAP_HIGH      4096
+#define PL_COLORBAR_SHADE_LABEL   8192
 
 PLDLLIMPEXP void
 c_pllegend( PLFLT *p_legend_width, PLFLT *p_legend_height,
@@ -1260,6 +1261,7 @@
 
 PLDLLIMPEXP void
 c_plcolorbar( PLINT opt, PLFLT x, PLFLT y, PLFLT length, PLFLT width,
+              PLFLT ticks, PLINT sub_ticks,
               const char *axis_opts, const char *label,
               PLINT n_colors, PLFLT *colors, PLFLT *values );
 

Modified: trunk/src/pllegend.c
===================================================================
--- trunk/src/pllegend.c	2011-01-02 00:42:59 UTC (rev 11418)
+++ trunk/src/pllegend.c	2011-01-02 00:43:35 UTC (rev 11419)
@@ -906,6 +906,7 @@
 
 void
 c_plcolorbar( PLINT opt, PLFLT x, PLFLT y, PLFLT length, PLFLT width,
+              PLFLT ticks, PLINT sub_ticks,
               const char *axis_opts, const char *label,
               PLINT n_colors, PLFLT *colors, PLFLT *values )
 {
@@ -1209,26 +1210,24 @@
     if ( opt & PL_COLORBAR_LEFT )
     {
         snprintf( opt_string, max_opts, "bcn%s", axis_opts );
-        plbox( "bc", 0.0, 0, opt_string, 0.0, 0 );
+        plbox( "bc", ticks, sub_ticks, opt_string, ticks, sub_ticks );
     }
     else if ( opt & PL_COLORBAR_RIGHT )
     {
         snprintf( opt_string, max_opts, "bcm%s", axis_opts );
-        plbox( "bc", 0.0, 0, opt_string, 0.0, 0 );
+        plbox( "bc", 0.0, 0, opt_string, ticks, sub_ticks );
     }
     else if ( opt & PL_COLORBAR_UPPER )
     {
         snprintf( opt_string, max_opts, "bcm%s", axis_opts );
-        plbox( opt_string, 0.0, 0, "bc", 0.0, 0 );
+        plbox( opt_string, ticks, sub_ticks, "bc", 0.0, 0 );
     }
     else if ( opt & PL_COLORBAR_LOWER )
     {
         snprintf( opt_string, max_opts, "bcn%s", axis_opts );
-        plbox( opt_string, 0.0, 0, "bc", 0.0, 0 );
+        plbox( opt_string, ticks, sub_ticks, "bc", 0.0, 0 );
     }
 
-    // TODO: Add tick mark drawing and labeling here when n_colors > 2
-
     // Draw a title
     char perp;
     if ( opt & PL_COLORBAR_LABEL_LEFT )
@@ -1291,6 +1290,58 @@
         snprintf( opt_string, max_opts, "b%c", perp );
         plmtex( opt_string, label_offset, 0.5, 0.5, label );
     }
+    
+    // Draw labels and tick marks if this is a shade color bar
+    // TODO: A better way to handle this would be to update the
+    // internals of plbox to support custom tick and label positions
+    // along an axis.
+    if ( opt & PL_COLORBAR_SHADE && opt & PL_COLORBAR_SHADE_LABEL )
+    {
+        // Draw labels and tick marks
+        char label_string[40];
+        char *pos_string;
+        PLFLT just;
+        PLFLT label_value, label_position;
+        if ( opt & PL_COLORBAR_RIGHT )
+        {
+            pos_string = "rv";
+            just = 0.0;
+        }
+        else if ( opt & PL_COLORBAR_LEFT )
+        {
+            pos_string = "lv";
+            just = 1.0;
+        }
+        else if ( opt & PL_COLORBAR_UPPER )
+        {
+            pos_string = "t";
+            just = 0.5;
+        }
+        else if ( opt & PL_COLORBAR_LOWER )
+        {
+            pos_string = "b";
+            just = 0.5;
+        }
+        for ( i = 0; i < n_steps; i++ )
+        {
+            label_value = values[i];
+            label_position = ( label_value - min_value ) / ( max_value - min_value );
+            snprintf( label_string, 40, "%g", label_value );
+            // Label
+            plmtex( pos_string, 1.5, label_position, just, label_string );
+            // Tick mark
+            if ( opt & PL_COLORBAR_RIGHT || opt & PL_COLORBAR_LEFT )
+            {
+                plwytik( 0.0, label_value, FALSE, TRUE );
+                plwytik( 1.0, label_value, FALSE, FALSE );
+            }
+            else if ( opt & PL_COLORBAR_UPPER || opt & PL_COLORBAR_LOWER )
+            {
+                plwxtik( label_value, 0.0, FALSE, TRUE );
+                plwxtik( label_value, 1.0, FALSE, FALSE );
+            }
+        }
+    }
 
     // Restore
     plvpor( xdmin_save, xdmax_save, ydmin_save, ydmax_save );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.