Changeset 6414 for branches/blt4_trunk/gui/scripts/vtkimageviewer.tcl

Timestamp:

Jul 1, 2016 7:11:32 AM (8 years ago)

Author:

ldelgass

Message:

merge from trunk

Location:

branches/blt4_trunk

Files:

• . (modified) (1 prop)
• gui/scripts/vtkimageviewer.tcl (modified) (16 diffs)

branches/blt4_trunk/gui/scripts/vtkimageviewer.tcl

@@ -100 +100 @@
     private method Rotate {option x y}
     private method SetCurrentColormap { color }
+    private method SetCurrentFieldName { dataobj }
     private method SetLegendTip { x y }
     private method SetObjectStyle { dataobj comp }
@@ -243 +244 @@
 
     itk_component add fieldmenu {
-        menu $itk_component(plotarea).menu \
-            -relief flat \
-            -tearoff 0
+        menu $itk_component(plotarea).menu -relief flat -tearoff 0
     } {
         usual
@@ -274 +273 @@
     }
     pack $itk_component(reset) -side top -padx 2 -pady { 2 0 }
-    Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
+    Rappture::Tooltip::for $itk_component(reset) \
+        "Reset the view to the default zoom level"
 
     itk_component add zoomin {
@@ -510 +510 @@
         set _dlist [lreplace $_dlist $pos $pos]
         array unset _obj2ovride $dataobj-*
-        array unset _settings $dataobj-*
         set changed 1
     }
@@ -604 +603 @@
         }
         foreach axis { x y } {
+            set units [$dataobj hints ${axis}units]
+            set found($units) 1
             set lim [$dataobj limits $axis]
             if { ![info exists _limits($axis)] } {
@@ -618 +619 @@
             }
             set _limits($axis) [list $amin $amax]
-            set units [$dataobj hints ${axis}units]
-            set found($units) 1
         }
         foreach { fname lim } [$dataobj fieldlimits] {
@@ -900 +899 @@
         DoResize
         if { $_settings(-stretchtofit) } {
-            AdjustSetting -stretchToFit
+            AdjustSetting -stretchtofit
         }
     }
@@ -907 +906 @@
         # Reset the camera and other view parameters
         #
-        InitSettings -view3d -background
-
+        InitSettings -view3d -background \
+            -xgrid -ygrid -zgrid -axismode \
+            -axesvisible -axislabels -axisminorticks
+
+        SendCmd "axis tickpos outside"
         SendCmd "axis lrot z 90"
         $_arcball quaternion [ViewToQuaternion]
@@ -932 +934 @@
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
             set _first $dataobj
+            SetCurrentFieldName $dataobj
         }
         foreach comp [$dataobj components] {
@@ -968 +971 @@
         }
     }
-    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 LegendTitleAction save]
-                set _fields($fname) [list $label $units $components]
-                if { $_curFldName == "" } {
-                    set _curFldName $fname
-                    set _curFldLabel $label
-                }
-            }
-        }
-        $itk_component(field) value $_curFldLabel
-    }
+
     InitSettings -stretchtofit -outline
-
     if { $_reset } {
-        SendCmd "axis tickpos outside"
-        #SendCmd "axis lformat all %g"
-
         foreach axis { x y z } {
             set label ""
@@ -1043 +1014 @@
         }
         PanCamera
-        InitSettings -xgrid -ygrid -zgrid \
-            -axesvisible -axislabels -field -view3d
+        InitSettings -field -view3d
         if { [array size _fields] < 2 } {
             catch {blt::table forget $itk_component(field) $itk_component(field_l)}
@@ -1275 +1245 @@
 itcl::body Rappture::VtkImageViewer::InitSettings { args } {
     foreach spec $args {
-        if { [info exists _settings($_first${spec})] } {
-            # Reset global setting with dataobj specific setting
-            set _settings($spec) $_settings($_first${spec})
-        }
         AdjustSetting $spec
     }
@@ -1389 +1355 @@
 
             # Get the new limits because the field changed.
-            SendCmd "dataset scalar $_curFldName"
-            #SendCmd "image colormode scalar $_curFldName"
+            SendCmd [list dataset scalar $_curFldName]
+            #SendCmd [list image colormode scalar $_curFldName]
             SendCmd "camera reset"
             DrawLegend
@@ -1545 +1511 @@
             set _colormaps($cmap) 1
         }
-        #SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
+        #SendCmd [list legend $cmap scalar $_curFldName {} $w $h 0]
         SendCmd "legend2 $cmap $w $h"
     }
@@ -2046 +2012 @@
     if { [info exists style(-stretchtofit)] } {
         set _settings(-stretchtofit) $style(-stretchtofit)
-        AdjustSetting -stretchToFit
+        AdjustSetting -stretchtofit
     }
     SendCmd "outline add $tag"
@@ -2327 +2293 @@
     set _view(-zoom) 1.0
 }
+
+itcl::body Rappture::VtkImageViewer::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
+}