Changeset 1201 for trunk/GSASIIpwdGUI.py

Timestamp:

Jan 18, 2014 4:29:52 PM (8 years ago)

Author:

vondreele

Message:

remove bind to leave window in ValidatedTxtCtrl?; interfered with plotting
implement plot of intensity*scale for small angle data
remove some dead code in G2pwdGUI

File:

• trunk/GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIpwdGUI.py

@@ -1256 +1256 @@
             dlg.Destroy()
 
-    def OnScaleRef(event):
-        Obj = event.GetEventObject()
-        data['Scale'][1] = Obj.GetValue()
-        
-    def OnScaleVal(event):
-        Obj = event.GetEventObject()
-        try:
-            scale = float(Obj.GetValue())
-            if scale > 0:
-                data['Scale'][0] = scale
-        except ValueError:
-            pass
-        Obj.SetValue("%.4f"%(data['Scale'][0]))          #reset in case of error
-        
     def OnHistoType(event):
         Obj = event.GetEventObject()
@@ -1284 +1270 @@
     def OnNameVal(event):
         event.Skip()
-        wx.CallAfter(SetNameVal)       
+        wx.CallAfter(SetNameVal)
+        
+    def AfterChange(invalid,value,tc):
+        if invalid:
+            return
+        if tc.key == 0 and 'SASD' in histName:          #a kluge!
+            G2plt.PlotPatterns(G2frame,plotType='SASD',newPlot=True)
+                   
 
     ######## DEBUG #######################################################
@@ -1384 +1377 @@
             parmRef = G2gd.G2CheckBox(G2frame.dataDisplay,' '+lbl,data[key],1)
             parmSizer.Add(parmRef,0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
-            parmVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,data[key],0,nDig=nDig,typeHint=float)
+            parmVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,data[key],0,
+                nDig=nDig,typeHint=float,OnLeave=AfterChange)
         else:
             parmSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' '+lbl),