Changeset 3056 for trunk/lang/tcl/scripts

Timestamp:

Jun 25, 2012, 3:43:37 PM (12 years ago)

Author:

mmc

Message:

Fixed an error in the builder "preview" mode related to the reorganization of
the Analyzer code and changed component names.

Fixed the "periodicelement" type in the builder to save/load properly and
offer drop-down lists for default value and other properties.

Location:

trunk/lang/tcl/scripts

Files:

• Makefile.in (modified) (1 diff)
• objects/periodicelement/periodicelement.rp (modified) (1 diff)
• types/atomactive.tcl (added)
• types/atomelem.tcl (added)
• types/atomprops.tcl (added)

trunk/lang/tcl/scripts/Makefile.in

@@ -61 +61 @@
 
 TYPEFILES       = \
+                $(srcdir)/types/atomactive.tcl \
+                $(srcdir)/types/atomelem.tcl \
+                $(srcdir)/types/atomprops.tcl \
                 $(srcdir)/types/boolean.tcl \
                 $(srcdir)/types/choices.tcl \

trunk/lang/tcl/scripts/objects/periodicelement/periodicelement.rp

@@ -18 +18 @@
     help http://rappture.org/wiki/rp_xml_ele_periodicelement
 
-    attr active -title "Active Elements" \
-        -type string -path default -only input \
-        -tooltip "Specifies the set of elements that can be selected.\n\nCan be a list of element symbols or groups: actinoid, alkali-metal, alkaline-earth-metal, halogen, lanthanoid, metalloid, noble-gas, other-non-metal, post-transition-metal, transition-metal, or unknown."
-    attr inactive -title "Inactive Elements" \
-        -type string -path default -only input \
-        -tooltip "Specifies the set of elements that can't be selected.\n\nCan be a list of element symbols or groups: actinoid, alkali-metal, alkaline-earth-metal, halogen, lanthanoid, metalloid, noble-gas, other-non-metal, post-transition-metal, transition-metal, or unknown."
+    attr default -title "Default Value" -type atomelem -path default -only input -tooltip "Sets the value that this input has when the program first starts.  This value is used by default unless the user explicitly changes it."
 
-    attr returnvalue -title "Return value" -type string -path default -only input -tooltip "Specifies the return value: name, symbol, number, or weight."
+    attr returnvalue -title "Return value" -type atomprops -path returnvalue -only input -tooltip "Specifies how the selected element is reported to your program: name, symbol, number, or weight."
 
-    attr default -title "Default Value" -type string -path default -only input -tooltip "Sets the value that this input has when the program first starts.  This value is used by default unless the user explicitly changes it."
+    attr active -title "Allowed Elements" \
+        -type atomactive -path active -only input -tooltip "Specifies the set of elements that can be selected.\n\nCan allow or disallow one or more groups of elements on the periodic table: actinoid, alkali-metal, alkaline-earth-metal, halogen, lanthanoid, metalloid, noble-gas, other-non-metal, post-transition-metal, transition-metal, or unknown."
 
     check default {
-        if {[llength $attr(options)] > 0} {
-            if {[string length [string trim $attr(default)]] == 0} {
-                return [list error "Must have a default value for this periodicelement."]
+        set defval [string trim $attr(default)]
+        if {[string length $defval] == 0} {
+            return [list error "Must have a default value for this periodicelement."]
+        }
+
+        # make sure that the given value is a valid element type
+        if {[Rappture::PeriodicTable::FindElement $defval] eq ""} {
+            return [list error "Bad value \"$defval\": must be a known element in the periodic table."]
+        }
+
+        # make sure that the given value isn't in conflict with allowed values
+        if {$attr(active) ne "" && [regexp {^(active|inactive): (.+)} $attr(active) match polarity vlist]} {
+            set found [eval Rappture::PeriodicTable::ElementIsType $attr(default) [split $vlist ,]]
+            if { (!$found && $polarity eq "active")
+                  || ($found && $polarity eq "inactive") } {
+                return [list error "Default value \"$attr(default)\" is not one of the allowed values"]
             }
+        }
+    }
 
-            # make sure that the default is really a choice
-            set defval [string trim $attr(default)]
-            set found 0
-            foreach rec $attr(options) {
-                set label [string trim [lindex $rec 0]]
-                set value [string trim [lindex $rec 1]]
-                if {$defval eq $label || $defval eq $value} {
-                    set found 1
-                    break
-                }
-            }
-            if {!$found} {
-                return [list error "Default value must be a label or value for one of the current periodicelements."]
-            }
+    check returnvalue {
+        if {[string length [string trim $attr(returnvalue)]] == 0} {
+            return [list error "Must choose at least one return value to report the selected element to your program."]
         }
     }