Changeset 4703 for branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

Timestamp:

Nov 12, 2014 2:47:37 PM (9 years ago)

Author:

ldelgass

Message:

merge r4688 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (8 diffs)

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -240 +240 @@
     array set _settings {
         -axesvisible                    1
-        -axislabelsvisible              1
+        -axislabels                     1
+        -axisminorticks                 1
         -axismode                       "static"
         -background                     black
@@ -994 +995 @@
         set _first ""
         InitSettings -xgrid -ygrid -zgrid -axismode \
-            -axesvisible -axislabelsvisible -ortho
-        SendCmd "axis lformat all %g"
-        # Too many major ticks, so turn off minor ticks
-        SendCmd "axis minticks all 0"
+            -axesvisible -axislabels -axisminorticks -ortho
+        #SendCmd "axis lformat all %g"
         StopBufferingCommands
         SendCmd "imgflush"
@@ -1032 +1031 @@
                     SendCmd "clientinfo [list $info]"
                 }
-                append _outbuf "dataset add $tag data follows $length\n"
+                SendCmd "dataset add $tag data follows $length"
                 append _outbuf $bytes
                 set _datasets($tag) 1
@@ -1321 +1320 @@
             SendCmd "axis visible all $bool"
         }
-        "-axislabelsvisible" {
+        "-axislabels" {
             set bool $_settings($what)
             SendCmd "axis labels all $bool"
+        }
+        "-axisminorticks" {
+            set bool $_settings($what)
+            SendCmd "axis minticks all $bool"
         }
         "-axismode" {
@@ -1757 +1760 @@
 
     checkbutton $inner.visible \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable [itcl::scope _settings(-axesvisible)] \
         -command [itcl::code $this AdjustSetting -axesvisible] \
@@ -1763 +1766 @@
 
     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(-xgrid)] \
         -command [itcl::code $this AdjustSetting -xgrid] \
         -font "Arial 9"
-    checkbutton $inner.gridy \
-        -text "Show Y Grid" \
+    checkbutton $inner.ygrid \
+        -text "Y" \
         -variable [itcl::scope _settings(-ygrid)] \
         -command [itcl::code $this AdjustSetting -ygrid] \
         -font "Arial 9"
-    checkbutton $inner.gridz \
-        -text "Show Z Grid" \
+    checkbutton $inner.zgrid \
+        -text "Z" \
         -variable [itcl::scope _settings(-zgrid)] \
         -command [itcl::code $this AdjustSetting -zgrid] \
+        -font "Arial 9"
+    checkbutton $inner.minorticks \
+        -text "Minor Ticks" \
+        -variable [itcl::scope _settings(-axisminorticks)] \
+        -command [itcl::code $this AdjustSetting -axisminorticks] \
         -font "Arial 9"
 
@@ -1798 +1806 @@
 
     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
 }
 
@@ -2575 +2586 @@
     }
     if { $_contourList(numLevels) < 1 } {
-        puts stderr "numLevels < 1"
+        # There are tools that set 0 levels to get cutplanes only
+        #puts stderr "numLevels < 1"
         return ""
     }