Changeset 1881 for trunk/GSASIIpwdGUI.py

Timestamp:

Jun 5, 2015 5:28:49 PM (8 years ago)

Author:

toby

Message:

fix bugs in single crystal editing as well as problems with ValidatedTextCtrl?

File:

• trunk/GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASIIpwdGUI.py

@@ -1106 +1106 @@
         return good
         
-    def inst2data(inst,ref,data):
+    def updateData(inst,ref):
+        data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
+            G2frame.PatternId,'Instrument Parameters'))[0]
         for item in data:
             try:
                 data[item] = [data[item][0],inst[item],ref[item]]
             except KeyError:
-                pass        #skip 'Polariz.' for N-data
-        return data
-        
-    def updateData(inst,ref):
-        return inst2data(inst,ref,G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
-            G2frame.PatternId,'Instrument Parameters'))[0])        
+                try:
+                    data[item] = [data[item][0],inst[item]]
+                except KeyError:
+                    pass        #skip 'Polariz.' for N-data
     
     def RefreshInstrumentGrid(event,doAnyway=False):