Changeset 5158 for trunk

Timestamp:

Mar 21, 2015 2:41:25 PM (9 years ago)

Author:

ldelgass

Message:

More surface viewer fixes, including color mode on reset fix

File:

• trunk/gui/scripts/vtksurfaceviewer.tcl (modified) (7 diffs)

trunk/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 }
@@ -924 +925 @@
     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) ""
@@ -964 +967 @@
     }
 
-    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
-    }
     InitSettings -isolinesvisible -surfacevisible -outline
     if { $_reset } {
@@ -1020 +994 @@
         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
@@ -1914 +1891 @@
     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]
@@ -1985 +1962 @@
 
     SendCmd "polydata add $tag"
+    if { $_curFldName != "" } {
+        SendCmd "polydata colormode $_colorMode $_curFldName $tag"
+    }
     SendCmd "polydata edges $style(-edges) $tag"
     set _settings(-surfaceedges) $style(-edges)
@@ -2343 +2323 @@
     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
+}