Changeset 1276 for trunk/GSASII.py


Ignore:
Timestamp:
Apr 11, 2014 2:31:29 PM (8 years ago)
Author:
toby
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1261 r1276  
    425425                    if result == wx.ID_NO: return []
    426426                           
    427                 self.lastimport = filename
     427                self.lastimport = filename # this is probably not what I want to do -- it saves only the
     428                # last name in a series. See rd.readfilename for a better name.
     429               
    428430                # try the file first with Readers that specify the
    429431                # file's extension and later with ones that merely allow it
     
    459461                            rd.errors += "\n  Traceback info:\n"+str(traceback.format_exc())
    460462                        if flag: # this read succeeded
     463                            rd.readfilename = filename
    461464                            rd_list.append(copy.deepcopy(rd)) # save the result before it is written over
    462465                            if rd.repeat:
     
    11891192            HistName = G2obj.MakeUniqueLabel(HistName,PWDRlist)
    11901193            print 'Read powder data '+str(HistName)+ \
    1191                 ' from file '+str(self.lastimport) + \
     1194                ' from file '+str(rd.readfilename) + \
    11921195                ' with parameters from '+str(rd.instmsg)
    11931196            # data are read, now store them in the tree
Note: See TracChangeset for help on using the changeset viewer.