Changeset 1231

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:

• GSASIIplot.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)
• Substances.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -2264 +2264 @@
         sizexy = Data['size']
         if event.xdata and event.ydata and len(G2frame.ImageZ):                 #avoid out of frame errors
+            Page.canvas.SetToolTipString('%8.2f %8.2fmm'%(event.xdata,event.ydata))
             Page.canvas.SetCursor(wx.CROSS_CURSOR)
             item = G2frame.itemPicked
@@ -2280 +2281 @@
                         Page.canvas.SetToolTipString('%6d deg'%(azm))
                     elif 'line1' in  str(item) or 'line2' in str(item):
-                        Page.canvas.SetToolTipString('%8.3fdeg'%(tth))                           
+                        Page.canvas.SetToolTipString('%8.3f deg'%(tth))                           
             else:
                 xpos = event.xdata

trunk/GSASIIpwdGUI.py

@@ -2149 +2149 @@
     def OnLoadSubstance(event):
         names = substFile.Substances.keys()
+        names.sort()
         dlg = wx.SingleChoiceDialog(G2frame, 'Which substance?', 'Select substance', names, wx.CHOICEDLG_STYLE)
         try:

trunk/Substances.py

@@ -18 +18 @@
 'Silicon':{'Elements':{'Si':{'Num':8}},'Volume':160.209},
 'Ethanol':{'Elements':{'C':{'Num':2},'O':{'Num':1},'H':{'Num':6}},},
+'Polyethylene':{'Elements':{'C':{'Num':1},'H':{'Num':2}},'Density':0.93,},
+'Polystyrene':{'Elements':{'C':{'Num':1},'H':{'Num':1}},'Density':1.060,},
+'Teflon':{'Elements':{'C':{'Num':1},'F':{'Num':2}},'Density':2.25,},
+'Mylar':{'Elements':{'C':{'Num':5},'H':{'Num':4},'O':{'Num':2}},'Density':1.38,},
+'Iron':{'Elements':{'Fe':{'Num':4}},'Density':7.87,},
+'Zirconium':{'Elements':{'Zr':{'Num':2}},'Density':6.51,},
+'Carbon':{'Elements':{'C':{'Num':1}},'Density':2.27,},
+'Titanium':{'Elements':{'Ti':{'Num':1}},'Density':4.51,},
+'Chromium':{'Elements':{'Cr':{'Num':1}},'Density':7.19,},
+'Nickel':{'Elements':{'Ni':{'Num':4}},'Density':8.90,},
+'Copper':{'Elements':{'Cu':{'Num':4}},'Density':8.96,},
+'Hydroxyapatite':{'Elements':{'Ca':{'Num':5},'P':{'Num':3},'O':{'Num':13},'H':{'Num':1}},'Density':3.986,},
+'Cr2O3':{'Elements':{'Cr':{'Num':2},'O':{'Num':3}},'Density':5.206,},
+'ZrO2':{'Elements':{'Zr':{'Num':1},'O':{'Num':3}},'Density':6.134,},
+'Y(0.16)Zr(0.84)O2':{'Elements':{'Y':{'Num':0.16},'Zr':{'Num':0.84},'O':{'Num':2}},'Density':6.01,},
 }
 # they should not be duplicated in the UserSubstances.py file: