Changeset 1573


Ignore:
Timestamp:
Nov 20, 2014 10:53:09 AM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1566 r1573  
    486486                            rd.errors += "\n  Read exception: "+str(detail)
    487487                        except Exception as detail:
     488                            import traceback
    488489                            rd.errors += "\n  Unhandled read exception: "+str(detail)
    489490                            rd.errors += "\n  Traceback info:\n"+str(traceback.format_exc())
     
    34453446        if parentId:
    34463447            parentName = self.PatternTree.GetItemText(parentId)     #find the current data tree name
    3447         dlg = wx.MessageDialog(self,'Load new result?','Refinement results, Rw =%.3f'%(Rw),wx.OK|wx.CANCEL)
     3448        dlg2 = wx.MessageDialog(self,'Load new result?','Refinement results, Rw =%.3f'%(Rw),wx.OK|wx.CANCEL)
    34483449        try:
    3449             if dlg.ShowModal() == wx.ID_OK:
     3450            if dlg2.ShowModal() == wx.ID_OK:
    34503451                Id = 0
    34513452                self.PatternTree.DeleteChildren(self.root)
     
    34703471                    self.PatternTree.SelectItem(itemId)
    34713472        finally:
    3472             dlg.Destroy()
     3473            dlg2.Destroy()
    34733474
    34743475    def OnSeqRefine(self,event):
  • trunk/GSASIIIO.py

    r1572 r1573  
    11951195        'RBModels':{},
    11961196        }
    1197     if Super.get('Use',False):
     1197    if Super and Super.get('Use',False):
    11981198        phaseData['General'].update({'Type':'modulated','Super':1,'SuperSg':Super['ssSymb']})
    11991199        phaseData['General']['SSGData'] = G2spc.SSpcGroup(SGData,Super['ssSymb'])
Note: See TracChangeset for help on using the changeset viewer.