Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12288] trunk
|
From: <ai...@us...> - 2013-01-30 04:40:48
|
Revision: 12288
http://plplot.svn.sourceforge.net/plplot/?rev=12288&view=rev
Author: airwin
Date: 2013-01-30 04:40:35 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Replace plwid everywhere by plwidth, and store pen width
arguments as PLFLT's everywhere (that I can find them).
These changes allow width parameters < 1. to
work for cairo devices, e.g.,
examples/c/x03c.c -dev xcairo -width 0.3
gives extremely thin line results.
Further discussion on list of what else there is to do.
Modified Paths:
--------------
trunk/bindings/ada/plplot.adb
trunk/bindings/ada/plplot.ads
trunk/bindings/ada/plplot_thin.ads
trunk/bindings/ada/plplot_traditional.adb
trunk/bindings/ada/plplot_traditional.ads
trunk/bindings/c++/plstream.cc
trunk/bindings/c++/plstream.h
trunk/bindings/d/plplot.d
trunk/bindings/f77/plstubs.h
trunk/bindings/f77/scstubs.c
trunk/bindings/f95/plstubs.h
trunk/bindings/f95/scstubs.c
trunk/bindings/f95/sfstubsf95.f90
trunk/bindings/gnome2/lib/plplotcanvas.c
trunk/bindings/java/PLStream.java
trunk/bindings/lua/plplotluac.i
trunk/bindings/ocaml/plplot.ml
trunk/bindings/ocaml/plplot.mli
trunk/bindings/ocaml/plplot_core.idl
trunk/bindings/ocaml/plplot_h
trunk/bindings/ocaml/plplot_h.inc
trunk/bindings/ocaml/plplot_impl.c
trunk/bindings/octave/etc/plplot.doc
trunk/bindings/octave/plplot_octave.h.in
trunk/bindings/swig-support/plplotcapi.i
trunk/bindings/tcl/plapi.tpl
trunk/bindings/tk/PLWin.itk
trunk/bindings/tk/plr.c
trunk/doc/docbook/src/advanced.xml
trunk/doc/docbook/src/api.xml
trunk/doc/docbook/src/plplotdoc.xml.in
trunk/drivers/cairo.c
trunk/examples/ada/x01a.adb
trunk/examples/ada/x02a.adb
trunk/examples/c/x01c.c
trunk/examples/c/x02c.c
trunk/examples/c++/qt_PlotWindow.cpp
trunk/examples/c++/wxPLplotDemo.cpp
trunk/examples/c++/x01.cc
trunk/examples/c++/x02.cc
trunk/examples/d/x01d.d
trunk/examples/d/x02d.d
trunk/examples/f77/x01f.fm4
trunk/examples/f77/x02f.fm4
trunk/examples/f95/x01f.f90
trunk/examples/f95/x02f.f90
trunk/examples/java/x01.java
trunk/examples/java/x02.java
trunk/examples/lua/x01.lua
trunk/examples/lua/x02.lua
trunk/examples/ocaml/x01.ml
trunk/examples/ocaml/x02.ml
trunk/examples/octave/x01c.m
trunk/examples/octave/x02c.m
trunk/examples/perl/x01.pl
trunk/examples/perl/x02.pl
trunk/examples/python/plplot_logo.py
trunk/examples/python/pyqt4_example.py
trunk/examples/python/x02.py
trunk/examples/python/xw01.py
trunk/examples/python/xw02.py
trunk/examples/tcl/x01.tcl
trunk/examples/tcl/x02.tcl
trunk/include/plplot.h
trunk/include/plstrm.h
trunk/src/plargs.c
trunk/src/plcore.c
trunk/src/pllegend.c
trunk/src/plot3d.c
trunk/src/plshade.c
trunk/sys/win-tk/tclgen.c
trunk/sys/win-tk/tclgen.h
trunk/sys/win-tk/tclgen_s.h
trunk/utils/plrender.c
Modified: trunk/bindings/ada/plplot.adb
===================================================================
--- trunk/bindings/ada/plplot.adb 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ada/plplot.adb 2013-01-30 04:40:35 UTC (rev 12288)
@@ -3311,10 +3311,10 @@
-- Set pen width.
- -- plwid
+ -- plwidth
procedure Set_Pen_Width(Pen_Width : Integer) is
begin
- plwid(Pen_Width);
+ plwidth(Pen_Width);
end Set_Pen_Width;
Modified: trunk/bindings/ada/plplot.ads
===================================================================
--- trunk/bindings/ada/plplot.ads 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ada/plplot.ads 2013-01-30 04:40:35 UTC (rev 12288)
@@ -2103,7 +2103,7 @@
-- Set pen width.
- -- plwid
+ -- plwidth
procedure Set_Pen_Width(Pen_Width : Integer);
Modified: trunk/bindings/ada/plplot_thin.ads
===================================================================
--- trunk/bindings/ada/plplot_thin.ads 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ada/plplot_thin.ads 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1875,8 +1875,8 @@
-- Set pen width.
procedure
- plwid(width : PLINT);
- pragma Import(C, plwid, "c_plwid");
+ plwidth(width : PLFLT);
+ pragma Import(C, plwidth, "c_plwidth");
-- Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/ada/plplot_traditional.adb
===================================================================
--- trunk/bindings/ada/plplot_traditional.adb 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ada/plplot_traditional.adb 2013-01-30 04:40:35 UTC (rev 12288)
@@ -73,7 +73,7 @@
Default_Pen_Width : constant Integer := 1;
procedure Set_Default_Pen_Width is
begin
- plwid(Default_Pen_Width);
+ plwidth(Default_Pen_Width);
end Set_Default_Pen_Width;
@@ -3147,10 +3147,10 @@
-- Set pen width.
- procedure plwid(Pen_Width : Integer) is
+ procedure plwidth(Pen_Width : Integer) is
begin
- PLplot_Thin.plwid(Pen_Width);
- end plwid;
+ PLplot_Thin.plwidth(Pen_Width);
+ end plwidth;
-- Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/ada/plplot_traditional.ads
===================================================================
--- trunk/bindings/ada/plplot_traditional.ads 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ada/plplot_traditional.ads 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1932,7 +1932,7 @@
-- Set pen width.
- procedure plwid(Pen_Width : Integer);
+ procedure plwidth(Pen_Width : Integer);
-- Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/c++/plstream.cc
===================================================================
--- trunk/bindings/c++/plstream.cc 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/c++/plstream.cc 2013-01-30 04:40:35 UTC (rev 12288)
@@ -2320,11 +2320,11 @@
// Set pen width.
-void plstream::wid( PLINT width )
+void plstream::width( PLFLT width )
{
set_stream();
- plwid( width );
+ plwidth( width );
}
// Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/c++/plstream.h
===================================================================
--- trunk/bindings/c++/plstream.h 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/c++/plstream.h 2013-01-30 04:40:35 UTC (rev 12288)
@@ -959,7 +959,7 @@
// Set pen width.
- void wid( PLINT width );
+ void width( PLFLT width );
// Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/d/plplot.d
===================================================================
--- trunk/bindings/d/plplot.d 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/d/plplot.d 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1472,7 +1472,7 @@
alias c_plvpor plvpor;
alias c_plvsta plvsta;
alias c_plw3d plw3d;
-alias c_plwid plwid;
+alias c_plwidth plwidth;
alias c_plwind plwind;
alias c_plxormod plxormod;
@@ -2167,7 +2167,7 @@
// Set pen width.
-void c_plwid( PLINT width );
+void c_plwidth( PLFLT width );
// Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/f77/plstubs.h
===================================================================
--- trunk/bindings/f77/plstubs.h 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/f77/plstubs.h 2013-01-30 04:40:35 UTC (rev 12288)
@@ -353,7 +353,7 @@
#define PLVPOR FNAME( PLVPOR, plvpor )
#define PLVSTA FNAME( PLVSTA, plvsta )
#define PLW3D FNAME( PLW3D, plw3d )
-#define PLWID FNAME( PLWID, plwid )
+#define PLWIDTH FNAME( PLWIDTH, plwidth )
#define PLWIND FNAME( PLWIND, plwind )
#define PLXORMOD FNAME( PLXORMOD, plxormod )
Modified: trunk/bindings/f77/scstubs.c
===================================================================
--- trunk/bindings/f77/scstubs.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/f77/scstubs.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1225,7 +1225,7 @@
void
PLWID( PLINT *width )
{
- c_plwid( *width );
+ c_plwidth( *width );
}
void
Modified: trunk/bindings/f95/plstubs.h
===================================================================
--- trunk/bindings/f95/plstubs.h 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/f95/plstubs.h 2013-01-30 04:40:35 UTC (rev 12288)
@@ -364,7 +364,7 @@
#define PLVPOR FNAME( PLVPOR, plvpor )
#define PLVSTA FNAME( PLVSTA, plvsta )
#define PLW3D FNAME( PLW3D, plw3d )
-#define PLWID FNAME( PLWID, plwid )
+#define PLWIDTH FNAME( PLWIDTH, plwidth )
#define PLWIND FNAME( PLWIND, plwind )
#define PLXORMOD FNAME( PLXORMODF77, plxormodf77 )
Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/f95/scstubs.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -260,7 +260,7 @@
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *zmin, PLFLT *zmax,
PLFLT *alt, PLFLT *az );
-void PLWID( PLINT *width );
+void PLWIDTH( PLFLT *width );
void PLWIND( PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax );
void PLXORMOD( PLBOOL *mode, PLBOOL *status );
@@ -1519,9 +1519,9 @@
}
void
-PLWID( PLINT *width )
+PLWIDTH( PLFLT *width )
{
- c_plwid( *width );
+ c_plwidth( *width );
}
void
Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/f95/sfstubsf95.f90 2013-01-30 04:40:35 UTC (rev 12288)
@@ -944,9 +944,10 @@
end interface
interface
- subroutine plwid( width )
- integer :: width
- end subroutine plwid
+ subroutine plwidth( width )
+ use plplot_flt
+ real(kind=plflt) :: width
+ end subroutine plwidth
end interface
interface
Modified: trunk/bindings/gnome2/lib/plplotcanvas.c
===================================================================
--- trunk/bindings/gnome2/lib/plplotcanvas.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/gnome2/lib/plplotcanvas.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1263,7 +1263,7 @@
void plplot_canvas_wid( PlplotCanvas* self, PLINT width )
{
plsstrm( self->Nstream );
- plwid( width );
+ plwidth( width );
}
// Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/java/PLStream.java
===================================================================
--- trunk/bindings/java/PLStream.java 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/java/PLStream.java 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1163,10 +1163,10 @@
zmin0, zmax0, alt, az );
}
- public void wid( int width )
+ public void width( int width )
{
if ( set_stream() == -1 ) return;
- plplotjavac.plwid( width );
+ plplotjavac.plwidth( width );
}
public void wind( double xmin, double xmax, double ymin, double ymax )
Modified: trunk/bindings/lua/plplotluac.i
===================================================================
--- trunk/bindings/lua/plplotluac.i 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/lua/plplotluac.i 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1456,7 +1456,7 @@
%rename( vpor ) plvpor;
%rename( vsta ) plvsta;
%rename( w3d ) plw3d;
-%rename( wid ) plwid;
+%rename( width ) plwidth;
%rename( wind ) plwind;
%rename( xormod ) plxormod;
%rename( warn ) plwarn;
Modified: trunk/bindings/ocaml/plplot.ml
===================================================================
--- trunk/bindings/ocaml/plplot.ml 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ocaml/plplot.ml 2013-01-30 04:40:35 UTC (rev 12288)
@@ -973,14 +973,14 @@
let plot_axes (color, xopt, yopt, width, style, labelfunc) =
set_color_in color (
fun () ->
- let old_width = plgwid () in
- plwid width;
+ let old_width = plgwidth () in
+ plwidth width;
set_line_style style;
Option.may plslabelfunc labelfunc;
plot_axes xopt yopt;
Option.may (fun _ -> plunset_labelfunc ()) labelfunc;
set_line_style Solid_line;
- plwid old_width;
+ plwidth old_width;
)
in
let plot_contours (color, pltr, contours, data) =
@@ -1008,12 +1008,12 @@
let plot_join (color, x0, y0, x1, y1, width, style) =
set_color_in color (
fun () ->
- let old_width = plgwid () in
- plwid width;
+ let old_width = plgwidth () in
+ plwidth width;
set_line_style style;
pljoin x0 y0 x1 y1;
set_line_style Solid_line;
- plwid old_width;
+ plwidth old_width;
)
in
let plot_labels (color, x, y, title) =
@@ -1024,12 +1024,12 @@
let plot_lines (label, color, xs, ys, width, style) =
set_color_in color (
fun () ->
- let old_width = plgwid () in
- plwid width;
+ let old_width = plgwidth () in
+ plwidth width;
set_line_style style;
plline xs ys;
set_line_style Solid_line;
- plwid old_width;
+ plwidth old_width;
)
in
let plot_map (color, outline, x0, y0, x1, y1) =
Modified: trunk/bindings/ocaml/plplot.mli
===================================================================
--- trunk/bindings/ocaml/plplot.mli 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ocaml/plplot.mli 2013-01-30 04:40:35 UTC (rev 12288)
@@ -942,7 +942,7 @@
float ->
float -> float -> float -> float -> float -> float -> float -> unit
= "camlidl_plplot_core_c_plw3d_bytecode" "camlidl_plplot_core_c_plw3d"
-external plwid : int -> unit = "camlidl_plplot_core_c_plwid"
+external plwidth : float -> unit = "camlidl_plplot_core_c_plwidth"
external plwind : float -> float -> float -> float -> unit
= "camlidl_plplot_core_c_plwind"
external plxormod : bool -> bool = "camlidl_plplot_core_c_plxormod"
@@ -992,7 +992,7 @@
= "camlidl_plplot_core_plg_current_col0"
external plg_current_col1 : unit -> float
= "camlidl_plplot_core_plg_current_col1"
-external plgwid : unit -> int = "camlidl_plplot_core_plgwid"
+external plgwidth : unit -> float = "camlidl_plplot_core_plgwidth"
external plgchrht : unit -> float = "camlidl_plplot_core_plgchrht"
external plstripc :
string ->
Modified: trunk/bindings/ocaml/plplot_core.idl
===================================================================
--- trunk/bindings/ocaml/plplot_core.idl 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ocaml/plplot_core.idl 2013-01-30 04:40:35 UTC (rev 12288)
@@ -201,7 +201,7 @@
// information from PLplot.
int plg_current_col0(void);
float plg_current_col1(void);
-int plgwid(void);
+float plgwidth(void);
float plgchrht(void);
#define QUOTEME(x) #x
Modified: trunk/bindings/ocaml/plplot_h
===================================================================
--- trunk/bindings/ocaml/plplot_h 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ocaml/plplot_h 2013-01-30 04:40:35 UTC (rev 12288)
@@ -738,7 +738,7 @@
PLFLT zmax0, PLFLT alt, PLFLT az);
void
-c_plwid(PLINT width);
+c_plwidth(PLFLT width);
void
c_plwind(PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax);
Modified: trunk/bindings/ocaml/plplot_h.inc
===================================================================
--- trunk/bindings/ocaml/plplot_h.inc 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ocaml/plplot_h.inc 2013-01-30 04:40:35 UTC (rev 12288)
@@ -146,7 +146,7 @@
[mlname(plvpor)] void c_plvpor ( double xmin, double xmax, double ymin, double ymax );
[mlname(plvsta)] void c_plvsta ( void );
[mlname(plw3d)] void c_plw3d ( double basex, double basey, double height, double xmin0, double xmax0, double ymin0, double ymax0, double zmin0, double zmax0, double alt, double az );
-[mlname(plwid)] void c_plwid ( int width );
+[mlname(plwidth)] void c_plwidth ( double width );
[mlname(plwind)] void c_plwind ( double xmin, double xmax, double ymin, double ymax );
[mlname(plxormod)] void c_plxormod ( boolean mode, [out] boolean * status );
[mlname(plsetopt)] nonzero_error_int c_plsetopt ( [string] const char * opt, [string] const char * optarg );
Modified: trunk/bindings/ocaml/plplot_impl.c
===================================================================
--- trunk/bindings/ocaml/plplot_impl.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/ocaml/plplot_impl.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -958,7 +958,7 @@
// Get the current pen width. TODO: Remove this, as I think this information
// can be retrieved from another proper PLplot function.
-int plgwid( void )
+float plgwidth( void )
{
return plsc->width;
}
Modified: trunk/bindings/octave/etc/plplot.doc
===================================================================
--- trunk/bindings/octave/etc/plplot.doc 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/octave/etc/plplot.doc 2013-01-30 04:40:35 UTC (rev 12288)
@@ -111,7 +111,7 @@
plvpor -- Creates a viewport with the specified normalized subpage coordinates.
plvsta -- Defines a "standard" viewport with seven character heights for the left margin and four character heights everywhere else.
plw3d -- Set up a window for three-dimensional plotting.
-plwid -- Set pen width.
+plwidth -- Set pen width.
plwind -- Set up world coordinates of the viewport boundaries -2d plots-.
Functions for use from C or C++ only
Modified: trunk/bindings/octave/plplot_octave.h.in
===================================================================
--- trunk/bindings/octave/plplot_octave.h.in 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/octave/plplot_octave.h.in 2013-01-30 04:40:35 UTC (rev 12288)
@@ -588,7 +588,7 @@
#define plvpor c_plvpor
#define plvsta c_plvsta
#define plw3d c_plw3d
-#define plwid c_plwid
+#define plwidth c_plwidth
#define plwind c_plwind
#define plxormod c_plxormod
@@ -1587,7 +1587,7 @@
// Set pen width.
-void c_plwid( PLINT width ); //%name plwid
+void c_plwidth( PLFLT width ); //%name plwidth
// Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/swig-support/plplotcapi.i
===================================================================
--- trunk/bindings/swig-support/plplotcapi.i 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/swig-support/plplotcapi.i 2013-01-30 04:40:35 UTC (rev 12288)
@@ -805,7 +805,7 @@
PLFLT zmax0, PLFLT alt, PLFLT az );
void
-plwid( PLINT width );
+plwidth( PLINT width );
void
plwind( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax );
Modified: trunk/bindings/tcl/plapi.tpl
===================================================================
--- trunk/bindings/tcl/plapi.tpl 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/tcl/plapi.tpl 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1060,7 +1060,7 @@
# Set pen width.
-pltclcmd plwid void
+pltclcmd plwidth void
width PLINT
# Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/bindings/tk/PLWin.itk
===================================================================
--- trunk/bindings/tk/PLWin.itk 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/tk/PLWin.itk 2013-01-30 04:40:35 UTC (rev 12288)
@@ -402,8 +402,8 @@
eval $plwin cmd plw3d $args
}
- method plwid {args} {
- eval $plwin cmd plwid $args
+ method plwidth {args} {
+ eval $plwin cmd plwidth $args
}
method plwind {args} {
Modified: trunk/bindings/tk/plr.c
===================================================================
--- trunk/bindings/tk/plr.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/bindings/tk/plr.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -249,7 +249,7 @@
if ( !strcmp( tag, "width" ) )
{
plr_rd( pdf_rd_1byte( plr->pdfs, &dum_uchar ) );
- plwid( dum_uchar );
+ plwidth( dum_uchar );
continue;
}
@@ -425,7 +425,7 @@
plr_rd( pdf_rd_2bytes( plr->pdfs, &width ) );
- plwid( width );
+ plwidth( width );
break;
}
Modified: trunk/doc/docbook/src/advanced.xml
===================================================================
--- trunk/doc/docbook/src/advanced.xml 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/doc/docbook/src/advanced.xml 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1318,7 +1318,7 @@
</para>
<para>
- Line width is set using &plwid;. This option is not supported by
+ Line width is set using &plwidth;. This option is not supported by
all devices.
</para>
Modified: trunk/doc/docbook/src/api.xml
===================================================================
--- trunk/doc/docbook/src/api.xml 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/doc/docbook/src/api.xml 2013-01-30 04:40:35 UTC (rev 12288)
@@ -16252,16 +16252,16 @@
</sect1>
- <sect1 id="plwid" renderas="sect3">
+ <sect1 id="plwidth" renderas="sect3">
<title>
- <function>plwid</function>: Set pen width
+ <function>plwidth</function>: Set pen width
</title>
<para>
<funcsynopsis>
<funcprototype>
<funcdef>
- <function>plwid</function>
+ <function>plwidth</function>
</funcdef>
<paramdef><parameter>width</parameter></paramdef>
</funcprototype>
@@ -16292,7 +16292,7 @@
</variablelist>
<para>
- Redacted form: <function>plwid(width)</function>
+ Redacted form: <function>plwidth(width)</function>
</para>
<para>
Modified: trunk/doc/docbook/src/plplotdoc.xml.in
===================================================================
--- trunk/doc/docbook/src/plplotdoc.xml.in 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/doc/docbook/src/plplotdoc.xml.in 2013-01-30 04:40:35 UTC (rev 12288)
@@ -254,7 +254,7 @@
<!ENTITY plvpor '<link linkend="plvpor"><function>plvpor</function></link>'>
<!ENTITY plvsta '<link linkend="plvsta"><function>plvsta</function></link>'>
<!ENTITY plw3d '<link linkend="plw3d"><function>plw3d</function></link>'>
-<!ENTITY plwid '<link linkend="plwid"><function>plwid</function></link>'>
+<!ENTITY plwidth '<link linkend="plwidth"><function>plwidth</function></link>'>
<!ENTITY plwind '<link linkend="plwind"><function>plwind</function></link>'>
<!ENTITY PLGraphicsIn '<link linkend="PLGraphicsIn"><structname>PLGraphicsIn</structname></link>'>
<!ENTITY PLOptionTable '<link linkend="PLOptionTable"><structname>PLOptionTable</structname></link>'>
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/drivers/cairo.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1361,7 +1361,7 @@
(double) pls->curcolor.b / 255.0,
(double) pls->curcolor.a );
// In Cairo, zero width lines are not hairlines, they are completely invisible.
- if ( pls->width < 1 )
+ if ( pls->width <= 0. )
{
cairo_set_line_width( aStream->cairoContext, 1.0 );
}
Modified: trunk/examples/ada/x01a.adb
===================================================================
--- trunk/examples/ada/x01a.adb 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/ada/x01a.adb 2013-01-30 04:40:35 UTC (rev 12288)
@@ -98,9 +98,9 @@
-- Draw the line
plcol0(3);
- plwid(2);
+ plwidth(2);
plline(x, y);
- plwid(1);
+ plwidth(1);
end plot2;
Modified: trunk/examples/ada/x02a.adb
===================================================================
--- trunk/examples/ada/x02a.adb 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/ada/x02a.adb 2013-01-30 04:40:35 UTC (rev 12288)
@@ -62,14 +62,14 @@
vmin := 0.1;
vmax := 0.9;
for j in 0..2 loop
- plwid(j + 1);
+ plwidth(j + 1);
plvpor(vmin, vmax, vmin, vmax);
plwind(0.0, 1.0, 0.0, 1.0);
plbox("bc", 0.0, 0, "bc", 0.0, 0);
vmin := vmin + 0.1;
vmax := vmax - 0.1;
end loop;
- plwid(1);
+ plwidth(1);
plptex(0.5, 0.5, 1.0, 0.0, 0.5, Trim(Integer'image(i), Left));
end loop;
end draw_windows;
Modified: trunk/examples/c/x01c.c
===================================================================
--- trunk/examples/c/x01c.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/c/x01c.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -320,9 +320,9 @@
// Draw the line
plcol0( 3 );
- plwid( 2 );
+ plwidth( 2 );
plline( 100, x, y );
- plwid( 1 );
+ plwidth( 1 );
}
//--------------------------------------------------------------------------
Modified: trunk/examples/c/x02c.c
===================================================================
--- trunk/examples/c/x02c.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/c/x02c.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -141,14 +141,14 @@
vmax = 0.9;
for ( j = 0; j <= 2; j++ )
{
- plwid( j + 1 );
+ plwidth( j + 1 );
plvpor( vmin, vmax, vmin, vmax );
plwind( 0.0, 1.0, 0.0, 1.0 );
plbox( "bc", 0.0, 0, "bc", 0.0, 0 );
vmin = vmin + 0.1;
vmax = vmax - 0.1;
}
- plwid( 1 );
+ plwidth( 1 );
plptex( 0.5, 0.5, 1.0, 0.0, 0.5, text );
}
}
Modified: trunk/examples/c++/qt_PlotWindow.cpp
===================================================================
--- trunk/examples/c++/qt_PlotWindow.cpp 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/c++/qt_PlotWindow.cpp 2013-01-30 04:40:35 UTC (rev 12288)
@@ -96,11 +96,11 @@
plbox( "bcnst", 0., 0, "bcnst", 0., 0 );
plcol0( 1 );
- plwid( 2 );
+ plwidth( 2 );
plline( 360, indexes, sine );
plcol0( 3 );
- plwid( 1 );
+ plwidth( 1 );
pllsty( 2 );
plline( 360, indexes, cosine );
pllsty( 1 );
@@ -125,11 +125,11 @@
plbox( "bcnst", 0., 0, "bcnst", 0., 0 );
plcol0( 1 );
- plwid( 2 );
+ plwidth( 2 );
plline( 360, indexes, square );
plcol0( 3 );
- plwid( 1 );
+ plwidth( 1 );
pllsty( 2 );
plline( 360, indexes, cubic );
pllsty( 1 );
Modified: trunk/examples/c++/wxPLplotDemo.cpp
===================================================================
--- trunk/examples/c++/wxPLplotDemo.cpp 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/c++/wxPLplotDemo.cpp 2013-01-30 04:40:35 UTC (rev 12288)
@@ -272,7 +272,7 @@
pls->lab( "x", "y", "sin(x)/x" );
pls->col0( 3 );
- pls->wid( 2 );
+ pls->width( 2 );
pls->line( np, x, y );
plotwindow->RenewPlot();
Modified: trunk/examples/c++/x01.cc
===================================================================
--- trunk/examples/c++/x01.cc 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/c++/x01.cc 2013-01-30 04:40:35 UTC (rev 12288)
@@ -327,9 +327,9 @@
// Draw the line.
pls->col0( 3 );
- pls->wid( 2 );
+ pls->width( 2 );
pls->line( 100, x, y );
- pls->wid( 1 );
+ pls->width( 1 );
delete[] x;
delete[] y;
Modified: trunk/examples/c++/x02.cc
===================================================================
--- trunk/examples/c++/x02.cc 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/c++/x02.cc 2013-01-30 04:40:35 UTC (rev 12288)
@@ -148,14 +148,14 @@
vmax = 0.9;
for ( j = 0; j <= 2; j++ )
{
- pls->wid( j + 1 );
+ pls->width( j + 1 );
pls->vpor( vmin, vmax, vmin, vmax );
pls->wind( 0.0, 1.0, 0.0, 1.0 );
pls->box( "bc", 0.0, 0, "bc", 0.0, 0 );
vmin = vmin + 0.1;
vmax = vmax - 0.1;
}
- pls->wid( 1 );
+ pls->width( 1 );
pls->ptex( 0.5, 0.5, 1.0, 0.0, 0.5, text );
}
}
Modified: trunk/examples/d/x01d.d
===================================================================
--- trunk/examples/d/x01d.d 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/d/x01d.d 2013-01-30 04:40:35 UTC (rev 12288)
@@ -254,10 +254,10 @@
// Draw the line
plcol0( 3 );
- plwid( 2 );
+ plwidth( 2 );
plline( x, y );
plflush();
- plwid( 1 );
+ plwidth( 1 );
}
public void plot3()
Modified: trunk/examples/d/x02d.d
===================================================================
--- trunk/examples/d/x02d.d 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/d/x02d.d 2013-01-30 04:40:35 UTC (rev 12288)
@@ -125,14 +125,14 @@
PLFLT vmax = 0.9;
for ( int j = 0; j < 3; j++ )
{
- plwid( j + 1 );
+ plwidth( j + 1 );
plvpor( vmin, vmax, vmin, vmax );
plwind( 0.0, 1.0, 0.0, 1.0 );
plbox( "bc", 0.0, 0, "bc", 0.0, 0 );
vmin = vmin + 0.1;
vmax = vmax - 0.1;
}
- plwid( 1 );
+ plwidth( 1 );
plptex( 0.5, 0.5, 1.0, 0.0, 0.5, std.string.toString( i ) );
}
}
Modified: trunk/examples/f77/x01f.fm4
===================================================================
--- trunk/examples/f77/x01f.fm4 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/f77/x01f.fm4 2013-01-30 04:40:35 UTC (rev 12288)
@@ -153,9 +153,9 @@
c Draw the line
call plcol0(3)
- call plwid(2)
+ call plwidth(2.d0)
call plline( 100, x, y )
- call plwid(1)
+ call plwidth(1.d0)
end
c======================================================================
Modified: trunk/examples/f77/x02f.fm4
===================================================================
--- trunk/examples/f77/x02f.fm4 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/f77/x02f.fm4 2013-01-30 04:40:35 UTC (rev 12288)
@@ -139,14 +139,14 @@
vmin = 0.1d0
vmax = 0.9d0
do j=1,3
- call plwid(j)
+ call plwidth(dble(j))
call plvpor(vmin,vmax,vmin,vmax)
call plwind(0.0d0, 1.0d0, 0.0d0, 1.0d0)
call plbox('bc', 0.0d0, 0, 'bc', 0.0d0, 0)
vmin = vmin + 0.1d0
vmax = vmax - 0.1d0
enddo
- call plwid(1)
+ call plwidth(1.d0)
call plptex(0.5d0, 0.5d0, 1.0d0, 0.0d0, 0.5d0, text)
enddo
Modified: trunk/examples/f95/x01f.f90
===================================================================
--- trunk/examples/f95/x01f.f90 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/f95/x01f.f90 2013-01-30 04:40:35 UTC (rev 12288)
@@ -135,9 +135,9 @@
! Draw the line
call plcol0(3)
- call plwid(2)
+ call plwidth(2._plflt)
call plline( x, y )
- call plwid(1)
+ call plwidth(1._plflt)
end subroutine plot2
Modified: trunk/examples/f95/x02f.f90
===================================================================
--- trunk/examples/f95/x02f.f90 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/f95/x02f.f90 2013-01-30 04:40:35 UTC (rev 12288)
@@ -118,7 +118,7 @@
integer :: nw, cmap0_offset
integer :: i,j
- real(kind=plflt) :: vmin, vmax
+ real(kind=plflt) :: vmin, vmax, xj
character (len=3) :: text
call plschr(0.0_plflt, 3.5_plflt)
@@ -132,14 +132,15 @@
vmin = 0.1_plflt
vmax = 0.9_plflt
do j=1,3
- call plwid(j)
+ xj = j
+ call plwidth(xj)
call plvpor(vmin,vmax,vmin,vmax)
call plwind(0.0_plflt, 1.0_plflt, 0.0_plflt, 1.0_plflt)
call plbox('bc', 0.0_plflt, 0, 'bc', 0.0_plflt, 0)
vmin = vmin + 0.1_plflt
vmax = vmax - 0.1_plflt
enddo
- call plwid(1)
+ call plwidth(1._plflt)
call plptex(0.5_plflt, 0.5_plflt, 1.0_plflt, 0.0_plflt, 0.5_plflt, text)
enddo
Modified: trunk/examples/java/x01.java
===================================================================
--- trunk/examples/java/x01.java 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/java/x01.java 2013-01-30 04:40:35 UTC (rev 12288)
@@ -235,9 +235,9 @@
// Draw the line.
pls.col0( 3 );
- pls.wid( 2 );
+ pls.width( 2 );
pls.line( x, y );
- pls.wid( 1 );
+ pls.width( 1 );
}
void plot3()
Modified: trunk/examples/java/x02.java
===================================================================
--- trunk/examples/java/x02.java 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/java/x02.java 2013-01-30 04:40:35 UTC (rev 12288)
@@ -165,14 +165,14 @@
vmax = 0.9;
for ( j = 0; j <= 2; j++ )
{
- pls.wid( j + 1 );
+ pls.width( j + 1 );
pls.vpor( vmin, vmax, vmin, vmax );
pls.wind( 0.0, 1.0, 0.0, 1.0 );
pls.box( "bc", 0.0, 0, "bc", 0.0, 0 );
vmin = vmin + 0.1;
vmax = vmax - 0.1;
}
- pls.wid( 1 );
+ pls.width( 1 );
pls.ptex( 0.5, 0.5, 1.0, 0.0, 0.5, text );
}
}
Modified: trunk/examples/lua/x01.lua
===================================================================
--- trunk/examples/lua/x01.lua 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/lua/x01.lua 2013-01-30 04:40:35 UTC (rev 12288)
@@ -87,9 +87,9 @@
-- Draw the line
pl.col0(3)
- pl.wid(2)
+ pl.width(2)
pl.line(x, y)
- pl.wid(1)
+ pl.width(1)
end
Modified: trunk/examples/lua/x02.lua
===================================================================
--- trunk/examples/lua/x02.lua 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/lua/x02.lua 2013-01-30 04:40:35 UTC (rev 12288)
@@ -40,14 +40,14 @@
vmin = 0.1
vmax = 0.9
for j = 0, 2 do
- pl.wid(j + 1)
+ pl.width(j + 1)
pl.vpor(vmin, vmax, vmin, vmax)
pl.wind(0, 1, 0, 1)
pl.box("bc", 0, 0, "bc", 0, 0)
vmin = vmin + 0.1
vmax = vmax - 0.1
end
- pl.wid(1)
+ pl.width(1)
pl.ptex(0.5, 0.5, 1, 0, 0.5, tostring(i))
end
end
Modified: trunk/examples/ocaml/x01.ml
===================================================================
--- trunk/examples/ocaml/x01.ml 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/ocaml/x01.ml 2013-01-30 04:40:35 UTC (rev 12288)
@@ -182,9 +182,9 @@
(* Draw the line *)
plcol0 3;
- plwid 2;
+ plwidth 2;
plline x y;
- plwid 1;
+ plwidth 1;
(* All done. *)
()
Modified: trunk/examples/ocaml/x02.ml
===================================================================
--- trunk/examples/ocaml/x02.ml 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/ocaml/x02.ml 2013-01-30 04:40:35 UTC (rev 12288)
@@ -39,13 +39,13 @@
let vmin = 0.1 in
let vmax = 0.9 in
for j = 0 to 2 do
- plwid (j + 1);
+ plwidth (j + 1);
let j' = float_of_int j *. 0.1 in
plvpor (vmin +. j') (vmax -. j') (vmin +. j') (vmax -. j');
plwind 0.0 1.0 0.0 1.0;
plbox "bc" 0.0 0 "bc" 0.0 0;
done;
- plwid 1;
+ plwidth 1;
plptex 0.5 0.5 1.0 0.0 0.5 text;
done;
()
Modified: trunk/examples/octave/x01c.m
===================================================================
--- trunk/examples/octave/x01c.m 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/octave/x01c.m 2013-01-30 04:40:35 UTC (rev 12288)
@@ -171,9 +171,9 @@
## Draw the line */
plcol0(3);
- plwid(2);
+ plwidth(2);
plline(x', y');
- plwid(1);
+ plwidth(1);
endfunction
Modified: trunk/examples/octave/x02c.m
===================================================================
--- trunk/examples/octave/x02c.m 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/octave/x02c.m 2013-01-30 04:40:35 UTC (rev 12288)
@@ -50,14 +50,14 @@
vmin = 0.1;
vmax = 0.9;
for j=0:2
- plwid(j + 1);
+ plwidth(j + 1);
plvpor(vmin, vmax, vmin, vmax);
plwind(0.0, 1.0, 0.0, 1.0);
plbox("bc", 0.0, 0, "bc", 0.0, 0);
vmin = vmin + 0.1;
vmax = vmax - 0.1;
endfor
- plwid(1);
+ plwidth(1);
plptex(0.5, 0.5, 1.0, 0.0, 0.5, text);
endfor
endfunction
Modified: trunk/examples/perl/x01.pl
===================================================================
--- trunk/examples/perl/x01.pl 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/perl/x01.pl 2013-01-30 04:40:35 UTC (rev 12288)
@@ -254,9 +254,9 @@
# Draw the line
plcol0 (3);
- plwid (2);
+ plwidth (2);
plline ($x, $y);
- plwid (1);
+ plwidth (1);
}
sub plot3 {
Modified: trunk/examples/perl/x02.pl
===================================================================
--- trunk/examples/perl/x02.pl 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/perl/x02.pl 2013-01-30 04:40:35 UTC (rev 12288)
@@ -130,14 +130,14 @@
my $vmin = 0.1;
my $vmax = 0.9;
for (my $j = 0; $j <= 2; $j++) {
- plwid($j + 1);
+ plwidth($j + 1);
plvpor($vmin, $vmax, $vmin, $vmax);
plwind(0.0, 1.0, 0.0, 1.0);
plbox(0,0,0,0,"bc","bc");
$vmin += 0.1;
$vmax -= 0.1;
}
- plwid(1);
+ plwidth(1);
plptex(0.5, 0.5, 1.0, 0.0, 0.5, $text);
}
}
Modified: trunk/examples/python/plplot_logo.py
===================================================================
--- trunk/examples/python/plplot_logo.py 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/python/plplot_logo.py 2013-01-30 04:40:35 UTC (rev 12288)
@@ -83,7 +83,7 @@
step = (zmax-zmin)/(nlevel+1)
clevel = zmin + step + arange(nlevel)*step
plschr(0., 1.8)
- plwid(1)
+ plwidth(1)
pladv(0)
plvpor(0.0, 1.0, 0.0, 1.0)
plwind(-0.43, 0.840, 0.05, 0.48)
Modified: trunk/examples/python/pyqt4_example.py
===================================================================
--- trunk/examples/python/pyqt4_example.py 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/python/pyqt4_example.py 2013-01-30 04:40:35 UTC (rev 12288)
@@ -89,11 +89,11 @@
plplot.plbox("bcnst", 0., 0, "bcnst", 0., 0)
plplot.plcol0(1)
- plplot.plwid(2)
+ plplot.plwidth(2)
plplot.plline(indexes, sine)
plplot.plcol0(3)
- plplot.plwid(1)
+ plplot.plwidth(1)
plplot.pllsty(2)
plplot.plline(indexes, cosine)
plplot.pllsty(1)
@@ -114,11 +114,11 @@
plplot.plbox("bcnst", 0., 0, "bcnst", 0., 0)
plplot.plcol0(1)
- plplot.plwid(2)
+ plplot.plwidth(2)
plplot.plline(indexes, square)
plplot.plcol0(3)
- plplot.plwid(1)
+ plplot.plwidth(1)
plplot.pllsty(2)
plplot.plline(indexes, cubic)
plplot.pllsty(1)
Modified: trunk/examples/python/x02.py
===================================================================
--- trunk/examples/python/x02.py 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/python/x02.py 2013-01-30 04:40:35 UTC (rev 12288)
@@ -41,13 +41,13 @@
vmin = 0.1
vmax = 0.9
for j in range(3):
- w.plwid(j + 3)
+ w.plwidth(j + 3)
w.plvpor(vmin, vmax, vmin, vmax)
w.plwind(0.0, 1.0, 0.0, 1.0)
w.plbox("bc", 0.0, 0, "bc", 0.0, 0)
vmin = vmin + 0.1
vmax = vmax - 0.1
- w.plwid(1)
+ w.plwidth(1)
w.plptex(0.5, 0.5, 1.0, 0.0, 0.5, `i`)
# Now finish up.
Modified: trunk/examples/python/xw01.py
===================================================================
--- trunk/examples/python/xw01.py 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/python/xw01.py 2013-01-30 04:40:35 UTC (rev 12288)
@@ -124,9 +124,9 @@
# Draw the line
plcol0(3)
- plwid(2)
+ plwidth(2)
plline(x, y)
- plwid(1)
+ plwidth(1)
# ===============================================================
Modified: trunk/examples/python/xw02.py
===================================================================
--- trunk/examples/python/xw02.py 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/python/xw02.py 2013-01-30 04:40:35 UTC (rev 12288)
@@ -36,13 +36,13 @@
vmin = 0.1
vmax = 0.9
for j in range(3):
- plwid(j + 1)
+ plwidth(j + 1)
plvpor(vmin, vmax, vmin, vmax)
plwind(0.0, 1.0, 0.0, 1.0)
plbox("bc", 0.0, 0, "bc", 0.0, 0)
vmin = vmin + 0.1
vmax = vmax - 0.1
- plwid(1)
+ plwidth(1)
plptex(0.5, 0.5, 1.0, 0.0, 0.5, `i`)
# Demonstrate multiple windows and default color map 0 palette.
Modified: trunk/examples/tcl/x01.tcl
===================================================================
--- trunk/examples/tcl/x01.tcl 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/tcl/x01.tcl 2013-01-30 04:40:35 UTC (rev 12288)
@@ -111,9 +111,9 @@
}
$w cmd plcol0 3
- $w cmd plwid 2
+ $w cmd plwidth 2
$w cmd plline 100 x1 y1
- $w cmd plwid 1
+ $w cmd plwidth 1
}
# This is supposed to work just like the plot3() in x01c.c
Modified: trunk/examples/tcl/x02.tcl
===================================================================
--- trunk/examples/tcl/x02.tcl 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/examples/tcl/x02.tcl 2013-01-30 04:40:35 UTC (rev 12288)
@@ -124,14 +124,14 @@
set vmin 0.1
set vmax 0.9
for {set j 0} {$j <= 2} {incr j} {
- $w cmd plwid [expr $j+1]
+ $w cmd plwidth [expr $j+1]
$w cmd plvpor $vmin $vmax $vmin $vmax
$w cmd plwind 0.0 1.0 0.0 1.0
$w cmd plbox "bc" 0.0 0 "bc" 0.0 0
set vmin [expr $vmin+0.1]
set vmax [expr $vmax-0.1]
}
- $w cmd plwid 1
+ $w cmd plwidth 1
$w cmd plptex 0.5 0.5 1.0 0.0 0.5 $i
}
Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/include/plplot.h 2013-01-30 04:40:35 UTC (rev 12288)
@@ -753,6 +753,7 @@
#define plvsta c_plvsta
#define plw3d c_plw3d
#define plwid c_plwid
+#define plwidth c_plwidth
#define plwind c_plwind
#define plxormod c_plxormod
@@ -1976,7 +1977,7 @@
// Set pen width.
PLDLLIMPEXP void
-c_plwid( PLINT width );
+c_plwidth( PLFLT width );
// Set up world coordinates of the viewport boundaries (2d plots).
Modified: trunk/include/plstrm.h
===================================================================
--- trunk/include/plstrm.h 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/include/plstrm.h 2013-01-30 04:40:35 UTC (rev 12288)
@@ -554,7 +554,7 @@
// Variables governing pen width
- PLINT width;
+ PLFLT width;
PLINT widthset, widthlock;
// Variables governing arrow
Modified: trunk/src/plargs.c
===================================================================
--- trunk/src/plargs.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/src/plargs.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -1867,17 +1867,17 @@
static int
opt_width( const char * PL_UNUSED( opt ), const char *opt_arg, void * PL_UNUSED( client_data ) )
{
- int width;
+ double width;
- width = atoi( opt_arg );
- if ( width < 0 )
+ width = atof( opt_arg );
+ if ( width < 0. )
{
fprintf( stderr, "?invalid width\n" );
return 1;
}
else
{
- plwid( width );
+ plwidth( width );
plsc->widthlock = 1;
}
return 0;
Modified: trunk/src/plcore.c
===================================================================
--- trunk/src/plcore.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/src/plcore.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -11,7 +11,7 @@
// Copyright (C) 2004, 2005 Rafael Laboissiere
// Copyright (C) 2004, 2006 Andrew Ross
// Copyright (C) 2004 Andrew Roach
-// Copyright (C) 2005-2010 Alan W. Irwin
+// Copyright (C) 2005-2013 Alan W. Irwin
// Copyright (C) 2005 Thomas J. Duck
//
// This file is part of PLplot.
@@ -3624,9 +3624,9 @@
//
void
-c_plwid( PLINT width )
+c_plwidth( PLFLT width )
{
- if ( width != plsc->width && width >= 0 )
+ if ( width != plsc->width && width >= 0. )
{
plsc->width = width;
Modified: trunk/src/pllegend.c
===================================================================
--- trunk/src/pllegend.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/src/pllegend.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -820,7 +820,7 @@
{
plcol0( box_colors[i] );
plpsty( box_patterns[i] );
- plwid( box_line_widths[i] );
+ plwidth( box_line_widths[i] );
xbox[0] = plot_x_subpage + xshift;
xbox[1] = xbox[0];
xbox[2] = plot_x_end_subpage + xshift;
@@ -831,20 +831,20 @@
ybox[3] = ty + 0.5 * drow * box_scales[i];
plfill( 4, xbox, ybox );
pllsty( line_style_save );
- plwid( line_width_save );
+ plwidth( line_width_save );
}
if ( opt_array[i] & PL_LEGEND_LINE )
{
plcol0( line_colors[i] );
pllsty( line_styles[i] );
- plwid( line_widths[i] );
+ plwidth( line_widths[i] );
xl[0] = plot_x_subpage + xshift;
xl[1] = plot_x_end_subpage + xshift;
yl[0] = ty;
yl[1] = ty;
plline( 2, xl, yl );
pllsty( line_style_save );
- plwid( line_width_save );
+ plwidth( line_width_save );
}
if ( opt_array[i] & PL_LEGEND_SYMBOL )
Modified: trunk/src/plot3d.c
===================================================================
--- trunk/src/plot3d.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/src/plot3d.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -553,7 +553,7 @@
bx[2] = ( ixOrigin != ixmin && ixSlow == 0 ) || ixSlow > 0 ? xmax : xmin;
by[2] = ( iyOrigin != iymin && iySlow == 0 ) || iySlow > 0 ? ymax : ymin;
- plwid( zbwidth );
+ plwidth( zbwidth );
plcol0( zbcol );
for ( tp = tick * floor( zmin / tick ) + tick; tp <= zmax; tp += tick )
{
@@ -565,7 +565,7 @@
by[0] = by[1];
bz[0] = zmin;
plline3( 2, bx, by, bz );
- plwid( width );
+ plwidth( width );
plcol0( color );
}
@@ -1432,10 +1432,10 @@
{
color = plsc->icol0;
width = plsc->width;
- plwid( zbwidth );
+ plwidth( zbwidth );
plcol0( zbcol );
plgrid3( zbtck );
- plwid( width );
+ plwidth( width );
plcol0( color );
}
Modified: trunk/src/plshade.c
===================================================================
--- trunk/src/plshade.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/src/plshade.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -272,7 +272,7 @@
init_color = plsc->icol0;
init_width = plsc->width;
plcol0( cont_color );
- plwid( cont_width );
+ plwidth( cont_width );
if ( pltr )
{
plfcont( zops->f2eval, zp, nx, ny, 1, nx, 1, ny, clevel, nlevel, pltr, pltr_data );
@@ -306,7 +306,7 @@
free( y );
}
plcol0( init_color );
- plwid( init_width );
+ plwidth( init_width );
}
}
@@ -520,7 +520,7 @@
pen_wd_max = max_width;
plstyl( (PLINT) 0, NULL, NULL );
- plwid( sh_width );
+ plwidth( sh_width );
if ( fill != NULL )
{
switch ( sh_cmap )
@@ -788,7 +788,7 @@
if ( fill != NULL )
{
- plwid( sh_width );
+ plwidth( sh_width );
if ( sh_cmap == 0 )
plcol0( (PLINT) sh_color );
else if ( sh_cmap == 1 )
@@ -804,7 +804,7 @@
free( c );
free( a );
- plwid( init_width );
+ plwidth( init_width );
}
//--------------------------------------------------------------------------
@@ -1166,7 +1166,7 @@
if ( pen_col_min != 0 && pen_wd_min != 0 && min_points != 0 )
{
plcol0( pen_col_min );
- plwid( pen_wd_min );
+ plwidth( pen_wd_min );
if ( min_points == 4 && slope == 0 )
{
// swap points 1 and 3
@@ -1184,7 +1184,7 @@
if ( pen_col_max != 0 && pen_wd_max != 0 && max_points != 0 )
{
plcol0( pen_col_max );
- plwid( pen_wd_max );
+ plwidth( pen_wd_max );
if ( max_points == 4 && slope == 0 )
{
// swap points 1 and 3
Modified: trunk/sys/win-tk/tclgen.c
===================================================================
--- trunk/sys/win-tk/tclgen.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/sys/win-tk/tclgen.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -5150,13 +5150,13 @@
}
/*--------------------------------------------------------------------------*\
- * plwidCmd
+ * plwidthCmd
*
- * Processes plwid Tcl command.
+ * Processes plwidth Tcl command.
\*--------------------------------------------------------------------------*/
static int
-plwidCmd( ClientData clientData, Tcl_Interp *interp, int argc, char *argv[] )
+plwidthCmd( ClientData clientData, Tcl_Interp *interp, int argc, char *argv[] )
{
PLINT width;
@@ -5164,7 +5164,7 @@
if ( (argc == 2) && (strncmp(argv[1],"-help",strlen(argv[1])) == 0) ) {
Tcl_AppendResult( interp, "command syntax: \"",
- "plwid width", "\"",
+ "plwidth width", "\"",
(char *) NULL);
return TCL_ERROR;
}
@@ -5173,14 +5173,14 @@
(!0 && !0 && (argc != (1 + 1))) ||
( 0 && (argc != 1) && (argc != (1 + 1))) ) {
Tcl_AppendResult( interp, "wrong # args: should be \"",
- "plwid width", "\"",
+ "plwidth width", "\"",
(char *) NULL);
return TCL_ERROR;
}
width = atoi(argv[1+0]);
- plwid ( width );
+ plwidth ( width );
if (errcode != 0) {
Modified: trunk/sys/win-tk/tclgen.h
===================================================================
--- trunk/sys/win-tk/tclgen.h 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/sys/win-tk/tclgen.h 2013-01-30 04:40:35 UTC (rev 12288)
@@ -99,6 +99,6 @@
static int plvporCmd( ClientData, Tcl_Interp *, int, char **);
static int plvstaCmd( ClientData, Tcl_Interp *, int, char **);
static int plw3dCmd( ClientData, Tcl_Interp *, int, char **);
-static int plwidCmd( ClientData, Tcl_Interp *, int, char **);
+static int plwidthCmd( ClientData, Tcl_Interp *, int, char **);
static int plwindCmd( ClientData, Tcl_Interp *, int, char **);
static int plxormodCmd( ClientData, Tcl_Interp *, int, char **);
Modified: trunk/sys/win-tk/tclgen_s.h
===================================================================
--- trunk/sys/win-tk/tclgen_s.h 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/sys/win-tk/tclgen_s.h 2013-01-30 04:40:35 UTC (rev 12288)
@@ -99,6 +99,6 @@
{"plvpor", plvporCmd},
{"plvsta", plvstaCmd},
{"plw3d", plw3dCmd},
- {"plwid", plwidCmd},
+ {"plwidth", plwidthCmd},
{"plwind", plwindCmd},
{"plxormod", plxormodCmd},
Modified: trunk/utils/plrender.c
===================================================================
--- trunk/utils/plrender.c 2013-01-30 01:06:02 UTC (rev 12287)
+++ trunk/utils/plrender.c 2013-01-30 04:40:35 UTC (rev 12288)
@@ -972,7 +972,7 @@
plm_rd( pdf_rd_2bytes( pdfs, &width ) );
- plwid( width );
+ plwidth( width );
break;
}
@@ -1931,7 +1931,7 @@
if ( !strcmp( tag, "width" ) )
{
plm_rd( pdf_rd_1byte( pdfs, &dum_uchar ) );
- plwid( dum_uchar );
+ plwidth( dum_uchar );
continue;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
