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

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

Revision: 11659
          http://plplot.svn.sourceforge.net/plplot/?rev=11659&view=rev
Author:   airwin
Date:     2011-03-19 23:56:59 +0000 (Sat, 19 Mar 2011)

Log Message:
-----------
Untested changes to get rid of plcol (and replace it with plcol0 when
appropriate).

Modified Paths:
--------------
    trunk/bindings/python/Plframe.py
    trunk/bindings/tk-x-plat/Plwindow.tcl
    trunk/bindings/tk-x-plat/plbarchart.tcl
    trunk/bindings/tk-x-plat/pltimeseries.tcl
    trunk/utils/plrender.c

Modified: trunk/bindings/python/Plframe.py
===================================================================
--- trunk/bindings/python/Plframe.py	2011-03-19 22:31:10 UTC (rev 11658)
+++ trunk/bindings/python/Plframe.py	2011-03-19 23:56:59 UTC (rev 11659)
@@ -52,9 +52,6 @@
 ## on the Numeric extensions cannot work this way, so for those we
 ## call straight to the Python compiled interface to the PLplot API.
 
-    def plcol(s,c):
-	s.cmd( 'plcol', c )
-
     def plenv( s, xmin, xmax, ymin, ymax, i, j ):
 	s.cmd( 'plenv', xmin, xmax, ymin, ymax, i, j )
 
@@ -1101,11 +1098,8 @@
                yopt, ylabel, ytick, nsuby,
                zopt, zlabel, ztick, nsubz )
 
-    def plcol(s,c):
-        s.cmd( 'plcol', c )
-
     def plcol0( s, col0 ):
-	s.plcol( col0 )
+	s.cmd( 'plcol0', col0 )
 
     def plcol1( s, col1 ):
         s.cmd( 'plcol1', col1 )

Modified: trunk/bindings/tk-x-plat/Plwindow.tcl
===================================================================
--- trunk/bindings/tk-x-plat/Plwindow.tcl	2011-03-19 22:31:10 UTC (rev 11658)
+++ trunk/bindings/tk-x-plat/Plwindow.tcl	2011-03-19 23:56:59 UTC (rev 11659)
@@ -47,10 +47,6 @@
 	uplevel 1 $itk_interior.plwin cmd $args
     }
 
-    method plcol {color} {
-	cmd plcol0 $color
-    }
-
     method plcont {data clev} {
 	upvar $data d
 	upvar $clev c

Modified: trunk/bindings/tk-x-plat/plbarchart.tcl
===================================================================
--- trunk/bindings/tk-x-plat/plbarchart.tcl	2011-03-19 22:31:10 UTC (rev 11658)
+++ trunk/bindings/tk-x-plat/plbarchart.tcl	2011-03-19 23:56:59 UTC (rev 11659)
@@ -80,17 +80,17 @@
 
 itcl::body Plbarchart::datapoints {data} {
     if {[info commands _pp$nn] == "_pp$nn"} {
-	cmd plcol 0
+	cmd plcol0 0
 	cmd plhist [_pp$nn info] _pp$nn $minbin $maxbin $bins 0
 	rename _pp$nn {}
     }
     matrix -persist _pp$nn f [llength $data] = $data
-    cmd plcol 1
+    cmd plcol0 1
     cmd plhist [_pp$nn info] _pp$nn $minbin $maxbin $bins 0
 }
 
 itcl::body Plbarchart::drawAxes {} {
-    cmd plcol 15
+    cmd plcol0 15
     cmd plenv [expr {[lindex $V 0] -0.7*$step}] \
       [expr {[lindex $V end] +0.7*$step}] \
       0 $ymax 0 0

Modified: trunk/bindings/tk-x-plat/pltimeseries.tcl
===================================================================
--- trunk/bindings/tk-x-plat/pltimeseries.tcl	2011-03-19 22:31:10 UTC (rev 11658)
+++ trunk/bindings/tk-x-plat/pltimeseries.tcl	2011-03-19 23:56:59 UTC (rev 11659)
@@ -90,10 +90,10 @@
 }
 
 itcl::body Pltimeseries::initialise {} {
-    cmd plcol 15
+    cmd plcol0 15
     cmd plenv $min_time $max_time $y_min $y_max 0 1
     cmd pllab $itk_option(-xname) $itk_option(-yname) $itk_option(-title)
-    cmd plcol 1
+    cmd plcol0 1
 }
 
 itcl::body Pltimeseries::destructor {} {
@@ -115,7 +115,7 @@
 	    }
 	}
 	foreach trace [array names _points] {
-	    cmd plcol [expr {1 + int($trace * $colour_increment) % 15}]
+	    cmd plcol0 [expr {1 + int($trace * $colour_increment) % 15}]
 	    plotline [lrange $_ticks $l end] [lrange $_points($trace) $l end]
 	}
 	return
@@ -130,16 +130,16 @@
     set _ticks [lrange $_ticks $i end]
     plotaxes
     foreach trace [array names _points] {
-	cmd plcol [expr {1 + int($trace * $colour_increment) % 15}]
+	cmd plcol0 [expr {1 + int($trace * $colour_increment) % 15}]
 	plotline $_ticks $_points($trace)
     }
 }
 
 itcl::body Pltimeseries::plotaxes {} {
-    cmd plcol 15
+    cmd plcol0 15
     cmd plenv $min_time $max_time $y_min $y_max 0 1
     cmd pllab $itk_option(-xname) $itk_option(-yname) $itk_option(-title)
-    cmd plcol 1
+    cmd plcol0 1
 }
 
 itcl::body Pltimeseries::plotpoint {t y} {

Modified: trunk/utils/plrender.c
===================================================================
--- trunk/utils/plrender.c	2011-03-19 22:31:10 UTC (rev 11658)
+++ trunk/utils/plrender.c	2011-03-19 23:56:59 UTC (rev 11659)
@@ -986,7 +986,7 @@
             }
             else
             {
-                plcol( icol0 );
+                plcol0( icol0 );
             }
         }
         else if ( strcmp( mf_version, "1993a" ) >= 0 )
@@ -1004,14 +1004,14 @@
             }
             else
             {
-                plcol( icol0 );
+                plcol0( icol0 );
             }
         }
         else
         {
             U_SHORT icol;
             plm_rd( pdf_rd_2bytes( pdfs, &icol ) );
-            plcol( icol );
+            plcol0( icol );
         }
         break;
     }


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