Changeset 6359 for trunk

Timestamp:

May 23, 2016, 6:00:40 PM (8 years ago)

Author:

ldelgass

Message:

more syncing viewers

Location:

trunk/gui/scripts

Files:

• vtkglyphviewer.tcl (modified) (1 diff)
• vtkheightmapviewer.tcl (modified) (6 diffs)
• vtkimageviewer.tcl (modified) (5 diffs)
• vtkisosurfaceviewer.tcl (modified) (1 diff)
• vtkstreamlinesviewer.tcl (modified) (2 diffs)
• vtksurfaceviewer.tcl (modified) (1 diff)

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -151 +151 @@
     private variable _rotatePending 0
     private variable _cutplanePending 0
-    private variable _colorMode "vmag"; # Mode of colormap (vmag or scalar)
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
     private variable _curFldComp 3
+    private variable _colorMode "vmag"; # Mode of colormap (vmag or scalar)
     private variable _mouseOver "";     # what called LegendRangeAction:
                                         # vmin or vmax

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -262 +262 @@
 
     itk_component add fieldmenu {
-        menu $itk_component(plotarea).menu \
-            -relief flat \
-            -tearoff 0
+        menu $itk_component(plotarea).menu -relief flat -tearoff 0
     } {
         usual
@@ -293 +291 @@
     }
     pack $itk_component(reset) -side top -padx 2 -pady { 2 0 }
-    Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
+    Rappture::Tooltip::for $itk_component(reset) \
+        "Reset the view to the default zoom level"
 
     itk_component add zoomin {
@@ -924 +923 @@
         # Reset the camera and other view parameters
         #
-        InitSettings -isheightmap -background
+        InitSettings -isheightmap -background \
+            -xgrid -ygrid -zgrid -axismode \
+            -axesvisible -axislabels -axisminorticks
 
         # Setting a custom exponent and label format for axes is causing
@@ -937 +938 @@
         #SendCmd "axis exp 0 0 0 1"
 
+        SendCmd "axis tickpos outside"
         SendCmd "axis lrot z 90"
         $_arcball quaternion [ViewToQuaternion]
@@ -1006 +1008 @@
     InitSettings -stretchtofit -outline
     if { $_reset } {
-        SendCmd "axis tickpos outside"
-        #SendCmd "axis lformat all %g"
-
         foreach axis { x y z } {
             set label ""
@@ -1065 +1064 @@
         }
         PanCamera
-        InitSettings -xgrid -ygrid -zgrid \
-            -axesvisible -axislabels -heightmapscale -field -isheightmap \
-            -numisolines
+        InitSettings -heightmapscale -field -isheightmap -numisolines
         if { [array size _fields] < 2 } {
             catch {blt::table forget $itk_component(field) $itk_component(field_l)}

trunk/gui/scripts/vtkimageviewer.tcl

@@ -244 +244 @@
 
     itk_component add fieldmenu {
-        menu $itk_component(plotarea).menu \
-            -relief flat \
-            -tearoff 0
+        menu $itk_component(plotarea).menu -relief flat -tearoff 0
     } {
         usual
@@ -275 +273 @@
     }
     pack $itk_component(reset) -side top -padx 2 -pady { 2 0 }
-    Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
+    Rappture::Tooltip::for $itk_component(reset) \
+        "Reset the view to the default zoom level"
 
     itk_component add zoomin {
@@ -908 +907 @@
         # Reset the camera and other view parameters
         #
-        InitSettings -view3d -background
-
+        InitSettings -view3d -background \
+            -xgrid -ygrid -zgrid -axismode \
+            -axesvisible -axislabels -axisminorticks
+
+        SendCmd "axis tickpos outside"
         SendCmd "axis lrot z 90"
         $_arcball quaternion [ViewToQuaternion]
@@ -973 +975 @@
     InitSettings -stretchtofit -outline
     if { $_reset } {
-        SendCmd "axis tickpos outside"
-        #SendCmd "axis lformat all %g"
-
         foreach axis { x y z } {
             set label ""
@@ -1016 +1015 @@
         }
         PanCamera
-        InitSettings -xgrid -ygrid -zgrid \
-            -axesvisible -axislabels -field -view3d
+        InitSettings -field -view3d
         if { [array size _fields] < 2 } {
             catch {blt::table forget $itk_component(field) $itk_component(field_l)}

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -160 +160 @@
     private variable _rotatePending 0
     private variable _cutplanePending 0
-    private variable _colorMode "scalar"; # Mode of colormap (vmag or scalar)
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
+    private variable _colorMode "scalar"; # Mode of colormap (vmag or scalar)
     private variable _mouseOver "";     # what called LegendRangeAction:
                                         # vmin or vmax

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -146 +146 @@
     private variable _curFldName ""
     private variable _curFldLabel ""
+    private variable _colorMode "vmag"; # Mode of colormap (vmag or scalar)
     private variable _streamlinesLength 0
     private variable _numSeeds 200
-    private variable _colorMode "vmag"; # Mode of colormap (vmag or scalar)
 
     private common _downloadPopup;      # download options from popup
@@ -301 +301 @@
     }
     pack $itk_component(reset) -side top -padx 2 -pady 2
-    Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
+    Rappture::Tooltip::for $itk_component(reset) \
+        "Reset the view to the default zoom level"
 
     itk_component add zoomin {

trunk/gui/scripts/vtksurfaceviewer.tcl

@@ -139 +139 @@
     private variable _legendPending 0
     private variable _rotatePending 0
-    private variable _colorMode "scalar"; # Mode of colormap (vmag or scalar)
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
+    private variable _colorMode "scalar"; # Mode of colormap (vmag or scalar)
 
     private common _downloadPopup;      # download options from popup