From: <arj...@us...> - 2010-06-16 07:15:32
|
Revision: 11070 http://plplot.svn.sourceforge.net/plplot/?rev=11070&view=rev Author: arjenmarkus Date: 2010-06-16 07:15:26 +0000 (Wed, 16 Jun 2010) Log Message: ----------- Provide a script to run all Tcl examples in the same way as we do for the Tk examples. The script properly resets PLplot so that each example displays correctly (with the exception of x21). Reformatted the Tk script, as the list of commands to reset PLplot got fairly long. Currently, the script (standard_examples) can not be used as a proper shell script, in the same way as the Tk equivalent. This is a first version to get the basic functionality. Re x21: this example does something to upset PLplot on my machine, so that the next example complains that I should call plinit() again. I have commented it out for now. Modified Paths: -------------- trunk/examples/tcl/CMakeLists.txt trunk/examples/tcl/tcldemos.tcl trunk/examples/tk/tkdemos.tcl Added Paths: ----------- trunk/examples/tcl/standard_examples.in Modified: trunk/examples/tcl/CMakeLists.txt =================================================================== --- trunk/examples/tcl/CMakeLists.txt 2010-06-16 07:10:00 UTC (rev 11069) +++ trunk/examples/tcl/CMakeLists.txt 2010-06-16 07:15:26 UTC (rev 11070) @@ -74,6 +74,14 @@ set(tcl_SCRIPTS ${tcl_SCRIPTS} x${STRING_INDEX}) endforeach(STRING_INDEX ${tcl_STRING_INDICES}) +# Configure the standard examples file. It is always copied +get_target_property(pltcl_LOCATION pltcl LOCATION) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/standard_examples.in + ${CMAKE_CURRENT_BINARY_DIR}/standard_examples + @ONLY +) + if(CORE_BUILD) # Copy file and scripts to the binary directory if different to the # source directory. Needed for ctest, but also so the tclIndex file @@ -110,7 +118,7 @@ install(FILES ${tcl_FILES} DESTINATION ${DATA_DIR}/examples/tcl) install(PROGRAMS ${tcl_SCRIPTS} DESTINATION ${DATA_DIR}/examples/tcl) - install(FILES CMakeLists.txt + install(FILES CMakeLists.txt DESTINATION ${DATA_DIR}/examples/tcl ) @@ -127,9 +135,9 @@ if(CORE_BUILD) set_property(GLOBAL PROPERTY TARGETS_examples_tcl tcl_examples - tclIndex_examples_tcl + tclIndex_examples_tcl plplottcltk${LIB_TAG} - pltcl + pltcl plplot.tcl_target tclIndex_tcl ) @@ -137,9 +145,9 @@ get_property(files_tclIndex_tcl GLOBAL PROPERTY FILES_tclIndex_tcl) set_property(GLOBAL PROPERTY FILES_examples_tcl ${tclIndex_DEPENDS} - ${CMAKE_CURRENT_BINARY_DIR}/tclIndex + ${CMAKE_CURRENT_BINARY_DIR}/tclIndex plplottcltk${LIB_TAG} - pltcl + pltcl ${files_plplot.tcl_target} ${files_tclIndex_tcl} ) Added: trunk/examples/tcl/standard_examples.in =================================================================== --- trunk/examples/tcl/standard_examples.in (rev 0) +++ trunk/examples/tcl/standard_examples.in 2010-06-16 07:15:26 UTC (rev 11070) @@ -0,0 +1,39 @@ +# Examples 14 and 31 left out - see Tk standard_examples.in +# +# Problem in x22: crash - but not if run standalone +# Interference from x21? According to the messages I need to call plinit again +# Yes, leaving out x21 makes x22 behave correctly +# +# +source tcldemos.tcl +plinit +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 +exit Modified: trunk/examples/tcl/tcldemos.tcl =================================================================== --- trunk/examples/tcl/tcldemos.tcl 2010-06-16 07:10:00 UTC (rev 11069) +++ trunk/examples/tcl/tcldemos.tcl 2010-06-16 07:15:26 UTC (rev 11070) @@ -7,12 +7,9 @@ # IFS, University of Texas at Austin # 23-Jun-1994 # -# To plot these, start up pltcl and type plinit to get a selection of -# device types. Choose one of the devices then type -# "source tcldemos.tcl", then type "1" for the first demo, "2" for the -# second, and so on. Not all examples are fully implemented yet. -# Note if you use xwin for the device type, you must type CR in the -# xwin window to move from one plot to the next. +# To plot these, start up pltcl with the argument "standard_examples". +# Choose one of the devices to start the demo. Press the space bar +# to move to the next window or to the next example # # Note: each demo proc is supplied a widget argument if run from a widget, # or "loopback" if being run from pltcl. In the latter case, the @@ -24,6 +21,13 @@ set demo x[format "%02d" $i] source $demo.tcl # restore defaults - plcol0 1 - proc $i {} "$demo" + proc $i {} " + $demo + loopback cmd pleop + loopback cmd plcol0 1 + loopback cmd plsori 0 + loopback cmd plspal0 cmap0_default.pal + loopback cmd plspal1 cmap1_default.pal 1 + loopback cmd plstransform NULL + " } Modified: trunk/examples/tk/tkdemos.tcl =================================================================== --- trunk/examples/tk/tkdemos.tcl 2010-06-16 07:10:00 UTC (rev 11069) +++ trunk/examples/tk/tkdemos.tcl 2010-06-16 07:15:26 UTC (rev 11070) @@ -2,7 +2,7 @@ # $Id$ # # PLplot TK demos -# +# # Maurice LeBrun # IFS, University of Texas at Austin # 26-Jan-1995 @@ -24,5 +24,12 @@ for {set i 1} {$i <= 31} {incr i} { set demo x[format "%02d" $i] source $demo.tcl - proc $i {} "$demo .plw.plwin; .plw.plwin cmd plspal0 cmap0_default.pal; .plw.plwin cmd plspal1 cmap1_default.pal 1" + proc $i {} " + $demo .plw.plwin + .plw.plwin cmd plcol0 1 + .plw.plwin cmd plsori 0 + .plw.plwin cmd plspal0 cmap0_default.pal + .plw.plwin cmd plspal1 cmap1_default.pal 1 + .plw.plwin cmd plstransform NULL + " } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |