Changeset 4770 for branches/1.3/gui/scripts/vtkheightmapviewer.tcl

Timestamp:

Nov 23, 2014 4:24:53 AM (9 years ago)

Author:

ldelgass

Message:

merge r4769 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkheightmapviewer.tcl (modified) (7 diffs)

branches/1.3/gui/scripts/vtkheightmapviewer.tcl

@@ -218 +218 @@
 
     array set _settings {
-        -axisflymode            "static"
+        -axisflymode            "static"
         -axislabels             1
-        -axisminorticks         1
-        -axisvisible            1
+        -axisminorticks         1
+        -axisvisible            1
         -colormap               BCGYR
         -colormapdiscrete       0
         -colormapvisible        1
-        -edges                  0
-        -field                  "Default"
-        -heightmapscale         50
-        -isheightmap            0
+        -edges                  0
+        -field                  "Default"
+        -heightmapscale         50
+        -isheightmap            0
         -isolinecolor           black
         -isolinesvisible        1
         -legendvisible          1
-        -lighting               1
-        -numisolines            10
+        -lighting               1
+        -numisolines            10
         -opacity                100
-        -outline                0
-        -savelighting           1
-        -saveopacity            100
-        -saveoutline            0
-        -stretchtofit           0
-        -wireframe              0
-        -xgrid                  0
-        -ygrid                  0
-        -zgrid                  0
+        -outline                0
+        -savelighting           1
+        -saveopacity            100
+        -saveoutline            0
+        -stretchtofit           0
+        -wireframe              0
+        -xgrid                  0
+        -ygrid                  0
+        -zgrid                  0
     }
     array set _changed {
@@ -1380 +1380 @@
             SendCmd "axis visible all $bool"
         }
-        "-xgrid" - "-ygrid" - "-zgrid" {
-            set axis [string tolower [string range $what 1 1]]
-            set bool $_settings($what)
-            SendCmd "axis grid $axis $bool"
-        }
         "-background" {
             set bg [$itk_component(background) value]
@@ -1668 +1663 @@
             SendCmd "heightmap wireframe $bool"
         }
+        "-xgrid" - "-ygrid" - "-zgrid" {
+            set axis [string tolower [string range $what 1 1]]
+            set bool $_settings($what)
+            SendCmd "axis grid $axis $bool"
+        }
         default {
             error "don't know how to fix $what"
@@ -1779 +1779 @@
     SendCmd "heightmap colormap $_currentColormap"
 }
-
 
 #
@@ -2093 +2092 @@
 }
 
-
 itcl::body Rappture::VtkHeightmapViewer::BuildCameraTab {} {
     set inner [$itk_component(main) insert end \
@@ -2112 +2110 @@
         0,0 $inner.view_l -anchor e -pady 2 \
         0,1 $inner.view -anchor w -pady 2
+    blt::table configure $inner r0 -resize none
 
     set labels { qx qy qz qw xpan ypan zoom }
@@ -2139 +2138 @@
     incr row
 
-    blt::table configure $inner c* r* -resize none
+    blt::table configure $inner c* -resize none
     blt::table configure $inner c2 -resize expand
     blt::table configure $inner r$row -resize expand