Changeset 4343 for trunk/GSASIIautoInt.py

Timestamp:

Mar 5, 2020 10:48:06 AM (3 years ago)

Author:

toby

Message:

deal with exporters sharing extension in autointegration

File:

• trunk/GSASIIautoInt.py (modified) (7 diffs)

trunk/GSASIIautoInt.py

@@ -182 +182 @@
 
         def TestInput(*args,**kwargs):
-            'Determine if the start button should be enabled'
+            '''Determine if the start button should be enabled and 
+            ask for the exporter type with ambiguous extensions
+            '''
+            for dfmt,obj in self.fmtlist.items():
+                fmt = dfmt[1:]
+                if not self.params['outsel'][fmt]: continue
+                if fmt in self.multipleFmtChoices: continue
+                if type(obj) is not list: continue # only one exporter for this
+                choices = []
+                for e in obj: 
+                    choices.append(e.formatName)
+                if len(choices) == 0:
+                    print('Error: why 0 choices in TestInput?')
+                    continue
+                if len(choices) == 1:
+                    print('Error: why 1 choice in TestInput?')
+                    self.multipleFmtChoices[fmt] = obj[0].formatName
+                    continue
+                # select the format here
+                dlg = G2G.G2SingleChoiceDialog(self,
+                        'There is more than one format with a '+
+                        '.{} output. Choose the one to use'.format(fmt),
+                        'Choose output format',choices)
+                dlg.clb.SetSelection(0)  # force a selection
+                if dlg.ShowModal() == wx.ID_OK and dlg.GetSelection() >= 0:
+                    self.multipleFmtChoices[fmt] = choices[dlg.GetSelection()]
+                dlg.Destroy()
+                
             writingSomething = False
             writingPDF = False
@@ -426 +453 @@
         self.params['outdir'] = os.getcwd()
         self.PDFformats = ('I(Q)', 'S(Q)', 'F(Q)', 'G(r)', 'PDFgui')
+        self.multipleFmtChoices = {}
         #GSASIIpath.IPyBreak_base()
         
@@ -492 +520 @@
         sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Select format(s):'))
-        for dfmt in self.fmtlist:
+        for dfmt in sorted(self.fmtlist):
             sizer.Add((6,2)) # add a bit of extra space
             fmt = dfmt[1:]
@@ -758 +786 @@
             PDFformats = self.PDFformats
             fmtlist = self.fmtlist
-            outputModes = (outputSelect,PDFformats,fmtlist,outdir)
+            outputModes = (outputSelect,PDFformats,fmtlist,outdir,
+                               self.multipleFmtChoices)
             if PDFobj:
                 PDFdict = PDFobj.data
@@ -786 +815 @@
     :param tuple outputModes:
     '''
-    GSASIIpath.IPyBreak()
     (TableMode,ComputePDF,SeparateDir,optPDF) = calcModes
-    (outputSelect,PDFformats,fmtlist,outdir) = outputModes            
+    (outputSelect,PDFformats,fmtlist,outdir,multipleFmtChoices) = outputModes
     gpxout = G2sc.G2Project(filename=os.path.splitext(newImage)[0]+'.gpx')
     print('creating',gpxout.filename)
@@ -807 +835 @@
             fmt = dfmt[1:]
             if not outputSelect[fmt]: continue
+            hint = ''
+            if fmt in multipleFmtChoices:
+                hint = multipleFmtChoices[fmt]
             if SeparateDir:
                 savedir = os.path.join(outdir,fmt)
@@ -817 +848 @@
                 try:
                     fil = os.path.join(savedir,fname)
-                    print('Wrote',h.Export(fil,dfmt))
+                    print('Wrote',h.Export(fil,dfmt,hint))
                 except Exception as msg:
                     print('Failed to write {} as {}. Error msg\n{}'