Changeset 553

Timestamp:

Dec 4, 2009 5:08:06 PM (13 years ago)

Author:

toby

Message:

# on 2002/01/23 20:53:36, toby did:
fix bugs related to adding ValidateAtomsBox?
launch import (ImportPhase/ImportAtom?) when a import format is selected

File:

• trunk/addcmds.tcl (modified) (7 diffs, 3 props)

trunk/addcmds.tcl

@@ -67 +67 @@
                 -command "ImportPhase \$expgui(importFormat) $np"] \
                 -column 0 -row 0 -sticky e
-        eval tk_optionMenu $np.bf.fr.b4 expgui(importFormat) \
-                $expgui(importFormatList)
+        set menu [eval tk_optionMenu $np.bf.fr.b4 expgui(importFormat) \
+                $expgui(importFormatList)]
+        for {set i 0} {$i <= [$menu index end]} {incr i} {
+            $menu entryconfig $i -command "ImportPhase \$expgui(importFormat) $np"
+        }
         grid $np.bf.fr.b4 -column 1 -row 0 -sticky w
         grid rowconfig $np.bf.fr 0 -pad 10
@@ -1046 +1049 @@
                 -command "ImportAtoms \$expgui(importFormat) $top $phase"] \
                 -column 0 -row 0 -sticky e
-        eval tk_optionMenu $top.fr.b4 expgui(importFormat) \
-                $expgui(importFormatList)
+        set menu [eval tk_optionMenu $top.fr.b4 expgui(importFormat) \
+                $expgui(importFormatList)]
+        for {set i 0} {$i <= [$menu index end]} {incr i} {
+            $menu entryconfig $i -command "ImportAtoms \$expgui(importFormat) $top $phase"
+        }
         grid $top.fr.b4 -column 1 -row 0 -sticky w
         grid rowconfig $top.fr 0 -pad 10
@@ -1119 +1125 @@
 # Validate the atoms in the atoms add/phase replace box 
 # returns a null string on error or a list of atoms
-proc ValidateAtomsBox {np} {
+proc ValidateAtomsBox {top np} {
+    global expgui
     set row 0
     # loop over the defined rows
@@ -1194 +1201 @@
     # validate the atoms info
     set atomlist [ValidateAtomsBox $top $np]
-    if {$atomslist == ""} return
+    if {$atomlist == ""} return
 
     # ok add the atoms!
@@ -1667 +1674 @@
                 -command "ImportPhase \$expgui(importFormat) $top"] \
                 -column 0 -row 0 -sticky e
-        eval tk_optionMenu $top.fr.b4 expgui(importFormat) \
-                $expgui(importFormatList)
+        set menu [eval tk_optionMenu $top.fr.b4 expgui(importFormat) \
+                $expgui(importFormatList)]
+        for {set i 0} {$i <= [$menu index end]} {incr i} {
+            $menu entryconfig $i -command "ImportPhase \$expgui(importFormat) $np"
+        }
         grid $top.fr.b4 -column 1 -row 0 -sticky w
         grid rowconfig $top.fr 0 -pad 10
@@ -1832 +1842 @@
                 -command "ImportAtoms \$expgui(importFormat) $top $phase"] \
                 -column 0 -row 0 -sticky e
-        eval tk_optionMenu $top.fr.b4 expgui(importFormat) \
-                $expgui(importFormatList)
+        set menu [eval tk_optionMenu $top.fr.b4 expgui(importFormat) \
+                $expgui(importFormatList)]
+        for {set i 0} {$i <= [$menu index end]} {incr i} {
+            $menu entryconfig $i -command "ImportAtoms \$expgui(importFormat) $top $phase"
+        }
         grid $top.fr.b4 -column 1 -row 0 -sticky w
         grid rowconfig $top.fr 0 -pad 10
@@ -1859 +1872 @@
     # validate the atoms info
     set atomlist [ValidateAtomsBox $top $np]
-    if {$atomslist == ""} return
+    if {$atomlist == ""} return
 
     pleasewait "updating phase"