Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[13093] trunk/examples
|
From: <ai...@us...> - 2014-04-02 07:42:11
|
Revision: 13093
http://sourceforge.net/p/plplot/code/13093
Author: airwin
Date: 2014-04-02 07:42:07 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Change from "*" ==> "#(728)" for the symbol that is plotted.
This change is from a simple ascii asterisk to the Hershey-indexed
asterisk operator symbol which for both Hershey and Unicode fonts has
much better vertical alignment. The result is much improved looking
plots for standard examples 4, 26 and 33.
Tested on Linux using the test_diff_psc target.
Modified Paths:
--------------
trunk/examples/ada/x04a.adb
trunk/examples/ada/x26a.adb
trunk/examples/ada/x33a.adb
trunk/examples/ada/xthick04a.adb
trunk/examples/ada/xthick26a.adb
trunk/examples/ada/xthick33a.adb
trunk/examples/c/x04c.c
trunk/examples/c/x26c.c
trunk/examples/c/x33c.c
trunk/examples/c++/x04.cc
trunk/examples/c++/x26.cc
trunk/examples/c++/x33.cc
trunk/examples/d/x04d.d
trunk/examples/d/x26d.d
trunk/examples/d/x33d.d
trunk/examples/f95/x04f.f90
trunk/examples/f95/x26f.f90
trunk/examples/f95/x33f.f90
trunk/examples/java/x04.java
trunk/examples/java/x26.java
trunk/examples/java/x33.java
trunk/examples/lua/x04.lua
trunk/examples/lua/x26.lua
trunk/examples/lua/x33.lua
trunk/examples/ocaml/x04.ml
trunk/examples/ocaml/x26.ml
trunk/examples/ocaml/x33.ml
trunk/examples/octave/x04c.m
trunk/examples/octave/x26c.m
trunk/examples/octave/x33c.m
trunk/examples/python/xw04.py
trunk/examples/python/xw26.py
trunk/examples/python/xw33.py
trunk/examples/tcl/x04.tcl
trunk/examples/tcl/x26.tcl
trunk/examples/tcl/x33.tcl
Modified: trunk/examples/ada/x04a.adb
===================================================================
--- trunk/examples/ada/x04a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/x04a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -80,7 +80,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql, phase);
- plstring(freql, phase, "*");
+ plstring(freql, phase, "#(728)");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, "Phase shift (degrees)");
end if;
@@ -110,7 +110,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
-- Second legend entry.
opt_array(1) := Legend_Line + Legend_Symbol;
@@ -122,7 +122,7 @@
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
- symbols(1) := To_Unbounded_String("*");
+ symbols(1) := To_Unbounded_String("#(728)");
pllegend(legend_width, legend_height,
Legend_Background + Legend_Bounding_Box, 0,
@@ -159,7 +159,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
Box_Colors(0) := 0;
Box_Patterns(0) := 0;
Box_Line_Widths(0) := 0.0;
Modified: trunk/examples/ada/x26a.adb
===================================================================
--- trunk/examples/ada/x26a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/x26a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -172,7 +172,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql, phase);
- plstring(freql, phase, "*");
+ plstring(freql, phase, "#(728)");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, alty_label);
@@ -186,7 +186,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
-- Second legend entry.
opt_array(1) := Legend_Line + Legend_Symbol;
@@ -197,7 +197,7 @@
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
- symbols(1) := To_Unbounded_String("*");
+ symbols(1) := To_Unbounded_String("#(728)");
plscol0a(15, 32, 32, 32, 0.70);
pllegend(legend_width, legend_height,
Modified: trunk/examples/ada/x33a.adb
===================================================================
--- trunk/examples/ada/x33a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/x33a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -304,7 +304,7 @@
line_widths(0) := 1.0;
symbol_scales(0) := 1.0;
symbol_numbers(0) := 4;
- symbols(0) := TUB("*");
+ symbols(0) := TUB("#(728)");
-- Use monotype fonts so that all legends are the same size.
plsfont(PL_FCI_MONO, -1, -1);
@@ -369,7 +369,7 @@
line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
- symbols(k) := TUB("*");
+ symbols(k) := TUB("#(728)");
-- Make 2-digit strings with leading 0 for 0 .. 9.
if k >= 10 then
text(k) := To_Unbounded_String(Trim(Integer'image(k), Left));
@@ -538,7 +538,7 @@
line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
- symbols(k) := TUB("*");
+ symbols(k) := TUB("#(728)");
-- Make 2-digit strings with leading 0 for 0 .. 9.
if k >= 10 then
text(k) := To_Unbounded_String(Trim(Integer'image(k), Left));
Modified: trunk/examples/ada/xthick04a.adb
===================================================================
--- trunk/examples/ada/xthick04a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/xthick04a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -80,7 +80,7 @@
Box_Around_Viewport("", 0.0, 0, "cmstv", 30.0, 3);
Set_Pen_Color(Green);
Draw_Curve(freql, phase);
- Draw_String(freql, phase, "*");
+ Draw_String(freql, phase, "#(728)");
Set_Pen_Color(Green);
Write_Text_Viewport("r", 5.0, 0.5, 0.5, "Phase shift (degrees)");
end if;
@@ -110,7 +110,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
-- Second legend entry.
opt_array(1) := Legend_Line + Legend_Symbol;
@@ -122,7 +122,7 @@
symbol_colors(1) := Green;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
- symbols(1) := To_Unbounded_String("*");
+ symbols(1) := To_Unbounded_String("#(728)");
Create_Legend(legend_width, legend_height,
Legend_Background + Legend_Bounding_Box, 0,
@@ -159,7 +159,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
Box_Colors(0) := 0;
Box_Patterns(0) := 0;
Box_Line_Widths(0) := 0.0;
Modified: trunk/examples/ada/xthick26a.adb
===================================================================
--- trunk/examples/ada/xthick26a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/xthick26a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -172,7 +172,7 @@
Box_Around_Viewport("", 0.0, 0, "cmstv", 30.0, 3);
Set_Pen_Color(Green);
Draw_Curve(freql, phase);
- Draw_String(freql, phase, "*");
+ Draw_String(freql, phase, "#(728)");
Set_Pen_Color(Green);
Write_Text_Viewport("r", 5.0, 0.5, 0.5, alty_label);
@@ -186,7 +186,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
-- Second legend entry.
opt_array(1) := Legend_Line + Legend_Symbol;
@@ -197,7 +197,7 @@
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
- symbols(1) := To_Unbounded_String("*");
+ symbols(1) := To_Unbounded_String("#(728)");
Set_One_Color_Map_0_And_Alpha(15, 32, 32, 32, 0.70);
Create_Legend(legend_width, legend_height,
Modified: trunk/examples/ada/xthick33a.adb
===================================================================
--- trunk/examples/ada/xthick33a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/xthick33a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -304,7 +304,7 @@
line_widths(0) := 1.0;
symbol_scales(0) := 1.0;
symbol_numbers(0) := 4;
- symbols(0) := TUB("*");
+ symbols(0) := TUB("#(728)");
-- Use monotype fonts so that all legends are the same size.
Set_Font(PL_FCI_MONO, -1, -1);
@@ -369,7 +369,7 @@
line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
- symbols(k) := TUB("*");
+ symbols(k) := TUB("#(728)");
-- Make 2-digit strings with leading 0 for 0 .. 9.
if k >= 10 then
text(k) := To_Unbounded_String(Trim(Integer'image(k), Left));
@@ -538,7 +538,7 @@
line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
- symbols(k) := TUB("*");
+ symbols(k) := TUB("#(728)");
-- Make 2-digit strings with leading 0 for 0 .. 9.
if k >= 10 then
text(k) := To_Unbounded_String(Trim(Integer'image(k), Left));
Modified: trunk/examples/c/x04c.c
===================================================================
--- trunk/examples/c/x04c.c 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c/x04c.c 2014-04-02 07:42:07 UTC (rev 13093)
@@ -109,7 +109,7 @@
plbox( "", 0.0, 0, "cmstv", 30.0, 3 );
plcol0( 3 );
plline( 101, freql, phase );
- plstring( 101, freql, phase, "*" );
+ plstring( 101, freql, phase, "#(728)" );
plcol0( 3 );
plmtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
nlegend = 2;
@@ -138,7 +138,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/c/x26c.c
===================================================================
--- trunk/examples/c/x26c.c 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c/x26c.c 2014-04-02 07:42:07 UTC (rev 13093)
@@ -211,7 +211,7 @@
plbox( "", 0.0, 0, "cmstv", 30.0, 3 );
plcol0( 3 );
plline( 101, freql, phase );
- plstring( 101, freql, phase, "*" );
+ plstring( 101, freql, phase, "#(728)" );
plcol0( 3 );
plmtex( "r", 5.0, 0.5, 0.5, alty_label );
}
@@ -234,7 +234,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/c/x33c.c
===================================================================
--- trunk/examples/c/x33c.c 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c/x33c.c 2014-04-02 07:42:07 UTC (rev 13093)
@@ -353,7 +353,7 @@
line_widths[0] = 1.;
symbol_scales[0] = 1.;
symbol_numbers[0] = 4;
- symbols[0] = "*";
+ symbols[0] = "#(728)";
// Use monotype fonts so that all legends are the same size.
plsfont( PL_FCI_MONO, -1, -1 );
@@ -399,7 +399,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
sprintf( text[k], "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
@@ -539,7 +539,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
sprintf( text[k], "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
Modified: trunk/examples/c++/x04.cc
===================================================================
--- trunk/examples/c++/x04.cc 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c++/x04.cc 2014-04-02 07:42:07 UTC (rev 13093)
@@ -135,7 +135,7 @@
pls->box( "", 0.0, 0, "cmstv", 30.0, 3 );
pls->col0( 3 );
pls->line( 101, freql, phase );
- pls->string( 101, freql, phase, "*" );
+ pls->string( 101, freql, phase, "#(728)" );
pls->col0( 3 );
pls->mtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
nlegend = 2;
@@ -162,7 +162,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/c++/x26.cc
===================================================================
--- trunk/examples/c++/x26.cc 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c++/x26.cc 2014-04-02 07:42:07 UTC (rev 13093)
@@ -220,7 +220,7 @@
pls->box( "", 0.0, 0, "cmstv", 30.0, 3 );
pls->col0( 3 );
pls->line( 101, freql, phase );
- pls->string( 101, freql, phase, "*" );
+ pls->string( 101, freql, phase, "#(728)" );
pls->col0( 3 );
pls->mtex( "r", 5.0, 0.5, 0.5, alty_label );
}
@@ -244,7 +244,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/c++/x33.cc
===================================================================
--- trunk/examples/c++/x33.cc 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c++/x33.cc 2014-04-02 07:42:07 UTC (rev 13093)
@@ -358,7 +358,7 @@
line_widths[0] = 1.0;
symbol_scales[0] = 1.;
symbol_numbers[0] = 4;
- symbols[0] = "*";
+ symbols[0] = "#(728)";
// Use monotype fonts so that all legends are the same size.
pls->sfont( PL_FCI_MONO, -1, -1 );
@@ -404,7 +404,7 @@
line_widths[k] = 1.0;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
sprintf( text[k], "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
@@ -544,7 +544,7 @@
line_widths[k] = 1.0;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
sprintf( text[k], "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
Modified: trunk/examples/d/x04d.d
===================================================================
--- trunk/examples/d/x04d.d 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/d/x04d.d 2014-04-02 07:42:07 UTC (rev 13093)
@@ -103,7 +103,7 @@
plbox( "", 0.0, 0, "cmstv", 30.0, 3 );
plcol0( 3 );
plline( freql, phase );
- plstring( freql, phase, "*" );
+ plstring( freql, phase, "#(728)" );
plcol0( 3 );
plmtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
@@ -151,7 +151,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// Note from the above opt_array the second box array indices
// do not have to be specified
}
Modified: trunk/examples/d/x26d.d
===================================================================
--- trunk/examples/d/x26d.d 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/d/x26d.d 2014-04-02 07:42:07 UTC (rev 13093)
@@ -200,7 +200,7 @@
plbox( "", 0.0, 0, "cmstv", 30.0, 3 );
plcol0( 3 );
plline( freql, phase );
- plstring( freql, phase, "*" );
+ plstring( freql, phase, "#(728)" );
plcol0( 3 );
plmtex( "r", 5.0, 0.5, 0.5, alty_label );
}
@@ -238,7 +238,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// Note from the above opt_array the second box array indices
// do not have to be specified
Modified: trunk/examples/d/x33d.d
===================================================================
--- trunk/examples/d/x33d.d 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/d/x33d.d 2014-04-02 07:42:07 UTC (rev 13093)
@@ -324,7 +324,7 @@
line_widths[0] = 1.;
symbol_scales[0] = 1.;
symbol_numbers[0] = 4;
- symbols[0] = "*";
+ symbols[0] = "#(728)";
// Use monotype fonts so that all legends are the same size.
plsfont( PL_FCI_MONO, -1, -1 );
@@ -370,7 +370,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
text[k] = format( "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
@@ -510,7 +510,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
text[k] = format( "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
Modified: trunk/examples/f95/x04f.f90
===================================================================
--- trunk/examples/f95/x04f.f90 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/f95/x04f.f90 2014-04-02 07:42:07 UTC (rev 13093)
@@ -47,7 +47,7 @@
integer :: box_colors(0), box_patterns(0)
real(kind=plflt) :: box_line_widths(0)
character(len=20) :: text(2)
- character(len=1) :: symbols(2)
+ character(len=20) :: symbols(2)
call pladv(0)
! Set up data for log plot.
@@ -85,7 +85,7 @@
call plbox(' ', 0.0_plflt, 0, 'cmstv', 30.0_plflt, 3)
call plcol0(3)
call plline(freql, phase)
- call plstring(freql, phase, '*')
+ call plstring(freql, phase, "#(728)")
call plcol0(3)
call plmtex('r', 5.0_plflt, 0.5_plflt, 0.5_plflt, &
'Phase shift (degrees)')
@@ -116,7 +116,7 @@
symbol_colors(2) = 3
symbol_scales(2) = 1.0
symbol_numbers(2) = 4
- symbols(2) = '*'
+ symbols(2) = "#(728)"
! from the above opt_arrays we can completely ignore everything
! to do with boxes. (Hence the size 0 for the associated arrays)
Modified: trunk/examples/f95/x26f.f90
===================================================================
--- trunk/examples/f95/x26f.f90 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/f95/x26f.f90 2014-04-02 07:42:07 UTC (rev 13093)
@@ -207,7 +207,7 @@
call plbox("", 0.0_plflt, 0, "cmstv", 30.0_plflt, 3)
call plcol0(3)
call plline(freql, phase)
- call plstring(freql, phase, '*')
+ call plstring(freql, phase, "#(728)")
call plcol0(3)
call plmtex("r", 5.0_plflt, 0.5_plflt, 0.5_plflt, alty_label)
endif
@@ -239,7 +239,7 @@
symbol_colors(2) = 3
symbol_scales(2) = 1.
symbol_numbers(2) = 4
- symbols(2) = "*"
+ symbols(2) = "#(728)"
! from the above opt_arrays we can completely ignore everything
! to do with boxes.
Modified: trunk/examples/f95/x33f.f90
===================================================================
--- trunk/examples/f95/x33f.f90 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/f95/x33f.f90 2014-04-02 07:42:07 UTC (rev 13093)
@@ -54,7 +54,7 @@
integer :: symbol_numbers(MAX_NLEGEND), symbol_colors(MAX_NLEGEND)
real(kind=plflt) :: symbol_scales(MAX_NLEGEND)
character(len=200) :: text(MAX_NLEGEND)
- character(len=3) :: symbols(MAX_NLEGEND)
+ character(len=20) :: symbols(MAX_NLEGEND)
real(kind=plflt) :: legend_width, legend_height, x, y, xstart, ystart
real(kind=plflt) :: max_height, text_scale
integer :: opt_base, nrow, ncolumn
@@ -190,7 +190,7 @@
line_widths(1) = 1
symbol_scales(1) = 1._plflt
symbol_numbers(1) = 4
- symbols(1) = '*'
+ symbols(1) = "#(728)"
! Use monotype fonts so that all legends are the same size.
call plsfont( PL_FCI_MONO, -1, -1 )
@@ -239,7 +239,7 @@
line_widths(k) = 1
symbol_scales(k) = 1._plflt
symbol_numbers(k) = 2
- symbols(k) = '*'
+ symbols(k) = "#(728)"
write( text(k), '(i2.2)' ) k-1
text_colors(k) = 1 + mod( k-1, 8 )
line_colors(k) = 1 + mod( k-1, 8 )
@@ -385,7 +385,7 @@
line_widths(k) = 1
symbol_scales(k) = 1._plflt
symbol_numbers(k) = 2
- symbols(k) = '*'
+ symbols(k) = "#(728)"
write( text(k), '(i2.2)' ) k-1
text_colors(k) = 1 + mod( k-1, 8 )
line_colors(k) = 1 + mod( k-1, 8 )
Modified: trunk/examples/java/x04.java
===================================================================
--- trunk/examples/java/x04.java 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/java/x04.java 2014-04-02 07:42:07 UTC (rev 13093)
@@ -135,7 +135,7 @@
pls.box( "", 0.0, 0, "cmstv", 30.0, 3 );
pls.col0( 3 );
pls.line( freql, phase );
- pls.string( freql, phase, "*" );
+ pls.string( freql, phase, "#(728)" );
pls.col0( 3 );
pls.mtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
nlegend = 2;
@@ -177,7 +177,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
}
// from the above opt_arrays we can completely ignore everything
Modified: trunk/examples/java/x26.java
===================================================================
--- trunk/examples/java/x26.java 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/java/x26.java 2014-04-02 07:42:07 UTC (rev 13093)
@@ -215,7 +215,7 @@
pls.box( "", 0.0, 0, "cmstv", 30.0, 3 );
pls.col0( 3 );
pls.line( freql, phase );
- pls.string( freql, phase, "*" );
+ pls.string( freql, phase, "#(728)" );
pls.col0( 3 );
pls.mtex( "r", 5.0, 0.5, 0.5, alty_label );
}
@@ -241,7 +241,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/java/x33.java
===================================================================
--- trunk/examples/java/x33.java 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/java/x33.java 2014-04-02 07:42:07 UTC (rev 13093)
@@ -341,7 +341,7 @@
line_widths[0] = 1.;
symbol_scales[0] = 1.;
symbol_numbers[0] = 4;
- symbols[0] = "*";
+ symbols[0] = "#(728)";
// Use monotype fonts so that all legends are the same size.
pls.sfont( PL_FCI_MONO, -1, -1 );
@@ -401,7 +401,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
text[k] = nf.format( k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
@@ -556,7 +556,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
text[k] = nf.format( k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
Modified: trunk/examples/lua/x04.lua
===================================================================
--- trunk/examples/lua/x04.lua 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/lua/x04.lua 2014-04-02 07:42:07 UTC (rev 13093)
@@ -92,7 +92,7 @@
pl.box("", 0, 0, "cmstv", 30, 3)
pl.col0(3)
pl.line(freql, phase)
- pl.string(freql, phase, "*")
+ pl.string(freql, phase, "#(728)")
pl.col0(3)
pl.mtex("r", 5, 0.5, 0.5, "Phase shift (degrees)")
nlegend = 2
@@ -150,7 +150,7 @@
symbol_colors[2] = 3
symbol_scales[2] = 1.
symbol_numbers[2] = 4
- symbols[2] = "*"
+ symbols[2] = "#(728)"
end
pl.scol0a( 15, 32, 32, 32, 0.70 )
Modified: trunk/examples/lua/x26.lua
===================================================================
--- trunk/examples/lua/x26.lua 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/lua/x26.lua 2014-04-02 07:42:07 UTC (rev 13093)
@@ -142,7 +142,7 @@
pl.box("", 0, 0, "cmstv", 30, 3)
pl.col0(3)
pl.line(freql, phase)
- pl.string(freql, phase, "*")
+ pl.string(freql, phase, "#(728)")
pl.col0(3)
pl.mtex("r", 5, 0.5, 0.5, alty_label)
nlegend = 2
@@ -200,7 +200,7 @@
symbol_colors[2] = 3
symbol_scales[2] = 1.
symbol_numbers[2] = 4
- symbols[2] = "*"
+ symbols[2] = "#(728)"
end
pl.scol0a( 15, 32, 32, 32, 0.70 )
Modified: trunk/examples/lua/x33.lua
===================================================================
--- trunk/examples/lua/x33.lua 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/lua/x33.lua 2014-04-02 07:42:07 UTC (rev 13093)
@@ -310,7 +310,7 @@
line_widths[1] = 1.
symbol_scales[1] = 1.0
symbol_numbers[1] = 4
-symbols[1] = "*"
+symbols[1] = "#(728)"
-- Use monotype fonts so that all legends are the same size.
pl.sfont(pl.PL_FCI_MONO, -1, -1)
@@ -355,7 +355,7 @@
line_widths[k+1] = 1.
symbol_scales[k+1] = 1.0
symbol_numbers[k+1] = 2
- symbols[k+1] = "*"
+ symbols[k+1] = "#(728)"
text[k+1] = string.format("%2.2d", k)
text_colors[k+1] = 1 + (k % 8)
line_colors[k+1] = 1 + (k % 8)
@@ -495,7 +495,7 @@
line_widths[k+1] = 1.
symbol_scales[k+1] = 1.0
symbol_numbers[k+1] = 2
- symbols[k+1] = "*"
+ symbols[k+1] = "#(728)"
text[k+1] = string.format("%2.2d", k)
text_colors[k+1] = 1 + (k % 8)
line_colors[k+1] = 1 + (k % 8)
Modified: trunk/examples/ocaml/x04.ml
===================================================================
--- trunk/examples/ocaml/x04.ml 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ocaml/x04.ml 2014-04-02 07:42:07 UTC (rev 13093)
@@ -62,7 +62,7 @@
plbox "" 0.0 0 "cmstv" 30.0 3;
plcol0 3;
plline freql phase;
- plstring freql phase "*";
+ plstring freql phase "#(728)";
plcol0 3;
plmtex "r" 5.0 0.5 0.5 "Phase shift (degrees)";
@@ -81,7 +81,7 @@
let symbol_colors = [| 0; 3 |] in
let symbol_scales = [| 0.0; 1.0 |] in
let symbol_numbers = [| 0; 4 |] in
- let symbols = [| ""; "*" |] in
+ let symbols = [| ""; "#(728)" |] in
(* from the above opt_arrays we can completely ignore everything
to do with boxes *)
Modified: trunk/examples/ocaml/x26.ml
===================================================================
--- trunk/examples/ocaml/x26.ml 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ocaml/x26.ml 2014-04-02 07:42:07 UTC (rev 13093)
@@ -155,7 +155,7 @@
plbox "" 0.0 0 "cmstv" 30.0 3;
plcol0 3;
plline freql phase;
- plstring freql phase "*";
+ plstring freql phase "#(728)";
plcol0 3;
plmtex "r" 5.0 0.5 0.5 alty_label;
);
@@ -174,7 +174,7 @@
let symbol_colors = [| 0; 3 |] in
let symbol_scales = [| 0.0; 1.0 |] in
let symbol_numbers = [| 0; 4 |] in
- let symbols = [| ""; "*" |] in
+ let symbols = [| ""; "#(728)" |] in
(* from the above opt_arrays we can completely ignore everything
to do with boxes *)
Modified: trunk/examples/ocaml/x33.ml
===================================================================
--- trunk/examples/ocaml/x33.ml 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ocaml/x33.ml 2014-04-02 07:42:07 UTC (rev 13093)
@@ -103,7 +103,7 @@
line_widths.(0) <- 1.0;
symbol_scales.(0) <- 1.;
symbol_numbers.(0) <- 4;
- symbols.(0) <- "*";
+ symbols.(0) <- "#(728)";
(* Use monotype fonts so that all legends are the same size. *)
plsfont PL_FCI_MONO PL_FCI_STYLE_UNCHANGED PL_FCI_WEIGHT_UNCHANGED;
@@ -150,7 +150,7 @@
line_widths.(k) <- 1.0;
symbol_scales.(k) <- 1.0;
symbol_numbers.(k) <- 2;
- symbols.(k) <- "*";
+ symbols.(k) <- "#(728)";
text.(k) <- sprintf "%2.2d" k;
text_colors.(k) <- 1 + (k mod 8);
line_colors.(k) <- 1 + (k mod 8);
@@ -309,7 +309,7 @@
line_widths.(k) <- 1.0;
symbol_scales.(k) <- 1.;
symbol_numbers.(k) <- 2;
- symbols.(k) <- "*";
+ symbols.(k) <- "#(728)";
text.(k) <- sprintf "%2.2d" k;
text_colors.(k) <- 1 + (k mod 8);
line_colors.(k) <- 1 + (k mod 8);
Modified: trunk/examples/octave/x04c.m
===================================================================
--- trunk/examples/octave/x04c.m 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/octave/x04c.m 2014-04-02 07:42:07 UTC (rev 13093)
@@ -89,7 +89,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql', phase');
- plstring(freql', phase', "*");
+ plstring(freql', phase', "#(728)");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, "Phase shift (degrees)");
nlegend = 2;
@@ -150,7 +150,7 @@
symbol_colors(2) = 3;
symbol_scales(2) = 1.;
symbol_numbers(2) = 4;
- symbols(2,1:length("*")) = "*";
+ symbols(2,1:length("#(768)")) = "#(728)";
endif
plscol0a( 15, 32, 32, 32, 0.70 );
Modified: trunk/examples/octave/x26c.m
===================================================================
--- trunk/examples/octave/x26c.m 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/octave/x26c.m 2014-04-02 07:42:07 UTC (rev 13093)
@@ -168,7 +168,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql', phase');
- plstring(freql', phase', "*");
+ plstring(freql', phase', "#(728)");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, alty_label);
nlegend = 2;
@@ -235,7 +235,7 @@
symbol_colors(2) = 3;
symbol_scales(2) = 1.;
symbol_numbers(2) = 4;
- symbols(2,1:length("*")) = "*";
+ symbols(2,1:length("#(728)")) = "#(728)";
endif
plscol0a( 15, 32, 32, 32, 0.70 );
Modified: trunk/examples/octave/x33c.m
===================================================================
--- trunk/examples/octave/x33c.m 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/octave/x33c.m 2014-04-02 07:42:07 UTC (rev 13093)
@@ -296,7 +296,7 @@
line_styles(1) = 1;
line_widths(1) = 1.;
symbol_scales(1) = 1.; symbol_numbers(1) = 4;
- symbols(1,1:length("*")) = "*";
+ symbols(1,1:length("#(728)")) = "#(728)";
## Use monotype fonts so that all legends are the same size.
plsfont( PL_FCI_MONO , -1, -1);
@@ -373,7 +373,7 @@
line_widths(k+1) = 1.;
symbol_scales(k+1) = 1.;
symbol_numbers(k+1) = 2;
- symbols(k+1,1:length("*")) = "*";
+ symbols(k+1,1:length("#(728)")) = "#(728)";
string = sprintf("%2.2d",k);
text(k+1,1:length(string)) = string;
text_colors(k+1) = 1 + mod(k,8);
@@ -551,7 +551,7 @@
line_widths(k+1) = 1.;
symbol_scales(k+1) = 1.;
symbol_numbers(k+1) = 2;
- symbols(k+1,1:length("*")) = "*";
+ symbols(k+1,1:length("#(728)")) = "#(728)";
string = sprintf("%2.2d",k);
text(k+1,1:length(string)) = string;
text_colors(k+1) = 1 + mod(k,8);
Modified: trunk/examples/python/xw04.py
===================================================================
--- trunk/examples/python/xw04.py 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/python/xw04.py 2014-04-02 07:42:07 UTC (rev 13093)
@@ -72,7 +72,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3)
plcol0(3)
plline(freql, phase)
- plstring(freql, phase, "*")
+ plstring(freql, phase, "#(728)")
plcol0(3)
plmtex("r", 5.0, 0.5, 0.5, "Phase shift (degrees)")
nlegend = 2
@@ -117,7 +117,7 @@
symbol_colors[1] = 3
symbol_scales[1] = 1.
symbol_numbers[1] = 4
- symbols[1] = "*"
+ symbols[1] = "#(728)"
plscol0a( 15, 32, 32, 32, 0.70 )
Modified: trunk/examples/python/xw26.py
===================================================================
--- trunk/examples/python/xw26.py 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/python/xw26.py 2014-04-02 07:42:07 UTC (rev 13093)
@@ -142,7 +142,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3)
plcol0(3)
plline(freql, phase)
- plstring(freql, phase, "*")
+ plstring(freql, phase, "#(728)")
plcol0(3)
plmtex("r", 5.0, 0.5, 0.5, alty_label)
nlegend = 2
@@ -189,7 +189,7 @@
symbol_colors[1] = 3
symbol_scales[1] = 1.
symbol_numbers[1] = 4
- symbols[1] = "*"
+ symbols[1] = "#(728)"
plscol0a( 15, 32, 32, 32, 0.70 )
Modified: trunk/examples/python/xw33.py
===================================================================
--- trunk/examples/python/xw33.py 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/python/xw33.py 2014-04-02 07:42:07 UTC (rev 13093)
@@ -244,7 +244,7 @@
line_widths[0] = 1.
symbol_scales[0] = 1.
symbol_numbers[0] = 4
- symbols[0] = "*"
+ symbols[0] = "#(728)"
# Use monotype fonts so that all legends are the same size.
plsfont(PL_FCI_MONO, -1, -1)
@@ -302,7 +302,7 @@
line_widths[k] = 1.
symbol_scales[k] = 1.
symbol_numbers[k] = 2
- symbols[k] = "*"
+ symbols[k] = "#(728)"
text[k] = "%2.2d" % k
text_colors[k] = 1 + (k % 8)
line_colors[k] = 1 + (k % 8)
@@ -454,7 +454,7 @@
line_widths[k] = 1.
symbol_scales[k] = 1.
symbol_numbers[k] = 2
- symbols[k] = "*"
+ symbols[k] = "#(728)"
text[k] = "%2.2d" % k
text_colors[k] = 1 + (k % 8)
line_colors[k] = 1 + (k % 8)
Modified: trunk/examples/tcl/x04.tcl
===================================================================
--- trunk/examples/tcl/x04.tcl 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/tcl/x04.tcl 2014-04-02 07:42:07 UTC (rev 13093)
@@ -61,7 +61,7 @@
$w cmd plbox "" 0.0 0 "cmstv" 30.0 3
$w cmd plcol0 3
$w cmd plline 101 freql phase
- $w cmd plstring 101 freql phase "*"
+ $w cmd plstring 101 freql phase "#(728)"
$w cmd plcol0 3
$w cmd plmtex "r" 5.0 0.5 0.5 "Phase shift (degrees)"
@@ -91,7 +91,7 @@
set symbol_colors [list 0 3]
set symbol_scales [list 0.0 1.0]
set symbol_numbers [list 0 4]
- set symbols [list "" "*"]
+ set symbols [list "" "#(728)"]
# from the above opt_arrays we can completely ignore everything
# to do with boxes.
Modified: trunk/examples/tcl/x26.tcl
===================================================================
--- trunk/examples/tcl/x26.tcl 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/tcl/x26.tcl 2014-04-02 07:42:07 UTC (rev 13093)
@@ -177,7 +177,7 @@
$w cmd plbox "" 0.0 0 "cmstv" 30.0 3
$w cmd plcol0 3
$w cmd plline 101 freql phase
- $w cmd plstring 101 freql phase "*"
+ $w cmd plstring 101 freql phase "#(728)"
$w cmd plcol0 3
$w cmd plmtex "r" 5.0 0.5 0.5 $alty_label
}
@@ -202,7 +202,7 @@
set symbol_colors [list 0 3]
set symbol_scales [list 0.0 1.]
set symbol_numbers [list 0 4]
- set symbols [list "" "*"]
+ set symbols [list "" "#(728)"]
# from the above opt_arrays we can completely ignore everything
# to do with boxes.
Modified: trunk/examples/tcl/x33.tcl
===================================================================
--- trunk/examples/tcl/x33.tcl 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/tcl/x33.tcl 2014-04-02 07:42:07 UTC (rev 13093)
@@ -164,7 +164,7 @@
set line_widths [list 1.]
set symbol_scales [list 1.]
set symbol_numbers [list 4]
- set symbols [list "*"]
+ set symbols [list "#(728)"]
# Use monotype fonts so that all legends are the same size.
$w cmd plsfont [expr {$::PLPLOT::PL_FCI_MONO}] -1 -1
@@ -218,7 +218,7 @@
lappend line_widths 1.
lappend symbol_scales 1.
lappend symbol_numbers 2
- lappend symbols "*"
+ lappend symbols "#(728)"
lappend text [format "%2.2d" $k]
lappend text_colors [expr {1 + $k % 8}]
lappend line_colors [expr {1 + $k % 8}]
@@ -367,7 +367,7 @@
lappend line_widths 1.
lappend symbol_scales 1.
lappend symbol_numbers 2
- lappend symbols "*"
+ lappend symbols "#(728)"
lappend text [format "%2.2d" $k]
lappend text_colors [expr {1 + $k % 8}]
lappend line_colors [expr {1 + $k % 8}]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
