Changeset 2817 for trunk/GSASII.py


Ignore:
Timestamp:
May 2, 2017 10:03:41 AM (4 years ago)
Author:
vondreele
Message:

major revision - move all importers to GSASIIobj & make them independent of wx so they can be used in a scripting environment.
Still to move are PhaseSelector?, and 3 BlockSelector? dialogs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2800 r2817  
    380380        :meth:`GSASII.OnImportSmallAngle` and :meth:'GSASII.OnImportReflectometry`
    381381
    382         Uses reader_objects subclassed from :class:`GSASIIIO.ImportPhase`,
    383         :class:`GSASIIIO.ImportStructFactor`,
    384         :class:`GSASIIIO.ImportPowderData`,
    385         :class:`GSASIIIO.ImportSmallAngleData`
    386         :class:`GSASIIIO.ImportReflectometryData` or
    387         :class:`GSASIIIO.ImportImage`.
     382        Uses reader_objects subclassed from :class:`GSASIIobj.ImportPhase`,
     383        :class:`GSASIIobj.ImportStructFactor`,
     384        :class:`GSASIIobj.ImportPowderData`,
     385        :class:`GSASIIobj.ImportSmallAngleData`
     386        :class:`GSASIIobj.ImportReflectometryData` or
     387        :class:`GSASIIobj.ImportImage`.
    388388        If a specific reader is specified, only that method will be called,
    389389        but if no reader is specified, every one that is potentially
     
    552552                            rd.errors += "\n  Traceback info:\n"+str(traceback.format_exc())
    553553                    if flag: # this read succeeded
     554                        if rd.SciPy:        #was default read by scipy; needs 1 time fixes
     555                            G2IO.EditImageParms(self,rd.Data,rd.Comments,rd.Image,filename)
     556                            rd.SciPy = False
    554557                        rd.readfilename = filename
    555558                        if load2Tree:   #images only
     
    11221125            for i in range(1,1+ibanks):
    11231126                choices.append('Bank '+str(i))
    1124             bank = 1 + rd.BlockSelector(
     1127            bank = 1 + G2IO.BlockSelector(
    11251128                choices, self,
    11261129                title='Select an instrument parameter bank for '+
     
    13291332                for l in dI.defaultIparm_lbl:
    13301333                    choices.append('Defaults for '+l)
    1331                 res = rd.BlockSelector(choices,ParentFrame=self,title=head,
     1334                res = G2IO.BlockSelector(choices,ParentFrame=self,title=head,
    13321335                    header='Select default inst parms',useCancel=True)
    13331336                if res is None: return None
     
    17091712                item, cookie = self.PatternTree.GetNextChild(self.root, cookie)
    17101713        # Initialize a base class reader
    1711         rd = G2IO.ImportPowderData(
     1714        rd = G2obj.ImportPowderData(
    17121715            extensionlist=tuple(),
    17131716            strictExtension=False,
     
    31013104                    Id = self.PatternTree.AppendItem(parent=self.root,text=outname)
    31023105                    if Id:
    3103                         Sample = G2pdG.SetDefaultSample()
     3106                        Sample = G2obj.SetDefaultSample()
    31043107                        Ymin = np.min(Ysum)
    31053108                        Ymax = np.max(Ysum)
Note: See TracChangeset for help on using the changeset viewer.