Changeset 1231


Ignore:
Timestamp:
Feb 25, 2014 4:15:29 PM (8 years ago)
Author:
vondreele
Message:

add more substances & sort them
show pointer x,y on images

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r1221 r1231  
    22642264        sizexy = Data['size']
    22652265        if event.xdata and event.ydata and len(G2frame.ImageZ):                 #avoid out of frame errors
     2266            Page.canvas.SetToolTipString('%8.2f %8.2fmm'%(event.xdata,event.ydata))
    22662267            Page.canvas.SetCursor(wx.CROSS_CURSOR)
    22672268            item = G2frame.itemPicked
     
    22802281                        Page.canvas.SetToolTipString('%6d deg'%(azm))
    22812282                    elif 'line1' in  str(item) or 'line2' in str(item):
    2282                         Page.canvas.SetToolTipString('%8.3fdeg'%(tth))                           
     2283                        Page.canvas.SetToolTipString('%8.3f deg'%(tth))                           
    22832284            else:
    22842285                xpos = event.xdata
  • trunk/GSASIIpwdGUI.py

    r1221 r1231  
    21492149    def OnLoadSubstance(event):
    21502150        names = substFile.Substances.keys()
     2151        names.sort()
    21512152        dlg = wx.SingleChoiceDialog(G2frame, 'Which substance?', 'Select substance', names, wx.CHOICEDLG_STYLE)
    21522153        try:
  • trunk/Substances.py

    r1230 r1231  
    1818'Silicon':{'Elements':{'Si':{'Num':8}},'Volume':160.209},
    1919'Ethanol':{'Elements':{'C':{'Num':2},'O':{'Num':1},'H':{'Num':6}},},
     20'Polyethylene':{'Elements':{'C':{'Num':1},'H':{'Num':2}},'Density':0.93,},
     21'Polystyrene':{'Elements':{'C':{'Num':1},'H':{'Num':1}},'Density':1.060,},
     22'Teflon':{'Elements':{'C':{'Num':1},'F':{'Num':2}},'Density':2.25,},
     23'Mylar':{'Elements':{'C':{'Num':5},'H':{'Num':4},'O':{'Num':2}},'Density':1.38,},
     24'Iron':{'Elements':{'Fe':{'Num':4}},'Density':7.87,},
     25'Zirconium':{'Elements':{'Zr':{'Num':2}},'Density':6.51,},
     26'Carbon':{'Elements':{'C':{'Num':1}},'Density':2.27,},
     27'Titanium':{'Elements':{'Ti':{'Num':1}},'Density':4.51,},
     28'Chromium':{'Elements':{'Cr':{'Num':1}},'Density':7.19,},
     29'Nickel':{'Elements':{'Ni':{'Num':4}},'Density':8.90,},
     30'Copper':{'Elements':{'Cu':{'Num':4}},'Density':8.96,},
     31'Hydroxyapatite':{'Elements':{'Ca':{'Num':5},'P':{'Num':3},'O':{'Num':13},'H':{'Num':1}},'Density':3.986,},
     32'Cr2O3':{'Elements':{'Cr':{'Num':2},'O':{'Num':3}},'Density':5.206,},
     33'ZrO2':{'Elements':{'Zr':{'Num':1},'O':{'Num':3}},'Density':6.134,},
     34'Y(0.16)Zr(0.84)O2':{'Elements':{'Y':{'Num':0.16},'Zr':{'Num':0.84},'O':{'Num':2}},'Density':6.01,},
    2035}
    2136# they should not be duplicated in the UserSubstances.py file:
Note: See TracChangeset for help on using the changeset viewer.