Changeset 1774
- Timestamp:
- Apr 2, 2015 1:11:03 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r1772 r1774 1393 1393 if len(Pattern) < 3: # put name on end if needed 1394 1394 Pattern.append(G2frame.PatternTree.GetItemText(item)) 1395 if 'Offset' not in Pattern[0]: #plot offset data 1396 Pattern[0].update({'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,'refDelt':0.01,}) 1395 1397 PlotList.append(Pattern) 1396 1398 ParmList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame, … … 1479 1481 xye = ma.array(ma.getdata(Pattern[1])) 1480 1482 Zero = Parms.get('Zero',[0.,0.])[1] 1481 ifpicked = Pattern[2] == G2frame.PatternTree.GetItemText(PatternId) 1482 LimitId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Limits') 1483 limits = G2frame.PatternTree.GetItemPyData(LimitId) 1484 excls = limits[2:] 1485 for excl in excls: 1486 xye[0] = ma.masked_inside(xye[0],excl[0],excl[1]) 1483 if PickId: 1484 ifpicked = Pattern[2] == G2frame.PatternTree.GetItemText(PatternId) 1485 LimitId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Limits') 1486 limits = G2frame.PatternTree.GetItemPyData(LimitId) 1487 excls = limits[2:] 1488 for excl in excls: 1489 xye[0] = ma.masked_inside(xye[0],excl[0],excl[1]) 1487 1490 if G2frame.plotStyle['qPlot'] and 'PWDR' in plottype: 1488 1491 Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root, Pattern[2]) … … 1630 1633 Plot.axhline(0.,color=wx.BLACK) 1631 1634 Page.canvas.SetToolTipString('') 1632 if G2frame.PatternTree.GetItemText(PickId) == 'Peak List': 1633 tip = 'On data point: Pick peak - L or R MB. On line: L-move, R-delete' 1634 Page.canvas.SetToolTipString(tip) 1635 data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List')) 1636 for item in data['peaks']: 1637 if G2frame.plotStyle['qPlot']: 1638 Lines.append(Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,item[0]),color=colors[N%6],picker=2.)) 1639 elif G2frame.plotStyle['dPlot']: 1640 Lines.append(Plot.axvline(G2lat.Pos2dsp(Parms,item[0]),color=colors[N%6],picker=2.)) 1641 else: 1642 Lines.append(Plot.axvline(item[0],color=colors[N%6],picker=2.)) 1643 if G2frame.PatternTree.GetItemText(PickId) == 'Limits': 1644 tip = 'On data point: Lower limit - L MB; Upper limit - R MB. On limit: MB down to move' 1645 Page.canvas.SetToolTipString(tip) 1646 data = G2frame.LimitsTable.GetData() 1647 1635 if PickId: 1636 if G2frame.PatternTree.GetItemText(PickId) == 'Peak List': 1637 tip = 'On data point: Pick peak - L or R MB. On line: L-move, R-delete' 1638 Page.canvas.SetToolTipString(tip) 1639 data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List')) 1640 for item in data['peaks']: 1641 if G2frame.plotStyle['qPlot']: 1642 Lines.append(Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,item[0]),color=colors[N%6],picker=2.)) 1643 elif G2frame.plotStyle['dPlot']: 1644 Lines.append(Plot.axvline(G2lat.Pos2dsp(Parms,item[0]),color=colors[N%6],picker=2.)) 1645 else: 1646 Lines.append(Plot.axvline(item[0],color=colors[N%6],picker=2.)) 1647 if G2frame.PatternTree.GetItemText(PickId) == 'Limits': 1648 tip = 'On data point: Lower limit - L MB; Upper limit - R MB. On limit: MB down to move' 1649 Page.canvas.SetToolTipString(tip) 1650 data = G2frame.LimitsTable.GetData() 1651 1648 1652 else: #not picked 1649 1653 if G2frame.logPlot:
Note: See TracChangeset
for help on using the changeset viewer.