Changeset 4076 for trunk/gui

Timestamp:

Dec 16, 2013, 11:23:44 PM (11 years ago)

Author:

ldelgass

Message:

Use simple X/Y/Z axis labels for image viewer. Also, use native aspect ratio
in 3D mode

File:

• trunk/gui/scripts/vtkimageviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/vtkimageviewer.tcl

@@ -1025 +1025 @@
         
         foreach axis { x y z } {
-            if { $axis == "z" } {
-                set label [$_first hints label]
-            } else {
-                set label [$_first hints ${axis}label]
-            }
+            set label [$_first hints ${axis}label]
             if { $label == "" } {
-                if {$axis == "z"} {
-                    if { [string match "component*" $_curFldName] } {
-                        set label [string toupper $axis]
-                    } else {
-                        set label $_curFldLabel
-                    }
-                } else {
-                    set label [string toupper $axis]
-                }
+                set label [string toupper $axis]
             }
             # May be a space in the axis label.
@@ -1421 +1409 @@
                 return
             }
-            set label [$_first hints label]
-            if { $label == "" } {
-                if { [string match "component*" $_curFldName] } {
-                    set label Z
-                } else {
-                    set label $_curFldLabel
-                }
-            }
-            # May be a space in the axis label.
-            SendCmd [list axis name z $label]
-
-            if { [$_first hints zunits] == "" } {
-                set units [lindex $_fields($_curFldName) 1]
-            } else {
-                set units [$_first hints zunits]
-            }
-            if { $units != "" } {
-                # May be a space in the axis units.
-                SendCmd [list axis units z $units]
-            }
+
             # Get the new limits because the field changed.
             SendCmd "dataset scalar $_curFldName"
@@ -1466 +1435 @@
                     SendCmd "camera mode persp"
                 }
+                SendCmd "camera aspect native"
             } else {
                 $itk_component(opacity) configure -state disabled
                 $itk_component(opacity_l) configure -state disabled
                 SendCmd "camera mode image"
-            }
-            if {$_settings(stretchToFit)} {
-                if {$scale == 0} {
+                if {$_settings(stretchToFit)} {
                     SendCmd "camera aspect window"
-                } else {
-                    SendCmd "camera aspect square"
                 }
             }
@@ -1534 +1500 @@
             if { $bool } {
                 if { $_settings(view3D) } {
-                    SendCmd "camera aspect square"
+                    SendCmd "camera aspect native"
                 } else {
                     SendCmd "camera aspect window"