Changeset 2912 for branch/2frame
- Timestamp:
- Jul 5, 2017 7:13:15 PM (6 years ago)
- Location:
- branch/2frame
- Files:
-
- 4 edited
-
GSASIIpath.py (modified) (2 diffs)
-
GSASIIphsGUI.py (modified) (1 diff)
-
GSASIIpwdGUI.py (modified) (5 diffs)
-
GSASIIrestrGUI.py (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branch/2frame/GSASIIpath.py
r2905 r2912 634 634 print('GSAS-II binary directory: {}'.format(binpath)) 635 635 sys.path.insert(0,binpath) 636 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!637 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!638 # patch: use old location based on the host OS and the python version,639 # path is relative to location of the script that is called as well as this file640 636 # this must be imported before anything that imports any .pyd/.so file for GSASII 641 637 else: 642 print('\n'+75*'*')643 print(' Warning. Using an old-style GSAS-II binary library. This is unexpected')644 print(' and will break in future GSAS-II versions. Please contact toby@anl.gov')645 print(' so we can learn what is not working on your installation.')638 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 639 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 640 # patch: use old location based on the host OS and the python version, 641 # path is relative to location of the script that is called as well as this file 646 642 bindir = None 647 643 if sys.platform == "win32": … … 666 662 # that at the top of the path 667 663 fpth = os.path.join(loc,bindir) 664 binpath = fpth 668 665 if TestSPG(fpth): 669 binpath = fpth670 666 sys.path.insert(0,binpath) 667 print('\n'+75*'*') 668 print(' Warning. Using an old-style GSAS-II binary library. This is unexpected') 669 print(' and will break in future GSAS-II versions. Please contact toby@anl.gov') 670 print(' so we can learn what is not working on your installation.') 671 671 print('GSAS-II binary directory: {}'.format(binpath)) 672 672 print(75*'*') 673 673 break 674 674 else: 675 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 675 # end patch 676 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 677 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 678 print(75*'*') 679 print('Use of GSAS-II binary directory {} failed!'.format(binpath)) 680 print(75*'*') 676 681 raise Exception,"**** ERROR GSAS-II binary libraries not found, GSAS-II cannot run ****" 677 682 -
branch/2frame/GSASIIphsGUI.py
r2909 r2912 1303 1303 pages = [G2frame.phaseDisplay.GetPageText(PageNum) for PageNum in range(G2frame.phaseDisplay.GetPageCount())] 1304 1304 if generalData['Type'] == 'faulted': 1305 G2frame. dataWindow.Bind(wx.EVT_MENU, OnLoadDIFFaX, id=G2gd.wxID_LOADDIFFAX)1306 G2frame. dataWindow.Bind(wx.EVT_MENU, OnSimulate, id=G2gd.wxID_LAYERSIMULATE)1307 G2frame. dataWindow.Bind(wx.EVT_MENU, OnSeqSimulate, id=G2gd.wxID_SEQUENCESIMULATE)1308 G2frame. dataWindow.Bind(wx.EVT_MENU, OnFitLayers, id=G2gd.wxID_LAYERSFIT)1305 G2frame.Bind(wx.EVT_MENU, OnLoadDIFFaX, id=G2gd.wxID_LOADDIFFAX) 1306 G2frame.Bind(wx.EVT_MENU, OnSimulate, id=G2gd.wxID_LAYERSIMULATE) 1307 G2frame.Bind(wx.EVT_MENU, OnSeqSimulate, id=G2gd.wxID_SEQUENCESIMULATE) 1308 G2frame.Bind(wx.EVT_MENU, OnFitLayers, id=G2gd.wxID_LAYERSFIT) 1309 1309 if 'Wave Data' in pages: 1310 1310 pass -
branch/2frame/GSASIIpwdGUI.py
r2909 r2912 3927 3927 G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.SubstanceMenu) 3928 3928 G2frame.SetTitle('Substances') 3929 G2frame. dataWindow.Bind(wx.EVT_MENU, OnLoadSubstance, id=G2gd.wxID_LOADSUBSTANCE)3930 G2frame. dataWindow.Bind(wx.EVT_MENU, OnReloadSubstances, id=G2gd.wxID_RELOADSUBSTANCES)3931 G2frame. dataWindow.Bind(wx.EVT_MENU, OnAddSubstance, id=G2gd.wxID_ADDSUBSTANCE)3932 G2frame. dataWindow.Bind(wx.EVT_MENU, OnCopySubstance, id=G2gd.wxID_COPYSUBSTANCE)3933 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteSubstance, id=G2gd.wxID_DELETESUBSTANCE)3934 G2frame. dataWindow.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_ELEMENTADD)3935 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteElement, id=G2gd.wxID_ELEMENTDELETE)3929 G2frame.Bind(wx.EVT_MENU, OnLoadSubstance, id=G2gd.wxID_LOADSUBSTANCE) 3930 G2frame.Bind(wx.EVT_MENU, OnReloadSubstances, id=G2gd.wxID_RELOADSUBSTANCES) 3931 G2frame.Bind(wx.EVT_MENU, OnAddSubstance, id=G2gd.wxID_ADDSUBSTANCE) 3932 G2frame.Bind(wx.EVT_MENU, OnCopySubstance, id=G2gd.wxID_COPYSUBSTANCE) 3933 G2frame.Bind(wx.EVT_MENU, OnDeleteSubstance, id=G2gd.wxID_DELETESUBSTANCE) 3934 G2frame.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_ELEMENTADD) 3935 G2frame.Bind(wx.EVT_MENU, OnDeleteElement, id=G2gd.wxID_ELEMENTDELETE) 3936 3936 mainSizer = wx.BoxSizer(wx.VERTICAL) 3937 3937 mainSizer.Add(SubstSizer(),0) … … 4586 4586 G2frame.dataWindow.ClearData() 4587 4587 G2frame.SetTitle('Modelling') 4588 G2frame. dataWindow.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY)4589 G2frame. dataWindow.Bind(wx.EVT_MENU, OnCopyFlags, id=G2gd.wxID_MODELCOPYFLAGS)4590 G2frame. dataWindow.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT)4591 G2frame. dataWindow.Bind(wx.EVT_MENU, OnFitModelAll, id=G2gd.wxID_MODELFITALL)4592 G2frame. dataWindow.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_MODELUNDO)4593 G2frame. dataWindow.Bind(wx.EVT_MENU, OnAddModel, id=G2gd.wxID_MODELADD)4588 G2frame.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY) 4589 G2frame.Bind(wx.EVT_MENU, OnCopyFlags, id=G2gd.wxID_MODELCOPYFLAGS) 4590 G2frame.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT) 4591 G2frame.Bind(wx.EVT_MENU, OnFitModelAll, id=G2gd.wxID_MODELFITALL) 4592 G2frame.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_MODELUNDO) 4593 G2frame.Bind(wx.EVT_MENU, OnAddModel, id=G2gd.wxID_MODELADD) 4594 4594 Indx = {} 4595 4595 mainSizer = G2frame.dataWindow.GetSizer() … … 5170 5170 G2frame.SetTitle('Modelling') 5171 5171 G2frame.dataWindow.ClearData() 5172 G2frame. dataWindow.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY)5173 G2frame. dataWindow.Bind(wx.EVT_MENU, OnModelPlot, id=G2gd.wxID_MODELPLOT)5174 G2frame. dataWindow.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT)5175 G2frame. dataWindow.Bind(wx.EVT_MENU, OnFitModelAll, id=G2gd.wxID_MODELFITALL)5176 G2frame. dataWindow.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_MODELUNDO)5172 G2frame.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY) 5173 G2frame.Bind(wx.EVT_MENU, OnModelPlot, id=G2gd.wxID_MODELPLOT) 5174 G2frame.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT) 5175 G2frame.Bind(wx.EVT_MENU, OnFitModelAll, id=G2gd.wxID_MODELFITALL) 5176 G2frame.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_MODELUNDO) 5177 5177 mainSizer = G2frame.dataWindow.GetSizer() 5178 5178 mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Reflectometry fitting for: '+Name),0,WACV) … … 5974 5974 else: 5975 5975 G2frame.dataWindow.PDFMenu.EnableTop(0,enable=False) 5976 G2frame. dataWindow.Bind(wx.EVT_MENU, OnCopyPDFControls, id=G2gd.wxID_PDFCOPYCONTROLS)5977 G2frame. dataWindow.Bind(wx.EVT_MENU, OnSavePDFControls, id=G2gd.wxID_PDFSAVECONTROLS)5978 G2frame. dataWindow.Bind(wx.EVT_MENU, OnLoadPDFControls, id=G2gd.wxID_PDFLOADCONTROLS)5979 G2frame. dataWindow.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_PDFADDELEMENT)5980 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteElement, id=G2gd.wxID_PDFDELELEMENT)5981 G2frame. dataWindow.Bind(wx.EVT_MENU, OnComputePDF, id=G2gd.wxID_PDFCOMPUTE)5982 G2frame. dataWindow.Bind(wx.EVT_MENU, OnComputeAllPDF, id=G2gd.wxID_PDFCOMPUTEALL)5976 G2frame.Bind(wx.EVT_MENU, OnCopyPDFControls, id=G2gd.wxID_PDFCOPYCONTROLS) 5977 G2frame.Bind(wx.EVT_MENU, OnSavePDFControls, id=G2gd.wxID_PDFSAVECONTROLS) 5978 G2frame.Bind(wx.EVT_MENU, OnLoadPDFControls, id=G2gd.wxID_PDFLOADCONTROLS) 5979 G2frame.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_PDFADDELEMENT) 5980 G2frame.Bind(wx.EVT_MENU, OnDeleteElement, id=G2gd.wxID_PDFDELELEMENT) 5981 G2frame.Bind(wx.EVT_MENU, OnComputePDF, id=G2gd.wxID_PDFCOMPUTE) 5982 G2frame.Bind(wx.EVT_MENU, OnComputeAllPDF, id=G2gd.wxID_PDFCOMPUTEALL) 5983 5983 5984 5984 mainSizer = G2frame.dataWindow.GetSizer() … … 6157 6157 6158 6158 G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.PDFPksMenu) 6159 G2frame. dataWindow.Bind(wx.EVT_MENU, OnCopyPDFPeaks, id=G2gd.wxID_PDFCOPYPEAKS)6160 G2frame. dataWindow.Bind(wx.EVT_MENU, OnFitPDFpeaks, id=G2gd.wxID_PDFPKSFIT)6161 G2frame. dataWindow.Bind(wx.EVT_MENU, OnFitAllPDFpeaks, id=G2gd.wxID_PDFPKSFITALL)6162 G2frame. dataWindow.Bind(wx.EVT_MENU, OnClearPDFpeaks, id=G2gd.wxID_CLEARPDFPEAKS)6159 G2frame.Bind(wx.EVT_MENU, OnCopyPDFPeaks, id=G2gd.wxID_PDFCOPYPEAKS) 6160 G2frame.Bind(wx.EVT_MENU, OnFitPDFpeaks, id=G2gd.wxID_PDFPKSFIT) 6161 G2frame.Bind(wx.EVT_MENU, OnFitAllPDFpeaks, id=G2gd.wxID_PDFPKSFITALL) 6162 G2frame.Bind(wx.EVT_MENU, OnClearPDFpeaks, id=G2gd.wxID_CLEARPDFPEAKS) 6163 6163 mainSizer = G2frame.dataWindow.GetSizer() 6164 6164 mainSizer.Add((5,5),0) -
branch/2frame/GSASIIrestrGUI.py
r2909 r2912 919 919 Bonds.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect) 920 920 Bonds.Bind(wg.EVT_GRID_CELL_CHANGE, OnCellChange) 921 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)922 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL)923 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)921 G2frame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE) 922 G2frame.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL) 923 G2frame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD) 924 924 mainSizer.Add(wx.StaticText(BondRestr,-1, 925 925 'Bond restraints: sum(wt*(delt/sig)^2) = %.2f, mean(wt*(delt/sig)^2) = %.2f' \ … … 1055 1055 Angles.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect) 1056 1056 Angles.Bind(wg.EVT_GRID_CELL_CHANGE, OnCellChange) 1057 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)1058 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL)1059 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)1057 G2frame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE) 1058 G2frame.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL) 1059 G2frame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD) 1060 1060 mainSizer.Add(wx.StaticText(AngleRestr,-1, 1061 1061 'Angle restraints: sum(wt*(delt/sig)^2) = %.2f, mean(wt*(delt/sig)^2) = %.2f' \ … … 1183 1183 Planes.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect) 1184 1184 Planes.Bind(wg.EVT_GRID_CELL_CHANGE, OnCellChange) 1185 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)1186 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)1185 G2frame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE) 1186 G2frame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD) 1187 1187 mainSizer.Add(wx.StaticText(PlaneRestr,-1, 1188 1188 'Plane restraints: sum(wt*(delt/sig)^2) = %.2f, mean(wt*(delt/sig)^2) = %.2f' \ … … 1313 1313 Volumes.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect) 1314 1314 Volumes.Bind(wg.EVT_GRID_CELL_CHANGE, OnCellChange) 1315 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)1316 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL)1317 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)1315 G2frame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE) 1316 G2frame.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL) 1317 G2frame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD) 1318 1318 mainSizer.Add(wx.StaticText(ChiralRestr,-1, 1319 1319 'Chiral volume restraints: sum(wt*(delt/sig)^2) = %.2f, mean(wt*(delt/sig)^2) = %.2f' \ … … 1416 1416 TorsionRestr.Torsions.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect) 1417 1417 TorsionRestr.Torsions.Bind(wg.EVT_GRID_CELL_CHANGE, OnCellChange) 1418 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)1419 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)1418 G2frame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE) 1419 G2frame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD) 1420 1420 mainSizer.Add(wx.StaticText(TorsionRestr,-1, 1421 1421 'Torsion restraints: sum(wt*(delt/sig)^2) = %.2f, mean(wt*(delt/sig)^2) = %.2f' \ … … 1538 1538 RamaRestr.Ramas.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect) 1539 1539 RamaRestr.Ramas.Bind(wg.EVT_GRID_CELL_CHANGE, OnCellChange) 1540 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)1541 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)1540 G2frame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE) 1541 G2frame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD) 1542 1542 mainSizer.Add(wx.StaticText(RamaRestr,-1, 1543 1543 'Ramachandran restraints: sum(wt*(delt/sig)^2) = %.2f, mean(wt*(delt/sig)^2) = %.2f' \ … … 1691 1691 ChemComps.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect) 1692 1692 ChemComps.Bind(wg.EVT_GRID_CELL_CHANGE, OnCellChange) 1693 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)1694 G2frame. dataWindow.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL)1693 G2frame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE) 1694 G2frame.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL) 1695 1695 mainSizer.Add(wx.StaticText(ChemCompRestr,-1, 1696 1696 'Chemical composition restraints: sum(wt*(delt/sig)^2) = %.2f, mean(wt*(delt/sig)^2) = %.2f' \ … … 1771 1771 Textures.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect) 1772 1772 Textures.Bind(wg.EVT_GRID_CELL_CHANGE, OnCellChange) 1773 G2frame. dataWindow.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)1773 G2frame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE) 1774 1774 mainSizer.Add(Textures,0,) 1775 1775 else: … … 1866 1866 if len(Phases) > 1: 1867 1867 G2frame.dataWindow.RestraintEdit.Enable(G2gd.wxID_RESTSELPHASE,True) 1868 G2frame. dataWindow.Bind(wx.EVT_MENU, OnSelectPhase, id=G2gd.wxID_RESTSELPHASE)1869 G2frame. dataWindow.Bind(wx.EVT_MENU, OnAddRestraint, id=G2gd.wxID_RESTRAINTADD)1868 G2frame.Bind(wx.EVT_MENU, OnSelectPhase, id=G2gd.wxID_RESTSELPHASE) 1869 G2frame.Bind(wx.EVT_MENU, OnAddRestraint, id=G2gd.wxID_RESTRAINTADD) 1870 1870 if 'macro' in phasedata['General']['Type']: 1871 1871 G2frame.dataWindow.RestraintEdit.Enable(G2gd.wxID_AARESTRAINTADD,True) 1872 G2frame. dataWindow.Bind(wx.EVT_MENU, OnAddAARestraint, id=G2gd.wxID_AARESTRAINTADD)1873 G2frame. dataWindow.Bind(wx.EVT_MENU, OnPlotAARestraint, id=G2gd.wxID_AARESTRAINTPLOT)1872 G2frame.Bind(wx.EVT_MENU, OnAddAARestraint, id=G2gd.wxID_AARESTRAINTADD) 1873 G2frame.Bind(wx.EVT_MENU, OnPlotAARestraint, id=G2gd.wxID_AARESTRAINTPLOT) 1874 1874 1875 1875 # clear menu and menu pointers
Note: See TracChangeset
for help on using the changeset viewer.
