[Plplot-cvs] SF.net SVN: plplot:[11539] trunk/bindings

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

Revision: 11539
          http://plplot.svn.sourceforge.net/plplot/?rev=11539&view=rev
Author:   airwin
Date:     2011-01-30 22:46:02 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
Make constants in these files consistent with plplot.h

Modified Paths:
--------------
    trunk/bindings/f77/plplot_parameters.fm4
    trunk/bindings/f95/plplot_parameters.h
    trunk/bindings/swig-support/plplotcapi.i

Modified: trunk/bindings/f77/plplot_parameters.fm4
===================================================================
--- trunk/bindings/f77/plplot_parameters.fm4	2011-01-30 21:28:06 UTC (rev 11538)
+++ trunk/bindings/f77/plplot_parameters.fm4	2011-01-30 22:46:02 UTC (rev 11539)
@@ -112,34 +112,26 @@
       parameter (PL_LEGEND_BOUNDING_BOX = 64)
       integer*4 PL_LEGEND_ROW_MAJOR 
       parameter (PL_LEGEND_ROW_MAJOR = 128)
-      integer*4 PL_POSITION_LEFT 
-      parameter (PL_POSITION_LEFT = 1)
-      integer*4 PL_POSITION_RIGHT 
-      parameter (PL_POSITION_RIGHT = 2)
-      integer*4 PL_POSITION_TOP 
-      parameter (PL_POSITION_TOP = 4)
-      integer*4 PL_POSITION_BOTTOM 
-      parameter (PL_POSITION_BOTTOM = 8)
       integer*4 PL_COLORBAR_LABEL_LEFT 
-      parameter (PL_COLORBAR_LABEL_LEFT = 16)
+      parameter (PL_COLORBAR_LABEL_LEFT = 1)
       integer*4 PL_COLORBAR_LABEL_RIGHT 
-      parameter (PL_COLORBAR_LABEL_RIGHT = 32)
+      parameter (PL_COLORBAR_LABEL_RIGHT = 2)
       integer*4 PL_COLORBAR_LABEL_TOP 
-      parameter (PL_COLORBAR_LABEL_TOP = 64)
+      parameter (PL_COLORBAR_LABEL_TOP = 4)
       integer*4 PL_COLORBAR_LABEL_BOTTOM 
-      parameter (PL_COLORBAR_LABEL_BOTTOM = 128)
+      parameter (PL_COLORBAR_LABEL_BOTTOM = 8)
       integer*4 PL_COLORBAR_IMAGE 
-      parameter (PL_COLORBAR_IMAGE = 256)
+      parameter (PL_COLORBAR_IMAGE = 16)
       integer*4 PL_COLORBAR_SHADE 
-      parameter (PL_COLORBAR_SHADE = 512)
+      parameter (PL_COLORBAR_SHADE = 32)
       integer*4 PL_COLORBAR_GRADIENT 
-      parameter (PL_COLORBAR_GRADIENT = 1024)
+      parameter (PL_COLORBAR_GRADIENT = 64)
       integer*4 PL_COLORBAR_CAP_LOW 
-      parameter (PL_COLORBAR_CAP_LOW = 2048)
+      parameter (PL_COLORBAR_CAP_LOW = 128)
       integer*4 PL_COLORBAR_CAP_HIGH 
-      parameter (PL_COLORBAR_CAP_HIGH = 4096)
+      parameter (PL_COLORBAR_CAP_HIGH = 256)
       integer*4 PL_COLORBAR_SHADE_LABEL 
-      parameter (PL_COLORBAR_SHADE_LABEL = 8192)
+      parameter (PL_COLORBAR_SHADE_LABEL = 512)
       integer*4 PLSWIN_DEVICE ! device coordinates
       parameter (PLSWIN_DEVICE = 1)
       integer*4 PLSWIN_WORLD ! world coordinates

Modified: trunk/bindings/f95/plplot_parameters.h
===================================================================
--- trunk/bindings/f95/plplot_parameters.h	2011-01-30 21:28:06 UTC (rev 11538)
+++ trunk/bindings/f95/plplot_parameters.h	2011-01-30 22:46:02 UTC (rev 11539)
@@ -55,20 +55,16 @@
       integer, parameter :: PL_LEGEND_BACKGROUND = 32 
       integer, parameter :: PL_LEGEND_BOUNDING_BOX = 64 
       integer, parameter :: PL_LEGEND_ROW_MAJOR = 128 
