Changeset 4208

Timestamp:

Mar 6, 2014, 1:05:05 PM (11 years ago)

Author:

ldelgass

Message:

Merge trunk version of heightmap viewer for stretch-to-fit settings

Location:

branches/1.3/gui/scripts

Files:

• images/stretchtofit.png (added)
• vtkheightmapviewer.tcl (modified) (28 diffs)

branches/1.3/gui/scripts/vtkheightmapviewer.tcl

@@ -64 +64 @@
     public method scale {args}
 
+    protected method CameraReset {}
     protected method Connect {}
     protected method CurrentDatasets {args}
@@ -124 +125 @@
     private variable _currentOpacity ""
 
+    private variable _maxScale 100;     # This is the # of times the x-axis
+                                        # and y-axis ranges can differ before
+                                        # automatically turning on
+                                        # -stretchtofit
+
     private variable _click        ;    # info used for rotate operations
     private variable _limits       ;    # Holds overall limits for all dataobjs 
@@ -154 +160 @@
     private variable _curFldName ""
     private variable _curFldLabel ""
-    private variable _colorMode "vmag";#  Mode of colormap (vmag or scalar)
+    private variable _colorMode "scalar";#  Mode of colormap (vmag or scalar)
 }
 
@@ -283 +289 @@
             -highlightthickness 0 \
             -image [Rappture::icon reset-view] \
-            -command [itcl::code $this Zoom reset]
+            -command [itcl::code $this CameraReset]
     } {
         usual
         ignore -highlightthickness
     }
-    pack $itk_component(reset) -side top -padx 2 -pady 2
+    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"
 
@@ -300 +306 @@
         ignore -highlightthickness
     }
-    pack $itk_component(zoomin) -side top -padx 2 -pady 2
+    pack $itk_component(zoomin) -side top -padx 2 -pady { 2 0 }
     Rappture::Tooltip::for $itk_component(zoomin) "Zoom in"
 
@@ -312 +318 @@
         ignore -highlightthickness
     }
-    pack $itk_component(zoomout) -side top -padx 2 -pady 2
+    pack $itk_component(zoomout) -side top -padx 2 -pady { 2 0 }
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
@@ -324 +330 @@
     Rappture::Tooltip::for $itk_component(mode) \
         "Toggle the surface/contour on/off"
-    pack $itk_component(mode) -padx 2 -pady 2
+    pack $itk_component(mode) -padx 2 -pady { 2 0 }
+
+    itk_component add stretchtofit {
+        Rappture::PushButton $f.stretchtofit \
+            -onimage [Rappture::icon stretchtofit] \
+            -offimage [Rappture::icon stretchtofit] \
+            -variable [itcl::scope _settings(stretchToFit)] \
+            -command [itcl::code $this AdjustSetting stretchToFit] \
+    }
+    Rappture::Tooltip::for $itk_component(stretchtofit) \
+        "Stretch plot to fit window on/off"
+    pack $itk_component(stretchtofit) -padx 2 -pady 2
 
     if { [catch {
@@ -629 +646 @@
             }
             set _limits($axis) [list $amin $amax]
+            set units [$dataobj hints ${axis}units]
+            set found($units) 1
         }
         foreach { fname lim } [$dataobj fieldlimits] {
@@ -644 +663 @@
             }
             set _limits($fname) [list $fmin $fmax]
+        }
+    }
+    if { [array size found] > 1 } {
+        set _settings(stretchToFit) 1
+    } else {
+        # Check if the range of the x and y axes requires that we stretch
+        # the contour to fit the plotting area.  This can happen when the
+        # x and y scales differ greatly (> 100x)
+        foreach {xmin xmax} $_limits(x) break
+        foreach {ymin ymax} $_limits(y) break
+        if { (($xmax - $xmin) > (($ymax -$ymin) * $_maxScale)) ||
+             ((($xmax - $xmin) * $_maxScale) < ($ymax -$ymin)) } {
+            set _settings(stretchToFit) 1
         }
     }
