From: <ai...@us...> - 2013-11-16 01:36:54
|
Revision: 12704 http://sourceforge.net/p/plplot/code/12704 Author: airwin Date: 2013-11-16 01:36:52 +0000 (Sat, 16 Nov 2013) Log Message: ----------- Replace horrible hack with searching for substrings in $argv0 to decide if tkdemos.tcl was being sourced from a plserver or wish environment. Tested by Alan W. Irwin <ai...@us...> on Linux using the test_tk_standard_examples and test_wish_standard_examples targets. Note, the second target had a segfault right after example 33 completed so investigation of that issue is ongoing. Since the horrible hack is gone, there is a reasonable chance now that these two targets (and also the test_interactive target which depends on them) will also work fine in the installed examples tree. But that case has not been tested yet. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/tk/CMakeLists.txt trunk/examples/tk/tkdemos.tcl Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-16 01:07:16 UTC (rev 12703) +++ trunk/examples/CMakeLists.txt 2013-11-16 01:36:52 UTC (rev 12704) @@ -983,21 +983,21 @@ list(APPEND targets_examples_tk test_tk_standard_examples) add_custom_target(test_wish_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples -geometry 800x600 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) add_dependencies(test_wish_standard_examples plplottcltk${LIB_TAG} tk - # FIXME, the tkwin dependency is part of the horrible hack to - # allow tkdemos.tcl to distinguish between the plserver and wish - # environments. - tkwin + xwin tcl_examples tclIndex_tcl tclIndex_tk tclIndex_examples_tk ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_wish_standard_examples test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) list(APPEND targets_examples_tk test_wish_standard_examples) if(ENABLE_itk) Modified: trunk/examples/tk/CMakeLists.txt =================================================================== --- trunk/examples/tk/CMakeLists.txt 2013-11-16 01:07:16 UTC (rev 12703) +++ trunk/examples/tk/CMakeLists.txt 2013-11-16 01:36:52 UTC (rev 12704) @@ -185,11 +185,9 @@ # wish_standard_examples is a configured shell script that runs all # the standard examples under wish using a TEA-based approach. # pkgIndex_LOCATION is the directory where the relevant pkgIndex.tcl - # file is located. FIXME! use two directories temporarily as - # part of the horrible hack currently allowing tkdemos to distinguish - # between the plserver and wish environments. + # file is located. if(CORE_BUILD) - set(pkgIndex_LOCATION "${CMAKE_BINARY_DIR}/bindings/tk-x-plat ${CMAKE_BINARY_DIR}/bindings/tk") + set(pkgIndex_LOCATION ${CMAKE_BINARY_DIR}/bindings/tk) else(CORE_BUILD) set(pkgIndex_LOCATION ${DATA_DIR}) endif(CORE_BUILD) Modified: trunk/examples/tk/tkdemos.tcl =================================================================== --- trunk/examples/tk/tkdemos.tcl 2013-11-16 01:07:16 UTC (rev 12703) +++ trunk/examples/tk/tkdemos.tcl 2013-11-16 01:36:52 UTC (rev 12704) @@ -42,17 +42,25 @@ set utf8_examples {4 18 24 26 33} -# This is hacked logic for distinguishing between the plserver -# and wish cases which requires an extra directory be lappended in -# the build tree for the Pltk case. FIXME. -if {[catch {package require Plplotter}]} { +# In order to distinguish whether this is a plserver or wish +# environment we assume that $argv0 has the string "plserver" or +# "wish" in it. Some contrived examples can be figured out where this +# assumption is not correct, and for those cases we simply emit an +# error message and return. But normally this assumption is correct, +# and it is certainly correct for our tests. +if { [string first "plserver" $argv0] >= 0 } { # use 'plserver' method plstdwin . plxframe .plw set plwin .plw.plwin -} else { +} elseif { [string first "wish" $argv0] >= 0 } { + # use 'wish" method plframe .plw set plwin .plw +} else { + puts stderr "Error: argv0 = \"$argv0\"\ndoes not contain either the substrings \"plserver\" or \"wish\"" + puts stderr "Therefore cannot decide how to proceed with tkdemos.tcl so giving up" + return } pack append . .plw {left expand fill} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-11-23 04:20:19
|
Revision: 12744 http://sourceforge.net/p/plplot/code/12744 Author: airwin Date: 2013-11-23 04:20:14 +0000 (Sat, 23 Nov 2013) Log Message: ----------- Implement the test_plserver_runAllDemos and test_wish_runAllDemos targets which do what their name implies. Tested by Alan W. Irwin <ai...@us...> on Linux using build-tree testing of the test_plserver_runAllDemos and test_wish_runAllDemos from an initially empty build tree (to test all required dependencies will be built correctly by these targets). There are a number of run-time issues with these targets that will be discussed on the plplot-devel mailing list. Because of those issues these targets are temporarily kept from being dependencies of more general interactive targets such as test_interactive. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/tk/CMakeLists.txt Added Paths: ----------- trunk/examples/tk/plserver_runAllDemos.in trunk/examples/tk/wish_runAllDemos.in Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-23 01:28:32 UTC (rev 12743) +++ trunk/examples/CMakeLists.txt 2013-11-23 04:20:14 UTC (rev 12744) @@ -1048,6 +1048,41 @@ else(USE_INCRTCL_VERSION_4) list(APPEND targets_examples_tk test_tk_04) endif(USE_INCRTCL_VERSION_4) + + add_custom_target(test_plserver_runAllDemos + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/plserver_runAllDemos + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk + ) + add_dependencies(test_plserver_runAllDemos + plserver + tcl_examples + tclIndex_tcl + tclIndex_tk + tclIndex_examples_tk + ) + + message(STATUS "WARNING: The test_plserver_runAlldemos target can be run independently but + there are several issues with this target so it is temporarily excluded from being a + dependency of other more general interactive test targets") + #list(APPEND targets_examples_tk test_plserver_runAllDemos) + + add_custom_target(test_wish_runAllDemos + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos -geometry 800x600 + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk + ) + add_dependencies(test_wish_runAllDemos + plplottcltk${LIB_TAG} + tkwin + tcl_examples + tclIndex_tcl + tclIndex_tk + tclIndex_examples_tk + ) + message(STATUS "WARNING: The test_wish_runAlldemos target can be run independently but + there are several issues with this target so it is temporarily excluded from being a + dependency of other more general interactive test targets") + # list(APPEND targets_examples_tk test_wish_runAlldemos) + endif(ENABLE_itk) endif(ENABLE_tk AND PLD_tk) Modified: trunk/examples/tk/CMakeLists.txt =================================================================== --- trunk/examples/tk/CMakeLists.txt 2013-11-23 01:28:32 UTC (rev 12743) +++ trunk/examples/tk/CMakeLists.txt 2013-11-23 04:20:14 UTC (rev 12744) @@ -142,10 +142,21 @@ # standard_examples is a configured shell script that runs all the standard # examples under plserver. -set(tk_SCRIPTS tk01 tk03 plgrid standard_examples wish_standard_examples) -# The second and fourth Tk examples depend on Itk to work. +set(tk_SCRIPTS + tk01 + tk03 + plgrid + standard_examples + wish_standard_examples + ) +# These examples depend on Itk to work. if(ENABLE_itk) - list(APPEND tk_SCRIPTS tk02 tk04) + list(APPEND tk_SCRIPTS + tk02 + tk04 + plserver_runAllDemos + wish_runAllDemos + ) endif(ENABLE_itk) if(BUILD_TEST) @@ -185,11 +196,15 @@ # wish_standard_examples is a configured shell script that runs all # the standard examples under wish using a TEA-based approach. # pkgIndex_LOCATION is the directory where the relevant pkgIndex.tcl - # file is located. + # file is located. In the Plplotter package case two build-tree + # locations must be given, and we use the pkgIndex_LOCATIONS variable + # to configure that case. if(CORE_BUILD) set(pkgIndex_LOCATION ${CMAKE_BINARY_DIR}/bindings/tk) + set(pkgIndex_LOCATIONS "${CMAKE_BINARY_DIR}/bindings/tk ${CMAKE_BINARY_DIR}/bindings/tk-x-plat") else(CORE_BUILD) set(pkgIndex_LOCATION ${DATA_DIR}) + set(pkgIndex_LOCATIONS ${DATA_DIR}) endif(CORE_BUILD) foreach(tk_related_target xtk01 plserver xtk02 xtk04) Added: trunk/examples/tk/plserver_runAllDemos.in =================================================================== --- trunk/examples/tk/plserver_runAllDemos.in (rev 0) +++ trunk/examples/tk/plserver_runAllDemos.in 2013-11-23 04:20:14 UTC (rev 12744) @@ -0,0 +1,7 @@ +#!@SH_EXECUTABLE@ +# Run plserver example for standard examples. +# The following exec command reexecutes the script under wish. This +# is possible because all comment lines are ignored by wish including +# continued ones with a trailing backslash like this one \ +exec @plserver_LOCATION@ -f "$0" "$@" +source runAllDemos.tcl Property changes on: trunk/examples/tk/plserver_runAllDemos.in ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/examples/tk/wish_runAllDemos.in =================================================================== --- trunk/examples/tk/wish_runAllDemos.in (rev 0) +++ trunk/examples/tk/wish_runAllDemos.in 2013-11-23 04:20:14 UTC (rev 12744) @@ -0,0 +1,9 @@ +#!@SH_EXECUTABLE@ +# Run standard examples using wish/runAllDemos.tcl +# The following exec command reexecutes the script under wish. This +# is possible because all comment lines are ignored by wish including +# continued ones with a trailing backslash like this one \ +exec @TK_WISH@ "$0" "$@" +lappend auto_path @pkgIndex_LOCATIONS@ +package require Plplotter +source runAllDemos.tcl Property changes on: trunk/examples/tk/wish_runAllDemos.in ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2013-11-25 06:30:07
|
Revision: 12748 http://sourceforge.net/p/plplot/code/12748 Author: andrewross Date: 2013-11-25 06:30:00 +0000 (Mon, 25 Nov 2013) Log Message: ----------- Easier way to rescale the velocity vectors in example 22. Modified Paths: -------------- trunk/examples/c/x22c.c trunk/examples/c++/x22.cc Modified: trunk/examples/c/x22c.c =================================================================== --- trunk/examples/c/x22c.c 2013-11-24 22:01:17 UTC (rev 12747) +++ trunk/examples/c/x22c.c 2013-11-25 06:30:00 UTC (rev 12748) @@ -30,11 +30,11 @@ void potential( void ); void f2mnmx( PLFLT **f, PLINT nx, PLINT ny, PLFLT *fnmin, PLFLT *fnmax ); -// Pairs of points making the line segments used to plot the user defined arrow -static PLFLT arrow_x[6] = { -1.0, 1.0, 0.6, 1.0, 0.6, 1.0 }; -static PLFLT arrow_y[6] = { 0.0, 0.0, 0.4, 0.0, -0.4, 0.0 }; -static PLFLT arrow2_x[6] = { -1.0, 0.6, 0.6, 1.0, 0.6, 0.6 }; -static PLFLT arrow2_y[6] = { 0.0, 0.0, 0.4, 0.0, -0.4, 0.0 }; +// Pairs of points making the line segments used to plot the user defined arroW +static PLFLT arrow_x[6] = { -0.5, 0.5, 0.3, 0.5, 0.3, 0.5 }; +static PLFLT arrow_y[6] = { 0.0, 0.0, 0.2, 0.0, -0.2, 0.0 }; +static PLFLT arrow2_x[6] = { -0.5, 0.3, 0.3, 0.5, 0.3, 0.3 }; +static PLFLT arrow2_y[6] = { 0.0, 0.0, 0.2, 0.0, -0.2, 0.0 }; //-------------------------------------------------------------------------- // main @@ -160,7 +160,7 @@ sprintf( title, "#frPLplot Example 22 - constriction (arrow style %d)", astyle ); pllab( "(x)", "(y)", title ); plcol0( 2 ); - plvect( (const PLFLT * const *) u, (const PLFLT * const *) v, nx, ny, -0.5, pltr2, (void *) &cgrid2 ); + plvect( (const PLFLT * const *) u, (const PLFLT * const *) v, nx, ny, -1.0, pltr2, (void *) &cgrid2 ); plcol0( 1 ); plFree2dGrid( cgrid2.xg, nx, ny ); @@ -252,7 +252,7 @@ xmin + dx / 2, xmax - dx / 2, ymin + dy / 2, ymax - dy / 2, clev, nc, 0, 1, 1.0, plfill, 1, NULL, NULL ); plvect( (const PLFLT * const *) u, (const PLFLT * const *) v, nx, ny, - -0.5, pltr2, (void *) &cgrid2 ); + -1.0, pltr2, (void *) &cgrid2 ); // Plot edges using plpath (which accounts for coordinate transformation) rather than plline plpath( nseg, xmin, ymax, xmax, ymax ); plpath( nseg, xmin, ymin, xmax, ymin ); Modified: trunk/examples/c++/x22.cc =================================================================== --- trunk/examples/c++/x22.cc 2013-11-24 22:01:17 UTC (rev 12747) +++ trunk/examples/c++/x22.cc 2013-11-25 06:30:00 UTC (rev 12748) @@ -157,7 +157,7 @@ sprintf( title, "#frPLplot Example 22 - constriction (arrow style %d)", astyle ); pls->lab( "(x)", "(y)", title ); pls->col0( 2 ); - pls->vect( u, v, nx, ny, -0.5, plstream::tr2, (void *) &cgrid2 ); + pls->vect( u, v, nx, ny, -1.0, plstream::tr2, (void *) &cgrid2 ); pls->col0( 1 ); } @@ -211,7 +211,7 @@ xmin + dx / 2, xmax - dx / 2, ymin + dy / 2, ymax - dy / 2, clev, nc, 0, 1, 1.0, plstream::fill, 1, NULL, NULL ); pls->vect( (const PLFLT * const *) u, (const PLFLT * const *) v, nx, ny, - -0.5, plstream::tr2, (void *) &cgrid2 ); + -1.0, plstream::tr2, (void *) &cgrid2 ); // Plot edges using plpath (which accounts for coordinate transformation) rather than plline pls->path( nseg, xmin, ymax, xmax, ymax ); pls->path( nseg, xmin, ymin, xmax, ymin ); @@ -343,10 +343,10 @@ bool fill; // Set of points making a polygon to use as the arrow - PLFLT arrow_x[6] = { -1.0, 1.0, 0.6, 1.0, 0.6, 1.0 }; - PLFLT arrow_y[6] = { 0.0, 0.0, 0.4, 0.0, -0.4, 0.0 }; - PLFLT arrow2_x[6] = { -1.0, 0.6, 0.6, 1.0, 0.6, 0.6 }; - PLFLT arrow2_y[6] = { 0.0, 0.0, 0.4, 0.0, -0.4, 0.0 }; + PLFLT arrow_x[6] = { -0.5, 0.5, 0.3, 0.5, 0.3, 0.5 }; + PLFLT arrow_y[6] = { 0.0, 0.0, 0.2, 0.0, -0.2, 0.0 }; + PLFLT arrow2_x[6] = { -0.5, 0.3, 0.3, 0.5, 0.3, 0.3 }; + PLFLT arrow2_y[6] = { 0.0, 0.0, 0.2, 0.0, -0.2, 0.0 }; // Create new plstream pls = new plstream(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2013-11-27 11:44:01
|
Revision: 12763 http://sourceforge.net/p/plplot/code/12763 Author: andrewross Date: 2013-11-27 11:43:57 +0000 (Wed, 27 Nov 2013) Log Message: ----------- With transform need to set rect = 0 since rectangles are not mapped to rectangles any more. Modified Paths: -------------- trunk/examples/c/x22c.c trunk/examples/c++/x22.cc Modified: trunk/examples/c/x22c.c =================================================================== --- trunk/examples/c/x22c.c 2013-11-27 08:41:24 UTC (rev 12762) +++ trunk/examples/c/x22c.c 2013-11-27 11:43:57 UTC (rev 12763) @@ -250,7 +250,7 @@ plcol0( 2 ); plshades( (const PLFLT * const *) u, nx, ny, NULL, xmin + dx / 2, xmax - dx / 2, ymin + dy / 2, ymax - dy / 2, - clev, nc, 0, 1, 1.0, plfill, 1, NULL, NULL ); + clev, nc, 0.0, 1, 1.0, plfill, 0, NULL, NULL ); plvect( (const PLFLT * const *) u, (const PLFLT * const *) v, nx, ny, -1.0, pltr2, (void *) &cgrid2 ); // Plot edges using plpath (which accounts for coordinate transformation) rather than plline Modified: trunk/examples/c++/x22.cc =================================================================== --- trunk/examples/c++/x22.cc 2013-11-27 08:41:24 UTC (rev 12762) +++ trunk/examples/c++/x22.cc 2013-11-27 11:43:57 UTC (rev 12763) @@ -211,7 +211,7 @@ pls->col0( 2 ); pls->shades( (const PLFLT * const *) u, nx, ny, NULL, xmin + dx / 2, xmax - dx / 2, ymin + dy / 2, ymax - dy / 2, - clev, nc, 0, 1, 1.0, plstream::fill, 1, NULL, NULL ); + clev, nc, 0, 1, 1.0, plstream::fill, 0, NULL, NULL ); pls->vect( (const PLFLT * const *) u, (const PLFLT * const *) v, nx, ny, -1.0, plstream::tr2, (void *) &cgrid2 ); // Plot edges using plpath (which accounts for coordinate transformation) rather than plline This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-11-28 19:19:11
|
Revision: 12777 http://sourceforge.net/p/plplot/code/12777 Author: airwin Date: 2013-11-28 19:19:04 +0000 (Thu, 28 Nov 2013) Log Message: ----------- Use better naming convention for scripts. examples/tcl/standard_examples.in ==> examples/tcl/pltcl_standard_examples.in examples/tk/standard_examples.in ==> examples/tk/plserver_standard_examples.in Tested by: Alan W. Irwin <ai...@us...> on Linux using the test_interactive target for both the core build tree and the installed examples build tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/tcl/CMakeLists.txt trunk/examples/tk/CMakeLists.txt Added Paths: ----------- trunk/examples/tcl/pltcl_standard_examples.in trunk/examples/tk/plserver_standard_examples.in Removed Paths: ------------- trunk/examples/tcl/standard_examples.in trunk/examples/tk/standard_examples.in Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/CMakeLists.txt 2013-11-28 19:19:04 UTC (rev 12777) @@ -870,7 +870,7 @@ if(ENABLE_tcl AND PLD_xwin) add_custom_target(test_pltcl_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/standard_examples -dev xwin -np + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/pltcl_standard_examples -dev xwin -np DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) @@ -964,7 +964,7 @@ list(APPEND targets_examples_tk test_tk_plgrid) add_custom_target(test_plserver_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/standard_examples + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/plserver_standard_examples DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) Modified: trunk/examples/tcl/CMakeLists.txt =================================================================== --- trunk/examples/tcl/CMakeLists.txt 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/tcl/CMakeLists.txt 2013-11-28 19:19:04 UTC (rev 12777) @@ -76,12 +76,12 @@ set(tcl_SCRIPTS ${tcl_SCRIPTS} x${STRING_INDEX}) endforeach(STRING_INDEX ${tcl_STRING_INDICES}) -# standard_examples is a configured shell script that runs all the standard -# examples under pltcl. +# pltcl_standard_examples is a configured shell script that runs all +# the standard examples under pltcl. get_target_property(pltcl_LOCATION pltcl LOCATION) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/standard_examples.in - ${CMAKE_CURRENT_BINARY_DIR}/standard_examples + ${CMAKE_CURRENT_SOURCE_DIR}/pltcl_standard_examples.in + ${CMAKE_CURRENT_BINARY_DIR}/pltcl_standard_examples @ONLY ) @@ -135,7 +135,7 @@ ) install(FILES ${tcl_FILES} DESTINATION ${DATA_DIR}/examples/tcl) - install(PROGRAMS ${tcl_SCRIPTS} standard_examples.in tclsh_standard_examples.in + install(PROGRAMS ${tcl_SCRIPTS} pltcl_standard_examples.in tclsh_standard_examples.in DESTINATION ${DATA_DIR}/examples/tcl ) Copied: trunk/examples/tcl/pltcl_standard_examples.in (from rev 12772, trunk/examples/tcl/standard_examples.in) =================================================================== --- trunk/examples/tcl/pltcl_standard_examples.in (rev 0) +++ trunk/examples/tcl/pltcl_standard_examples.in 2013-11-28 19:19:04 UTC (rev 12777) @@ -0,0 +1,41 @@ +#!@SH_EXECUTABLE@ +# Examples 14 and 31 left out - see Tk standard_examples.in +# Note the backslash at the end of the comments - this causes Tcl to +# ignore the next line. It becomes a valid Tcl script as well as valid +# shell script \ +exec @pltcl_LOCATION@ "$0" "$@" +source tcldemos.tcl +plinit +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +15 +16 +17 +18 +19 +20 +plspause 0 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +33 +exit Deleted: trunk/examples/tcl/standard_examples.in =================================================================== --- trunk/examples/tcl/standard_examples.in 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/tcl/standard_examples.in 2013-11-28 19:19:04 UTC (rev 12777) @@ -1,41 +0,0 @@ -#!@SH_EXECUTABLE@ -# Examples 14 and 31 left out - see Tk standard_examples.in -# Note the backslash at the end of the comments - this causes Tcl to -# ignore the next line. It becomes a valid Tcl script as well as valid -# shell script \ -exec @pltcl_LOCATION@ "$0" "$@" -source tcldemos.tcl -plinit -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -15 -16 -17 -18 -19 -20 -plspause 0 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -33 -exit Modified: trunk/examples/tk/CMakeLists.txt =================================================================== --- trunk/examples/tk/CMakeLists.txt 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/tk/CMakeLists.txt 2013-11-28 19:19:04 UTC (rev 12777) @@ -140,13 +140,13 @@ # plgrid is a configured shell script that runs the plgrid.tcl example # (N.B., in the tcl directory) using plserver. -# standard_examples is a configured shell script that runs all the standard -# examples under plserver. +# plserver_standard_examples is a configured shell script that runs +# all the standard examples under plserver. set(tk_SCRIPTS tk01 tk03 plgrid - standard_examples + plserver_standard_examples wish_standard_examples ) # These examples depend on Itk to work. Copied: trunk/examples/tk/plserver_standard_examples.in (from rev 12772, trunk/examples/tk/standard_examples.in) =================================================================== --- trunk/examples/tk/plserver_standard_examples.in (rev 0) +++ trunk/examples/tk/plserver_standard_examples.in 2013-11-28 19:19:04 UTC (rev 12777) @@ -0,0 +1,51 @@ +#!@SH_EXECUTABLE@ +# Run plserver example for standard examples. +# Drop examples 14 and 31 because querying for devices does not +# seem to work in this context. +# The following exec command reexecutes the script under wish. This +# is possible because all comment lines are ignored by wish including +# continued ones with a trailing backslash like this one \ +exec @plserver_LOCATION@ -f "$0" "$@" +source tkdemos.tcl +# +# Turn off pausing - Note in the current plserver case, the plxframe +# uses a visual clue and bindings to key press events so a different +# method must be used to disable pausing than in the wish case. +# Note that the widget in question is .plw, not $plwin +# +plw::set_pause .plw 0 +# +# Now run the examples one by one +# +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +33 +exit Deleted: trunk/examples/tk/standard_examples.in =================================================================== --- trunk/examples/tk/standard_examples.in 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/tk/standard_examples.in 2013-11-28 19:19:04 UTC (rev 12777) @@ -1,51 +0,0 @@ -#!@SH_EXECUTABLE@ -# Run plserver example for standard examples. -# Drop examples 14 and 31 because querying for devices does not -# seem to work in this context. -# The following exec command reexecutes the script under wish. This -# is possible because all comment lines are ignored by wish including -# continued ones with a trailing backslash like this one \ -exec @plserver_LOCATION@ -f "$0" "$@" -source tkdemos.tcl -# -# Turn off pausing - Note in the current plserver case, the plxframe -# uses a visual clue and bindings to key press events so a different -# method must be used to disable pausing than in the wish case. -# Note that the widget in question is .plw, not $plwin -# -plw::set_pause .plw 0 -# -# Now run the examples one by one -# -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -15 -16 -17 -18 -19 -20 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -33 -exit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2013-12-10 23:52:22
|
Revision: 12840 http://sourceforge.net/p/plplot/code/12840 Author: andrewross Date: 2013-12-10 23:52:18 +0000 (Tue, 10 Dec 2013) Log Message: ----------- Fix up a number of valgrind warnings in some of the examples. Modified Paths: -------------- trunk/examples/c/x04c.c trunk/examples/c++/x14.cc trunk/examples/c++/x22.cc trunk/examples/c++/x31.cc trunk/examples/f95/x04f.f90 Modified: trunk/examples/c/x04c.c =================================================================== --- trunk/examples/c/x04c.c 2013-12-10 23:49:29 UTC (rev 12839) +++ trunk/examples/c/x04c.c 2013-12-10 23:52:18 UTC (rev 12840) @@ -125,7 +125,10 @@ line_styles[0] = 1; line_widths[0] = 1.; // note from the above opt_array the first symbol (and box) indices - // do not have to be specified + // do not have to be specified, at least in C. For Fortran we need + // to set the symbols to be something, since the string is always + // copied as part of the bindings. + symobols[0] = ""; // Second legend entry. opt_array[1] = PL_LEGEND_LINE | PL_LEGEND_SYMBOL; Modified: trunk/examples/c++/x14.cc =================================================================== --- trunk/examples/c++/x14.cc 2013-12-10 23:49:29 UTC (rev 12839) +++ trunk/examples/c++/x14.cc 2013-12-10 23:52:18 UTC (rev 12840) @@ -435,6 +435,10 @@ pls->col0( 1 ); pls->lab( "X Coordinate", "Y Coordinate", "Streamlines of flow" ); pls->flush(); + +// Clean up + pls->Free2dGrid( z, xpts, ypts ); + pls->Free2dGrid( w, xpts, ypts ); } Modified: trunk/examples/c++/x22.cc =================================================================== --- trunk/examples/c++/x22.cc 2013-12-10 23:49:29 UTC (rev 12839) +++ trunk/examples/c++/x22.cc 2013-12-10 23:52:18 UTC (rev 12840) @@ -405,7 +405,6 @@ pls->Free2dGrid( v, nx, ny ); delete pls; - exit( 0 ); } int main( int argc, const char ** argv ) Modified: trunk/examples/c++/x31.cc =================================================================== --- trunk/examples/c++/x31.cc 2013-12-10 23:49:29 UTC (rev 12839) +++ trunk/examples/c++/x31.cc 2013-12-10 23:52:18 UTC (rev 12840) @@ -31,6 +31,7 @@ class x31 { public: x31( int, const char** ); + int status; private: plstream *pls; @@ -63,7 +64,6 @@ PLINT g1[] = { 255, 0 }; PLINT b1[] = { 0, 0 }; PLFLT a1[] = { 1.0, 1.0 }; - int status; char fnam[256]; pls = new plstream(); @@ -289,12 +289,15 @@ delete pls; - exit( status ); } int main( int argc, const char **argv ) { + int status; + x31 *x = new x31( argc, argv ); + status = x->status; delete x; + return status; } Modified: trunk/examples/f95/x04f.f90 =================================================================== --- trunk/examples/f95/x04f.f90 2013-12-10 23:49:29 UTC (rev 12839) +++ trunk/examples/f95/x04f.f90 2013-12-10 23:52:18 UTC (rev 12840) @@ -102,7 +102,10 @@ line_styles(1) = 1 line_widths(1) = 1 ! note from the above opt_array the first symbol (and box) indices -! do not have to be specified +! do not have to be specified, at least in C. For Fortran we need +! to set the symbols to be something, since the string is always +! copied as part of the bindings. + symbols(1) = '' ! Second legend entry. opt_array(2) = PL_LEGEND_LINE + PL_LEGEND_SYMBOL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-02-24 23:53:48
|
Revision: 13023 http://sourceforge.net/p/plplot/code/13023 Author: airwin Date: 2014-02-24 23:53:42 +0000 (Mon, 24 Feb 2014) Log Message: ----------- Remove unneeded "coding: utf-8" comments. Previously these occurred inconsistently (i.e., not for all utf-8 examples) for all languages other than Python demonstrating these comments are not needed for non-Python examples. As a result of this commit the only such comments left are for Python files where such comments are absolutely required by that language. Modified Paths: -------------- trunk/examples/c/x18c.c trunk/examples/c/x26c.c trunk/examples/c/x33c.c trunk/examples/d/x26d.d trunk/examples/d/x33d.d trunk/examples/f95/x26f.f90 trunk/examples/f95/x33f.f90 trunk/examples/perl/x26.pl trunk/examples/perl/x33.pl trunk/examples/tcl/x26.tcl Modified: trunk/examples/c/x18c.c =================================================================== --- trunk/examples/c/x18c.c 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/c/x18c.c 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,3 @@ -// -*- coding: utf-8; -*- -// // 3-d line and point plot demo. Adapted from x08c.c. // Modified: trunk/examples/c/x26c.c =================================================================== --- trunk/examples/c/x26c.c 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/c/x26c.c 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,3 @@ -// -*- coding: utf-8; -*- -// // Multi-lingual version of the first page of example 4. // // Copyright (C) 2006 Alan Irwin Modified: trunk/examples/c/x33c.c =================================================================== --- trunk/examples/c/x33c.c 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/c/x33c.c 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,3 @@ -// -*- coding: utf-8; -*- -// // Demonstrate most pllegend capability including unicode symbols. // // Copyright (C) 2010 Alan Irwin Modified: trunk/examples/d/x26d.d =================================================================== --- trunk/examples/d/x26d.d 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/d/x26d.d 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,3 @@ -// -*- coding: utf-8; -*- -// // Multi-lingual version of the first page of example 4. // // Copyright (C) 2009 Werner Smekal Modified: trunk/examples/d/x33d.d =================================================================== --- trunk/examples/d/x33d.d 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/d/x33d.d 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,3 @@ -// -*- coding: utf-8; -*- -// // Demonstrate most pllegend capability including unicode symbols. // // Copyright (C) 2010 Alan W. Irwin Modified: trunk/examples/f95/x26f.f90 =================================================================== --- trunk/examples/f95/x26f.f90 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/f95/x26f.f90 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,3 @@ -! -*- coding: utf-8; -*- -! ! Multi-lingual version of the first page of example 4. ! ! Copyright (C) 2006 Alan Irwin Modified: trunk/examples/f95/x33f.f90 =================================================================== --- trunk/examples/f95/x33f.f90 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/f95/x33f.f90 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,3 @@ -! -*- coding: utf-8; -*- -! ! Demonstrate most pllegend capability including unicode symbols. ! ! Copyright (C) 2010 Alan Irwin Modified: trunk/examples/perl/x26.pl =================================================================== --- trunk/examples/perl/x26.pl 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/perl/x26.pl 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,6 +1,4 @@ #! /usr/bin/env perl -# -# -*- coding: utf-8; -*- # # Demo x26 for the PLplot PDL binding # Modified: trunk/examples/perl/x33.pl =================================================================== --- trunk/examples/perl/x33.pl 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/perl/x33.pl 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,4 @@ #! /usr/bin/env perl -# -*- coding: utf-8; -*- # # Demonstrate most pllegend capability including unicode symbols. # Modified: trunk/examples/tcl/x26.tcl =================================================================== --- trunk/examples/tcl/x26.tcl 2014-02-24 23:26:54 UTC (rev 13022) +++ trunk/examples/tcl/x26.tcl 2014-02-24 23:53:42 UTC (rev 13023) @@ -1,5 +1,3 @@ -# -*- coding: utf-8; -*- -# # Multi-lingual version of the first page of example 4. # # Copyright (C) 2006 Alan Irwin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <ai...@us...> - 2014-04-21 04:34:49
|
Revision: 13106 http://sourceforge.net/p/plplot/code/13106 Author: airwin Date: 2014-04-21 04:34:46 +0000 (Mon, 21 Apr 2014) Log Message: ----------- Clean up test logic in the traditional build system for the installed examples for the (corner) case where -DPLD_ps=OFF. Tested on Linux for -DDEFAULT_NO_DEVICES=ON -DPLD_epsqt=ON -DPLD_pdfqt=ON -DPLD_qtwidget=ON -DPLD_bmpqt=ON -DPLD_jpgqt=ON -DPLD_pngqt=ON -DPLD_=ppmqtON -DPLD_tiffqt=ON -DPLD_extqt=ON -DPLD_memqt=ON -DPLD_svgqt=ON -DDEFAULT_NO_BINDINGS=ON -DENABLE_cxx=ON -DENABLE_qt=ON -DPLPLOT_USE_QT5=ON using the comprehensive test_script and an epa_build of Qt5. N.B. this is the first completely successful comprehensive test of the -DPLPLOT_USE_QT5=ON case, but certain Qt-related components of PLplot are still disabled or not implemented for the Qt5 case as discussed on list. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/Makefile.examples.in Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-04-21 00:26:11 UTC (rev 13105) +++ trunk/examples/CMakeLists.txt 2014-04-21 04:34:46 UTC (rev 13106) @@ -34,6 +34,10 @@ set(PSC_ADA_COMMENT "#") endif(NOT ENABLE_ada) + if(NOT ENABLE_cxx) + set(PSC_CXX_COMMENT "#") + endif(NOT ENABLE_cxx) + if(NOT ENABLE_d) set(PSC_D_COMMENT "#") endif(NOT ENABLE_d) @@ -73,6 +77,7 @@ else(PLD_ps) set(PSC_ADA_COMMENT "#") set(PSC_C_COMMENT "#") + set(PSC_CXX_COMMENT "#") set(PSC_D_COMMENT "#") set(PSC_F95_COMMENT "#") set(PSC_JAVA_COMMENT "#") @@ -81,6 +86,7 @@ set(PSC_PERL_COMMENT "#") set(PSC_PYTHON_COMMENT "#") set(PSC_TCL_COMMENT "#") + set(PSC_LUA_COMMENT "#") endif(PLD_ps) if(NOT(ENABLE_cxx AND (PLD_ps OR ENABLE_qt))) Modified: trunk/examples/Makefile.examples.in =================================================================== --- trunk/examples/Makefile.examples.in 2014-04-21 00:26:11 UTC (rev 13105) +++ trunk/examples/Makefile.examples.in 2014-04-21 04:34:46 UTC (rev 13106) @@ -32,11 +32,11 @@ cd c; $(MAKE) clean .PHONY: c_clean clean: c_clean -x01c.psc: c/x01c@EXEEXT@ - @echo Generate C results for psc device - ./plplot-test.sh --verbose --front-end=c --device=psc -test_noninteractive: x01c.psc -@COMPARE_COMMENT@compare: x01c.psc +@PSC...@x0...c: c/x01c@EXEEXT@ +@PSC_C_COMMENT@ @echo Generate C results for psc device +@PSC_C_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=psc +@PSC_C_COMMENT@test_noninteractive: x01c.psc +@PSC_C_COMMENT@@COMPARE_COMMENT@compare: x01c.psc # Just for c, c++, and tk directories test_interactive: c/x01c@EXEEXT@ @@ -60,11 +60,11 @@ @CXX_COMMENT@ cd c++; $(MAKE) clean @CXX_COMMENT@.PHONY: cxx_clean @CXX_COMMENT@clean: cxx_clean -@CXX...@x0...c: c++/x01@EXEEXT@ -@CXX_COMMENT@ @echo Generate C++ results for psc device -@CXX_COMMENT@ ./plplot-test.sh --verbose --front-end=cxx --device=psc -@CXX_COMMENT@test_noninteractive: x01cxx.psc -@CXX_COMMENT@@COMPARE_COMMENT@compare: x01cxx.psc +@PSC...@x0...c: c++/x01@EXEEXT@ +@PSC_CXX_COMMENT@ @echo Generate C++ results for psc device +@PSC_CXX_COMMENT@ ./plplot-test.sh --verbose --front-end=cxx --device=psc +@PSC_CXX_COMMENT@test_noninteractive: x01cxx.psc +@PSC_CXX_COMMENT@@COMPARE_COMMENT@compare: x01cxx.psc # Just for c, c++, and tk directories @CXX_COMMENT@test_interactive: c++/x01@EXEEXT@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |