Changeset 3771

Timestamp:

Dec 22, 2018 8:20:43 AM (5 years ago)

Author:

vondreele

Message:

cleanup of fprime & absorb

Location:

trunk

Files:

• Absorb.py (modified) (4 diffs)
• fprime.py (modified) (6 diffs)

trunk/Absorb.py

@@ -323 +323 @@
         pylab.close('all')
         self.Close()
+        self.Destroy()
 
     def OnNewMenu(self, event):
@@ -329 +330 @@
         PE = G2elemGUI.PickElements(self,ElList)
         if PE.ShowModal() == wx.ID_OK:
-            for El in PE.Elem:
+            Elem = PE.Elem
+        PE.Destroy()
+        if Elem:
+            for El in Elem:
                 ElemSym = El.strip().upper()
                 if ElemSym not in ElList:
-                    atomData = G2elem.GetAtomInfo(ElemSym)
+                    atomData = G2elem.GetAtomInfo(ElemSym.capitalize())
                     FormFactors = G2elem.GetFormFactorCoeff(ElemSym)
                     for FormFac in FormFactors:
@@ -346 +350 @@
             self.DrawPanel()
             self.SetWaveEnergy(self.Wave)
-        PE.Destroy()
             
     def OnDeleteMenu(self, event):
@@ -604 +607 @@
         ax.set_ylim(Ymin,Ymax)
         if self.FPPS:
-            legend = ax.legend(loc='best')
-        
+            ax.legend(loc='best')
         if newPlot:
             newPlot = False

trunk/fprime.py

@@ -233 +233 @@
         pylab.close('all')
         self.Close()
+        self.Destroy()
 
     def OnFPRIMENewMenu(self, event):
@@ -239 +240 @@
         PE = G2elemGUI.PickElements(self,ElList)
         if PE.ShowModal() == wx.ID_OK:
-            for El in PE.Elem:
+            Elems = PE.Elem
+        PE.Destroy()
+        if Elems:
+            for El in Elems:
                 ElemSym = El.strip().upper()
                 if ElemSym not in ElList:
@@ -253 +257 @@
             self.CalcFPPS()
             self.SetWaveEnergy(self.Wave)
-        PE.Destroy()
             
     def OnFPRIMEDeleteMenu(self, event):
@@ -364 +367 @@
         ax.set_ylim(Ymin,Ymax)
         if self.FPPS:
-            legend = ax.legend(loc='best')
+            ax.legend(loc='best')
         bx = self.fplot.add_subplot(212)
         self.fplot.subplots_adjust(hspace=0.25)
@@ -414 +417 @@
             bx.plot(Xp,ffp,Color,label=Els+" f+f'")
         if self.Elems:
-            legend = bx.legend(loc='best')
+            bx.legend(loc='best')
         bx.set_ylim(0.0,Ymax+1.0)
         
@@ -457 +460 @@
                 Wave = self.Kev/xpos               
             self.SetWaveEnergy(Wave)
-            
 
     def SetWaveEnergy(self,Wave):
-        Gkmu = unichr(0x3bc)
         self.Wave = Wave
         self.Energy = self.Kev/self.Wave