Changeset 4411


Ignore:
Timestamp:
Apr 24, 2020 11:27:10 AM (18 months ago)
Author:
toby
Message:

bug in CIF export; misc cleanup

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r4410 r4411  
    1616Includes support for image reading.
    1717
    18 Also includes base classes for data import routines.
    19 
    20 This module needs some work to separate wx from non-wx routines. GUI
     18Also includes base class for data export routines (TODO: should move)
     19
     20TODO: This module needs some work to separate wx from non-wx routines. GUI
    2121routines should probably move to GSASIIctrlGUI.
    2222'''
    2323
    2424from __future__ import division, print_function
    25 # If this is being used for GSASIIscriptable, don't depend on wx
     25
     26# Allow this to be imported without wx present. Was needed for G2scriptable, but is
     27# likely not needed anymore
    2628try:
    2729    import wx
    2830except ImportError:
    29     # this may not be needed for sphinx anymore
     31    # was needed by sphinx, but probably not anymore
    3032    class Placeholder(object):
    3133        def __init__(self):
  • trunk/GSASIIscriptable.py

    r4409 r4411  
    10911091import GSASIIpwd as G2pwd
    10921092import GSASIIstrMain as G2strMain
    1093 #import GSASIIIO as G2IO
    10941093import GSASIIstrIO as G2strIO
    10951094import GSASIIspc as G2spc
  • trunk/exports/G2export_CIF.py

    r4402 r4411  
    30583058        dlg.Destroy()
    30593059        if ret == wx.ID_OK:
    3060             cf = G2IO.ReadCIF(fil)
     3060            cf = G2obj.ReadCIF(fil)
    30613061            if len(cf.keys()) == 0:
    30623062                raise Exception("No CIF data_ blocks found")
     
    30713071            dblk,loopstructure = copy.deepcopy(self.CIF) # don't modify original
    30723072        else:
    3073             cf = G2IO.ReadCIF(self.CIF)
     3073            cf = G2obj.ReadCIF(self.CIF)
    30743074            dblk,loopstructure = CIF2dict(cf)
    30753075        dlg = EditCIFtemplate(self.cifdefs,dblk,loopstructure,self.defaultname)
Note: See TracChangeset for help on using the changeset viewer.