Changeset 3376 for trunk/GSASIIdataGUI.py
- Timestamp:
- May 8, 2018 12:47:52 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIdataGUI.py
r3375 r3376 524 524 self.Bind(wx.EVT_MENU, self.OnRefine, id=item.GetId()) 525 525 526 #===============================================================================527 # TODO: remove this, also EnableSeqRefineMenu and self.SeqRefine528 # do when tutorials are updated so that references to menu item are gone529 item = parent.Append(wx.ID_ANY,'Sequential refine','')530 self.Bind(wx.EVT_MENU, self.OnSeqRefine, id=item.GetId())531 if len(self.SeqRefine): # extend state for new menus to match main (on mac)532 state = self.SeqRefine[0].IsEnabled()533 else:534 state = False535 item.Enable(state)536 self.SeqRefine.append(item) # save menu obj for use in self.EnableSeqRefineMenu537 #================================================================================538 526 # if GSASIIpath.GetConfigValue('debug'): # allow exceptions for debugging 539 527 # item = parent.Append(help='', id=wx.ID_ANY, kind=wx.ITEM_NORMAL, … … 562 550 if cId: 563 551 controls = self.GPXtree.GetItemPyData(cId) 564 return controls.get('Seq Data',[]) 552 seqSetting = controls.get('Seq Data',[]) 553 if seqSetting: 554 for item in self.Refine: 555 item.SetText('Se&quential refine') 556 else: 557 for item in self.Refine: 558 item.SetText('&Refine') 559 return seqSetting 565 560 else: 561 for item in self.Refine: 562 item.SetText('&Refine') 566 563 return None 567 564 568 def EnableSeqRefineMenu(self):569 '''Enable or disable the sequential refinement menu items based on the570 contents of the Controls 'Seq Data' item (if present)571 '''572 if self.testSeqRefineMode():573 for i in self.SeqRefine: i.Enable(True)574 else:575 for i in self.SeqRefine: i.Enable(False)576 577 565 def PreviewFile(self,filename): 578 566 'confirm we have the right file' … … 1552 1540 # check for phases connected to histograms 1553 1541 sub = GetGPXtreeItemId(self,self.root,'Phases') 1554 if not sub: return1555 item, cookie = self.GPXtree.GetFirstChild(sub)1556 while item: # loop over phases1557 data = self.GPXtree.GetItemPyData(item)1558 item, cookie = self.GPXtree.GetNextChild(sub, cookie)1559 UseList = data['Histograms']1560 if UseList: haveData = True1561 if haveData:1562 self.dataWindow.DataMenu.Enable(G2G.wxID_DATADELETE,True)1563 for item in self.Refine: item.Enable(True)1542 if sub: 1543 item, cookie = self.GPXtree.GetFirstChild(sub) 1544 while item: # loop over phases 1545 data = self.GPXtree.GetItemPyData(item) 1546 item, cookie = self.GPXtree.GetNextChild(sub, cookie) 1547 UseList = data['Histograms'] 1548 if UseList: haveData = True 1549 if haveData: 1550 self.dataWindow.DataMenu.Enable(G2G.wxID_DATADELETE,True) 1551 for item in self.Refine: item.Enable(True) 1564 1552 else: 1565 1553 self.dataWindow.DataMenu.Enable(G2G.wxID_DATADELETE,False) … … 2587 2575 self.MakePDF = [] 2588 2576 self.Refine = [] 2589 self.SeqRefine = [] # pointer(s) to Sequential Refinement menu objects2590 2577 #self.ExportPattern = [] 2591 2578 self.ExportPeakList = [] … … 3683 3670 if data: 3684 3671 for item in self.Refine: item.Enable(True) 3685 self.EnableSeqRefineMenu()3686 3672 item, cookie = self.GPXtree.GetNextChild(self.root, cookie) 3687 3673 if phaseId: # show all phases … … 3717 3703 if self.G2plotNB.plotList: 3718 3704 self.G2plotNB.clear() 3705 self.SetTitleByGPX() 3706 self.EnableRefineCommand() 3719 3707 finally: 3720 3708 dlg.Destroy() … … 3735 3723 '''Set the title for the two window frames 3736 3724 ''' 3725 projName = os.path.split(self.GSASprojectfile)[1] 3726 if not projName: projName = "<unnamed project>" 3737 3727 if self.testSeqRefineMode(): 3738 3728 s = u' (sequential refinement)' 3739 3729 else: 3740 3730 s = u'' 3741 self.SetTitle("GSAS-II project: "+ os.path.split(self.GSASprojectfile)[1]+s)3742 self.plotFrame.SetTitle("GSAS-II plots: "+ os.path.split(self.GSASprojectfile)[1])3731 self.SetTitle("GSAS-II project: "+projName + s) 3732 self.plotFrame.SetTitle("GSAS-II plots: "+projName) 3743 3733 3744 3734 def OnFileSaveas(self, event): … … 5528 5518 names.append(choices[sel]) 5529 5519 data['Seq Data'] = names 5530 G2frame.EnableSeqRefineMenu()5531 5520 dlg.Destroy() 5532 5521 G2frame.SetTitleByGPX() … … 7631 7620 G2frame.GPXtree.SetItemPyData(item,data) 7632 7621 for i in G2frame.Refine: i.Enable(True) 7633 G2frame.EnableSeqRefineMenu()7634 7622 UpdateControls(G2frame,data) 7635 7623 elif G2frame.GPXtree.GetItemText(item).startswith('Sequential '):
Note: See TracChangeset
for help on using the changeset viewer.