Changeset 4512 for branches/1.3/gui/scripts/vtkmeshviewer.tcl

Timestamp:

Jul 16, 2014, 4:24:32 PM (10 years ago)

Author:

gah

Message:

test and fixes for meshviewer, add rappture (non-viewer) bug fixes and features

File:

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

branches/1.3/gui/scripts/vtkmeshviewer.tcl

@@ -86 +86 @@
     private method EventuallyResize { w h } 
     private method EventuallyRotate { q } 
-    private method EventuallySetPolydataOpacity { args } 
+    private method EventuallySetPolydataOpacity {} 
     private method GetImage { args } 
     private method GetVtkData { args } 
@@ -111 +111 @@
     private variable _view;             # view params for 3D view
     private variable _settings
+    private variable _widget
     private variable _style;            # Array of current component styles.
     private variable _initialStyle;     # Array of initial component styles.
@@ -128 +129 @@
     private variable _polydataOpacityPending 0
     private variable _rotateDelay 150
+    private variable _opacityDelay 150
 }
 
@@ -188 +190 @@
         -polydataedges          0
         -polydatalighting       1
-        -polydataopacity        100
+        -polydataopacity        0.6
         -polydatavisible        1
         -polydatawireframe      0
@@ -204 +206 @@
         -zposition              0
     }
+    array set _widget {
+        -polydataopacity        0.6
+    }        
     itk_component add view {
         canvas $itk_component(plotarea).view \
@@ -404 +409 @@
     set _polydataOpacityPending 0
     set val $_settings(-polydataopacity)
-    set sval [expr { 0.01 * double($val) }]
-    SendCmd "polydata opacity $sval"
-}
-
-itcl::body Rappture::VtkMeshViewer::EventuallySetPolydataOpacity { val } {
-    set _settings(-polydataopacity) $val
+    SendCmd "polydata opacity $val"
+}
+
+itcl::body Rappture::VtkMeshViewer::EventuallySetPolydataOpacity {} {
     if { !$_polydataOpacityPending } {
         set _polydataOpacityPending 1
-        $_dispatcher event -after $_scaleDelay !polydataOpacity
+        $_dispatcher event -after $_opacityDelay !polydataOpacity
     }
 }
@@ -868 +871 @@
         }
         lappend _obj2datasets($dataobj) $tag
-        if { [info exists _obj2ovride($dataobj-raise)] && 
-             $_obj2ovride($dataobj-raise) } {
+        if { [info exists _obj2ovride($dataobj-raise)] } {
             SendCmd "dataset visible 1 $tag"
-            SetOpacity $tag
+            EventuallySetPolydataOpacity
         }
     }
@@ -897 +899 @@
             -polydatavisible -polydatawireframe
  
+        SendCmd "axis lformat all %g"
+        # Too many major ticks, so turn off minor ticks
+        SendCmd "axis minticks all 0"
+
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
         $_arcball quaternion $q 
@@ -1350 +1356 @@
     label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w 
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-polydataopacity)] \
+        -variable [itcl::scope _widget(-polydataopacity)] \
         -width 10 \
         -showvalue off \
         -command [itcl::code $this AdjustSetting -polydataopacity]
-    $inner.opacity set $_settings(-polydataopacity)
+    $inner.opacity set [expr $_settings(-polydataopacity) * 100.0]
 
     blt::table $inner \
@@ -1735 +1741 @@
         -color white
         -edgecolor black
-        -lighting 1
         -linewidth 1.0
         -outline 0
         -polydataedges 1
-        -polydataopacity 1.0
+        -polydatalighting 1
+        -polydataopacity 0.6
         -polydatavisible 1
         -polydatawireframe 0
@@ -1770 +1776 @@
     SendCmd "polydata linewidth $settings(-linewidth) $tag"
     SendCmd "polydata opacity $settings(-polydataopacity) $tag"
-    set _settings(-polydataopacity) [expr 100.0 * $settings(-polydataopacity)]
+    set _settings(-polydataopacity) $settings(-polydataopacity)
+    set _widget(-polydataopacity) [expr 100.0 * $settings(-polydataopacity)]
     SendCmd "polydata wireframe $settings(-polydatawireframe) $tag"
     set _settings(-polydatawireframe) $settings(-polydatawireframe)