Changeset 1115 for trunk/exports/G2export_CIF.py

Timestamp:

Oct 18, 2013 4:00:32 PM (8 years ago)

Author:

toby

Message:

rework exports for new types

File:

• trunk/exports/G2export_CIF.py (modified) (3 diffs)

trunk/exports/G2export_CIF.py

@@ -1516 +1516 @@
 
         # the export process starts here
+        self.InitExport(event)
         # load all of the tree into a set of dicts
         self.loadTree()
         # create a dict with refined values and their uncertainties
         self.loadParmDict()
-        if self.SetupExport(event,                         # set export parameters
-                            AskFile=(self.mode=='simple')
-                            ): return 
+        if self.ExportSelect(AskFile=(self.mode=='simple')):    # set export parameters
+            return 
         # Someday: get restraint & constraint info
         #restraintDict = self.OverallParms.get('Restraints',{})
@@ -1842 +1842 @@
 class ExportPhaseCIF(ExportCIF):
     '''Used to create a simple CIF of at most one phase. Uses exact same code as
-    :class:`ExportCIF` except that `self.mode` is set to "simple". Shows up in menu as
-    Quick CIF
+    :class:`ExportCIF` except that `self.mode` is set to "simple" in `self.InitExport`.
+    Shows up in menu as Quick CIF.
 
     :param wx.Frame G2frame: reference to main GSAS-II frame
@@ -1862 +1862 @@
     '''Used to create a simple CIF containing diffraction data only. Uses exact same code as
     :class:`ExportCIF` except that `self.mode` is set to "simple" and `self.currentExportType`
-    is set to "single" or "powder" in `self.SetupExport`. Shows up in menus as Data-only CIF.
+    is set to "single" or "powder" in `self.InitExport`. Shows up in menus as Data-only CIF.
 
     :param wx.Frame G2frame: reference to main GSAS-II frame