Changeset 2976 for branch

Timestamp:

Aug 9, 2017 9:37:03 AM (6 years ago)

Author:

toby

Message:

fix Linux bug, binding triggers on widget delete, minor fixes

Location:

branch/2frame

Files:

• GSASIIddataGUI.py (modified) (3 diffs)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)

branch/2frame/GSASIIddataGUI.py

@@ -769 +769 @@
         
     def OnSelect(event):
-        G2frame.hist = G2frame.dataWindow.HistsInPhase[select.GetSelection()]
+        G2frame.hist = G2frame.dataWindow.HistsInPhase[DData.select.GetSelection()]
         oldFocus = wx.Window.FindFocus()
         G2plt.PlotSizeStrainPO(G2frame,data,G2frame.hist)
         wx.CallLater(100,RepaintHistogramInfo)
-        wx.CallAfter(oldFocus.SetFocus)
+        if oldFocus: wx.CallAfter(oldFocus.SetFocus)
        
     def RepaintHistogramInfo(Scroll=0):
@@ -983 +983 @@
     
     if DData.GetSizer():
+        DData.select.Unbind(wx.EVT_LISTBOX)  # remove binding to avoid event on Linux
         DData.GetSizer().Clear(True)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -988 +989 @@
     if G2frame.hist:
         topSizer = wx.FlexGridSizer(1,2,5,5)
-        select = wx.ListBox(DData,choices=G2frame.dataWindow.HistsInPhase,
+        DData.select = wx.ListBox(DData,choices=G2frame.dataWindow.HistsInPhase,
                             style=wx.LB_SINGLE,size=(-1,120))
-        select.SetSelection(G2frame.dataWindow.HistsInPhase.index(G2frame.hist))
-        select.SetFirstItem(G2frame.dataWindow.HistsInPhase.index(G2frame.hist))
-        select.Bind(wx.EVT_LISTBOX,OnSelect)
-        topSizer.Add(select,0,WACV|wx.LEFT,5)
+        DData.select.SetSelection(G2frame.dataWindow.HistsInPhase.index(G2frame.hist))
+        DData.select.SetFirstItem(G2frame.dataWindow.HistsInPhase.index(G2frame.hist))
+        DData.select.Bind(wx.EVT_LISTBOX,OnSelect)
+        topSizer.Add(DData.select,0,WACV|wx.LEFT,5)
         if any(['PWDR' in item for item in keyList]):
             topSizer.Add(PlotSizer())

branch/2frame/GSASIIphsGUI.py

@@ -985 +985 @@
     
 def SetPhaseWindow(phasePage,mainSizer=None,Scroll=0):
-    if not mainSizer is None: 
+    if mainSizer is not None: 
         phasePage.SetSizer(mainSizer)
     phasePage.SetAutoLayout(True)

branch/2frame/GSASIIplot.py

@@ -3638 +3638 @@
         rId = G2gd.GetGPXtreeItemId(G2frame,Id,'Reflection Lists')
         RefData = G2frame.GPXtree.GetItemPyData(rId)[phase]
+        if 'Type' not in RefData or 'RefList' not in RefData:
+            G2G.G2MessageBox(G2frame,'Reflection list not ready','RefData error')
+            return
         Type = RefData['Type']
         Refs = RefData['RefList'].T