Changeset 5756
- Timestamp:
- Jul 18, 2015, 11:06:41 AM (9 years ago)
- Location:
- branches/1.4
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.4
- Property svn:mergeinfo changed
/trunk merged: 5736,5747,5754
- Property svn:mergeinfo changed
-
branches/1.4/gui/apps/execute.tcl
r5665 r5756 32 32 Rappture::resources::load 33 33 34 # Parse command line options 35 # ---------------------------------------------------------------------- 36 Rappture::getopts argv params { 37 value -tool "" 38 value -status "" 39 value -output "" 40 value -cleanup no 41 } 42 34 43 # load the XML info in the driver file 35 44 if {[catch {Rappture::library $driverxml} result]} { … … 41 50 42 51 # If tool.xml is not specified, try to find it the way Rappture would. 52 if {$params(-tool) ne ""} { 53 set toolxml $params(-tool) 54 } 43 55 if {$toolxml eq ""} { 44 56 if {[file isfile tool.xml]} { … … 120 132 } 121 133 122 # Parse command line options to see134 # Apply effects of all other command line options 123 135 # ---------------------------------------------------------------------- 124 Rappture::getopts argv params {125 value -status ""126 value -output ""127 value -cleanup no128 }129 130 136 if {$params(-status) ne ""} { 131 137 set LogFid [open $params(-status) w] -
branches/1.4/gui/scripts/field.tcl
r5660 r5756 651 651 # ---------------------------------------------------------------------- 652 652 itcl::body Rappture::Field::InitHints {} { 653 # Order of duplicate keys matters here: later entries override 654 # earlier ones. For example: camera.position is deprecated in 655 # favor of about.camera, so about.camera is listed after 656 # camera.position 653 657 foreach {key path} { 654 658 camera camera.position 659 camera about.camera 655 660 color about.color 656 661 default about.default -
branches/1.4/gui/scripts/vtkheightmapviewer.tcl
r5349 r5756 1490 1490 ResetAxes 1491 1491 SendCmd "dataset scalar $_curFldName" 1492 SendCmd "heightmap colormode scalar$_curFldName"1492 SendCmd "heightmap colormode $_colorMode $_curFldName" 1493 1493 Zoom reset 1494 1494 UpdateContourList
Note: See TracChangeset
for help on using the changeset viewer.