@@ -723 +755 @@
         if { $_reportClientInfo }  {
             # Tell the server the viewer, hub, user and session.
-            # Do this immediately on connect before buffing any commands
+            # Do this immediately on connect before buffering any commands
             global env
 
@@ -1010 +1042 @@
         
         foreach axis { x y z } {
-            set label [$_first hints ${axis}label]
+            if { $axis == "z" } {
+                set label [$_first hints label]
+            } else {
+                set label [$_first hints ${axis}label]
+            }
             if { $label == "" } {
                 if {$axis == "z"} {
@@ -1115 +1151 @@
 }
 
+itcl::body Rappture::VtkHeightmapViewer::CameraReset {} {
+    array set _view {
+        qw      0.36
+        qx      0.25
+        qy      0.50
+        qz      0.70
+        zoom    1.0
+        xpan    0
+        ypan    0 
+    }
+    if { $_first != "" } {
+        set location [$_first hints camera]
+        if { $location != "" } {
+            array set _view $location
+        }
+    }
+    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    $_arcball quaternion $q
+    if {$_settings(isHeightmap) } {
+        DoRotate
+    }
+    SendCmd "camera reset"
+}
+
 # ----------------------------------------------------------------------
 # USAGE: Zoom in
@@ -1135 +1195 @@
         "reset" {
             array set _view {
-                qw      0.36
-                qx      0.25
-                qy      0.50
-                qz      0.70
                 zoom    1.0
                 xpan    0
                 ypan    0 
-            }
-            if { $_first != "" } {
-                set location [$_first hints camera]
-                if { $location != "" } {
-                    array set _view $location
-                }
-            }
-            set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-            $_arcball quaternion $q
-            if {$_settings(isHeightmap) } {
-                DoRotate
             }
             SendCmd "camera reset"
@@ -1410 +1455 @@
                 return
             }
-            set label [$_first hints zlabel]
+            set label [$_first hints label]
             if { $label == "" } {
                 if { [string match "component*" $_curFldName] } {
@@ -1434 +1479 @@
             SendCmd "dataset scalar $_curFldName"
             SendCmd "heightmap colormode scalar $_curFldName"
-            SendCmd "camera reset"
+            Zoom reset
             UpdateContourList
             DrawLegend
@@ -1514 +1559 @@
                 bind $c <ButtonRelease-1> {}
             }
-            SendCmd "camera reset"
+            Zoom reset
             # Fix the mouse bindings for rotation/panning and the 
             # camera mode. Ideally we'd create a bindtag for these.
@@ -1610 +1655 @@
                 SendCmd "camera aspect native"
             }
+            Zoom reset
         }
         "wireframe" {
@@ -1660 +1706 @@
         incr h -$lineht 
     }
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -1667 +1713 @@
         set cmap $_currentColormap
         SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
-        #SendCmd "heightmap colormode scalar $_curFldName"
-        #SendCmd "dataset scalar $_curFldName"
     }
 }
@@ -1720 +1764 @@
 itcl::body Rappture::VtkHeightmapViewer::SetCurrentColormap { name } {
     # Keep track of the colormaps that we build.
-    if { ![info exists _colormaps($name)] } {
+    if { $name != "none" && ![info exists _colormaps($name)] } {
         BuildColormap $name 
         set _colormaps($name) 1
@@ -1958 +2002 @@
     itk_component add numisolines {
         Rappture::Spinint $inner.numisolines \
-            -min 1 -max 50 -font "arial 9"
+            -min 0 -max 50 -font "arial 9"
     }
     $itk_component(numisolines) value $_settings(numIsolines)
@@ -2048 +2092 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axisflymode) value "static"
@@ -2264 +2308 @@
         $itk_component(colormap) value $style(-color)
     }
+    if { [info exists style(-stretchtofit)] } {
+        set _settings(stretchToFit) $style(-stretchtofit)
+        AdjustSetting stretchToFit
+    }
     set _currentOpacity $style(-opacity)
     if { $_currentNumIsolines != $style(-levels) } {
@@ -2284 +2332 @@
     SendCmd "heightmap isolinecolor [Color2RGB $color] $tag"
     SendCmd "heightmap lighting $_settings(isHeightmap) $tag"
+    SendCmd "heightmap isolines $_settings(isolinesVisible) $tag"
+    SendCmd "heightmap surface $_settings(colormapVisible) $tag"
 }
 
@@ -2379 +2429 @@
 
     # Draw the isolines on the legend.
+    array unset _isolines
     if { $color != "none"  && [info exists _limits($_curFldName)] && 
          $_settings(isolinesVisible) && $_currentNumIsolines > 0 } {
@@ -2422 +2473 @@
     incr y $lineht
     $c coords colormap $x $y
-    set ix [image width $_image(legend)]
-    set ih [image height $_image(legend)]
     $c coords sensor [expr $x - $iw] $y $x [expr $y + $ih]
     $c raise sensor
@@ -2563 +2612 @@
         return $sval
     }
-    set sval 0 
+    return 0 
 }
 
@@ -2588 +2637 @@
 
 itcl::body Rappture::VtkHeightmapViewer::UpdateContourList {} { 
+    if {$_currentNumIsolines == 0} {
+        set _contourList ""
+        return
+    }
     if { ![info exists _limits($_curFldName)] } {
         return