Changeset 2817 for trunk/GSASII.py

Timestamp:

May 2, 2017 10:03:41 AM (6 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:

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

trunk/GSASII.py

@@ -380 +380 @@
         :meth:`GSASII.OnImportSmallAngle` and :meth:'GSASII.OnImportReflectometry`
 
-        Uses reader_objects subclassed from :class:`GSASIIIO.ImportPhase`,
-        :class:`GSASIIIO.ImportStructFactor`,
-        :class:`GSASIIIO.ImportPowderData`,
-        :class:`GSASIIIO.ImportSmallAngleData`
-        :class:`GSASIIIO.ImportReflectometryData` or
-        :class:`GSASIIIO.ImportImage`.
+        Uses reader_objects subclassed from :class:`GSASIIobj.ImportPhase`,
+        :class:`GSASIIobj.ImportStructFactor`,
+        :class:`GSASIIobj.ImportPowderData`,
+        :class:`GSASIIobj.ImportSmallAngleData`
+        :class:`GSASIIobj.ImportReflectometryData` or
+        :class:`GSASIIobj.ImportImage`.
         If a specific reader is specified, only that method will be called,
         but if no reader is specified, every one that is potentially
@@ -552 +552 @@
                             rd.errors += "\n  Traceback info:\n"+str(traceback.format_exc())
                     if flag: # this read succeeded
+                        if rd.SciPy:        #was default read by scipy; needs 1 time fixes
+                            G2IO.EditImageParms(self,rd.Data,rd.Comments,rd.Image,filename)
+                            rd.SciPy = False
                         rd.readfilename = filename
                         if load2Tree:   #images only
@@ -1122 +1125 @@
             for i in range(1,1+ibanks):
                 choices.append('Bank '+str(i))
-            bank = 1 + rd.BlockSelector(
+            bank = 1 + G2IO.BlockSelector(
                 choices, self,
                 title='Select an instrument parameter bank for '+
@@ -1329 +1332 @@
                 for l in dI.defaultIparm_lbl:
                     choices.append('Defaults for '+l)
-                res = rd.BlockSelector(choices,ParentFrame=self,title=head,
+                res = G2IO.BlockSelector(choices,ParentFrame=self,title=head,
                     header='Select default inst parms',useCancel=True)
                 if res is None: return None
@@ -1709 +1712 @@
                 item, cookie = self.PatternTree.GetNextChild(self.root, cookie)
         # Initialize a base class reader
-        rd = G2IO.ImportPowderData(
+        rd = G2obj.ImportPowderData(
             extensionlist=tuple(),
             strictExtension=False,
@@ -3101 +3104 @@
                     Id = self.PatternTree.AppendItem(parent=self.root,text=outname)
                     if Id:
-                        Sample = G2pdG.SetDefaultSample()
+                        Sample = G2obj.SetDefaultSample()
                         Ymin = np.min(Ysum)
                         Ymax = np.max(Ysum)