Changeset 5189

Timestamp:

Apr 2, 2015 11:41:28 AM (9 years ago)

Author:

mmh

Message:

make sure computed uniform does not exceed min or max

File:

• branches/uq/gui/scripts/probdisteditor.tcl (modified) (5 diffs)

branches/uq/gui/scripts/probdisteditor.tcl

@@ -200 +200 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ProbDistEditor::value {{newval ""}} {
-    #puts "PDE::value $newval"
+    puts "PDE::value $newval"
 
     #FIXME: _value has numerical values _uvalue has value with units
@@ -286 +286 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ProbDistEditor::mode {{newval ""}} {
-    #puts "PDE::mode mode=$newval min=$_umin max=$_umax units=$_units"
+    puts "PDE::mode mode=$newval min=$_umin max=$_umax units=$_units"
 
     set modes {exact uniform gaussian custom}
@@ -311 +311 @@
             set min ""
         } else {
-            set min [Rappture::Units::convert $_umin -units off]
+            set min [Rappture::Units::convert $_umin -context $_units -units off]
         }
         if {$_umax == ""} {
             set max ""
         } else {
-            set max [Rappture::Units::convert $_umax -units off]
+            set max [Rappture::Units::convert $_umax -context $_units -units off]
         }
     }
@@ -338 +338 @@
                 if {$_value(central) == 0.0} {
                     set _value(max) 1.0
+                }
+                if {$min != ""} {
+                    if {$_value(min) < $min} {
+                        set $_value(min) $min
+                    }
+                }
+                if {$max != ""} {
+                    if {$_value(max) > $max} {
+                        set $_value(max) $max
+                    }
                 }
                 set _uvalue(min) $_value(min)$_units
@@ -596 +606 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ProbDistEditor::_apply {op {widget ""}} {
-    #puts "PDE::_apply $op $widget"
+    puts "PDE::_apply $op $widget"
     if {$op != "bindings"} {
         # need this for value/finalize