Changeset 5055

Timestamp:

Mar 3, 2015 1:28:40 PM (9 years ago)

Author:

dkearney

Message:

merging vtk isosurface viewer and gauge widget changes for adjustable legend ranges feature from trunk to branch 1.3

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/gauge.tcl (modified) (3 diffs)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (29 diffs)

branches/1.3/gui/scripts/gauge.tcl

@@ -42 +42 @@
     itk_option define -sampleheight sampleHeight SampleHeight 0
     itk_option define -log log Log ""
+    itk_option define -validatecommand validateCommand ValidateCommand ""
 
     constructor {args} { # defined below }
@@ -236 +237 @@
             }
             real {
-                # "scan" will reject the number if the string is "NaN" or
-                # "Inf" or the empty string.  It also is accepts large numbers
-                # (e.g. 111111111111111111111) that "string is double"
-                # rejects.  The problem with "scan" is that it doesn't care if
-                # there are extra characters trailing the number (eg. "123a").
-                # The extra %s substitution is used to detect this case.
+                # "scan" will reject the number if the string is "NaN" or
+                # "Inf" or the empty string.  It also is accepts large numbers
+                # (e.g. 111111111111111111111) that "string is double"
+                # rejects.  The problem with "scan" is that it doesn't care if
+                # there are extra characters trailing the number (eg. "123a").
+                # The extra %s substitution is used to detect this case.
                 if { [scan $nv "%g%s" dummy1 dummy2] != 1 } {
                     error "bad value \"$nv\": should be a real number"
@@ -288 +289 @@
                 error "maximum value allowed here is $convMaxVal"
             }
+        }
+
+        #
+        # If there's a -validatecommand option, then invoke the code
+        # now to check the new value.
+        #
+        if {[string length $itk_option(-validatecommand)] > 0} {
+            set cmd "uplevel #0 [list $itk_option(-validatecommand) [list $newval]]"
+            set result [eval $cmd]
         }
 

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -70 +70 @@
     private method BuildDownloadPopup { widget command }
     private method BuildIsosurfaceTab {}
-    private method Combo { option }
     private method Connect {}
     private method CurrentDatasets {args}
+    private method DisableMouseRotationBindings {}
     private method Disconnect {}
     private method DoChangeContourLevels {}
@@ -90 +90 @@
     private method IsValidObject { dataobj }
     private method LeaveLegend {}
+    private method LegendB1Motion {status x y}
+    private method LegendPointToValue { x y }
+    private method LegendProbeSingleContour { x y }
+    private method LegendRangeAction { option args }
+    private method LegendRangeValidate { widget which value }
+    private method LegendTitleAction { option }
     private method MotionLegend { x y }
+    private method MouseOver2Which {}
     private method Pan {option x y}
     private method PanCamera {}
@@ -106 +113 @@
     private method SetCurrentFieldName { dataobj }
     private method SetLegendTip { x y }
+    private method SetMinMaxGauges { min max }
     private method SetObjectStyle { dataobj comp }
     private method SetOrientation { side }
+    private method SetupMouseRotationBindings {}
+    private method SetupMousePanningBindings {}
+    private method SetupKeyboardBindings {}
     private method Slice {option args}
+    private method ToggleCustomRange { args }
     private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
@@ -162 +174 @@
     private variable _curFldName ""
     private variable _curFldLabel ""
+
+    private variable _mouseOver "";     # what called LegendRangeAction, vmin or vmax
+    private variable _customRangeClick 1;   # what called ToggleCustomRange
 }
 
@@ -247 +262 @@
         -colormap                   BCGYR
         -colormapvisible            1
+        -customrange                0
+        -customrangemin             0
+        -customrangemax             1
         -cutplaneedges              0
         -cutplanelighting           1
@@ -299 +317 @@
         ignore -background -foreground -relief -tearoff
     }
+
+    # add an editor for adjusting the legend min and max values
+    itk_component add editor {
+        Rappture::Editor $itk_interior.editor \
+            -activatecommand [itcl::code $this LegendRangeAction activate] \
+            -validatecommand [itcl::code $this LegendRangeAction validate] \
+            -applycommand [itcl::code $this LegendRangeAction apply]
+    }
+
     set c $itk_component(view)
     bind $c <Configure> [itcl::code $this EventuallyResize %w %h]
