Changeset 2051

Timestamp:

Nov 13, 2015 4:36:21 PM (8 years ago)

Author:

toby

Message:

address crash on selecting Q steps (now capitalized): change all CallAfter? to CallLater? for UpdateImageControls? calls

Location:

trunk

Files:

• GSASIIimage.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (8 diffs)

trunk/GSASIIimage.py

@@ -865 +865 @@
     if 'log(q)' in data['binType']:
         lutth = np.log(4.*np.pi*npsind(LUtth/2.)/data['wavelength'])
-    elif 'q' == data['binType']:
+    elif 'Q' == data['binType']:
         lutth = 4.*np.pi*npsind(LUtth/2.)/data['wavelength']
     elif '2-theta' in data['binType']:
@@ -913 +913 @@
             if 'log(q)' in data['binType']:
                 tay = np.log(4.*np.pi*npsind(tay/2.)/data['wavelength'])
-            elif 'q' == data['binType']:
+            elif 'Q' == data['binType']:
                 tay = 4.*np.pi*npsind(tay/2.)/data['wavelength']
             t0 = time.time()
@@ -930 +930 @@
     if 'log(q)' in data['binType']:
         H2 = 2.*npasind(np.exp(H2)*data['wavelength']/(4.*np.pi))
-    elif 'q' == data['binType']:
+    elif 'Q' == data['binType']:
         H2 = 2.*npasind(H2*data['wavelength']/(4.*np.pi))
     if Dazm:        

trunk/GSASIIimgGUI.py

@@ -120 +120 @@
     def OnRecalibrate(event):
         G2img.ImageRecalibrate(G2frame,data,masks)
-        wx.CallAfter(UpdateImageControls,G2frame,data,masks)
+        wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
         
     def OnClearCalib(event):
@@ -343 +343 @@
                 data.update(save)
                 G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))
-                wx.CallAfter(UpdateImageControls,G2frame,data,masks)
+                wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
                 G2plt.PlotExposedImage(G2frame,event=event)
                 
@@ -362 +362 @@
                 data['SampleAbs'][0] = -np.log(data['SampleAbs'][0])  #switch from trans to muT!
                 if data['binType'] == 'log(q)': data['binType'] = '2-theta'  #switch default bin type                 
-            wx.CallAfter(UpdateImageControls,G2frame,data,masks)
+            wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
     
         def OnNewColorBar(event):
@@ -531 +531 @@
         def OnNewBinType(event):
             data['binType'] = binSel.GetValue()
-            wx.CallAfter(UpdateImageControls,G2frame,data,masks)
+            wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
         
         def OnIOtth(event):
@@ -538 +538 @@
             if Ltth > Utth:
                 Ltth,Utth = Utth,Ltth
-            if 'q' in data['binType']:
+            if 'Q' in data['binType']:
                 data['IOtth'] = [2.*asind(Ltth*wave/(4.*math.pi)),2.*asind(Utth*wave/(4.*math.pi))]
             else:
@@ -631 +631 @@
                 data['fullIntegrate'] = True
                 data['LRazimuth'] = [Lazm,Lazm+360]
-            wx.CallAfter(UpdateImageControls,G2frame,data,masks)
+            wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
             G2plt.PlotExposedImage(G2frame,event=event)
             
@@ -670 +670 @@
         dataSizer.Add((5,0),0)
         if 'PWDR' in data['type']:
-            binChoice = ['2-theta','q']
+            binChoice = ['2-theta','Q']
         elif 'SASD' in data['type']:
-            binChoice = ['2-theta','q','log(q)']
+            binChoice = ['2-theta','Q','log(q)']
         dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Bin style: Constant step bins in'),0,WACV)            
         binSel = wx.ComboBox(parent=G2frame.dataDisplay,value=data['binType'],choices=binChoice,
@@ -679 +679 @@
         dataSizer.Add(binSel,0,WACV)
         binType = '2-theta'
-        if 'q' in data['binType']:
-            binType = 'q'
+        if 'q' in data['binType'].lower():
+            binType = 'Q'
         dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Inner/Outer '+binType),0,WACV)            
         IOtth = data['IOtth'][:]
-        if 'q' in data['binType']:
+        if 'Q' in data['binType']:
             wave = data['wavelength']
             IOtth = [4.*math.pi*sind(IOtth[0]/2.)/wave,4.*math.pi*sind(IOtth[1]/2.)/wave]