Changeset 2586 for trunk/GSASIIpwdGUI.py

Timestamp:

Dec 15, 2016 10:46:47 PM (6 years ago)

Author:

toby

Message:

Add blank hist. for PDF; fix spinbox to step w/.01 on mac; trap unicode in imported file headers

File:

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

trunk/GSASIIpwdGUI.py

@@ -4615 +4615 @@
             Obj.SetValue(fmt%(value))
             data[fileKey][itemKey] = value
-            UpdatePDFGrid(G2frame,data)
+            wx.CallAfter(UpdatePDFGrid,G2frame,data)
             
         def OnMoveMult(event):
-            data[key]['Mult'] += multSpin.GetValue()*0.01
+            data[key]['Mult'] = multSpin.GetValue()*0.01
             mult.SetValue(data[key]['Mult'])
             wx.CallAfter(OnComputePDF,None)
@@ -4624 +4624 @@
         def AfterChange(invalid,value,tc):
             if invalid: return
+            multSpin.SetValue(int(0.5 + data[key]['Mult']*100))
             wx.CallAfter(OnComputePDF,None)
         
         item = data[key]
-        fileList = GetFileList('PWDR')
+        fileList = [''] + GetFileList('PWDR')
         fileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' '+key+' file:'),0,WACV)
         fileName = wx.ComboBox(G2frame.dataDisplay,value=item['Name'],choices=fileList,
@@ -4640 +4641 @@
         mulBox.Add(mult,0,)
         multSpin = wx.SpinButton(G2frame.dataDisplay,style=wx.SP_VERTICAL,size=wx.Size(20,20))
-        multSpin.SetValue(0)
-        multSpin.SetRange(-1,1)
+        multSpin.SetRange(-100,100)
+        multSpin.SetValue(int(data[key]['Mult']*100))
         multSpin.Bind(wx.EVT_SPIN, OnMoveMult)
         mulBox.Add(multSpin,0,WACV)
@@ -4677 +4678 @@
     def OnGeometry(event):
         data['Geometry'] = geometry.GetValue()
-        UpdatePDFGrid(G2frame,data)
+        wx.CallAfter(UpdatePDFGrid,G2frame,data)
+        #UpdatePDFGrid(G2frame,data)
         wx.CallAfter(OnComputePDF,None)
         
     def OnDetType(event):
         data['DetType'] = detType.GetValue()
-        UpdatePDFGrid(G2frame,data)
+        wx.CallAfter(UpdatePDFGrid,G2frame,data)
+        #UpdatePDFGrid(G2frame,data)
         wx.CallAfter(OnComputePDF,None)
         
@@ -4802 +4805 @@
             dlg.Destroy()
         OnComputePDF(event)                
-        UpdatePDFGrid(G2frame,data)
+        wx.CallAfter(UpdatePDFGrid,G2frame,data)
+        #UpdatePDFGrid(G2frame,data)
         
     def OnAddElement(event):
@@ -4813 +4817 @@
             data['Form Vol'] = max(10.0,SumElementVolumes())
         PE.Destroy()
-        UpdatePDFGrid(G2frame,data)
+        wx.CallAfter(UpdatePDFGrid,G2frame,data)
+        #UpdatePDFGrid(G2frame,data)
         
     def OnDeleteElement(event):
@@ -4822 +4827 @@
             del ElList[dlg.GetDeleteElement()]
         dlg.Destroy()
-        UpdatePDFGrid(G2frame,data)
+        wx.CallAfter(UpdatePDFGrid,G2frame,data)
+        #UpdatePDFGrid(G2frame,data)
                 
     def ComputePDF(Data):