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

[<ai...@us...>]

Revision: 11757
          http://plplot.svn.sourceforge.net/plplot/?rev=11757&view=rev
Author:   airwin
Date:     2011-05-30 20:23:27 +0000 (Mon, 30 May 2011)

Log Message:
-----------
Style previous changes.

Modified Paths:
--------------
    trunk/drivers/cairo.c
    trunk/examples/c/x33c.c
    trunk/examples/c/x34c.c
    trunk/include/plplot.h
    trunk/src/plctrl.c
    trunk/src/pllegend.c

Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c	2011-05-30 20:16:51 UTC (rev 11756)
+++ trunk/drivers/cairo.c	2011-05-30 20:23:27 UTC (rev 11757)
@@ -613,7 +613,7 @@
 //--------------------------------------------------------------------------
 void get_mode( PLStream *pls, PLINT *mode )
 {
-    PLCairo *aStream;
+    PLCairo          *aStream;
     cairo_operator_t op;
 
     aStream = (PLCairo *) pls->dev;

Modified: trunk/examples/c/x33c.c
===================================================================
--- trunk/examples/c/x33c.c	2011-05-30 20:16:51 UTC (rev 11756)
+++ trunk/examples/c/x33c.c	2011-05-30 20:23:27 UTC (rev 11757)
@@ -180,7 +180,7 @@
             colorbar_cap_options[cap_i];
 
         vertical = position & PL_POSITION_LEFT || position & PL_POSITION_RIGHT;
-        ifn = position & PL_POSITION_LEFT || position & PL_POSITION_BOTTOM;
+        ifn      = position & PL_POSITION_LEFT || position & PL_POSITION_BOTTOM;
 
         // Set the offset position on the page
         if ( vertical )
@@ -201,26 +201,26 @@
         // Set appropriate labelling options.
         if ( ifn )
         {
-        if ( cont_color == 0 || cont_width == 0 )
-        {
-            axis_opts = "uwtvn";
+            if ( cont_color == 0 || cont_width == 0 )
+            {
+                axis_opts = "uwtvn";
+            }
+            else
+            {
+                axis_opts = "uwxvn";
+            }
         }
         else
         {
-            axis_opts = "uwxvn";
+            if ( cont_color == 0 || cont_width == 0 )
+            {
+                axis_opts = "uwtvm";
+            }
+            else
+            {
+                axis_opts = "uwxvm";
+            }
         }
-        }
-        else
-        {
-        if ( cont_color == 0 || cont_width == 0 )
-        {
-            axis_opts = "uwtvm";
-        }
-        else
-        {
-            axis_opts = "uwxvm";
-        }
-        }
 
         sprintf( label, "%s, %s",
             colorbar_position_option_labels[position_i],

Modified: trunk/examples/c/x34c.c
===================================================================
--- trunk/examples/c/x34c.c	2011-05-30 20:16:51 UTC (rev 11756)
+++ trunk/examples/c/x34c.c	2011-05-30 20:23:27 UTC (rev 11757)
@@ -25,8 +25,8 @@
 #include "plcdemos.h"
 
 // Drawing modes to demonstrate
-#define NUM_MODES 3
-PLINT drawing_modes[NUM_MODES] = {
+#define NUM_MODES    3
+PLINT      drawing_modes[NUM_MODES] = {
     PL_MODE_DEFAULT,
     PL_MODE_REPLACE,
     PL_MODE_XOR

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2011-05-30 20:16:51 UTC (rev 11756)
+++ trunk/include/plplot.h	2011-05-30 20:23:27 UTC (rev 11757)
@@ -1268,10 +1268,10 @@
 #define PL_COLORBAR_ORIENT_BOTTOM    0x4000
 
 // Flags for drawing mode
-#define PL_MODE_UNKNOWN             0
-#define PL_MODE_DEFAULT             1
-#define PL_MODE_REPLACE             2
-#define PL_MODE_XOR                 4
+#define PL_MODE_UNKNOWN              0
+#define PL_MODE_DEFAULT              1
+#define PL_MODE_REPLACE              2
+#define PL_MODE_XOR                  4
 
 // Routine for drawing discrete line, symbol, or cmap0 legends
 PLDLLIMPEXP void

Modified: trunk/src/plctrl.c
===================================================================
--- trunk/src/plctrl.c	2011-05-30 20:16:51 UTC (rev 11756)
+++ trunk/src/plctrl.c	2011-05-30 20:23:27 UTC (rev 11757)
@@ -1868,7 +1868,7 @@
         mode = PL_MODE_UNKNOWN;
     }
 
-    return( mode );
+    return ( mode );
 }
 
 //--------------------------------------------------------------------------

Modified: trunk/src/pllegend.c
===================================================================
--- trunk/src/pllegend.c	2011-05-30 20:16:51 UTC (rev 11756)
+++ trunk/src/pllegend.c	2011-05-30 20:23:27 UTC (rev 11757)
@@ -1,5 +1,5 @@
 // $Id$
-// All routines that help to create a discrete legend (pllegend) or 
+// All routines that help to create a discrete legend (pllegend) or
 // a continuous legend (plcolorbar).
 //
 // Copyright (C) 2010-2011  Hezekiah M. Carty
@@ -924,7 +924,7 @@
 //!
 
 void
-static draw_cap( PLBOOL if_edge , PLINT orientation, PLFLT xmin, PLFLT xmax,
+static draw_cap( PLBOOL if_edge, PLINT orientation, PLFLT xmin, PLFLT xmax,
                  PLFLT ymin, PLFLT ymax, PLFLT color )
 {
     // Save current drawing color.
@@ -1143,9 +1143,9 @@
     strcpy( local_axis_opts, axis_opts );
 
     if_edge = plP_stsearch( local_axis_opts, 'b' ) &&
-        !plP_stsearch( local_axis_opts, 'u' ) &&
-        plP_stsearch( local_axis_opts, 'c' ) &&
-        !plP_stsearch( local_axis_opts, 'w' );
+              !plP_stsearch( local_axis_opts, 'u' ) &&
+              plP_stsearch( local_axis_opts, 'c' ) &&
+              !plP_stsearch( local_axis_opts, 'w' );
 
     min_value = values[0];
     max_value = values[ n_values - 1 ];
@@ -1534,7 +1534,7 @@
         // Draw a filled triangle (cap/arrow) at the high end of the scale
         if ( opt & PL_COLORBAR_ORIENT_RIGHT )
         {
-          draw_cap( if_edge, PL_COLORBAR_ORIENT_RIGHT, vx_max, vx_max + cap_height, vy_min, vy_max, high_cap_color );
+            draw_cap( if_edge, PL_COLORBAR_ORIENT_RIGHT, vx_max, vx_max + cap_height, vy_min, vy_max, high_cap_color );
         }
         else if ( opt & PL_COLORBAR_ORIENT_TOP )
         {


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