Changeset 5157 for trunk

Timestamp:

Mar 21, 2015 2:27:41 AM (9 years ago)

Author:

ldelgass

Message:

Surface viewer fixes (based on changes from isosurface viewer)

Location:

trunk/gui/scripts

Files:

• vtkisosurfaceviewer.tcl (modified) (1 diff)
• vtksurfaceviewer.tcl (modified) (10 diffs)

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1555 +1555 @@
                     SendCmd "contour3d visible $bool $tag"
                 }
-            }
-            if { $bool } {
                 Rappture::Tooltip::for $itk_component(contour) \
                     "Hide the isosurface"

trunk/gui/scripts/vtksurfaceviewer.tcl

@@ -216 +216 @@
         -legendvisible              1
         -numcontours                10
+        -outline                    0
         -surfaceedges               0
         -surfacelighting            1
         -surfaceopacity             100
-        -outline                    0
         -surfacevisible             1
         -surfacewireframe           0
@@ -228 +228 @@
     array set _changed {
         -colormap                0
+        -isolinecolor            0
+        -isolinesvisible         0
         -numcontours             0
+        -outline                 0
+        -surfaceedges            0
+        -surfacelighting         0
         -surfaceopacity          0
+        -surfacevisible          0
+        -surfacewireframe        0
     }
 
@@ -952 +959 @@
             lappend _obj2datasets($dataobj) $tag
             if { [info exists _obj2ovride($dataobj-raise)] } {
-                # Setting dataset visible enables outline
-                # and contour2d
-                SendCmd "dataset visible 1 $tag"
+                SendCmd "polydata visible 1 $tag"
             }
         }
@@ -1356 +1361 @@
         }
         "-isolinecolor" {
+            set _changed($what) 1
             set color [$itk_component(isolineColor) value]
             set _settings($what) $color
@@ -1362 +1368 @@
         }
         "-isolinesvisible" {
+            set _changed($what) 1
             set bool $_settings($what)
-            SendCmd "contour2d visible $bool"
+            SendCmd "contour2d visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "contour2d visible $bool $tag"
+                }
+            }
             DrawLegend
         }
@@ -1387 +1399 @@
         }
         "-outline" {
+            set _changed($what) 1
             set bool $_settings($what)
-            SendCmd "outline visible $bool"
+            SendCmd "outline visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "outline visible $bool $tag"
+                }
+            }
         }
         "-surfaceedges" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "polydata edges $bool"
         }
         "-surfacelighting" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "polydata lighting $bool"
         }
         "-surfaceopacity" {
+            set _changed($what) 1
             set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
@@ -1404 +1425 @@
         }
         "-surfacevisible" {
+            set _changed($what) 1
             set bool $_settings($what)
-            SendCmd "polydata visible $bool"
+            SendCmd "polydata visible 0"
             if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "polydata visible $bool $tag"
+                }
                 Rappture::Tooltip::for $itk_component(surface) \
                     "Hide the surface"
@@ -1416 +1441 @@
         }
         "-surfacewireframe" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "polydata wireframe $bool"
@@ -1915 +1941 @@
     # the code to handle aberrant cases.
 
+    if { $_changed(-surfaceedges) } {
+        set style(-edges) $_settings(-surfaceedges)
+    }
+    if { $_changed(-surfacelighting) } {
+        set style(-lighting) $_settings(-surfacelighting)
+    }
     if { $_changed(-surfaceopacity) } {
         set style(-opacity) [expr $_settings(-surfaceopacity) * 0.01]
+    }
+    if { $_changed(-surfacewireframe) } {
+        set style(-wireframe) $_settings(-surfacewireframe)
     }
     if { $_changed(-numcontours) } {
@@ -1935 +1970 @@
         DrawLegend
     }
-    set _settings(-isolinesvisible) $style(-isolinesvisible)
-    set _settings(-surfacevisible) $style(-surfacevisible)
+    foreach setting {-outline -isolinesvisible -surfacevisible -isolinecolor} {
+        if {$_changed($setting)} {
+            # User-modified UI setting overrides style
+            set style($setting) $_settings($setting)
+        } else {
+            # Set UI control to style setting (tool provided or default)
+            set _settings($setting) $style($setting)
+        }
+    }
 
     SendCmd "outline add $tag"
     SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
     SendCmd "outline visible $style(-outline) $tag"
-    set _settings(-outline) $style(-outline)
 
     SendCmd "polydata add $tag"