Changeset 5071 for trunk

Timestamp:

Mar 4, 2015 9:22:11 PM (9 years ago)

Author:

ldelgass

Message:

Isosurface viewer fixes: Fix applying UI settings for opacity, numcontours to
new results. Set font option on gauges: still doesn't seem to get rid of bold
text. Use custom min/max to compute isovlues even when they are range is larger
than the intrinsic data range.

File:

• trunk/gui/scripts/vtkisosurfaceviewer.tcl (modified) (15 diffs)

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1424 +1424 @@
         }
         "-cutplaneopacity" {
+            set _changed($what) 1
             set _settings($what) [expr $_widget($what) * 0.01]
             SendCmd "cutplane opacity $_settings($what)"
@@ -1524 +1525 @@
         }
         "-isosurfaceopacity" {
+            set _changed($what) 1
             set _settings($what) [expr $_widget($what) * 0.01]
             SendCmd "contour3d opacity $_settings($what)"
@@ -1554 +1556 @@
         }
         "-numcontours" {
+            set _changed($what) 1
             set _settings($what) [$itk_component(numcontours) value]
             if { $_contourList(numLevels) != $_settings($what) } {
@@ -1821 +1824 @@
     }
     itk_component add min {
-        Rappture::Gauge $inner.min \
+        Rappture::Gauge $inner.min -font "Arial 9" \
             -validatecommand [itcl::code $this LegendRangeValidate "" vmin]
     }
@@ -1831 +1834 @@
     }
     itk_component add max {
-        Rappture::Gauge $inner.max \
+        Rappture::Gauge $inner.max -font "Arial 9" \
             -validatecommand [itcl::code $this LegendRangeValidate "" vmax]
     }
@@ -2328 +2331 @@
         SendCmd "cutplane axis $axis $visible $tag"
     }
+    SendCmd "cutplane opacity $_settings(-cutplaneopacity) $tag"
     SendCmd "cutplane visible $style(-cutplanesvisible) $tag"
 
@@ -2417 +2421 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: LegendPointToValue <x> <y>
@@ -2449 +2452 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: LegendProbeSingleContour <x> <y>
@@ -2461 +2463 @@
     SendCmd [list contour3d contourlist $value]
 }
-
 
 #
@@ -2819 +2820 @@
 }
 
-
 itcl::body Rappture::VtkIsosurfaceViewer::MouseOver2Which {} {
     switch -- $_mouseOver {
@@ -2834 +2834 @@
     return $which
 }
-
 
 # ----------------------------------------------------------------------
@@ -2926 +2925 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: ToggleCustomRange
@@ -2983 +2981 @@
     AdjustSetting -range
 }
-
 
 # ----------------------------------------------------------------------
@@ -3019 +3016 @@
 }
 
-
 #
 # SetCurrentColormap --
@@ -3082 +3078 @@
         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 custom range has been set, 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 vmin [$itk_component(min) value]
+            set vmax [$itk_component(max) value]
+        } else {
+            # use the field limits to calculate the contour list values
+            foreach { vmin vmax } $_limits($_curFldName) break
         }