@@ -409 +436 @@
     blt::table configure $itk_component(plotarea) c1 -resize none
 
+    SetupMouseRotationBindings
+    SetupMousePanningBindings
+    SetupKeyboardBindings
+
+
+    #bind $itk_component(view) <ButtonRelease-3> \
+    #    [itcl::code $this Pick %x %y]
+
+
+    if {[string equal "x11" [tk windowingsystem]]} {
+        # Bindings for zoom via mouse
+        bind $itk_component(view) <4> [itcl::code $this Zoom out]
+        bind $itk_component(view) <5> [itcl::code $this Zoom in]
+    }
+
+    set _image(download) [image create photo]
+
+    eval itk_initialize $args
+
+    EnableWaitDialog 500
+    Connect
+    # FIXME: Removing this update breaks wizard mode (see examples/3D)
+    # However, it also allows an error in the initialization order
+    # where FieldResult::add is called from ResultViewer before this
+    # constructor is completed.
+    #update
+}
+
+# ----------------------------------------------------------------------
+# DESTRUCTOR
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::destructor {} {
+    Disconnect
+    image delete $_image(plot)
+    image delete $_image(download)
+    catch { blt::arcball destroy $_arcball }
+}
+
+itcl::body Rappture::VtkIsosurfaceViewer::SetupMouseRotationBindings {} {
     # Bindings for rotation via mouse
     bind $itk_component(view) <ButtonPress-1> \
@@ -416 +482 @@
     bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
-
+}
+
+itcl::body Rappture::VtkIsosurfaceViewer::DisableMouseRotationBindings {} {
+    # Bindings for rotation via mouse
+    bind $itk_component(view) <ButtonPress-1> ""
+    bind $itk_component(view) <B1-Motion> ""
+    bind $itk_component(view) <ButtonRelease-1> ""
+}
+
+itcl::body Rappture::VtkIsosurfaceViewer::SetupMousePanningBindings {} {
     # Bindings for panning via mouse
     bind $itk_component(view) <ButtonPress-2> \
@@ -424 +499 @@
     bind $itk_component(view) <ButtonRelease-2> \
         [itcl::code $this Pan release %x %y]
-
-    #bind $itk_component(view) <ButtonRelease-3> \
-    #    [itcl::code $this Pick %x %y]
-
+}
+
+itcl::body Rappture::VtkIsosurfaceViewer::SetupKeyboardBindings {} {
     # Bindings for panning via keyboard
     bind $itk_component(view) <KeyPress-Left> \
@@ -453 +527 @@
 
     bind $itk_component(view) <Enter> "focus $itk_component(view)"
-
-    if {[string equal "x11" [tk windowingsystem]]} {
-        # Bindings for zoom via mouse
-        bind $itk_component(view) <4> [itcl::code $this Zoom out]
-        bind $itk_component(view) <5> [itcl::code $this Zoom in]
-    }
-
-    set _image(download) [image create photo]
-
-    eval itk_initialize $args
-
-    EnableWaitDialog 500
-    Connect
-}
-
-# ----------------------------------------------------------------------
-# DESTRUCTOR
-# ----------------------------------------------------------------------
-itcl::body Rappture::VtkIsosurfaceViewer::destructor {} {
-    Disconnect
-    image delete $_image(plot)
-    image delete $_image(download)
-    catch { blt::arcball destroy $_arcball }
 }
 
@@ -725 +776 @@
             if { ![info exists _limits($fname)] } {
                 set _limits($fname) $lim
+
+                # set reasonable defaults for
+                # customrangevmin and customrangevmax
+                foreach {min max} $lim break
+                SetMinMaxGauges $min $max
+                set _settings(-customrangemin) $min
+                set _settings(-customrangemax) $max
+
                 continue
             }
             foreach {min max} $lim break
             foreach {fmin fmax} $_limits($fname) break
