Changeset 4411 for trunk

Timestamp:

Apr 24, 2020 11:27:10 AM (3 years ago)

Author:

toby

Message:

bug in CIF export; misc cleanup

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIscriptable.py (modified) (1 diff)
• exports/G2export_CIF.py (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -16 +16 @@
 Includes support for image reading.
 
-Also includes base classes for data import routines.
-
-This module needs some work to separate wx from non-wx routines. GUI 
+Also includes base class for data export routines (TODO: should move)
+
+TODO: This module needs some work to separate wx from non-wx routines. GUI 
 routines should probably move to GSASIIctrlGUI.
 '''
 
 from __future__ import division, print_function
-# If this is being used for GSASIIscriptable, don't depend on wx
+
+# Allow this to be imported without wx present. Was needed for G2scriptable, but is
+# likely not needed anymore
 try:
     import wx
 except ImportError:
-    # this may not be needed for sphinx anymore
+    # was needed by sphinx, but probably not anymore
     class Placeholder(object):
         def __init__(self):

trunk/GSASIIscriptable.py

@@ -1091 +1091 @@
 import GSASIIpwd as G2pwd
 import GSASIIstrMain as G2strMain
-#import GSASIIIO as G2IO
 import GSASIIstrIO as G2strIO
 import GSASIIspc as G2spc

trunk/exports/G2export_CIF.py

@@ -3058 +3058 @@
         dlg.Destroy()
         if ret == wx.ID_OK:
-            cf = G2IO.ReadCIF(fil)
+            cf = G2obj.ReadCIF(fil)
             if len(cf.keys()) == 0:
                 raise Exception("No CIF data_ blocks found")
@@ -3071 +3071 @@
             dblk,loopstructure = copy.deepcopy(self.CIF) # don't modify original
         else:
-            cf = G2IO.ReadCIF(self.CIF)
+            cf = G2obj.ReadCIF(self.CIF)
             dblk,loopstructure = CIF2dict(cf)
         dlg = EditCIFtemplate(self.cifdefs,dblk,loopstructure,self.defaultname)