Changeset 3376 for trunk/GSASIIdataGUI.py

Timestamp:

May 8, 2018 12:47:52 PM (4 years ago)

Author:

toby

Message:

merge refine and seq. refine menu items, relabeling as needed

File:

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

trunk/GSASIIdataGUI.py

@@ -524 +524 @@
         self.Bind(wx.EVT_MENU, self.OnRefine, id=item.GetId())
 
-        #===============================================================================
-        # TODO: remove this, also EnableSeqRefineMenu and self.SeqRefine
-        # do when tutorials are updated so that references to menu item are gone
-        item = parent.Append(wx.ID_ANY,'Sequential refine','')
-        self.Bind(wx.EVT_MENU, self.OnSeqRefine, id=item.GetId())
-        if len(self.SeqRefine): # extend state for new menus to match main (on mac)
-            state = self.SeqRefine[0].IsEnabled()
-        else:
-            state = False
-        item.Enable(state)
-        self.SeqRefine.append(item) # save menu obj for use in self.EnableSeqRefineMenu
-        #================================================================================
 #        if GSASIIpath.GetConfigValue('debug'): # allow exceptions for debugging
 #            item = parent.Append(help='', id=wx.ID_ANY, kind=wx.ITEM_NORMAL,
@@ -562 +550 @@
         if cId:
             controls = self.GPXtree.GetItemPyData(cId)
-            return controls.get('Seq Data',[])
+            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:
+            for item in self.Refine:
+                item.SetText('&Refine')
             return None
         
-    def EnableSeqRefineMenu(self):
-        '''Enable or disable the sequential refinement menu items based on the
-        contents of the Controls 'Seq Data' item (if present)
-        '''
-        if self.testSeqRefineMode():
-            for i in self.SeqRefine: i.Enable(True)
-        else:
-            for i in self.SeqRefine: i.Enable(False)
-
     def PreviewFile(self,filename):
         'confirm we have the right file'
@@ -1552 +1540 @@
         # check for phases connected to histograms
         sub = GetGPXtreeItemId(self,self.root,'Phases')
-        if not sub: return
-        item, cookie = self.GPXtree.GetFirstChild(sub)
-        while item: # loop over phases
-            data = self.GPXtree.GetItemPyData(item)
-            item, cookie = self.GPXtree.GetNextChild(sub, cookie)
-            UseList = data['Histograms']
-            if UseList: haveData = True
-        if haveData:
-            self.dataWindow.DataMenu.Enable(G2G.wxID_DATADELETE,True)
-            for item in self.Refine: item.Enable(True)
+        if sub: 
+            item, cookie = self.GPXtree.GetFirstChild(sub)
+            while item: # loop over phases
+                data = self.GPXtree.GetItemPyData(item)
+                item, cookie = self.GPXtree.GetNextChild(sub, cookie)
+                UseList = data['Histograms']
+                if UseList: haveData = True
+            if haveData:
+                self.dataWindow.DataMenu.Enable(G2G.wxID_DATADELETE,True)
+                for item in self.Refine: item.Enable(True)
         else:
             self.dataWindow.DataMenu.Enable(G2G.wxID_DATADELETE,False)
@@ -2587 +2575 @@
         self.MakePDF = []
         self.Refine = []
-        self.SeqRefine = [] # pointer(s) to Sequential Refinement menu objects
         #self.ExportPattern = []
         self.ExportPeakList = []
@@ -3683 +3670 @@
                 if data:
                     for item in self.Refine: item.Enable(True)
-                    self.EnableSeqRefineMenu()
             item, cookie = self.GPXtree.GetNextChild(self.root, cookie)
         if phaseId: # show all phases
@@ -3717 +3703 @@
                 if self.G2plotNB.plotList:
                     self.G2plotNB.clear()
+                self.SetTitleByGPX()
+                self.EnableRefineCommand()
         finally:
             dlg.Destroy()
@@ -3735 +3723 @@
         '''Set the title for the two window frames
         '''
+        projName = os.path.split(self.GSASprojectfile)[1]
+        if not projName: projName = "<unnamed project>"
         if self.testSeqRefineMode():
             s = u' (sequential refinement)'
         else:
             s = u''
-        self.SetTitle("GSAS-II project: "+os.path.split(self.GSASprojectfile)[1]+s)
-        self.plotFrame.SetTitle("GSAS-II plots: "+os.path.split(self.GSASprojectfile)[1])
+        self.SetTitle("GSAS-II project: "+projName + s)
+        self.plotFrame.SetTitle("GSAS-II plots: "+projName)
 
     def OnFileSaveas(self, event):
@@ -5528 +5518 @@
                     names.append(choices[sel])
                 data['Seq Data'] = names                
-                G2frame.EnableSeqRefineMenu()
             dlg.Destroy()
             G2frame.SetTitleByGPX()
@@ -7631 +7620 @@
                 G2frame.GPXtree.SetItemPyData(item,data)                             
             for i in G2frame.Refine: i.Enable(True)
-            G2frame.EnableSeqRefineMenu()
             UpdateControls(G2frame,data)
         elif G2frame.GPXtree.GetItemText(item).startswith('Sequential '):