Changeset 2658

Timestamp:

Jan 23, 2017 1:34:00 PM (6 years ago)

Author:

toby

Message:

fix problem reporting histogram with Unicode chars

Location:

trunk

Files:

• GSASII.py (modified) (7 diffs)
• GSASIIstrIO.py (modified) (1 diff)

trunk/GSASII.py

@@ -160 +160 @@
             kind=wx.ITEM_NORMAL,text='&New project')
         self.Bind(wx.EVT_MENU, self.OnFileClose, id=item.GetId())
-        item = parent.Append(
-            help='Expand all items in GSAS-II data tree',id=wx.ID_ANY,
-            kind=wx.ITEM_NORMAL,text='Expand all')
-        self.Bind(wx.EVT_MENU,self.ExpandAll,id=item.GetId())
         item = parent.Append(wx.ID_PREFERENCES, text = "&Preferences")
         self.Bind(wx.EVT_MENU, self.OnPreferences, item)
@@ -783 +779 @@
                     UseList[histoName] = SetDefaultDData('PWDR',histoName,NShkl=NShkl,NDij=NDij)
                 else:
-                    raise Exception('Unexpected histogram '+str(histoName))
+                    raise Exception('Unexpected histogram '+histoName)
         wx.EndBusyCursor()
         self.EnableRefineCommand()
@@ -883 +879 @@
                     valuesdict = {'wtFactor':1.0,'Dummy':False,'ranId':ran.randint(0,sys.maxint),}
                     HistName = G2obj.MakeUniqueLabel(HistName,HKLFlist)
-                    print 'Read structure factor table '+str(HistName)+' from file '+str(self.lastimport)
+                    print 'Read structure factor table '+HistName+' from file '+self.lastimport
                     Id = self.PatternTree.AppendItem(parent=self.root,text=HistName)
                     if not Bank['RefDict'].get('FF'):
@@ -896 +892 @@
                 valuesdict = {'wtFactor':1.0,'Dummy':False,'ranId':ran.randint(0,sys.maxint),}
                 HistName = G2obj.MakeUniqueLabel(HistName,HKLFlist)
-                print 'Read structure factor table '+str(HistName)+' from file '+str(self.lastimport)
+                print 'Read structure factor table '+HistName+' from file '+self.lastimport
                 if not rd.RefDict.get('FF'):
                     rd.RefDict['FF'] = {}
@@ -1824 +1820 @@
         self.PatternTree.Expand(Id)
         self.PatternTree.SelectItem(Id)
-        print('Added simulation powder data '+str(HistName)+ 
+        print('Added simulation powder data '+HistName+ 
               ' with parameters from '+str(rd.instmsg))
 
@@ -1918 +1914 @@
             # make new histogram names unique
             HistName = G2obj.MakeUniqueLabel(HistName,SASDlist)
-            print 'Read small angle data '+str(HistName)+ \
-                ' from file '+str(self.lastimport)
+            print 'Read small angle data '+HistName+ \
+                ' from file '+self.lastimport
             # data are read, now store them in the tree
             Id = self.PatternTree.AppendItem(parent=self.root,text=HistName)
@@ -3786 +3782 @@
                             Histograms[hist]['hId'] = hId
                         else: # would happen if a referenced histogram were renamed or deleted
-                            print('For phase "'+str(phase)+
-                                  '" unresolved reference to histogram "'+str(hist)+'"')
+                            print('For phase "'+phase+
+                                  '" unresolved reference to histogram "'+hist+'"')
         #G2obj.IndexAllIds(Histograms=Histograms,Phases=Phases)
         G2obj.IndexAllIds(Histograms=Histograms,Phases=phaseData)

trunk/GSASIIstrIO.py

@@ -434 +434 @@
                     except KeyError: # would happen if a referenced histogram were
                         # renamed or deleted
-                        print('For phase "'+str(phase)+
-                              '" unresolved reference to histogram "'+str(hist)+'"')
+                        print('For phase "'+phase+
+                              '" unresolved reference to histogram "'+hist+'"')
     G2obj.IndexAllIds(Histograms=Histograms,Phases=Phases)
     return Histograms,Phases