Changeset 995
- Timestamp:
- Jul 17, 2013 12:54:44 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIddataGUI.py
r991 r995 18 18 ''' 19 19 import wx 20 import wx.grid as wg21 import wx.lib.gridmovers as wgmove22 import matplotlib as mpl23 20 import math 24 21 import copy 25 22 import time 26 23 import sys 27 import random as ran28 import cPickle29 24 import GSASIIpath 30 25 GSASIIpath.SetVersionNumber("$Revision: 844 $") … … 40 35 import GSASIIphsGUI as G2phsGUI 41 36 import numpy as np 42 import numpy.linalg as nl43 import numpy.ma as ma44 37 45 38 VERY_LIGHT_GREY = wx.Colour(235,235,235) … … 48 41 mapDefault = {'MapType':'','RefList':'','Resolution':0.5,'Show bonds':True, 49 42 'rho':[],'rhoMax':0.,'mapSize':10.0,'cutOff':50.,'Flip':False} 50 # trig functions in degrees51 sind = lambda x: np.sin(x*np.pi/180.)52 tand = lambda x: np.tan(x*np.pi/180.)53 cosd = lambda x: np.cos(x*np.pi/180.)54 asind = lambda x: 180.*np.arcsin(x)/np.pi55 acosd = lambda x: 180.*np.arccos(x)/np.pi56 43 57 44 ################################################################################ … … 411 398 for i in range(nTerm): 412 399 UseList[item]['Mustrain'][4][i] = 0.01 400 G2plt.PlotSizeStrainPO(G2frame,data) 413 401 wx.CallAfter(UpdateDData,G2frame,DData,data) 414 G2plt.PlotSizeStrainPO(G2frame,data)415 402 416 403 def OnHstrainRef(event): -
trunk/GSASIIgrid.py
r994 r995 1853 1853 self.DataGeneral = wx.MenuBar() 1854 1854 self.PrefillDataMenu(self.DataGeneral,helpType='General', helpLbl='Phase/General') 1855 self.DataGeneral.Append(menu=wx.Menu(title=''),title='Select page')1855 self.DataGeneral.Append(menu=wx.Menu(title=''),title='Select tab') 1856 1856 self.GeneralCalc = wx.Menu(title='') 1857 1857 self.DataGeneral.Append(menu=self.GeneralCalc,title='Compute') … … 1873 1873 self.DataMenu = wx.MenuBar() 1874 1874 self.PrefillDataMenu(self.DataMenu,helpType='Data', helpLbl='Phase/Data') 1875 self.DataMenu.Append(menu=wx.Menu(title=''),title='Select page')1875 self.DataMenu.Append(menu=wx.Menu(title=''),title='Select tab') 1876 1876 self.DataEdit = wx.Menu(title='') 1877 1877 self.DataMenu.Append(menu=self.DataEdit, title='Edit') … … 1887 1887 self.AtomsMenu = wx.MenuBar() 1888 1888 self.PrefillDataMenu(self.AtomsMenu,helpType='Atoms') 1889 self.AtomsMenu.Append(menu=wx.Menu(title=''),title='Select page')1889 self.AtomsMenu.Append(menu=wx.Menu(title=''),title='Select tab') 1890 1890 self.AtomEdit = wx.Menu(title='') 1891 1891 self.AtomCompute = wx.Menu(title='') … … 1936 1936 self.DataDrawOptions = wx.MenuBar() 1937 1937 self.PrefillDataMenu(self.DataDrawOptions,helpType='Draw Options', helpLbl='Phase/Draw Options',empty=True) 1938 self.DataDrawOptions.Append(menu=wx.Menu(title=''),title='Select page')1938 self.DataDrawOptions.Append(menu=wx.Menu(title=''),title='Select tab') 1939 1939 self.PostfillDataMenu(empty=True) 1940 1940 … … 1942 1942 self.DrawAtomsMenu = wx.MenuBar() 1943 1943 self.PrefillDataMenu(self.DrawAtomsMenu,helpType='Draw Atoms') 1944 self.DrawAtomsMenu.Append(menu=wx.Menu(title=''),title='Select page')1944 self.DrawAtomsMenu.Append(menu=wx.Menu(title=''),title='Select tab') 1945 1945 self.DrawAtomEdit = wx.Menu(title='') 1946 1946 self.DrawAtomCompute = wx.Menu(title='') … … 1992 1992 self.MCSAMenu = wx.MenuBar() 1993 1993 self.PrefillDataMenu(self.MCSAMenu,helpType='MC/SA') 1994 self.MCSAMenu.Append(menu=wx.Menu(title=''),title='Select page')1994 self.MCSAMenu.Append(menu=wx.Menu(title=''),title='Select tab') 1995 1995 self.MCSAEdit = wx.Menu(title='') 1996 1996 self.MCSAMenu.Append(menu=self.MCSAEdit, title='MC/SA') … … 2010 2010 self.TextureMenu = wx.MenuBar() 2011 2011 self.PrefillDataMenu(self.TextureMenu,helpType='Texture') 2012 self.TextureMenu.Append(menu=wx.Menu(title=''),title='Select page')2012 self.TextureMenu.Append(menu=wx.Menu(title=''),title='Select tab') 2013 2013 self.TextureEdit = wx.Menu(title='') 2014 2014 self.TextureMenu.Append(menu=self.TextureEdit, title='Texture') … … 2022 2022 self.PawleyMenu = wx.MenuBar() 2023 2023 self.PrefillDataMenu(self.PawleyMenu,helpType='Pawley') 2024 self.PawleyMenu.Append(menu=wx.Menu(title=''),title='Select page')2024 self.PawleyMenu.Append(menu=wx.Menu(title=''),title='Select tab') 2025 2025 self.PawleyEdit = wx.Menu(title='') 2026 2026 self.PawleyMenu.Append(menu=self.PawleyEdit,title='Operations') … … 2038 2038 self.MapPeaksMenu = wx.MenuBar() 2039 2039 self.PrefillDataMenu(self.MapPeaksMenu,helpType='Map peaks') 2040 self.MapPeaksMenu.Append(menu=wx.Menu(title=''),title='Select page')2040 self.MapPeaksMenu.Append(menu=wx.Menu(title=''),title='Select tab') 2041 2041 self.MapPeaksEdit = wx.Menu(title='') 2042 2042 self.MapPeaksMenu.Append(menu=self.MapPeaksEdit, title='Map peaks') … … 2064 2064 self.RigidBodiesMenu = wx.MenuBar() 2065 2065 self.PrefillDataMenu(self.RigidBodiesMenu,helpType='Rigid bodies') 2066 self.RigidBodiesMenu.Append(menu=wx.Menu(title=''),title='Select page')2066 self.RigidBodiesMenu.Append(menu=wx.Menu(title=''),title='Select tab') 2067 2067 self.RigidBodiesEdit = wx.Menu(title='') 2068 2068 self.RigidBodiesMenu.Append(menu=self.RigidBodiesEdit, title='Edit') -
trunk/GSASIIphsGUI.py
r994 r995 1948 1948 FindBondsDraw() 1949 1949 drawAtoms.ClearSelection() 1950 G2plt.PlotStructure(G2frame,data)1950 # G2plt.PlotStructure(G2frame,data) 1951 1951 1952 1952 def DrawAtomStyle(event): … … 4906 4906 4907 4907 def FillSelectPageMenu(menuBar): 4908 mid = menuBar.FindMenu('Select page')4908 mid = menuBar.FindMenu('Select tab') 4909 4909 for ipage,page in enumerate(Pages): 4910 4910 menu = menuBar.GetMenu(mid) … … 4927 4927 wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine 4928 4928 page = event.GetSelection() 4929 print 'Tab',page4930 4929 ChangePage(page) 4931 4930 4932 4931 def ChangePage(page): 4933 4932 text = G2frame.dataDisplay.GetPageText(page) 4934 print page,text4933 print 'Select',page,text 4935 4934 if text == 'General': 4936 4935 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataGeneral) … … 4993 4992 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineRB, id=G2gd.wxID_DRAWDEFINERB) 4994 4993 UpdateDrawAtoms() 4994 wx.CallAfter(G2plt.PlotStructure,G2frame,data) 4995 4995 elif text == 'RB Models': 4996 4996 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RigidBodiesMenu) … … 5085 5085 SetupGeneral() 5086 5086 GeneralData = data['General'] 5087 print 'oldPage',oldPage5088 5087 if oldPage is None: 5089 5088 UpdateGeneral()
Note: See TracChangeset
for help on using the changeset viewer.