Changeset 1201
- Timestamp:
- Jan 18, 2014 4:29:52 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
GSASIIgrid.py (modified) (1 diff)
-
GSASIImath.py (modified) (1 diff)
-
GSASIIplot.py (modified) (15 diffs)
-
GSASIIpwdGUI.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIgrid.py
r1199 r1201 295 295 # When the mouse is moved away or the widget loses focus 296 296 # display the last saved value, if an expression 297 self.Bind(wx.EVT_LEAVE_WINDOW, self._onLoseFocus) 297 # self.Bind(wx.EVT_LEAVE_WINDOW, self._onLoseFocus) 298 self.Bind(wx.EVT_TEXT_ENTER, self._onLoseFocus) 298 299 self.Bind(wx.EVT_KILL_FOCUS, self._onLoseFocus) 299 300 -
trunk/GSASIImath.py
r1200 r1201 152 152 Adiag = np.sqrt(np.diag(Amat)) 153 153 Anorm = np.outer(Adiag,Adiag) 154 # Amat /= Anorm155 154 Amatlam = Amat*(One+Lam)/Anorm #scale Amat to Marquardt array 156 155 try: -
trunk/GSASIIplot.py
r1199 r1201 400 400 def OnPlotKeyPress(event): 401 401 newPlot = False 402 if event.key == 'w' :402 if event.key == 'w' and 'PWDR' in plottype: 403 403 if G2frame.Weight: 404 404 G2frame.Weight = False … … 407 407 G2frame.SinglePlot = True 408 408 newPlot = True 409 elif event.key == 'b' :409 elif event.key == 'b' and 'PWDR' in plottype: 410 410 if G2frame.SubBack: 411 411 G2frame.SubBack = False … … 537 537 538 538 except TypeError: 539 G2frame.G2plotNB.status.SetStatusText('Select '+plot Type+' powder pattern first',1)539 G2frame.G2plotNB.status.SetStatusText('Select '+plottype+' powder pattern first',1) 540 540 541 541 def OnPick(event): … … 683 683 'c: contour on','q: toggle q plot','s: toggle single plot','+: no selection') 684 684 else: 685 Page.Choice = (' key press','l: offset left','r: offset right','d: offset down', 686 'u: offset up','o: reset offset','b: toggle subtract background','n: log(I) on','c: contour on', 687 'q: toggle q plot','s: toggle single plot','w: toggle divide by sig','+: no selection') 685 if 'PWDR' in plottype: 686 Page.Choice = (' key press','l: offset left','r: offset right','d: offset down', 687 'u: offset up','o: reset offset','b: toggle subtract background','n: log(I) on','c: contour on', 688 'q: toggle q plot','s: toggle single plot','w: toggle divide by sig','+: no selection') 689 elif 'SASD' in plottype: 690 Page.Choice = (' key press','l: offset left','r: offset right','d: offset down', 691 'u: offset up','o: reset offset','n: log(I) on','c: contour on', 692 'q: toggle q plot','s: toggle single plot','+: no selection') 688 693 Page.keyPress = OnPlotKeyPress 689 694 … … 699 704 Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame, 700 705 G2frame.PatternId, 'Instrument Parameters')) 706 Sample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Sample Parameters')) 701 707 ParmList = [Parms,] 702 708 Title = Pattern[-1] … … 705 711 PlotList = [] 706 712 ParmList = [] 713 SampleList = [] 707 714 item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root) 708 715 while item: 709 if plot Type in G2frame.PatternTree.GetItemText(item):716 if plottype in G2frame.PatternTree.GetItemText(item): 710 717 Pattern = G2frame.PatternTree.GetItemPyData(item) 711 718 if len(Pattern) < 3: # put name on end if needed … … 714 721 ParmList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame, 715 722 item,'Instrument Parameters'))[0]) 723 SampleList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame, 724 item, 'Sample Parameters'))) 716 725 item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie) 717 726 lenX = 0 … … 752 761 else: 753 762 if 'C' in ParmList[0]['Type'][0]: 754 Plot.set_ylabel('Intensity',fontsize=14) 763 if 'PWDR' in plottype: 764 Plot.set_ylabel('Intensity',fontsize=14) 765 elif 'SASD' in plottype: 766 Plot.set_ylabel('Intensity, cm-1',fontsize=14) 755 767 else: 756 768 Plot.set_ylabel('Normalized intensity',fontsize=14) … … 763 775 for N,Pattern in enumerate(PlotList): 764 776 Parms = ParmList[N] 777 Sample = SampleList[N] 765 778 if 'C' in Parms['Type'][0]: 766 779 wave = G2mth.getWave(Parms) … … 789 802 if not lenX: 790 803 lenX = len(X) 791 Y = xye[1]+offset*N 804 if 'PWDR' in plottype: 805 Y = xye[1]+offset*N 806 elif 'SASD' in plottype: 807 Y = xye[1]*Sample['Scale'][0]+offset*N 792 808 if LimitId: 793 809 limits = np.array(G2frame.PatternTree.GetItemPyData(LimitId)) … … 816 832 if ifpicked: 817 833 Z = xye[3]+offset*N 818 if 'PWDR' in plot Type: #powder background834 if 'PWDR' in plottype: #powder background 819 835 W = xye[4]+offset*N 820 836 D = xye[5]-Ymax*G2frame.delOffset 821 elif 'SASD' in plot Type:837 elif 'SASD' in plottype: 822 838 D = xye[4]-Ymax*G2frame.delOffset 823 839 if G2frame.logPlot: 824 if 'PWDR' in plot Type:840 if 'PWDR' in plottype: 825 841 Plot.semilogy(X,Y,colors[N%6]+'+',picker=3.,clip_on=False,nonposy='mask') 826 842 Plot.semilogy(X,Z,colors[(N+1)%6],picker=False,nonposy='mask') 827 843 Plot.semilogy(X,W,colors[(N+2)%6],picker=False,nonposy='mask') 828 elif 'SASD' in plot Type:844 elif 'SASD' in plottype: 829 845 Plot.loglog(X,Y,colors[N%6]+'+',picker=3.,clip_on=False,nonposy='mask') 830 846 Plot.loglog(X,Z,colors[(N+1)%6],picker=False,nonposy='mask') … … 839 855 Plot.axhline(0.,color=wx.BLACK) 840 856 else: 841 if G2frame.SubBack and 'PWDR' in plot Type:857 if G2frame.SubBack and 'PWDR' in plottype: 842 858 Plot.plot(Xum,Y-W,colors[N%6]+'+',picker=3.,clip_on=False) 843 859 Plot.plot(X,Z-W,colors[(N+1)%6],picker=False) … … 845 861 Plot.plot(Xum,Y,colors[N%6]+'+',picker=3.,clip_on=False) 846 862 Plot.plot(X,Z,colors[(N+1)%6],picker=False) 847 if 'PWDR' in plot Type:863 if 'PWDR' in plottype: 848 864 Plot.plot(X,W,colors[(N+2)%6],picker=False) 849 865 Plot.plot(X,D,colors[(N+3)%6],picker=False) … … 868 884 else: 869 885 if G2frame.logPlot: 870 if 'PWDR' in plot Type:886 if 'PWDR' in plottype: 871 887 Plot.semilogy(X,Y,colors[N%6],picker=False,nonposy='mask') 872 elif 'SASD' in plot Type:888 elif 'SASD' in plottype: 873 889 Plot.loglog(X,Y,colors[N%6],picker=False,nonposy='mask') 874 890 else: … … 998 1014 999 1015 def PlotISFG(G2frame,newPlot=False,type=''): 1000 ''' P Lotting package for PDF analysis; displays I(q), S(q), F(q) and G(r) as single1016 ''' Plotting package for PDF analysis; displays I(q), S(q), F(q) and G(r) as single 1001 1017 or multiple plots with waterfall and contour plots as options 1002 1018 ''' -
trunk/GSASIIpwdGUI.py
r1199 r1201 1256 1256 dlg.Destroy() 1257 1257 1258 def OnScaleRef(event):1259 Obj = event.GetEventObject()1260 data['Scale'][1] = Obj.GetValue()1261 1262 def OnScaleVal(event):1263 Obj = event.GetEventObject()1264 try:1265 scale = float(Obj.GetValue())1266 if scale > 0:1267 data['Scale'][0] = scale1268 except ValueError:1269 pass1270 Obj.SetValue("%.4f"%(data['Scale'][0])) #reset in case of error1271 1272 1258 def OnHistoType(event): 1273 1259 Obj = event.GetEventObject() … … 1284 1270 def OnNameVal(event): 1285 1271 event.Skip() 1286 wx.CallAfter(SetNameVal) 1272 wx.CallAfter(SetNameVal) 1273 1274 def AfterChange(invalid,value,tc): 1275 if invalid: 1276 return 1277 if tc.key == 0 and 'SASD' in histName: #a kluge! 1278 G2plt.PlotPatterns(G2frame,plotType='SASD',newPlot=True) 1279 1287 1280 1288 1281 ######## DEBUG ####################################################### … … 1384 1377 parmRef = G2gd.G2CheckBox(G2frame.dataDisplay,' '+lbl,data[key],1) 1385 1378 parmSizer.Add(parmRef,0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 1386 parmVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,data[key],0,nDig=nDig,typeHint=float) 1379 parmVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,data[key],0, 1380 nDig=nDig,typeHint=float,OnLeave=AfterChange) 1387 1381 else: 1388 1382 parmSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' '+lbl),
Note: See TracChangeset
for help on using the changeset viewer.
