Changeset 4419 for trunk/gui

Timestamp:

Jun 24, 2014, 1:37:46 PM (10 years ago)

Author:

ldelgass

Message:

Add bbox outline to mesh viewer

File:

• trunk/gui/scripts/vtkmeshviewer.tcl (modified) (11 diffs)

trunk/gui/scripts/vtkmeshviewer.tcl

@@ -69 +69 @@
     protected method DoRotate {}
     protected method AdjustSetting {what {value ""}}
-    protected method FixSettings { args  }
+    protected method InitSettings { args  }
     protected method Pan {option x y}
     protected method Pick {x y}
@@ -201 +201 @@
     }]
     array set _settings [subst {
+        outline                 0
         polydata-edges          0
         polydata-lighting       1
@@ -831 +832 @@
         $_arcball resize $w $h
         DoResize
-        FixSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
-            axis-visible axis-labels polydata-edges polydata-lighting polydata-opacity \
-            polydata-visible polydata-wireframe 
+        InitSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
+            axis-visible axis-labels
  
         StopBufferingCommands
@@ -896 +896 @@
         }
     }
+    InitSettings outline
     if { $_reset } {
+        # These are settings that rely on a dataset being loaded.
+        InitSettings polydata-edges polydata-lighting polydata-opacity \
+            polydata-visible polydata-wireframe
+ 
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
         $_arcball quaternion $q 
@@ -1123 +1128 @@
 
 # ----------------------------------------------------------------------
-# USAGE: FixSettings <what> ?<value>?
+# USAGE: InitSettings <what> ?<value>?
 #
 # Used internally to update rendering settings whenever parameters
@@ -1129 +1134 @@
 # to the back end.
 # ----------------------------------------------------------------------
-itcl::body Rappture::VtkMeshViewer::FixSettings { args } {
+itcl::body Rappture::VtkMeshViewer::InitSettings { args } {
     foreach setting $args {
         AdjustSetting $setting
@@ -1147 +1152 @@
     }
     switch -- $what {
+        "outline" {
+            set bool $_settings(outline)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                SendCmd "outline visible $bool $dataset"
+            }
+        }
         "polydata-opacity" {
             foreach dataset [CurrentDatasets -visible $_first] {
@@ -1310 +1321 @@
         -font "Arial 9" -anchor w 
 
+    checkbutton $inner.outline \
+        -text "Show Outline" \
+        -variable [itcl::scope _settings(outline)] \
+        -command [itcl::code $this AdjustSetting outline] \
+        -font "Arial 9" -anchor w 
+
     checkbutton $inner.wireframe \
         -text "Show Wireframe" \
@@ -1349 +1366 @@
     blt::table $inner \
         0,0 $inner.mesh      -cspan 2  -anchor w -pady 2 \
-        1,0 $inner.wireframe -cspan 2  -anchor w -pady 2 \
-        2,0 $inner.lighting  -cspan 2  -anchor w -pady 2 \
-        3,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
-        4,0 $inner.opacity_l -anchor w -pady 2 \
-        4,1 $inner.opacity   -fill x   -pady 2 
+        1,0 $inner.outline   -cspan 2  -anchor w -pady 2 \
+        2,0 $inner.wireframe -cspan 2  -anchor w -pady 2 \
+        3,0 $inner.lighting  -cspan 2  -anchor w -pady 2 \
+        4,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
+        5,0 $inner.opacity_l -anchor w -pady 2 \
+        5,1 $inner.opacity   -fill x   -pady 2 
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r6 c1 -resize expand
+    blt::table configure $inner r7 c1 -resize expand
 }
 
@@ -1729 +1747 @@
         -linewidth 1.0
         -opacity 1.0
+        -outline 0
         -visible 1
         -wireframe 0
@@ -1741 +1760 @@
         set settings(-color) $color
     }
+    SendCmd "outline add $tag"
+    SendCmd "outline color [Color2RGB $settings(-color)] $tag"
+    SendCmd "outline visible $settings(-outline) $tag"
+    set _settings(outline) $settings(-outline)
+
     SendCmd "polydata add $tag"
     SendCmd "polydata visible $settings(-visible) $tag"