Changeset 4712 for branches/1.3/gui/scripts

Timestamp:

Nov 12, 2014 11:56:13 PM (10 years ago)

Author:

ldelgass

Message:

Add per-component visibility control

File:

• branches/1.3/gui/scripts/nanovisviewer.tcl (modified) (6 diffs)

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -150 +150 @@
     private variable _transferFunctionEditors
     private variable _settings
-    private variable _alphamap
     private variable _widget
 
@@ -1690 +1689 @@
     #set bfg [option get $itk_component(hull) boldFont Font]
 
-    checkbutton $inner.vol -text "Show volume" -font $fg \
-        -variable [itcl::scope _settings(-volumevisible)] \
-        -command [itcl::code $this AdjustSetting -volumevisible]
     label $inner.shading -text "Shading:" -font $fg
 
@@ -1698 +1694 @@
         -variable [itcl::scope _settings(-light2side)] \
         -command [itcl::code $this AdjustSetting -light2side]
+
+    checkbutton $inner.visibility -text "Visible" -font $fg \
+        -variable [itcl::scope _settings(-volumevisible)] \
+        -command [itcl::code $this AdjustSetting -volumevisible]
 
     label $inner.dim -text "Glow" -font $fg
@@ -1747 +1747 @@
         1,0 $inner.shading -cspan 4 -anchor w -pady {10 2} \
         2,0 $inner.light2side -cspan 4 -anchor w -pady 2 \
-        3,0 $inner.dim -anchor e -pady 2 \
-        3,1 $inner.light -cspan 2 -pady 2 -fill x \
-        3,3 $inner.bright -anchor w -pady 2 \
-        4,0 $inner.fog -anchor e -pady 2 \
-        4,1 $inner.transp -cspan 2 -pady 2 -fill x \
-        4,3 $inner.plastic -anchor w -pady 2 \
-        5,0 $inner.thin -anchor e -pady 2 \
-        5,1 $inner.thickness -cspan 2 -pady 2 -fill x\
-        5,3 $inner.thick -anchor w -pady 2
+        3,0 $inner.visibility -cspan 4 -anchor w -pady 2 \
+        4,0 $inner.dim -anchor e -pady 2 \
+        4,1 $inner.light -cspan 2 -pady 2 -fill x \
+        4,3 $inner.bright -anchor w -pady 2 \
+        5,0 $inner.fog -anchor e -pady 2 \
+        5,1 $inner.transp -cspan 2 -pady 2 -fill x \
+        5,3 $inner.plastic -anchor w -pady 2 \
+        6,0 $inner.thin -anchor e -pady 2 \
+        6,1 $inner.thickness -cspan 2 -pady 2 -fill x\
+        6,3 $inner.thick -anchor w -pady 2
 
     blt::table configure $inner c0 c1 c3 r* -resize none
-    blt::table configure $inner r6 -resize expand
+    blt::table configure $inner r7 -resize expand
 }
 
@@ -1772 +1773 @@
         -command [itcl::code $this AdjustSetting -cutplanesvisible] \
         -font "Arial 9"
-    
+
     # X-value slicer...
     itk_component add xCutButton {
@@ -1857 +1858 @@
 
     blt::table $inner \
-        1,1 $itk_component(xCutButton) \
-        1,2 $itk_component(yCutButton) \
-        1,3 $itk_component(zCutButton) \
-        0,1 $itk_component(xCutScale) \
-        0,2 $itk_component(yCutScale) \
-        0,3 $itk_component(zCutScale) 
-
-    blt::table configure $inner r0 r1 c* -resize none
-    blt::table configure $inner r2 c4 -resize expand
+        0,1 $inner.visible              -anchor w -pady 2 -cspan 4 \
+        1,1 $itk_component(xCutScale) \
+        1,2 $itk_component(yCutScale) \
+        1,3 $itk_component(zCutScale) \
+        2,1 $itk_component(xCutButton) \
+        2,2 $itk_component(yCutButton) \
+        2,3 $itk_component(zCutButton)
+
+    blt::table configure $inner r0 r1 r2 c* -resize none
+    blt::table configure $inner r3 c4 -resize expand
     blt::table configure $inner c0 -width 2
     blt::table configure $inner c1 c2 c3 -padx 2