-      integer, parameter :: PL_POSITION_LEFT = 1 
-      integer, parameter :: PL_POSITION_RIGHT = 2 
-      integer, parameter :: PL_POSITION_TOP = 4 
-      integer, parameter :: PL_POSITION_BOTTOM = 8 
-      integer, parameter :: PL_COLORBAR_LABEL_LEFT = 16 
-      integer, parameter :: PL_COLORBAR_LABEL_RIGHT = 32 
-      integer, parameter :: PL_COLORBAR_LABEL_TOP = 64 
-      integer, parameter :: PL_COLORBAR_LABEL_BOTTOM = 128 
-      integer, parameter :: PL_COLORBAR_IMAGE = 256 
-      integer, parameter :: PL_COLORBAR_SHADE = 512 
-      integer, parameter :: PL_COLORBAR_GRADIENT = 1024 
-      integer, parameter :: PL_COLORBAR_CAP_LOW = 2048 
-      integer, parameter :: PL_COLORBAR_CAP_HIGH = 4096 
-      integer, parameter :: PL_COLORBAR_SHADE_LABEL = 8192 
+      integer, parameter :: PL_COLORBAR_LABEL_LEFT = 1 
+      integer, parameter :: PL_COLORBAR_LABEL_RIGHT = 2 
+      integer, parameter :: PL_COLORBAR_LABEL_TOP = 4 
+      integer, parameter :: PL_COLORBAR_LABEL_BOTTOM = 8 
+      integer, parameter :: PL_COLORBAR_IMAGE = 16 
+      integer, parameter :: PL_COLORBAR_SHADE = 32 
+      integer, parameter :: PL_COLORBAR_GRADIENT = 64 
+      integer, parameter :: PL_COLORBAR_CAP_LOW = 128 
+      integer, parameter :: PL_COLORBAR_CAP_HIGH = 256 
+      integer, parameter :: PL_COLORBAR_SHADE_LABEL = 512 
       integer, parameter :: PLSWIN_DEVICE = 1 ! device coordinates
       integer, parameter :: PLSWIN_WORLD = 2 ! world coordinates
       integer, parameter :: PL_X_AXIS = 1 ! The x-axis

Modified: trunk/bindings/swig-support/plplotcapi.i
===================================================================
--- trunk/bindings/swig-support/plplotcapi.i	2011-01-30 21:28:06 UTC (rev 11538)
+++ trunk/bindings/swig-support/plplotcapi.i	2011-01-30 22:46:02 UTC (rev 11539)
@@ -117,20 +117,16 @@
 #define PL_LEGEND_ROW_MAJOR       128
 
 // Flags for plcolorbar
-#define PL_POSITION_LEFT            1
-#define PL_POSITION_RIGHT           2
-#define PL_POSITION_TOP           4
-#define PL_POSITION_BOTTOM           8
-#define PL_COLORBAR_LABEL_LEFT      16
-#define PL_COLORBAR_LABEL_RIGHT     32
-#define PL_COLORBAR_LABEL_TOP     64
-#define PL_COLORBAR_LABEL_BOTTOM     128
-#define PL_COLORBAR_IMAGE           256
-#define PL_COLORBAR_SHADE           512
-#define PL_COLORBAR_GRADIENT        1024
-#define PL_COLORBAR_CAP_LOW         2048
-#define PL_COLORBAR_CAP_HIGH        4096
-#define PL_COLORBAR_SHADE_LABEL     8192
+#define PL_COLORBAR_LABEL_LEFT      1
+#define PL_COLORBAR_LABEL_RIGHT     2
+#define PL_COLORBAR_LABEL_TOP       4
+#define PL_COLORBAR_LABEL_BOTTOM    8
+#define PL_COLORBAR_IMAGE           16
+#define PL_COLORBAR_SHADE           32
+#define PL_COLORBAR_GRADIENT        64
+#define PL_COLORBAR_CAP_LOW         128
+#define PL_COLORBAR_CAP_HIGH        256
+#define PL_COLORBAR_SHADE_LABEL     512
 
 // Window parameter tags
 


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