+            if { ! $_settings(-customrange) } {
+                SetMinMaxGauges $fmin $fmax
+            }
             if { $fmin > $min } {
                 set fmin $min
@@ -1055 +1117 @@
             -isosurfacelighting \
             -field \
+            -range \
             -isosurfacevisible \
             -isosurfaceedges -isosurfacelighting -isosurfaceopacity \
@@ -1429 +1492 @@
                 SendCmd "dataset maprange all"
             } else {
-                SendCmd "dataset maprange explicit $_limits($_curFldName) $_curFldName"
+                if { $_settings(-customrange) } {
+                    set vmin [$itk_component(min) value]
+                    set vmax [$itk_component(max) value]
+                } else {
+                    foreach { vmin vmax } $_limits($_curFldName) break
+                    # set the min / max gauges with limits from the field
+                    # the legend's min and max text will be updated
+                    # when the legend is redrawn in DrawLegend
+                    SetMinMaxGauges $vmin $vmax
+                }
+                SendCmd "dataset maprange explicit $vmin $vmax $_curFldName"
             }
             SendCmd "cutplane colormode $_colorMode $_curFldName"
@@ -1503 +1576 @@
                 }
             }
+        }
+        "-range" {
+            if { $_settings(-customrange) } {
+                set vmin [$itk_component(min) value]
+                set vmax [$itk_component(max) value]
+            } else {
+                foreach { vmin vmax } $_limits($_curFldName) break
+            }
+            GenerateContourList
+            SendCmd [list contour3d contourlist $_contourList(values)]
+            SendCmd "dataset maprange explicit $vmin $vmax $_curFldName"
+            DrawLegend
         }
         "-xcutplanevisible" - "-ycutplanevisible" - "-zcutplanevisible" {
@@ -1575 +1660 @@
         incr h -$lineht
     }
-    # Set the legend on the first heightmap dataset.
+    # Set the legend on the first isosurface dataset.
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
@@ -1720 +1805 @@
     bind $itk_component(numcontours) <<Value>> \
         [itcl::code $this AdjustSetting -numcontours]
+
+
+    # add widgets for setting a custom range on the legend
+
+    itk_component add crange {
+        checkbutton $inner.crange \
+            -text "Use Custom Range:" \
+            -variable [itcl::scope _settings(-customrange)] \
+            -command [itcl::code $this ToggleCustomRange] \
+            -font "Arial 9"
+    }
+
+    itk_component add l_min {
+        label $inner.l_min -text "Min" -font "Arial 9"
+    }
+    itk_component add min {
+        Rappture::Gauge $inner.min \
+            -validatecommand [itcl::code $this LegendRangeValidate "" vmin]
+    }
+    bind $itk_component(min) <<Value>> \
+        [itcl::code $this AdjustSetting -range]
+
+    itk_component add l_max {
+        label $inner.l_max -text "Max" -font "Arial 9"
+    }
+    itk_component add max {
+        Rappture::Gauge $inner.max \
+            -validatecommand [itcl::code $this LegendRangeValidate "" vmax]
+    }
+    bind $itk_component(max) <<Value>> \
+        [itcl::code $this AdjustSetting -range]
+
+    $itk_component(min) configure -state disabled
+    $itk_component(max) configure -state disabled
+
 
     blt::table $inner \
@@ -1739 +1859 @@
         10,0 $inner.opacity_l -anchor w -pady 2 \
         10,1 $inner.opacity   -fill x   -pady 2 -fill x \
+        11,0 $inner.crange    -anchor w -pady 2 -cspan 2 \
+        12,0 $inner.l_min     -anchor w -pady 2 \
+        12,1 $inner.min       -anchor w -pady 2 -fill x \
+        13,0 $inner.l_max     -anchor w -pady 2 \
+        13,1 $inner.max       -anchor w -pady 2 -fill x \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r11 c1 -resize expand
+    blt::table configure $inner r14 c1 -resize expand
 }
 
@@ -2262 +2387 @@
 }
 
