Changeset 2934

Timestamp:

Jul 15, 2017 10:37:57 AM (6 years ago)

Author:

vondreele

Message:

fix display of Substances - wrong mainSizer

Location:

branch/2frame

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (11 diffs)

branch/2frame/GSASIIdataGUI.py

@@ -4790 +4790 @@
             raise Exception
         self.Layout()
+        self.SetupScrolling()
         self.SendSizeEvent()
 

branch/2frame/GSASIIpwdGUI.py

@@ -706 +706 @@
             data['peaks'] = G2frame.PeakTable.GetData()[:-nDel]
             G2frame.GPXtree.SetItemPyData(G2frame.PickId,data)
-            wx.CallAfter(reflGrid.ForceRefresh)
             setBackgroundColors()
         elif colList and (event.GetKeyCode() == 89 or event.GetKeyCode() == 78):
@@ -730 +729 @@
             return
         G2plt.PlotPatterns(G2frame,plotType='PWDR')
-        #wx.CallAfter(G2frame.dataWindow.ForceRefresh) # did not always work
         wx.CallAfter(UpdatePeakGrid,G2frame,data)
             
@@ -771 +769 @@
         SelectVars(range(reflGrid.GetNumberRows()))
 
-    def onCellListSClick(event):
-        '''Called when a peak is selected so that it can be highlighted in the plot
-        '''
-        event.Skip()
-        c =  event.GetRow(),event.GetCol()
-        if c < 0: # replot except whan a column is selected
-            wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='PWDR')
-        
+#    def onCellListSClick(event):
+#        '''Called when a peak is selected so that it can be highlighted in the plot
+#        '''
+#        event.Skip()
+#        c =  event.GetRow(),event.GetCol()
+#        if c < 0: # replot except whan a column is selected
+#            wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='PWDR')
+#        
     def onCellListDClick(event):
         '''Called after a double-click on a cell label'''
@@ -790 +788 @@
             reflGrid.ClearSelection()
             reflGrid.SelectRow(r,True)
-            wx.CallAfter(G2frame.dataWindow.ForceRefresh)
+            wx.CallAfter(G2frame.reflGrid.ForceRefresh)
             wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='PWDR')
         elif c > 0:     #column label: just select it (& redisplay)
@@ -878 +876 @@
     reflGrid.Bind(wg.EVT_GRID_CELL_CHANGE, RefreshPeakGrid)
     reflGrid.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
-    reflGrid.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK, onCellListSClick)
+#    reflGrid.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK, onCellListSClick)
 #    G2frame.dataWindow.Bind(wg.EVT_GRID_CELL_LEFT_CLICK, onCellListSClick)
     reflGrid.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK, onCellListDClick)
@@ -2523 +2521 @@
     limitId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits')
     Limits = G2frame.GPXtree.GetItemPyData(limitId)
+    
     def RefreshIndexPeaksGrid(event):
         r,c =  event.GetRow(),event.GetCol()
@@ -2533 +2532 @@
             G2frame.IndexPeaksTable.SetData(peaks)
             G2frame.GPXtree.SetItemPyData(IndexId,[peaks,data[1]])
-#            G2frame.dataWindow.ForceRefresh()
+            G2frame.indxPeaks.ForceRefresh()
             if 'PKS' in G2frame.GPXtree.GetItemText(G2frame.PatternId):
                 G2plt.PlotPowderLines(G2frame)
@@ -2565 +2564 @@
             event.Skip(True)
         elif colList:
-            G2frame.dataWindow.ClearSelection()
+            G2frame.indxPeaks.ClearSelection()
             key = event.GetKeyCode()
             for col in colList:
@@ -2627 +2626 @@
     G2frame.GPXtree.SetItemPyData(IndexId,data)
     G2frame.IndexPeaksTable = G2G.Table(data[0],rowLabels=rowLabels,colLabels=colLabels,types=Types)
-    #G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Index Peak List')
     G2frame.SetTitle('Index Peak List')
     G2frame.dataWindow.currentGrids = []
@@ -2656 +2654 @@
     G2frame.dataWindow.ClearData()
     mainSizer = G2frame.dataWindow.GetSizer()
-    mainSizer.Add(G2frame.indxPeaks,1,wx.ALL|wx.EXPAND,1)
+    mainSizer.Add(G2frame.indxPeaks,0,wx.ALL|wx.EXPAND,1)
+    G2frame.dataWindowSetAutoLayout(1)
     G2frame.dataWindow.SetDataSize()
 
@@ -3950 +3949 @@
     G2frame.Bind(wx.EVT_MENU, OnDeleteElement, id=G2G.wxID_ELEMENTDELETE)
     G2frame.dataWindow.ClearData()
-    mainSizer = wx.BoxSizer(wx.VERTICAL)
+    mainSizer = G2frame.dataWindow.GetSizer()
     mainSizer.Add(SubstSizer(),0)
     G2frame.dataWindow.SetDataSize()