Changeset 3990 for trunk/GSASIIdataGUI.py
- Timestamp:
- May 22, 2019 2:04:11 PM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIdataGUI.py
r3982 r3990 4716 4716 histNames = Controls['Seq Data'] 4717 4717 else: # patch from before Controls['Seq Data'] was implemented 4718 histNames = G2stIO.GetHistogramNames( GPXfile,['PWDR',])4718 histNames = G2stIO.GetHistogramNames(self.GPXfile,['PWDR',]) 4719 4719 if Controls.get('Reverse Seq'): 4720 4720 histNames.reverse() … … 5583 5583 #Phase / Dysnomia (Maximum Entropy Method) tab 5584 5584 G2G.Define_wxId('wxID_LOADDYSNOMIA', 'wxID_SAVEDYSNOMIA', 'wxID_RUNDYSNOMIA', ) 5585 self.MEM Data= wx.MenuBar()5586 self.PrefillDataMenu(self.MEM Data)5587 self.MEM Data.Append(menu=wx.Menu(title=''),title='Select tab')5585 self.MEMMenu = wx.MenuBar() 5586 self.PrefillDataMenu(self.MEMMenu) 5587 self.MEMMenu.Append(menu=wx.Menu(title=''),title='Select tab') 5588 5588 self.MEMDataEdit = wx.Menu(title='') 5589 self.MEM Data.Append(menu=self.MEMDataEdit, title='Operations')5589 self.MEMMenu.Append(menu=self.MEMDataEdit, title='Operations') 5590 5590 self.MEMDataEdit.Append(G2G.wxID_LOADDYSNOMIA,'Load from Dysnomia file','Load MEM info from Dysnomia file') 5591 5591 self.MEMDataEdit.Append(G2G.wxID_SAVEDYSNOMIA,'Save Dysnomia file','Save MEM info in Dysnomia file') … … 7817 7817 G2frame.PatternId,'Instrument Parameters')) 7818 7818 if 'C' in Inst[0]['Type'][0]: 7819 magSizer.Add(wx.StaticText(panel,-1,'2Theta' 7820 ),1,wx.ALIGN_CENTER,1) 7819 magSizer.Add(wx.StaticText(panel,-1,'2Theta'),1,wx.ALIGN_CENTER,1) 7821 7820 else: 7822 magSizer.Add(wx.StaticText(panel,-1,'TOF' 7823 ),1,wx.ALIGN_CENTER,1) 7821 magSizer.Add(wx.StaticText(panel,-1,'TOF'),1,wx.ALIGN_CENTER,1) 7824 7822 magSizer.Add(wx.StaticText(panel,-1,'Magnification\nfactor', 7825 7823 style=wx.ALIGN_CENTRE_HORIZONTAL),1,wx.ALIGN_CENTER,1) 7826 7824 magSizer.Add(wx.StaticText(panel,-1,'Delete\nbutton', 7827 style=wx.ALIGN_CENTRE_HORIZONTAL 7828 ),1,wx.ALIGN_CENTER,1) 7825 style=wx.ALIGN_CENTRE_HORIZONTAL),1,wx.ALIGN_CENTER,1) 7829 7826 magSizer.Add(wx.StaticText(panel,-1,'(start)'),1,wx.ALIGN_CENTER,1) 7830 7827 edit = G2G.ValidatedTxtCtrl(panel,data[0]['Magnification'][0],1, 7831 nDig=(7,2), 7832 min=0.01,max=1000., 7833 OnLeave=OnEditMag,size=(65,-1)) 7828 nDig=(7,2),min=0.01,max=1000.,OnLeave=OnEditMag,size=(65,-1)) 7834 7829 magSizer.Add(edit,1,wx.ALIGN_CENTER,5) 7835 7830 magSizer.Add((1,1)) 7836 7831 for i in range(1,lenmag): 7837 edit = G2G.ValidatedTxtCtrl(panel,data[0]['Magnification'][i],0, 7838 nDig=(10,3), 7839 min=data[1][0][0],max=data[1][0][-1], 7840 OnLeave=OnEditMag) 7832 edit = G2G.ValidatedTxtCtrl(panel,data[0]['Magnification'][i],0,nDig=(10,3), 7833 min=data[1][0][0],max=data[1][0][-1],OnLeave=OnEditMag) 7841 7834 magSizer.Add(edit) 7842 7835 edit = G2G.ValidatedTxtCtrl(panel,data[0]['Magnification'][i],1, 7843 nDig=(7,2), 7844 min=0.01,max=1000., 7845 OnLeave=OnEditMag,size=(65,-1)) 7836 nDig=(7,2),min=0.01,max=1000.,OnLeave=OnEditMag,size=(65,-1)) 7846 7837 magSizer.Add(edit,1,wx.ALIGN_CENTER,5) 7847 7838 delmag = wx.Button(panel,wx.ID_ANY,label='Del',size=(40,-1)) … … 7878 7869 SuperVec = [] 7879 7870 refList = data[1]['RefList'] 7880 # GSASIIpath.IPyBreak()7881 7871 FoMax = np.max(refList.T[5+data[1].get('Super',0)]) 7882 7872 page = G2frame.G2plotNB.nb.GetSelection()
Note: See TracChangeset
for help on using the changeset viewer.