+# ----------------------------------------------------------------------
+# USAGE: LegendB1Motion press <x> <y>
+# USAGE: LegendB1Motion motion <x> <y>
+# USAGE: LegendB1Motion release <x> <y>
+#
+# Manage actions for Button 1 presses that happen over the legend.
+# Pressing mouse Button 1 on the legend sends a command to the
+# visualization server to show a specific isosurface.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::LegendB1Motion { status x y } {
+
+    switch -- $status {
+        "press" {
+            DisableMouseRotationBindings
+            LegendProbeSingleContour $x $y
+        }
+        "motion" {
+            DisableMouseRotationBindings
+            LegendProbeSingleContour $x $y
+        }
+        "release" {
+            AdjustSetting -range
+            SetupMouseRotationBindings
+        }
+        default {
+            error "bad option \"$option\": should be one of press, motion, release."
+        }
+    }
+}
+
+
+# ----------------------------------------------------------------------
+# USAGE: LegendPointToValue <x> <y>
+#
+# Convert an x,y point on the legend to a numeric isosurface value.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::LegendPointToValue { x y } {
+
+    set fname $_curFldName
+
+    set font "Arial 8"
+    set lineht [font metrics $font -linespace]
+
+    set ih [image height $_image(legend)]
+    set iy [expr $y - ($lineht + 2)]
+
+    # Compute the value of the point
+    if { [info exists _limits($fname)] } {
+        if { $_settings(-customrange) } {
+            set vmin [$itk_component(min) value]
+            set vmax [$itk_component(max) value]
+        } else {
+            foreach { vmin vmax } $_limits($fname) break
+        }
+        set t [expr 1.0 - (double($iy) / double($ih-1))]
+        set value [expr $t * ($vmax - $vmin) + $vmin]
+    } else {
+        set value 0.0
+    }
+    return $value
+}
+
+
+# ----------------------------------------------------------------------
+# USAGE: LegendProbeSingleContour <x> <y>
+#
+# Calculate the isosurface value for the x,y point and send a commands
+# to the visualization server to show that isosurface.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::LegendProbeSingleContour { x y } {
+
+    set value [LegendPointToValue $x $y]
+    SendCmd [list contour3d contourlist $value]
+}
+
+
 #
 # SetLegendTip --
@@ -2306 +2507 @@
 
     # Compute the value of the point
-    if { [info exists _limits($_curFldName)] } {
-        foreach { vmin vmax } $_limits($_curFldName) break
-        set t [expr 1.0 - (double($iy) / double($ih-1))]
-        set value [expr $t * ($vmax - $vmin) + $vmin]
-    } else {
-        set value 0.0
-    }
+    set value [LegendPointToValue $x $y]
+
+    # Setup the location of the tooltip
     set tx [expr $x + 15]
     set ty [expr $y - 5]
+
+    # Setup the text for the tooltip
     if { [info exists _isolines($y)] } {
         Rappture::Tooltip::text $c [format "$title %g (isosurface)" $_isolines($y)]
@@ -2320 +2519 @@
         Rappture::Tooltip::text $c [format "$title %g" $value]
     }
+
+    # Show the tooltip
     Rappture::Tooltip::tooltip show $c +$tx,+$ty
 }
