Changeset 2938

Timestamp:

Jul 20, 2017 11:59:48 AM (6 years ago)

Author:

vondreele

Message:

atom reordering problem - draw atoms didn't follow. Now fixed
remove scrollbars from most GSgrids - SetScrollRate?(0,0) removes them

Location:

branch/2frame

Files:

• GSASIIphsGUI.py (modified) (8 diffs)
• GSASIIpwdGUI.py (modified) (5 diffs)

branch/2frame/GSASIIphsGUI.py

@@ -2506 +2506 @@
                             Atoms.frm = -1
                             G2frame.GetStatusBar().SetStatusText('',1)
+                            data['Drawing']['Atoms'] = []           #clear & rebuild Draw atoms table
+                            UpdateDrawAtoms()
                             wx.CallAfter(Paint)
                 else:
@@ -7606 +7608 @@
                     Results[r][0] = True
                     resultsTable.SetValue(r,0,True)
+#                    resultsGrid.ForceRefresh()
                     G2plt.PlotStructure(G2frame,data)
                     wx.CallAfter(UpdateMCSA,G2frame.MCSA.GetScrollPos(wx.VERTICAL))
-                    resultsGrid.ForceRefresh()
                 elif c == 1:
                     if Results[r][1]:
@@ -7641 +7643 @@
                     else:
                         resultsGrid.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
+            resultsGrid.SetScrollRate(0,0)
             resultsSizer.Add(resultsGrid,0,wx.EXPAND)
             return resultsSizer
@@ -7787 +7790 @@
                 G2plt.PlotXYZ(G2frame,XY,rcov,labelX='ref No.',labelY='ref No.',newPlot=False,Title='Reflection covariance matrix')
             else:
-                MCSAdata['Results'] = G2mth.MPmcsaSearch(nCyc,data,RBdata,reflType,reflData,covData)
+                MCSAdata['Results'] += G2mth.MPmcsaSearch(nCyc,data,RBdata,reflType,reflData,covData)   #+= to  any saved ones
             print ' MC/SA run time: %.2f'%(time.time()-time1)
         finally:
@@ -8830 +8833 @@
     Pages.append('Data')
     Atoms = G2G.GSGrid(G2frame.phaseDisplay)
+    Atoms.SetScrollRate(0,0)
     G2frame.phaseDisplay.gridList.append(Atoms)
     G2frame.phaseDisplay.AddPage(Atoms,'Atoms')
@@ -8845 +8849 @@
     Pages.append('Draw Options')
     drawAtoms = G2G.GSGrid(G2frame.phaseDisplay)
+    drawAtoms.SetScrollRate(0,0)
     G2frame.phaseDisplay.gridList.append(drawAtoms)
     G2frame.phaseDisplay.AddPage(drawAtoms,'Draw Atoms')
@@ -8853 +8858 @@
         Pages.append('RB Models')
     MapPeaks = G2G.GSGrid(G2frame.phaseDisplay)
+    MapPeaks.SetScrollRate(0,0)
     G2frame.phaseDisplay.gridList.append(MapPeaks)    
     G2frame.phaseDisplay.AddPage(MapPeaks,'Map peaks')
@@ -8864 +8870 @@
     Pages.append('Texture')
     G2frame.PawleyRefl = G2G.GSGrid(G2frame.phaseDisplay)
+    G2frame.PawleyRefl.SetScrollRate(0,0)
     G2frame.phaseDisplay.gridList.append(G2frame.PawleyRefl)
     G2frame.phaseDisplay.AddPage(G2frame.PawleyRefl,'Pawley reflections')

branch/2frame/GSASIIpwdGUI.py

@@ -880 +880 @@
     reflGrid.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK, onCellListDClick)
 #    G2frame.dataWindow.Bind(wg.EVT_GRID_CELL_LEFT_DCLICK, onCellListDClick)
-    reflGrid.SetMargins(0,0)
     reflGrid.AutoSizeColumns(False)
+    reflGrid.SetScrollRate(0,0)
     G2frame.reflGrid = reflGrid
-    mainSizer.Add(reflGrid,1,wx.ALL|wx.EXPAND,1)
+    mainSizer.Add(reflGrid)         #,1,wx.ALL|wx.EXPAND,1)
     G2frame.dataWindow.SetDataSize()
 
@@ -1177 +1177 @@
             debyeTable = G2G.Table(data[1]['debyeTerms'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
             debyeGrid = G2G.GSGrid(parent=G2frame.dataWindow)
+            debyeGrid.SetScrollRate(0,0)
             debyeGrid.SetTable(debyeTable, True)
             debyeGrid.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
@@ -1238 +1239 @@
             peaksTable = G2G.Table(data[1]['peaksList'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
             peaksGrid = G2G.GSGrid(parent=G2frame.dataWindow)
+            peaksGrid.SetScrollRate(0,0)
             peaksGrid.SetTable(peaksTable, True)
             peaksGrid.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
@@ -2643 +2645 @@
     G2frame.indxPeaks.Bind(wg.EVT_GRID_CELL_LEFT_CLICK, RefreshIndexPeaksGrid)
     G2frame.indxPeaks.Bind(wx.EVT_KEY_DOWN, KeyEditPickGrid)                 
-    G2frame.indxPeaks.SetMargins(0,0)
+    G2frame.indxPeaks.SetScrollRate(0,0)
     G2frame.indxPeaks.AutoSizeColumns(False)
     if len(XY):
@@ -3327 +3329 @@
         gridDisplay.Bind(wg.EVT_GRID_CELL_LEFT_CLICK,RefreshUnitCellsGrid)
         gridDisplay.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK,OnSortCells)
-        gridDisplay.SetMargins(0,0)
+        gridDisplay.SetScrollRate(0,0)
         gridDisplay.SetRowLabelSize(0)
         gridDisplay.AutoSizeColumns(False)