Changeset 3175 for branches/nanovis2/gui/scripts/periodictable.tcl

Timestamp:

Sep 20, 2012, 12:46:32 PM (12 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• gui/scripts/periodictable.tcl (modified) (8 diffs)

branches/nanovis2/gui/scripts/periodictable.tcl

@@ -1 @@
-
 # ----------------------------------------------------------------------
 #  COMPONENT: periodictable - drop-down list of items
@@ -7 +6 @@
 #
 # ======================================================================
-#  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  AUTHOR:  George Howlett, Purdue University
+#  Copyright (c) 2004-2012  Purdue Research Foundation
 #
 #  See the file "license.terms" for information on usage and
@@ -32 +31 @@
     public method value { {name ""} }
 
-    private variable _table
+    public proc FindElement { string }
+    public proc ElementIsType { string args }
+
     private variable _dispatcher ""
     private variable _current ""
@@ -43 +44 @@
     protected method Activate { widget id x y }
     protected method Deactivate { widget id }
-    protected method FindElement { string }
     private common _colors
     array set _colors {
@@ -242 +242 @@
         Lawrencium      103 Lr [262.110] 9 17   actinoid
     }
+
+    private common _table
+    foreach { name number symbol weight row column type } $_tableData {
+        set _table($name) [list name $name number $number symbol $symbol \
+                weight $weight row $row column $column type $type]
+    }
+
     private common _types
     array set _types {
@@ -302 +309 @@
     $_dispatcher register !rebuild
     $_dispatcher dispatch $this !rebuild "[itcl::code $this Redraw]; list"
-    foreach { name number symbol weight row column type } $_tableData {
-        set _table($name) [list name $name number $number symbol $symbol \
-                weight $weight row $row column $column type $type]
+
+    foreach name [array names _table] {
         set _state($name) "normal"
     }
+
     itk_component add scroller {
         Rappture::Scroller $itk_interior.sc \
@@ -494 +501 @@
     set _current $elem
     $_dispatcher event -idle !rebuild
+}
+
+# ----------------------------------------------------------------------
+# USAGE: FindElement <what>
+#
+# Checks to see if the given string <what> is recognized as an element
+# name, symbol, or number.  Returns the corresponding element name
+# or "" if the element is not recognized.
+# ----------------------------------------------------------------------
+itcl::body Rappture::PeriodicTable::FindElement { what } {
+    foreach name [array names _table] { 
+        array unset info
+        array set info $_table($name)
+        if { $what eq $info(name) || $what eq $info(number) || 
+             $what eq $info(symbol) } {
+            return $info(name)
+        }
+    }
+    return ""
+}
+
+# ----------------------------------------------------------------------
+# USAGE: ElementIsType <name> <type> <type>...
+#
+# Checks to see if the given element <name> is one of the specified
+# <type> values.  Returns true if the element is one of the types
+# (logical or), or false if it is not.
+# ----------------------------------------------------------------------
+itcl::body Rappture::PeriodicTable::ElementIsType { name args } {
+    foreach type $args {
+        if {[info exists _types($type)]} {
+            if {[lsearch -exact $_types($type) $name] >= 0} {
+                return 1
+            }
+        }
+    }
+    return 0
 }
 
@@ -608 +652 @@
     $c configure -height $height -width $width -background white
 }
-
-# ----------------------------------------------------------------------
-# USAGE: FindElement
-#
-# Used to manipulate the selection in the table.
-#
-# ----------------------------------------------------------------------
-itcl::body Rappture::PeriodicTable::FindElement { what } {
-    foreach name [array names _table] { 
-        array unset info
-        array set info $_table($name)
-        if { $what == $info(name) || $what == $info(number) || 
-             $what == $info(symbol) } {
-            return $info(name)
-        }
-    }
-    return ""
-}
-