Changeset 4741 for branches

Timestamp:

Nov 17, 2014 5:35:00 AM (9 years ago)

Author:

ldelgass

Message:

Remove cutplane edges/wireframe controls

File:

• branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) (7 diffs)

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -98 +98 @@
     private method EnterLegend { x y } 
     private method EventuallyResize { w h } 
+    private method EventuallyRequestLegend {} 
     private method EventuallyRotate { q } 
     private method EventuallySetCutplane { axis args } 
@@ -223 +224 @@
         -axisminorticks                 1
         -background                     black
-        -cutplaneedges                  0
         -cutplanelighting               1
         -cutplaneopacity                100
         -cutplanesvisible               0
-        -cutplanewireframe              0
         -legendvisible                  1
         -volumelighting                 1
@@ -469 +468 @@
 }
 
+itcl::body Rappture::VtkVolumeViewer::EventuallyRequestLegend {} {
+    if { !$_legendPending } {
+        set _legendPending 1
+        $_dispatcher event -idle !legend
+    }
+}
+
 set rotate_delay 100
 
@@ -1377 +1383 @@
             SendCmd "axis flymode $mode"
         }
-        "-cutplaneedges" {
-            set bool $_settings($what)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "$_cutplaneCmd edges $bool $dataset"
-            }
-        }
         "-cutplanesvisible" {
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
                 SendCmd "$_cutplaneCmd visible $bool $dataset"
-            }
-        }
-        "-cutplanewireframe" {
-            set bool $_settings($what)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "$_cutplaneCmd wireframe $bool $dataset"
             }
         }
@@ -1872 +1866 @@
         -font "Arial 9"
 
-    checkbutton $inner.wireframe \
-        -text "Show Wireframe" \
-        -variable [itcl::scope _settings(-cutplanewireframe)] \
-        -command [itcl::code $this AdjustSetting -cutplanewireframe] \
-        -font "Arial 9"
-
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
         -variable [itcl::scope _settings(-cutplanelighting)] \
         -command [itcl::code $this AdjustSetting -cutplanelighting] \
-        -font "Arial 9"
-
-    checkbutton $inner.edges \
-        -text "Show Edges" \
-        -variable [itcl::scope _settings(-cutplaneedges)] \
-        -command [itcl::code $this AdjustSetting -cutplaneedges] \
         -font "Arial 9"
 
@@ -1984 +1966 @@
         0,0 $inner.visible              -anchor w -pady 2 -cspan 4 \
         1,0 $inner.lighting             -anchor w -pady 2 -cspan 4 \
-        2,0 $inner.wireframe            -anchor w -pady 2 -cspan 4 \
-        3,0 $inner.edges                -anchor w -pady 2 -cspan 4 \
-        4,0 $inner.opacity_l            -anchor w -pady 2 -cspan 3 \
-        5,0 $inner.opacity              -fill x   -pady 2 -cspan 3 \
-        6,0 $itk_component(xCutButton)  -anchor e -padx 2 -pady 2 \
-        7,0 $itk_component(xCutScale)   -fill y \
-        6,1 $itk_component(yCutButton)  -anchor e -padx 2 -pady 2 \
-        7,1 $itk_component(yCutScale)   -fill y \
-        6,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
-        7,2 $itk_component(zCutScale)   -fill y \
+        2,0 $inner.opacity_l            -anchor w -pady 2 -cspan 3 \
+        3,0 $inner.opacity              -fill x   -pady 2 -cspan 3 \
+        4,0 $itk_component(xCutButton)  -anchor e -padx 2 -pady 2 \
+        5,0 $itk_component(xCutScale)   -fill y \
+        4,1 $itk_component(yCutButton)  -anchor e -padx 2 -pady 2 \
+        5,1 $itk_component(yCutScale)   -fill y \
+        4,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
+        5,2 $itk_component(zCutScale)   -fill y
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c3 -resize expand
+    blt::table configure $inner r5 c3 -resize expand
 }
 
@@ -2330 +2310 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: _dropdown post