Changeset 5179

Timestamp:

Apr 1, 2015 10:19:05 PM (9 years ago)

Author:

mmh

Message:

improved PDF initial values

Location:

branches/uq/gui/scripts

Files:

• gauge.tcl (modified) (2 diffs)
• probdisteditor.tcl (modified) (13 diffs)

branches/uq/gui/scripts/gauge.tcl

@@ -215 +215 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Gauge::value {args} {
-    # puts "Gauge value: $args"
+    #puts "Gauge value: $args"
 
     # Query.  Just return the current value.
@@ -737 +737 @@
 
         set _pde [Rappture::ProbDistEditor $inner.entry \
-        $itk_option(-minvalue) $itk_option(-maxvalue)]
+        $itk_option(-minvalue) $itk_option(-maxvalue) $itk_option(-units) $_value]
         $_val value $_mode
         $_pde value $_value

branches/uq/gui/scripts/probdisteditor.tcl

@@ -50 +50 @@
 # CONSTRUCTOR
 # ----------------------------------------------------------------------
-itcl::body Rappture::ProbDistEditor::constructor {min max} {
+itcl::body Rappture::ProbDistEditor::constructor {min max units default} {
     # create a dispatcher for events
-    puts "PDE::constructor $min $max"
+    #puts "PDE::constructor $min $max $default"
 
     # These are the tool min and max values.  May be empty.
     set _umin $min
     set _umax $max
-    set _units [Rappture::Units::Search::for $_umin]
+    set _units $units
+    set _uvalue(central) $default
 
     Rappture::dispatcher _dispatcher
@@ -199 +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
@@ -285 +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}
@@ -291 +292 @@
         return $modes
     }
+
+    set check 0
+    if {$newval == "check"} {
+        set newval $_mode
+        set check 1
+    }
+
     if {[lsearch $modes $newval] < 0} {
         error "bad value \"$newval\": should be [join $modes {, }]"
@@ -342 +350 @@
         }
         gaussian {
-            # puts "GAUSSIAN min=$min max=$max"
+            #puts "GAUSSIAN min=$min max=$max"
             if {![info exists _value(central)]} {
                 if {[info exists _value(min)] && [info exists _value(max)]} {
@@ -350 +358 @@
                 }
             }
-            # puts "central=$_value(central)"
+            #puts "central=$_value(central)"
             if {![info exists _value(stddev)]} {
-                if {[info exists _value(min)] && [info exists _value(max)]} {
-                    set _value(stddev) [expr {0.3*($_value(max) - $_value(min))}]
-                } elseif {$min != "" && $max != ""} {
-                    set _value(stddev) [expr {0.3*($max - $min)}]
-                } else {
-                    set _value(stddev)  [expr $_value(central) * 0.10]
-                }
+                set _value(stddev)  [expr $_value(central) * 0.10]
             }
             if {$_value(stddev) <= 0} {
                 set _value(stddev) 1.0
             }
-            # puts "stddev=$_value(stddev)"
+            #puts "stddev=$_value(stddev)"
             # lower bound is -3 deviations or tool min
             set trunc [expr {$_value(central) - 3*$_value(stddev)}]
@@ -387 +389 @@
     }
 
+    if {$check == 1} {
+        return
+    }
     # pop up the panel of editing options for this mode
     foreach w [pack slaves $itk_component(vals)] {
@@ -452 +457 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ProbDistEditor::_redraw {} {
+    #puts "PDE::_redraw"
+
     set g $itk_component(graph)
     eval $g element delete [$g element names]
@@ -486 +493 @@
         }
         gaussian {
+            #puts "min=$_value(min) max=$_value(max)"
+            #puts "mean=$_value(central) dev=$_value(stddev)"
+
             set min $_value(min)
             set max $_value(max)
@@ -592 +602 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ProbDistEditor::_apply {op {widget ""}} {
-    puts "_apply $op $widget"
+    #puts "PDE::_apply $op $widget"
     if {$op != "bindings"} {
         # need this for value/finalize
@@ -640 +650 @@
                 set newval [Rappture::Units::convert [$widget get] -context $_units]
             }
-            puts "widget=$widget"
             set itk $itk_component(gaussianvals).stddev
-            puts "itk=$itk"
             if {$widget != $itk && [catch {Rappture::Units::mcheck_range $newval $_umin $_umax $_units} err]} {
                 # oops! value is bad -- edit again
@@ -658 +666 @@
             set $uvar $newval
 
+            #if {$widget == $itk_component(gaussianvals).mean} {
+                # need new min and max
+                #set $_uvalue(min)
+                #set $_uvalue(max) ...
+            #}
+
             if {[catch {Rappture::Units::convert $newval -units off} nvar]} {
                 set nvar $newval
@@ -663 +677 @@
             set $var $nvar
 
+            mode check
             $_dispatcher event -idle !redraw
         }