Changeset 3593 for trunk

Timestamp:

Mar 27, 2013 2:03:38 PM (11 years ago)

Author:

gah

Message:

fix: don't send commands to server in configuration routines if reset, let Rebuild do it

File:

• trunk/gui/scripts/vtkheightmapviewer.tcl (modified) (8 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -200 +200 @@
         xpan    0
         ypan    0
-        ortho   1
+        ortho   0
     }
     set _arcball [blt::arcball create 100 100]
@@ -902 +902 @@
     }
     if { $_reset } {
-        InitSettings isHeightmap background
         #
         # Reset the camera and other view parameters
         #
-        SendCmd "axis color all [Color2RGB $itk_option(-plotforeground)]"
+        InitSettings isHeightmap background
 
         # Let's see how this goes.  I think it's preferable to overloading the
@@ -1044 +1043 @@
         # Reset the camera and other view parameters
         #
-        SendCmd "axis color all [Color2RGB $itk_option(-plotforeground)]"
-        SendCmd "outline color [Color2RGB $itk_option(-plotforeground)]"
         ResetAxes
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
@@ -1339 +1336 @@
         }
         "background" {
-            set bgcolor [$itk_component(background) value]
+            set bg [$itk_component(background) value]
             array set fgcolors {
                 "black" "white"
@@ -1345 +1342 @@
                 "grey"  "black"
             }
-            configure -plotbackground $bgcolor \
-                -plotforeground $fgcolors($bgcolor)
+            set fg $fgcolors($bg)
+            configure -plotbackground $bg -plotforeground $fg
             $itk_component(view) delete "legend"
+            SendCmd "screen bgcolor [Color2RGB $bg]"
+            SendCmd "outline color [Color2RGB $fg]"
+            SendCmd "axis color all [Color2RGB $fg]"
             DrawLegend
         }
@@ -1761 +1761 @@
         }
     }
-    AdjustSetting isHeightmap
+    if { !$_reset } {
+        AdjustSetting isHeightmap
+    }
 }
 
@@ -1770 +1772 @@
     if { [isconnected] } {
         set rgb [Color2RGB $itk_option(-plotbackground)]
-        SendCmd "screen bgcolor $rgb"
+        if { !$_reset } {
+            SendCmd "screen bgcolor $rgb"
+        }
         $itk_component(view) configure -background $itk_option(-plotbackground)
     }
@@ -1781 +1785 @@
     if { [isconnected] } {
         set rgb [Color2RGB $itk_option(-plotforeground)]
-        SendCmd "outline color $rgb"
-        SendCmd "axis color all $rgb"
+        if { !$_reset } {
+            SendCmd "outline color $rgb"
+            SendCmd "axis color all $rgb"
+        }
     }
 }