Changeset 4684 for trunk

Timestamp:

Nov 10, 2014, 3:46:47 AM (10 years ago)

Author:

ldelgass

Message:

Fix axes settings for glyph viewer, add fix (needs testing) for nanohub ticket
#270436

File:

• trunk/gui/scripts/vtkglyphviewer.tcl (modified) (10 diffs)

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -218 +218 @@
     array set _settings [subst {
         -axesvisible            1
-        -axislabelsvisible      1
+        -axislabels             1
+        -axisminorticks         1
         -axismode               "static"
         -background             black
@@ -959 +960 @@
         set _first ""
         InitSettings -xgrid -ygrid -zgrid -axismode \
-            -axesvisible -axislabelsvisible 
-        foreach axis { x y z } {
-            SendCmd "axis lformat $axis %g"
-        }
+            -axesvisible -axislabels -axisminorticks
+        #SendCmd "axis lformat all %g"
         StopBufferingCommands
         SendCmd "imgflush"
@@ -995 +994 @@
                     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
@@ -1326 +1325 @@
             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"
         }
         "-xgrid" - "-ygrid" - "-zgrid" {
@@ -1347 +1350 @@
         "-cutplanevisible" {
             set bool $_settings($what)
-            SendCmd "cutplane visible $bool"
+            SendCmd "cutplane visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "cutplane visible $bool $tag"
+                }
+            }
         }
         "-cutplanewireframe" {
@@ -1410 +1418 @@
         "-glyphvisible" {
             set bool $_settings($what)
-            SendCmd "glyphs visible $bool"
+            SendCmd "glyphs visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "glyphs visible $bool $tag"
+                }
+            }
             if { $bool } {
                 Rappture::Tooltip::for $itk_component(glyphs) \
@@ -1430 +1443 @@
         "-glyphoutline" {
             set bool $_settings($what)
-            SendCmd "outline visible $bool"
+            SendCmd "outline visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "outline visible $bool $tag"
+                }
+            }
         }
         "-glyphopacity" {
@@ -1771 +1789 @@
 
     checkbutton $inner.visible \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable [itcl::scope _settings(-axesvisible)] \
         -command [itcl::code $this AdjustSetting -axesvisible] \
@@ -1777 +1795 @@
 
     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"
 
@@ -1812 +1835 @@
 
     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
 }