Changeset 2818

Timestamp:

May 2, 2017 1:39:22 PM (6 years ago)

Author:

vondreele

Message:

add GetPhaseNames?(fl) to G2obj - uses opened gpx file
fix PhaseSelector? & remove ShowBusy? & DoneBusy? from G2IO - not used ever

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (3 diffs)
• GSASIIobj.py (modified) (2 diffs)
• docs/source/imports.rst (modified) (1 diff)

trunk/GSASII.py

@@ -636 +636 @@
                 if h.startswith('HKLF ') and h not in usedHKLFhists:
                     usedHKLFhists.append(h)
+                    
+                    
         rdlist = self.OnImportGeneric(reqrdr,self.ImportPhaseReaderlist,
             'phase',usedRanIdList=phaseRIdList)

trunk/GSASIIIO.py

@@ -33 +33 @@
 GSASIIpath.SetVersionNumber("$Revision$")
 import GSASIIgrid as G2gd
-import GSASIIspc as G2spc
 import GSASIIobj as G2obj
 import GSASIIlattice as G2lat
@@ -1202 +1201 @@
     return result
 
-def PhaseSelector(self, ChoiceList, ParentFrame=None,
+def PhaseSelector(ChoiceList, ParentFrame=None,
     title='Select a phase', size=None,header='Phase Selector'):
     ''' Provide a wx dialog to select a phase if the file contains more
@@ -1210 +1209 @@
         size,header)
 
-def ShowBusy():
-    wx.BeginBusyCursor()
-#        wx.Yield() # make it happen now!
-
-def DoneBusy():
-    wx.EndBusyCursor()
-    wx.Yield() # make it happen now!
 ######################################################################
 def striphist(var,insChar=''):

trunk/GSASIIobj.py

@@ -864 +864 @@
 import sys
 import os.path as ospath
+import cPickle
 import GSASIIpath
 import GSASIImath as G2mth
@@ -980 +981 @@
 '''
 P1SGData = G2spc.SpcGroup('P 1')[1] # data structure for default space group
+
+def GetPhaseNames(fl):
+    ''' Returns a list of phase names found under 'Phases' in GSASII gpx file
+    NB: there is another one of these in GSASIIstrIO.py that uses the gpx filename
+
+    :param file fl: opened .gpx file
+    :return: list of phase names
+    '''
+    PhaseNames = []
+    while True:
+        try:
+            data = cPickle.load(fl)
+        except EOFError:
+            break
+        datum = data[0]
+        if 'Phases' == datum[0]:
+            for datus in data[1:]:
+                PhaseNames.append(datus[0])
+    fl.seek(0)          #reposition file
+    return PhaseNames
 
 def SetNewPhase(Name='New Phase',SGData=None,cell=None,Super=None):

trunk/docs/source/imports.rst

@@ -154 +154 @@
 ``Reader()`` routines that may encounter more than one set of information
 in a file. 
-Likewise, when an operation will take some time to complete, 
-use :meth:`~GSASIIIO.ShowBusy` and 
-:meth:`~GSASIIIO.DoneBusy` to show the user that something is happening. 
 
 ContentsValidator()