Changeset 5756 for branches/1.4/gui

Timestamp:

Jul 18, 2015 11:06:41 AM (9 years ago)

Author:

ldelgass

Message:

Merge r5736,r5747,r5754 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/apps/execute.tcl (modified) (3 diffs)
• gui/scripts/field.tcl (modified) (1 diff)
• gui/scripts/vtkheightmapviewer.tcl (modified) (1 diff)

branches/1.4/gui/apps/execute.tcl

@@ -32 +32 @@
 Rappture::resources::load
 
+# Parse command line options
+# ----------------------------------------------------------------------
+Rappture::getopts argv params {
+    value -tool ""
+    value -status ""
+    value -output ""
+    value -cleanup no
+}
+
 # load the XML info in the driver file
 if {[catch {Rappture::library $driverxml} result]} {
@@ -41 +50 @@
 
 # If tool.xml is not specified, try to find it the way Rappture would.
+if {$params(-tool) ne ""} {
+    set toolxml $params(-tool)
+}
 if {$toolxml eq ""} {
     if {[file isfile tool.xml]} {
@@ -120 +132 @@
 }
 
-# Parse command line options to see
+# Apply effects of all other command line options
 # ----------------------------------------------------------------------
-Rappture::getopts argv params {
-    value -status ""
-    value -output ""
-    value -cleanup no
-}
-
 if {$params(-status) ne ""} {
     set LogFid [open $params(-status) w]

branches/1.4/gui/scripts/field.tcl

@@ -651 +651 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::InitHints {} {
+    # Order of duplicate keys matters here: later entries override
+    # earlier ones.  For example: camera.position is deprecated in
+    # favor of about.camera, so about.camera is listed after
+    # camera.position
     foreach {key path} {
         camera          camera.position
+        camera          about.camera
         color           about.color
         default         about.default

branches/1.4/gui/scripts/vtkheightmapviewer.tcl

@@ -1490 +1490 @@
             ResetAxes
             SendCmd "dataset scalar $_curFldName"
-            SendCmd "heightmap colormode scalar $_curFldName"
+            SendCmd "heightmap colormode $_colorMode $_curFldName"
             Zoom reset
             UpdateContourList