Changeset 1785
- Timestamp:
- Apr 10, 2015 8:59:24 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r1780 r1785 2167 2167 if self.dirname: os.chdir(self.dirname) 2168 2168 try: 2169 G2IO.ProjFileOpen(self) 2170 self.PatternTree.Expand(self.root) 2171 for item in self.Refine: item.Enable(True) 2172 self.EnableSeqRefineMenu() 2169 self.StartProject() #open the file if possible 2173 2170 except: 2174 2171 print 'Error opening file',arg[1] … … 2246 2243 G2gd.MovePatternTreeToGrid(self,NewId) 2247 2244 2248 def OnPatternTreeKeyDown(self,event): 2245 def OnPatternTreeKeyDown(self,event): #doesn't exactly work right with Shift key down 2249 2246 'Allows stepping through the tree with the up/down arrow keys' 2247 self.oldFocus = wx.Window.FindFocus() 2250 2248 keyevt = event.GetKeyEvent() 2251 2249 key = event.GetKeyCode() … … 2255 2253 parent = self.PatternTree.GetItemParent(item) 2256 2254 if key == wx.WXK_UP: 2257 self.oldFocus = wx.Window.FindFocus() 2258 # if keyevt.GetModifiers() == wx.MOD_SHIFT: 2259 # if type(parent) is int: return # is this the toplevel in tree? 2260 # prev = self.PatternTree.GetPrevSibling(parent) 2261 # self.PatternTree.Expand(prev) 2262 # id = G2gd.GetPatternTreeItemId(self,prev,name) 2263 # G2gd.MovePatternTreeToGrid(self,id) 2264 # else: 2265 self.PatternTree.GetPrevSibling(item) 2255 if keyevt.GetModifiers() == wx.MOD_SHIFT: 2256 if type(parent) is int: return # is this the toplevel in tree? 2257 prev = self.PatternTree.GetPrevSibling(parent) 2258 self.PatternTree.Collapse(parent) 2259 self.PatternTree.Expand(prev) 2260 id = G2gd.GetPatternTreeItemId(self,prev,name) 2261 self.PatternTree.SelectItem(id) 2262 self.oldFocus = wx.Window.FindFocus() 2263 else: 2264 self.PatternTree.GetPrevSibling(item) 2265 self.PatternTree.SelectItem(item) 2266 2266 elif key == wx.WXK_DOWN: 2267 # if keyevt.GetModifiers() == wx.MOD_SHIFT: 2268 # if type(parent) is int: return # is this the toplevel in tree? 2269 # next = self.PatternTree.GetNextSibling(parent) 2270 # self.PatternTree.Expand(next) 2271 # id = G2gd.GetPatternTreeItemId(self,next,name) 2272 # G2gd.MovePatternTreeToGrid(self,id) 2273 # else: 2274 self.PatternTree.GetNextSibling(item) 2267 if keyevt.GetModifiers() == wx.MOD_SHIFT: 2268 if type(parent) is int: return # is this the toplevel in tree? 2269 next = self.PatternTree.GetNextSibling(parent) 2270 self.PatternTree.Collapse(parent) 2271 self.PatternTree.Expand(next) 2272 id = G2gd.GetPatternTreeItemId(self,next,name) 2273 self.PatternTree.SelectItem(id) 2274 self.oldFocus = wx.Window.FindFocus() 2275 else: 2276 self.PatternTree.GetNextSibling(item) 2277 self.PatternTree.SelectItem(item) 2275 2278 2276 2279 def OnReadPowderPeaks(self,event): … … 2847 2850 Data/DeleteData menu 2848 2851 ''' 2849 # TextList = ['All Data']2850 2852 TextList = [] 2851 2853 DelList = [] … … 2870 2872 TextList.append(name) 2871 2873 item, cookie = self.PatternTree.GetNextChild(self.root, cookie) 2872 # if ifPWDR: TextList.insert(1,'All PWDR')2873 # if ifSASD: TextList.insert(1,'All SASD')2874 # if ifIMG: TextList.insert(1,'All IMG')2875 # if ifHKLF: TextList.insert(1,'All HKLF')2876 # if ifPDF: TextList.insert(1,'All PDF')2877 2874 dlg = G2G.G2MultiChoiceDialog(self, 'Which data to delete?', 'Delete data', TextList, wx.CHOICEDLG_STYLE) 2878 2875 try: … … 2880 2877 result = dlg.GetSelections() 2881 2878 for i in result: DelList.append(TextList[i]) 2882 # if 'All Data' in DelList:2883 # DelList = [item for item in TextList if item[:3] != 'All']2884 # elif 'All PWDR' in DelList:2885 # DelList = [item for item in TextList if item[:4] == 'PWDR']2886 # elif 'All SASD' in DelList:2887 # DelList = [item for item in TextList if item[:4] == 'SASD']2888 # elif 'All IMG' in DelList:2889 # DelList = [item for item in TextList if item[:3] == 'IMG']2890 # elif 'All HKLF' in DelList:2891 # DelList = [item for item in TextList if item[:4] == 'HKLF']2892 # elif 'All PDF' in DelList:2893 # DelList = [item for item in TextList if item[:3] == 'PDF']2894 2879 item, cookie = self.PatternTree.GetFirstChild(self.root) 2895 2880 while item: … … 2921 2906 2922 2907 def OnFileOpen(self, event, filename=None): 2923 ''' Reads ina GSAS-II .gpx project file in response to the2908 '''Gets a GSAS-II .gpx project file in response to the 2924 2909 File/Open Project menu button 2925 2910 ''' 2926 2911 result = wx.ID_OK 2927 Id = 02928 2912 self.EnablePlot = False 2929 2913 if self.PatternTree.GetChildrenCount(self.root,False): … … 2962 2946 self.dirname = os.path.split(filename)[0] 2963 2947 2948 try: 2949 self.StartProject() #open the file if possible 2950 except: 2951 print 'Error opening file ',filename 2952 2953 def StartProject(self): 2954 '''Opens a GSAS-II project file & selects the 1st available data set to 2955 display (PWDR, HKLF or SASD) 2956 ''' 2957 2958 Id = 0 2964 2959 G2IO.ProjFileOpen(self) 2965 2960 self.PatternTree.SetItemText(self.root,'Loaded Data: '+self.GSASprojectfile) … … 3046 3041 self.dataFrame.Destroy() 3047 3042 self.Close() 3048 3049 # def OnExportPatterns(self,event):3050 # names = ['All']3051 # exports = []3052 # item, cookie = self.PatternTree.GetFirstChild(self.root)3053 # while item:3054 # name = self.PatternTree.GetItemText(item)3055 # if 'PWDR' in name:3056 # names.append(name)3057 # item, cookie = self.PatternTree.GetNextChild(self.root, cookie)3058 # if names:3059 # dlg = wx.MultiChoiceDialog(self,'Select','Powder patterns to export',names)3060 # if dlg.ShowModal() == wx.ID_OK:3061 # sel = dlg.GetSelections()3062 # if sel[0] == 0:3063 # exports = names[1:]3064 # else:3065 # for x in sel:3066 # exports.append(names[x])3067 # dlg.Destroy()3068 # if exports:3069 # dlg = wx.FileDialog(self, 'Choose output powder file name', '.', '',3070 # 'GSAS fxye file (*.fxye)|*.fxye|xye file (*.xye)|*.xye',3071 # wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT|wx.CHANGE_DIR)3072 # try:3073 # if dlg.ShowModal() == wx.ID_OK:3074 # powderfile = dlg.GetPath()3075 # powderfile = G2IO.FileDlgFixExt(dlg,powderfile)3076 # if 'fxye' in powderfile:3077 # G2IO.powderFxyeSave(self,exports,powderfile)3078 # else: #just xye3079 # G2IO.powderXyeSave(self,exports,powderfile)3080 # finally:3081 # dlg.Destroy()3082 3043 3083 3044 def OnExportPeakList(self,event): -
trunk/GSASIIddataGUI.py
r1778 r1785 905 905 # patch - add penalty items 906 906 if len(POData) < 7: 907 POData.append(['' ])907 POData.append(['',]) 908 908 POData.append(0.1) 909 909 # end patch -
trunk/GSASIIphsGUI.py
r1780 r1785 3978 3978 Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,histoName) 3979 3979 UseList[histoName] = {'Histogram':histoName,'Show':False, 3980 'Scale':[1.0,False],'Pref.Ori.':['MD',1.0,False,[0,0,1],0,{},[ ],0.1],3980 'Scale':[1.0,False],'Pref.Ori.':['MD',1.0,False,[0,0,1],0,{},['',],0.1], 3981 3981 'Size':['isotropic',[1.,1.,1.],[False,False,False],[0,0,1], 3982 3982 [1.,1.,1.,0.,0.,0.],6*[False,]], -
trunk/GSASIIpwdGUI.py
r1784 r1785 3063 3063 it = 0 3064 3064 if HKLF: 3065 im = data[1] ['Super']3065 im = data[1].get('Super',0) 3066 3066 else: 3067 3067 if 'T' in data[phaseName]['Type']: -
trunk/GSASIIstrMath.py
r1784 r1785 2424 2424 dervDict = SCExtinction(ref,im,phfx,hfx,pfx,calcControls,parmDict,varylist+dependentVars)[1] 2425 2425 w = 1.0/ref[6+im] 2426 if w*ref[5+im] >= calcControls['minF/sig'] :2426 if w*ref[5+im] >= calcControls['minF/sig'] and ref[3+im] > 0: 2427 2427 wdf[iref] = w*(ref[5+im]-ref[7+im]) 2428 2428 for j,var in enumerate(varylist): … … 2453 2453 Fc = np.sqrt(ref[7+im]) 2454 2454 w = 1.0/ref[6+im] 2455 if 2.0*Fo*w*Fo >= calcControls['minF/sig'] :2455 if 2.0*Fo*w*Fo >= calcControls['minF/sig'] and ref[3+im] > 0: 2456 2456 wdf[iref] = 2.0*Fo*w*(Fo-Fc) 2457 2457 for j,var in enumerate(varylist):
Note: See TracChangeset
for help on using the changeset viewer.