Changeset 1276 for trunk/GSASII.py

Timestamp:

Apr 11, 2014 2:31:29 PM (9 years ago)

Author:

toby

Message:

seq. ref. bugs: wrong file name on msg; fix wildcarded constraints.

File:

• trunk/GSASII.py (modified) (3 diffs)

trunk/GSASII.py

@@ -425 +425 @@
                     if result == wx.ID_NO: return []
                             
-                self.lastimport = filename
+                self.lastimport = filename # this is probably not what I want to do -- it saves only the
+                # last name in a series. See rd.readfilename for a better name.
+                
                 # try the file first with Readers that specify the
                 # file's extension and later with ones that merely allow it
@@ -459 +461 @@
                             rd.errors += "\n  Traceback info:\n"+str(traceback.format_exc())
                         if flag: # this read succeeded
+                            rd.readfilename = filename
                             rd_list.append(copy.deepcopy(rd)) # save the result before it is written over
                             if rd.repeat:
@@ -1189 +1192 @@
             HistName = G2obj.MakeUniqueLabel(HistName,PWDRlist)
             print 'Read powder data '+str(HistName)+ \
-                ' from file '+str(self.lastimport) + \
+                ' from file '+str(rd.readfilename) + \
                 ' with parameters from '+str(rd.instmsg)
             # data are read, now store them in the tree