Changeset 729 for trunk/gui/scripts/deviceViewer1D.tcl

Timestamp:

May 12, 2007, 2:14:49 PM (17 years ago)

Author:

mmc

Message:

Fix for support ticket #1455, "floating-point value too large to represent".
The user was entering a really big value like "1e400" into the doping
area of PN Junction Lab. The GUI would choke and the job would later
fail. Fixed the field editor to test for bad values and honor min/max
limits set on parameters in a device structure.

Fix for support ticket #1465, "bad option "add": should be one of...".
The new molecule viewer requires add/delete operations. This is now
part of the general structure viewer, but the DeviceViewer1D class was
not updated properly. It is now. Fixed the structure demo to copy
the input to the output so we can test for this.

File:

• trunk/gui/scripts/deviceViewer1D.tcl (modified) (7 diffs)

trunk/gui/scripts/deviceViewer1D.tcl

@@ -32 +32 @@
     destructor { # defined below }
 
+    public method add {dataobj {settings ""}}
+    public method get {}
+    public method delete {args}
+
     public method controls {option args}
     public method download {option args}
@@ -48 +52 @@
 
     private variable _owner ""      ;# thing managing this control
+    private variable _dlist ""      ;# list of dataobj objects
+    private variable _dobj2raise    ;# maps dataobj => raise flag
     private variable _device ""     ;# XML library with <structure>
     private variable _tab2fields    ;# maps tab name => list of fields
     private variable _field2parm    ;# maps field path => parameter name
     private variable _units ""      ;# units for field being edited
-    private variable _restrict ""   ;# restriction expr for field being edited
     private variable _marker        ;# marker currently being edited
 }
@@ -137 +142 @@
     after cancel [list catch [itcl::code $this _fixAxes]]
     after cancel [list catch [itcl::code $this _align]]
+    after cancel [list catch [itcl::code $this _loadDevice]]
+}
+
+# ----------------------------------------------------------------------
+# USAGE: add <dataobj> ?<settings>?
+#
+# Clients use this to add a data object to the plot.  The optional
+# <settings> are used to configure the plot.  Allowed settings are
+# -color, -brightness, -width, -linestyle, and -raise. Only
+# -brightness and -raise do anything.
+# ----------------------------------------------------------------------
+itcl::body Rappture::DeviceViewer1D::add {dataobj {settings ""}} {
+    array set params {
+        -color auto
+        -brightness 0
+        -width 1
+        -raise 0
+        -linestyle solid
+        -description ""
+    }
+    foreach {opt val} $settings {
+        if {![info exists params($opt)]} {
+            error "bad settings \"$opt\": should be [join [lsort [array names params]] {, }]"
+        }
+        set params($opt) $val
+    }
+ 
+    set pos [lsearch -exact $dataobj $_dlist]
+
+    if {$pos < 0} {
+        if {![Rappture::library isvalid $dataobj]} {
+            error "bad value \"$dataobj\": should be Rappture::library object"
+        }
+
+        lappend _dlist $dataobj
+        set _dobj2raise($dataobj) $params(-raise)
+
+        after cancel [list catch [itcl::code $this _loadDevice]]
+        after idle [list catch [itcl::code $this _loadDevice]]
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: get
+#
+# Clients use this to query the list of objects being plotted, in
+# order from bottom to top of this result.
+# ----------------------------------------------------------------------
+itcl::body Rappture::DeviceViewer1D::get {} {
+    # put the dataobj list in order according to -raise options
+    set dlist $_dlist
+    foreach obj $dlist {
+        if {[info exists _dobj2raise($obj)] && $_dobj2raise($obj)} {
+            set i [lsearch -exact $dlist $obj]
+            if {$i >= 0} {
+                set dlist [lreplace $dlist $i $i]
+                lappend dlist $obj
+            }
+        }
+    }
+    return $dlist
+}
+
+# ----------------------------------------------------------------------
+# USAGE: delete ?<dataobj> <dataobj> ...?
+#
+# Clients use this to delete a dataobj from the plot. If no dataobjs
+# are specified, then all dataobjs are deleted.
+# ----------------------------------------------------------------------
+itcl::body Rappture::DeviceViewer1D::delete {args} {
+    if {[llength $args] == 0} {
+        set args $_dlist
+    }
+
+    # delete all specified dataobjs
+    set changed 0
+    foreach dataobj $args {
+        set pos [lsearch -exact $_dlist $dataobj]
+        if {$pos >= 0} {
+            set _dlist [lreplace $_dlist $pos $pos]
+            catch {unset _dobj2raise($dataobj)}
+            set changed 1
+        }
+    }
+
+    # if anything changed, then rebuild the plot
+    if {$changed} {
+        after cancel [list catch [itcl::code $this _loadDevice]]
+        after idle [list catch [itcl::code $this _loadDevice]]
+    }
 }
 
@@ -203 +298 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::DeviceViewer1D::_loadDevice {} {
+    set _device [lindex [get] end]
+
     #
     # Release any info left over from the last device.
@@ -418 +515 @@
         }
 
-        if {[info exists hints(restrict)]} {
-            set _restrict $hints(restrict)
-        } else {
-            set _restrict ""
-        }
-
         if {[info exists hints(scale)]
               && [string match log* $hints(scale)]} {
@@ -645 +736 @@
                     return 0
                 }
-                if {"" != $_restrict
-                      && [catch {Rappture::Units::convert $result \
-                        -context $_units -to $_units -units off} value] == 0} {
-
-                    set rexpr $_restrict
-                    regsub -all value $rexpr {$value} rexpr
-                    if {[catch {expr $rexpr} result] == 0 && !$result} {
-                        bell
-                        Rappture::Tooltip::cue $itk_component(geditor) "Should satisfy the condition: $_restrict"
-                        return 0
-                    }
-                }
+            }
+            if {[catch {$_marker(fobj) controls validate $_marker(path) $name} result]} {
+                bell
+                Rappture::Tooltip::cue $itk_component(geditor) $result
+                return 0
             }
             return 1
@@ -779 +863 @@
         }
     }
-    set _device $itk_option(-device)
-    _loadDevice
-}
+
+    delete
+    if {"" != $itk_option(-device)} {
+        add $itk_option(-device)
+    }
+    after cancel [list catch [itcl::code $this _loadDevice]]
+    after idle [list catch [itcl::code $this _loadDevice]]
+}