Changeset 5181

Timestamp:

Apr 1, 2015 11:06:08 PM (9 years ago)

Author:

ldelgass

Message:

merge r5157:5158 from trunk (surfaceviewer)

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (1 diff)
• gui/scripts/vtksurfaceviewer.tcl (modified) (15 diffs)

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

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

branches/1.3/gui/scripts/vtksurfaceviewer.tcl

@@ -99 +99 @@
     private method Rotate {option x y}
     private method SetCurrentColormap { color }
+    private method SetCurrentFieldName { dataobj }
     private method SetLegendTip { x y }
     private method SetObjectStyle { dataobj comp }
@@ -217 +218 @@
         -legendvisible              1
         -numcontours                10
+        -outline                    0
         -surfaceedges               0
         -surfacelighting            1
         -surfaceopacity             100
-        -outline                    0
         -surfacevisible             1
         -surfacewireframe           0
@@ -229 +230 @@
     array set _changed {
         -colormap                0
+        -isolinecolor            0
+        -isolinesvisible         0
         -numcontours             0
+        -outline                 0
+        -surfaceedges            0
+        -surfacelighting         0
         -surfaceopacity          0
+        -surfacevisible          0
+        -surfacewireframe        0
     }
 
@@ -918 +926 @@
     set _first ""
     SendCmd "dataset visible 0"
+    eval scale $_dlist
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
             set _first $dataobj
+            SetCurrentFieldName $dataobj
         }
         set _obj2datasets($dataobj) ""
@@ -953 +963 @@
             lappend _obj2datasets($dataobj) $tag
             if { [info exists _obj2ovride($dataobj-raise)] } {
-                # Setting dataset visible enables outline
-                # and contour2d
-                SendCmd "dataset visible 1 $tag"
-            }
-        }
-    }
-
-    if { $_first != "" } {
-        $itk_component(field) choices delete 0 end
-        $itk_component(fieldmenu) delete 0 end
-        array unset _fields
-        set _curFldName ""
-        foreach cname [$_first components] {
-            foreach fname [$_first fieldnames $cname] {
-                if { [info exists _fields($fname)] } {
-                    continue
-                }
-                foreach { label units components } \
-                    [$_first fieldinfo $fname] break
-                $itk_component(field) choices insert end "$fname" "$label"
-                $itk_component(fieldmenu) add radiobutton -label "$label" \
-                    -value $label -variable [itcl::scope _curFldLabel] \
-                    -selectcolor red \
-                    -activebackground $itk_option(-plotbackground) \
-                    -activeforeground $itk_option(-plotforeground) \
-                    -font "Arial 8" \
-                    -command [itcl::code $this Combo invoke]
-                set _fields($fname) [list $label $units $components]
-                if { $_curFldName == "" } {
-                    set _curFldName $fname
-                    set _curFldLabel $label
-                }
-            }
-        }
-        $itk_component(field) value $_curFldLabel
-    }
+                SendCmd "polydata visible 1 $tag"
+            }
+        }
+    }
+
     InitSettings -isolinesvisible -surfacevisible -outline
     if { $_reset } {
@@ -1016 +995 @@
         set _reset 0
     }
+    # Redraw the legend even if we're using the same colormap. The position
+    # of the isolines may have changed because the range of data changed.
+    DrawLegend
 
     # Actually write the commands to the server socket.  If it fails, we don't
@@ -1357 +1339 @@
         }
         "-isolinecolor" {
+            set _changed($what) 1
             set color [$itk_component(isolineColor) value]
             set _settings($what) $color
@@ -1363 +1346 @@
         }
         "-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
         }
@@ -1388 +1377 @@
         }
         "-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) }]
@@ -1405 +1403 @@
         }
         "-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"
@@ -1417 +1419 @@
         }
         "-surfacewireframe" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "polydata wireframe $bool"
@@ -1889 +1892 @@
     set tag $dataobj-$comp
     array set style {
-        -color BCGYR
-        -edgecolor black
-        -edges 0
-        -isolinecolor white
+        -color           BCGYR
+        -edgecolor       black
+        -edges           0
+        -isolinecolor    white
         -isolinesvisible 0
-        -levels 10
-        -lighting 1
-        -linewidth 1.0
-        -opacity 1.0
-        -outline 0
-        -surfacevisible 1
-        -wireframe 0
+        -levels          10
+        -lighting        1
+        -linewidth       1.0
+        -opacity         1.0
+        -outline         0
+        -surfacevisible  1
+        -wireframe       0
     }
     array set style [$dataobj style $comp]
@@ -1916 +1919 @@
     # 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) } {
@@ -1936 +1948 @@
         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"
+    if { $_curFldName != "" } {
+        SendCmd "polydata colormode $_colorMode $_curFldName $tag"
+    }
     SendCmd "polydata edges $style(-edges) $tag"
     set _settings(-surfaceedges) $style(-edges)
@@ -2303 +2324 @@
     blt::vector destroy $v
 }
+
+itcl::body Rappture::VtkSurfaceViewer::SetCurrentFieldName { dataobj } {
+    set _first $dataobj
+    $itk_component(field) choices delete 0 end
+    $itk_component(fieldmenu) delete 0 end
+    array unset _fields
+    set _curFldName ""
+    foreach cname [$_first components] {
+        foreach fname [$_first fieldnames $cname] {
+            if { [info exists _fields($fname)] } {
+                continue
+            }
+            foreach { label units components } \
+                [$_first fieldinfo $fname] break
+            $itk_component(field) choices insert end "$fname" "$label"
+            $itk_component(fieldmenu) add radiobutton -label "$label" \
+                -value $label -variable [itcl::scope _curFldLabel] \
+                -selectcolor red \
+                -activebackground $itk_option(-plotbackground) \
+                -activeforeground $itk_option(-plotforeground) \
+                -font "Arial 8" \
+                -command [itcl::code $this LegendTitleAction save]
+            set _fields($fname) [list $label $units $components]
+            if { $_curFldName == "" } {
+                set _curFldName $fname
+                set _curFldLabel $label
+            }
+        }
+    }
+    $itk_component(field) value $_curFldLabel
+}