Changeset 5051 for branches/uiuc_vtk_viewers

Timestamp:

Mar 2, 2015, 6:09:55 PM (10 years ago)

Author:

dkearney

Message:

removing the _ignoreRangeUpdate because newer implementations of the min/max range syncing does not cause a loop between changing the legend values and the gauge values.

added a -range flag to InitSettings? in ::Rebuild so the custom ranges are set.i dont think this works fully because some of the adjustments are inside the ToggleCustomRange? method, which isn't called by AdjustSetting? -range.

remove the trace on the crange widget's textvariable in favor of just calling the ToggleCustomRange? method where it needs to be called.

tried using the crange widget's (checkbutton) invoke command to turn on the checkbutton and call its -command script. the invoke command is a toggle, not just a "turn on" command and doesn't work the same as select.

changed the order of turning on the custom range checkbutton and setting the min or max gauge value. we should first signal that the custom range is being enabled from the legend min/max editor, then adjust the value in the min or max gauge, then enable the custom range checkbutton, labels, gauges. lastly call AdjustSetting? -range to redraw / recalculate isosurfaces and update the legend labels with the new min and max values.

File:

• branches/uiuc_vtk_viewers/gui/scripts/vtkisosurfaceviewer.tcl (modified) (7 diffs)

branches/uiuc_vtk_viewers/gui/scripts/vtkisosurfaceviewer.tcl

@@ -177 +177 @@
     private variable _mouseOver "";     # what called LegendRangeAction, vmin or vmax
     private variable _customRangeClick 1;   # what called ToggleCustomRange
-    private variable _ignoreRangeUpdate 0;  # update min/max gauges without redrawing
 }
 
@@ -1118 +1117 @@
             -isosurfacelighting \
             -field \
+            -range \
             -isosurfacevisible \
             -isosurfaceedges -isosurfacelighting -isosurfaceopacity \
@@ -1500 +1500 @@
                     # the legend's min and max text will be updated
                     # when the legend is redrawn in DrawLegend
-                    set _ignoreRangeUpdate 1
                     SetMinMaxGauges $vmin $vmax
                 }
@@ -1579 +1578 @@
         }
         "-range" {
-            if { ! $_ignoreRangeUpdate } {
-                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
-            }
-            set _ignoreRangeUpdate 0
+            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" {
@@ -1817 +1813 @@
             -text "Use Custom Range:" \
             -variable [itcl::scope _settings(-customrange)] \
+            -command [itcl::code $this ToggleCustomRange] \
             -font "Arial 9"
     }
-    # use a trace so we can adjust the value of our variable
-    # and still have the ToggleCustomRange command called,
-    # which doesn't seem to happen when using -command.
-    trace add variable _settings(-customrange) write \
-        [itcl::code $this ToggleCustomRange]
 
     itk_component add l_min {
@@ -2917 +2909 @@
             # only set custom range if value changed
             if {[$itk_component($which) value] != $value} {
-                # turn on crange first to enable and update the gauge,
-                # then change the value in the gauge
+                # 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
-                $itk_component($which) value $value
+                ToggleCustomRange
             }
         }
@@ -2949 +2945 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkIsosurfaceViewer::ToggleCustomRange {args} {
-
     if { ! $_settings(-customrange) } {
         # custom range was turned off