Changeset 3781 for trunk/GSASIIdataGUI.py

Timestamp:

Jan 13, 2019 5:33:03 PM (4 years ago)

Author:

toby

Message:

Add seq. results exports to main Export menu; enable/disable export items depending on sequential mode

File:

• trunk/GSASIIdataGUI.py (modified) (8 diffs)

trunk/GSASIIdataGUI.py

@@ -552 +552 @@
     def testSeqRefineMode(self):
         '''Returns the list of histograms included in a sequential refinement or
-        an empty list if a standard (non-sequential) refinement. 
+        an empty list if a standard (non-sequential) refinement.
+        Also sets Menu item status depending on mode
         '''
         cId = GetGPXtreeItemId(self,self.root, 'Controls')
@@ -558 +559 @@
             controls = self.GPXtree.GetItemPyData(cId)
             seqSetting = controls.get('Seq Data',[])
-            if seqSetting:
-                for item in self.Refine:
-                    item.SetText('Se&quential refine')
-            else:
-                for item in self.Refine:
-                    item.SetText('&Refine')
-            return seqSetting
+        else:
+            seqSetting = None
+            
+        if seqSetting:
+            for item in self.Refine:
+                item.SetText('Se&quential refine')
+            seqMode = True
         else:
             for item in self.Refine:
                 item.SetText('&Refine')
-            return None
+            seqMode = False
+        for menu in self.ExportSeq:
+            for item in menu.GetMenuItems():
+                menu.Enable(item.Id,seqMode)
+        for menu in self.ExportNonSeq:
+            for item in menu.GetMenuItems():
+                menu.Enable(item.Id,not seqMode)
+        return seqSetting
+
         
     def PreviewFile(self,filename):
@@ -2518 +2527 @@
         projectmenu = wx.Menu()
         item = menu.AppendSubMenu(projectmenu,'Entire project as','Export entire project')
-
+        self.ExportNonSeq.append(projectmenu)
+        
         phasemenu = wx.Menu()
         item = menu.AppendSubMenu(phasemenu,'Phase as','Export phase or sometimes phases')
@@ -2534 +2544 @@
         item = menu.AppendSubMenu(mapmenu,'Maps as','Export density map(s)')
 
+        # sequential exports are handled differently; N.B. enabled in testSeqRefineMode
+        seqPhasemenu = wx.Menu()
+        item = menu.AppendSubMenu(seqPhasemenu,'Sequential phases','Export phases from sequential fit')
+        self.ExportSeq.append(seqPhasemenu)
+        seqHistmenu = wx.Menu()
+        item = menu.AppendSubMenu(seqHistmenu,'Sequential histograms','Export histograms from sequential fit')
+        self.ExportSeq.append(seqHistmenu)
+        
         # find all the exporter files
         if not self.exporterlist: # this only needs to be done once
@@ -2562 +2580 @@
                 self.Bind(wx.EVT_MENU, obj.Exporter, id=item.GetId())
                 self.ExportLookup[item.GetId()] = typ # lookup table for submenu item
+            for lbl,submenu in (('Phase',seqPhasemenu),
+                        ('Powder',seqHistmenu),
+                        ):
+                if lbl.lower() in obj.exporttype:
+                    try:
+                        obj.Writer
+                    except AttributeError:
+                        continue
+                    # define a unique event handler for this menu item
+                    def seqMenuItemEventHandler(event,obj=obj,typ=lbl):
+                        'This handler has the needed exporter/type embedded'
+                        # lookup sequential table
+                        Id = GetGPXtreeItemId(self,self.root,'Sequential results')
+                        if not Id:
+                            print('Error in Seq seqMenuItemEventHandler for ',typ,'without Seq Res table')
+                            return
+                        data = self.GPXtree.GetItemPyData(Id)
+                        G2IO.ExportSequential(self,data,obj,typ)
+                    if 'mode' in inspect.getargspec(obj.Writer)[0]:
+                        item = submenu.Append(wx.ID_ANY,obj.formatName,obj.longFormatName)
+                        self.Bind(wx.EVT_MENU, seqMenuItemEventHandler, item)
+                        #                    self.SeqExportLookup[item.GetId()] = (obj,lbl) # lookup table for submenu item
+                        # Bind is in UpdateSeqResults
+
         item = imagemenu.Append(wx.ID_ANY,'Multiple image controls and masks',
             'Export image controls and masks for multiple images')
@@ -2695 +2737 @@
         self.MakePDF = []
         self.Refine = []
+        self.ExportSeq = []
+        self.ExportNonSeq = []
         #self.ExportPattern = []
         self.ExportPeakList = []
@@ -4977 +5021 @@
         # fill sequential Export menu
         # for an exporter to be used for sequential exports, it must have a Writer method and
-        # that Writer method must offer a mode argument. 
+        # that Writer method must offer a mode argument.
+        #============================================================
+        # N.B. this largely duplicates menu items now in Export
+        #============================================================
         self.SeqExportLookup = {}
         self.SequentialEx = wx.Menu(title='')
@@ -6661 +6708 @@
         if vals is None:
             print('Error: Id not found. This should not happen!')
+            return
         G2IO.ExportSequential(G2frame,data,*vals)