Changeset 1512 for trunk/GSASIIpwdGUI.py

Timestamp:

Oct 1, 2014 10:35:23 PM (8 years ago)

Author:

toby

Message:

implement logging and config storage

File:

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

trunk/GSASIIpwdGUI.py

@@ -1722 +1722 @@
             dlg.Destroy()
 
-    def OnHistoType(event):
-        Obj = event.GetEventObject()
-        data['Type'] = Obj.GetValue()
-        if data['Type'] == 'Bragg-Brentano' and 'Shift' not in data:    #set up defaults for new type(s)
-            data['Shift'] = [0.0,False]
-            data['Transparency'] = [0.0,False]
+    def OnHistoChange():
+        '''Called when the histogram type is changed to refresh the window
+        '''
         wx.CallAfter(UpdateSampleGrid,G2frame,data)
         
@@ -1819 +1816 @@
     if 'SlitLen' not in data and 'SASD' in histName:
         data['SlitLen'] = 0.0
+    if 'Shift' not in data:
+        data['Shift'] = [0.0,False]
+    if 'Transparency' not in data:
+        data['Transparency'] = [0.0,False]
     data['InstrName'] = data.get('InstrName','')
 #patch end
@@ -1852 +1853 @@
         else:
             choices = ['Debye-Scherrer','Bragg-Brentano',]
-        histoType = wx.ComboBox(G2frame.dataDisplay,wx.ID_ANY,value=data['Type'],choices=choices,
-            style=wx.CB_READONLY|wx.CB_DROPDOWN)
-        histoType.Bind(wx.EVT_COMBOBOX, OnHistoType)
+        histoType = G2gd.G2ChoiceButton(G2frame.dataDisplay,choices,
+                    strLoc=data,strKey='Type',
+                    onChoice=OnHistoChange)
         nameSizer.Add(histoType)
         mainSizer.Add(nameSizer,0,wx.EXPAND,1)