Changeset 4683 for branches

Timestamp:

Nov 10, 2014 3:00:45 AM (9 years ago)

Author:

ldelgass

Message:

merge r4682 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtksurfaceviewer.tcl (modified) (6 diffs)

branches/1.3/gui/scripts/vtksurfaceviewer.tcl

@@ -202 +202 @@
 
     array set _settings {
-        -axesvisible                    1
-        -axislabelsvisible              1
-        -background                     black
-        -colormap                       BCGYR
-        -colormapvisible                1
-        -field                          "Default"
-        -isolinecolor                   white
-        -isolinesvisible                0
-        -legendvisible                  1
-        -numcontours                    10
-        -surfaceedges                   0
-        -surfacelighting                1
-        -surfaceopacity                 100
-        -outline                        0
-        -surfacevisible                 1
-        -surfacewireframe               0
-        -xaxisgrid                      0
-        -yaxisgrid                      0
-        -zaxisgrid                      0
+        -axesvisible                1
+        -axislabels                 1
+        -axisminorticks             1
+        -background                 black
+        -colormap                   BCGYR
+        -colormapvisible            1
+        -field                      "Default"
+        -isolinecolor               white
+        -isolinesvisible            0
+        -legendvisible              1
+        -numcontours                10
+        -surfaceedges               0
+        -surfacelighting            1
+        -surfaceopacity             100
+        -outline                    0
+        -surfacevisible             1
+        -surfacewireframe           0
+        -xgrid                      0
+        -ygrid                      0
+        -zgrid                      0
     }
     array set _changed {
@@ -909 +910 @@
         set _first ""
         InitSettings -xaxisgrid -yaxisgrid -zaxisgrid -axismode \
-            -axesvisible -axislabelsvisible 
-        foreach axis { x y z } {
-            SendCmd "axis lformat $axis %g"
-        }
+            -axesvisible -axislabels -axisminorticks
+        #SendCmd "axis lformat all %g"
         StopBufferingCommands
         SendCmd "imgflush"
@@ -1269 +1268 @@
         }
         "-axesvisible" {
-            set bool $_settings(-axesvisible)
+            set bool $_settings($what)
             SendCmd "axis visible all $bool"
         }
-        "-axislabelsvisible" {
-            set bool $_settings(-axislabelsvisible)
+        "-axislabels" {
+            set bool $_settings($what)
             SendCmd "axis labels all $bool"
+        }
+        "-axisminorticks" {
+            set bool $_settings($what)
+            SendCmd "axis minticks all $bool"
         }
         "-xaxisgrid" - "-yaxisgrid" - "-zaxisgrid" {
@@ -1671 +1674 @@
 
     checkbutton $inner.visible \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable [itcl::scope _settings(-axesvisible)] \
         -command [itcl::code $this AdjustSetting -axesvisible] \
@@ -1677 +1680 @@
 
     checkbutton $inner.labels \
-        -text "Show Axis Labels" \
-        -variable [itcl::scope _settings(-axislabelsvisible)] \
-        -command [itcl::code $this AdjustSetting -axislabelsvisible] \
+        -text "Axis Labels" \
+        -variable [itcl::scope _settings(-axislabels)] \
+        -command [itcl::code $this AdjustSetting -axislabels] \
         -font "Arial 9"
-
-    checkbutton $inner.gridx \
-        -text "Show X Grid" \
+    label $inner.grid_l -text "Grid" -font "Arial 9" 
+    checkbutton $inner.xgrid \
+        -text "X" \
         -variable [itcl::scope _settings(-xaxisgrid)] \
         -command [itcl::code $this AdjustSetting -xaxisgrid] \
         -font "Arial 9"
-    checkbutton $inner.gridy \
-        -text "Show Y Grid" \
+    checkbutton $inner.ygrid \
+        -text "Y" \
         -variable [itcl::scope _settings(-yaxisgrid)] \
         -command [itcl::code $this AdjustSetting -yaxisgrid] \
         -font "Arial 9"
-    checkbutton $inner.gridz \
-        -text "Show Z Grid" \
+    checkbutton $inner.zgrid \
+        -text "Z" \
         -variable [itcl::scope _settings(-zaxisgrid)] \
         -command [itcl::code $this AdjustSetting -zaxisgrid] \
+        -font "Arial 9"
+    checkbutton $inner.minorticks \
+        -text "Minor Ticks" \
+        -variable [itcl::scope _settings(-axisminorticks)] \
+        -command [itcl::code $this AdjustSetting -axisminorticks] \
         -font "Arial 9"
 
@@ -1712 +1720 @@
 
     blt::table $inner \
-        0,0 $inner.visible -anchor w -cspan 2 \
-        1,0 $inner.labels  -anchor w -cspan 2 \
-        2,0 $inner.gridx   -anchor w -cspan 2 \
-        3,0 $inner.gridy   -anchor w -cspan 2 \
-        4,0 $inner.gridz   -anchor w -cspan 2 \
-        5,0 $inner.mode_l  -anchor w -cspan 2 -padx { 2 0 } \
-        6,0 $inner.mode    -fill x   -cspan 2 
+        0,0 $inner.visible -anchor w -cspan 4 \
+        1,0 $inner.labels  -anchor w -cspan 4 \
+        2,0 $inner.minorticks  -anchor w -cspan 4 \
+        4,0 $inner.grid_l  -anchor w \
+        4,1 $inner.xgrid   -anchor w \
+        4,2 $inner.ygrid   -anchor w \
+        4,3 $inner.zgrid   -anchor w \
+        5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
+        5,1 $inner.mode    -fill x   -cspan 3
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c1 -resize expand
-}
-
+    blt::table configure $inner r7 c6 -resize expand
+    blt::table configure $inner r3 -height 0.125i
+}
 
 itcl::body Rappture::VtkSurfaceViewer::BuildCameraTab {} {