@@ -2361 +2562 @@
 #
 itcl::body Rappture::VtkIsosurfaceViewer::ReceiveLegend { colormap title min max size } {
-    #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$min,$max size=$size"
+    # puts stderr "ReceiveLegend colormap=$colormap title=$title range=$min,$max size=$size"
     set _title $title
     regsub {\(mag\)} $title "" _title
@@ -2381 +2582 @@
 # DrawLegend --
 #
-#       Draws the legend in the own canvas on the right side of the plot area.
+#       Draws the legend on the canvas on the right side of the plot area.
 #
 itcl::body Rappture::VtkIsosurfaceViewer::DrawLegend {} {
@@ -2435 +2636 @@
         $c bind sensor <Leave> [itcl::code $this LeaveLegend]
         $c bind sensor <Motion> [itcl::code $this MotionLegend %x %y]
+#        $c bind sensor <ButtonPress-1>   [itcl::code $this LegendB1Motion press %x %y]
+#        $c bind sensor <B1-Motion>       [itcl::code $this LegendB1Motion motion %x %y]
+#        $c bind sensor <ButtonRelease-1> [itcl::code $this LegendB1Motion release %x %y]
+
     }
     $c delete isoline
@@ -2447 +2652 @@
          $_settings(-numcontours) > 0 } {
 
-        foreach { vmin vmax } $_limits($_curFldName) break
+        if { $_settings(-customrange) } {
+            set vmin [$itk_component(min) value]
+            set vmax [$itk_component(max) value]
+        } else {
+            foreach { vmin vmax } $_limits($_curFldName) break
+        }
         set range [expr double($vmax - $vmin)]
         if { $range <= 0.0 } {
@@ -2468 +2678 @@
     }
 
-    $c bind title <ButtonPress> [itcl::code $this Combo post]
-    $c bind title <Enter> [itcl::code $this Combo activate]
-    $c bind title <Leave> [itcl::code $this Combo deactivate]
+    $c bind title <ButtonPress> [itcl::code $this LegendTitleAction post]
+    $c bind title <Enter> [itcl::code $this LegendTitleAction enter]
+    $c bind title <Leave> [itcl::code $this LegendTitleAction leave]
     # Reset the item coordinates according the current size of the plot.
     $c itemconfigure title -text $title
     if { [info exists _limits($_curFldName)] } {
-        foreach { vmin vmax } $_limits($_curFldName) break
+        if { $_settings(-customrange) } {
+            set vmin [$itk_component(min) value]
+            set vmax [$itk_component(max) value]
+        } else {
+            foreach { vmin vmax } $_limits($_curFldName) break
+        }
         $c itemconfigure vmin -text [format %g $vmin]
         $c itemconfigure vmax -text [format %g $vmax]
@@ -2492 +2707 @@
     $c raise sensor
     $c coords vmin $x [expr {$h - 2}]
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _dropdown post
-# USAGE: _dropdown unpost
-# USAGE: _dropdown select
-#
-# Used internally to handle the dropdown list for this combobox.  The
-# post/unpost options are invoked when the list is posted or unposted
-# to manage the relief of the controlling button.  The select option
-# is invoked whenever there is a selection from the list, to assign
-# the value back to the gauge.
-# ----------------------------------------------------------------------
-itcl::body Rappture::VtkIsosurfaceViewer::Combo {option} {
+
+    $c bind vmin <ButtonPress> [itcl::code $this LegendRangeAction popup vmin]
+    $c bind vmin <Enter> [itcl::code $this LegendRangeAction enter vmin]
+    $c bind vmin <Leave> [itcl::code $this LegendRangeAction leave vmin]
+
+    $c bind vmax <ButtonPress> [itcl::code $this LegendRangeAction popup vmax]
+    $c bind vmax <Enter> [itcl::code $this LegendRangeAction enter vmax]
+    $c bind vmax <Leave> [itcl::code $this LegendRangeAction leave vmax]
+}
+
+# ----------------------------------------------------------------------
+# USAGE: LegendTitleAction post
+# USAGE: LegendTitleAction enter
+# USAGE: LegendTitleAction leave
+# USAGE: LegendTitleAction save
+#
+# Used internally to handle the dropdown list for the fields menu combobox.
+# The post option is invoked when the field title is pressed to launch the
+# dropdown. The enter option is invoked when the user mouses over the field
+# title. The leave option is invoked when the user moves the mouse away
+# from the field title.  The save option is invoked whenever there is a
+# selection from the list, to alert the visualization server.
+#
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::LegendTitleAction {option} {
     set c $itk_component(view)
     switch -- $option {
@@ -2517 +2743 @@
             tk_popup $itk_component(fieldmenu) $x $y
         }
-        activate {
+        enter {
             $c itemconfigure title -fill red
         }
-        deactivate {
+        leave {
             $c itemconfigure title -fill $itk_option(-plotforeground)
         }
-        invoke {
+        save {
             $itk_component(field) value $_curFldLabel
             AdjustSetting -field
         }
         default {
-            error "bad option \"$option\": should be post, unpost, select"
-        }
-    }
-}
+            error "bad option \"$option\": should be post, enter, leave, save"
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: LegendRangeValidate <widget> <which> <value>
+#
+# Used internally to validate a legend range min/max value.
+# Returns a boolean value telling if <value> was accepted (1) or rejected (0)
+# If the value is rejected, a tooltip/warning message is popped up
+# near the widget that asked for the validation, specified by <widget>
+#
+# <widget> is the widget where a tooltip/warning message should show up on
+# <which> is either "vmin" or "vmax".
+# <value> is the value to be validated.
+#
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::LegendRangeValidate {widget which value} {
+
+    #check for a valid value
+    if {[string is double $value] != 1} {
+        set msg "should be valid number"
+        if {$widget != ""} {
+            Rappture::Tooltip::cue $widget $msg
+        } else {
+            # error "bad value \"$value\": $msg"
+            error $msg
+        }
+        return 0
+    }
+
+    switch -- $which {
+        vmin {
+            # check for min > max
+            if {$value > [$itk_component(max) value]} {
+                set msg "min > max, change max first"
+                if {$widget != ""} {
+                    Rappture::Tooltip::cue $widget $msg
+                } else {
+                    # error "bad value \"$value\": $msg"
+                    error $msg
+                }
+                return 0
+            }
+        }
+        vmax {
+            # check for max < min
+            if {$value < [$itk_component(min) value]} {
+                set msg "max < min, change min first"
+                if {$widget != ""} {
+                    Rappture::Tooltip::cue $widget $msg
+                } else {
+                    # error "bad value \"$value\": $msg"
+                    error $msg
+                }
+                return 0
+            }
+        }
+        default {
+            error "bad option \"$which\": should be vmin, vmax"
+        }
+    }
+}
+
+
+itcl::body Rappture::VtkIsosurfaceViewer::MouseOver2Which {} {
+    switch -- $_mouseOver {
+        vmin {
+            set which min
+        }
+        vmax {
+            set which max
+        }
+        default {
+            error "bad _mouseOver \"$_mouseOver\": should be vmin, vmax"
+        }
+    }
+    return $which
+}
+
+
+# ----------------------------------------------------------------------
+# USAGE: LegendRangeAction enter <which>
+# USAGE: LegendRangeAction leave <which>
+#
+# USAGE: LegendRangeAction popup <which>
+# USAGE: LegendRangeAction activate
+# USAGE: LegendRangeAction validate <value>
+# USAGE: LegendRangeAction apply <value>
+#
+# Used internally to handle the mouseover and popup entry for the field range
+# inputs.  The enter option is invoked when the user moves the mouse over the
+# min or max field range. The leave option is invoked when the user moves the
+# mouse away from the min or max field range. The popup option is invoked when
+# the user click's on a field range. The popup option stores internally which
+# widget is requesting a popup ( in the _mouseOver variable) and calls the
+# activate command of the widget. The widget's activate command calls back to
+# this method to get the xywh dimensions of the popup editor. After the user
+# changes focus or sets the value in the editor, the editor calls this methods
+# validate and apply options to set the value.
+#
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::LegendRangeAction {option args} {
+    set c $itk_component(view)
+
+    switch -- $option {
+        enter {
+            set which [lindex $args 0]
+            $c itemconfigure $which -fill red
+        }
+        leave {
+            set which [lindex $args 0]
+            $c itemconfigure $which -fill $itk_option(-plotforeground)
+        }
+        popup {
+            DisableMouseRotationBindings
+            set which [lindex $args 0]
+            set _mouseOver $which
+            $itk_component(editor) activate
+        }
+        activate {
+            foreach { x1 y1 x2 y2 } [$c bbox $_mouseOver] break
+            set which [MouseOver2Which]
+            set info(text) [$itk_component($which) value]
+            set info(x) [expr $x1 + [winfo rootx $c]]
+            set info(y) [expr $y1 + [winfo rooty $c]]
+            set info(w) [expr $x2 - $x1]
+            set info(h) [expr $y2 - $y1]
+            return [array get info]
+        }
+        validate {
+            if {[llength $args] != 1} {
+                error "wrong # args: should be \"editor validate value\""
+            }
+
+            set value [lindex $args 0]
+            if {[LegendRangeValidate $itk_component(editor) $_mouseOver $value] == 0} {
+                return 0
+            }
+
+            # value was good, apply it
+            # reset the mouse rotation bindings
+            SetupMouseRotationBindings
+        }
+        apply {
+            if {[llength $args] != 1} {
+                error "wrong # args: should be \"editor apply value\""
+            }
+            set value [string trim [lindex $args 0]]
+
+            set which [MouseOver2Which]
+
+            # only set custom range if value changed
+            if {[$itk_component($which) value] != $value} {
+                # set the flag stating the custom range came from the legend
+                # change the value in the gauge
+                # turn on crange to enable the labels and gauges
+                # call AdjustSetting -range (inside ToggleCustomRange)
+                # to update drawing and legend
+                set _customRangeClick 0
+                $itk_component($which) value $value
+                $itk_component(crange) select
+                ToggleCustomRange
+            }
+        }
+        default {
+            error "bad option \"$option\": should be enter, leave, activate, validate, apply"
+        }
+    }
+}
+
+
+# ----------------------------------------------------------------------
+# USAGE: ToggleCustomRange
+#
+# Called whenever the custom range is turned on or off. Used to save
+# the custom min and custom max set by the user. When the -customrange
+# setting is turned on, the range min and range max gauges are set
+# with the last value set by the user, or the default range if no
+# previous min and max were set.
+#
+# When the custom range is turned on, we check how it was turned on
+# by querying _customRangeClick. If the variable is 1, this means
+# the user clicked the crange checkbutton and we should pull the
+# custom range values from our backup variables. If the variable is 0,
+# the custom range was enabled through the user manipulating the
+# min and max value in the legend.
+#
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::ToggleCustomRange {args} {
+    if { ! $_settings(-customrange) } {
+        # custom range was turned off
+
+        # disable the min/max labels and gauge widgets
+        $itk_component(l_min) configure -state disabled
+        $itk_component(min) configure -state disabled
+        $itk_component(l_max) configure -state disabled
+        $itk_component(max) configure -state disabled
+
+        # backup the custom range
+        set _settings(-customrangemin) [$itk_component(min) value]
+        set _settings(-customrangemax) [$itk_component(max) value]
+
+        # set the gauges to dataset's min and max
+        foreach { vmin vmax } $_limits($_curFldName) break
+        SetMinMaxGauges $vmin $vmax
+    } else {
+        # custom range was turned on
+
+        # enable the min/max labels and gauge widgets
+        $itk_component(l_min) configure -state normal
+        $itk_component(min) configure -state normal
+        $itk_component(l_max) configure -state normal
+        $itk_component(max) configure -state normal
+
+        # if the custom range is being turned on by clicking the
+        # checkbox, restore the min and max gauges from the backup
+        # variables. otherwise, new values for the min and max
+        # widgets will be set later from the legend's editor.
+        if { $_customRangeClick } {
+            SetMinMaxGauges $_settings(-customrangemin) $_settings(-customrangemax)
+        }
+
+        # reset the click flag
+        set _customRangeClick 1
+    }
+    AdjustSetting -range
+}
+
+
+# ----------------------------------------------------------------------
+# USAGE: SetMinMaxGauges <min> <max>
+#
+# Set the min and max gauges in the correct order, avoiding the
+# error where you try to set the min > max before updating the max or
+# set the max < min before updating the min.
+#
+# There are five range cases to consider with our current range validation.
+# For example:
+# [2,3] -> [0,1]       : update min first, max last
+# [2,3] -> [4,5]       : update max first, min last
+# [2,3] -> [0,2.5]     : update min or max first
+# [2,3] -> [2.5,5]     : update min or max first
+# [2,3] -> [2.25,2.75] : update min or max first
+#
+# In 4 of the cases we can update min first and max last, so we only
+# need to check the case where old max < new min, where we update
+# max first and min last.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkIsosurfaceViewer::SetMinMaxGauges {min max} {
+
+    if { [$itk_component(max) value] < $min} {
+        # old max < new min
+        # shift range toward right
+        # extend max first, then update min
+        $itk_component(max) value $max
+        $itk_component(min) value $min
+    } else {
+        # extend min first, then update max
+        $itk_component(min) value $min
+        $itk_component(max) value $max
+    }
+}
+
 
 #
@@ -2595 +3082 @@
         set values $_contourList(reqValues)
     } else {
+        # use the field limits to calculate the contour list values
         foreach { vmin vmax } $_limits($_curFldName) break
+
+        # if custom range has been set and are within the field's
+        # range, use the custom min and max to generate contour list values
+        if { $_settings(-customrange) } {
+            if { [$itk_component(min) value] > $vmin } {
+                set vmin [$itk_component(min) value]
+            }
+            if { [$itk_component(max) value] < $vmax } {
+                set vmax [$itk_component(max) value]
+            }
+        }
+
         set v [blt::vector create \#auto]
         $v seq $vmin $vmax [expr $_contourList(numLevels)+2]
@@ -2625 +3125 @@
                 -activeforeground $itk_option(-plotforeground) \
                 -font "Arial 8" \
-                -command [itcl::code $this Combo invoke]
+                -command [itcl::code $this LegendTitleAction save]
             set _fields($fname) [list $label $units $components]
             if { $_curFldName == "" } {