Changeset 1573

Timestamp:

Nov 20, 2014 10:53:09 AM (8 years ago)

Author:

vondreele

Message:

missing import traceback; real error on Super=None now fixed
messed up import phase; Data/Add? phase seems OK in wx 3.0.0.0

Location:

trunk

Files:

• GSASII.py (modified) (3 diffs)
• GSASIIIO.py (modified) (1 diff)

trunk/GSASII.py

@@ -486 +486 @@
                             rd.errors += "\n  Read exception: "+str(detail)
                         except Exception as detail:
+                            import traceback
                             rd.errors += "\n  Unhandled read exception: "+str(detail)
                             rd.errors += "\n  Traceback info:\n"+str(traceback.format_exc())
@@ -3445 +3446 @@
         if parentId:
             parentName = self.PatternTree.GetItemText(parentId)     #find the current data tree name
-        dlg = wx.MessageDialog(self,'Load new result?','Refinement results, Rw =%.3f'%(Rw),wx.OK|wx.CANCEL)
+        dlg2 = wx.MessageDialog(self,'Load new result?','Refinement results, Rw =%.3f'%(Rw),wx.OK|wx.CANCEL)
         try:
-            if dlg.ShowModal() == wx.ID_OK:
+            if dlg2.ShowModal() == wx.ID_OK:
                 Id = 0
                 self.PatternTree.DeleteChildren(self.root)
@@ -3470 +3471 @@
                     self.PatternTree.SelectItem(itemId)
         finally:
-            dlg.Destroy()
+            dlg2.Destroy()
 
     def OnSeqRefine(self,event):

trunk/GSASIIIO.py

@@ -1195 +1195 @@
         'RBModels':{},
         }
-    if Super.get('Use',False):
+    if Super and Super.get('Use',False):
         phaseData['General'].update({'Type':'modulated','Super':1,'SuperSg':Super['ssSymb']})
         phaseData['General']['SSGData'] = G2spc.SSpcGroup(SGData,Super['ssSymb'])