Changeset 3101

Timestamp:

Sep 28, 2017 9:16:15 AM (8 years ago)

Author:

vondreele

Message:

change SetScrollRate?(1,1) to SetScrollRate?(10,10) - improves scrolling speed on all windows

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (3 diffs)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (3 diffs)
• exports/G2export_CIF.py (modified) (1 diff)

trunk/GSASIIdataGUI.py ¶

@@ -4611 +4611 @@
         #if Sizer.GetItemCount() == 1: # not wx 2.8
         if len(Sizer.GetChildren()) == 1: # handle cases with a single grid in DataWindow differently
-            # note that Grid's scroll bars must be turned on with .SetScrollRate(1,1)
+            # note that Grid's scroll bars must be turned on with .SetScrollRate(10,10)
             # just after the call to .GSGrid()
             if isinstance(Sizer.GetItem(0).GetWindow(), G2G.GSGrid):
@@ -4621 +4621 @@
                 return
         self.SetAutoLayout(True)
-        self.SetScrollRate(1,1)
+        self.SetScrollRate(10,10)
         self.SendSizeEvent()
 
@@ -7186 +7186 @@
     G2frame.dataWindow.currentGrids = []
     G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataWindow)
-    G2frame.dataDisplay.SetScrollRate(1,1)
+    G2frame.dataDisplay.SetScrollRate(10,10)
     G2frame.dataWindow.GetSizer().Add(G2frame.dataDisplay,1,wx.ALL|wx.EXPAND)
     G2frame.SeqTable = G2G.Table([list(cl) for cl in zip(*G2frame.colList)],     # convert from columns to rows

trunk/GSASIIphsGUI.py ¶

@@ -991 +991 @@
         phasePage.SetSizer(mainSizer)
     phasePage.SetAutoLayout(True)
-    phasePage.SetScrollRate(1,1)
+    phasePage.SetScrollRate(10,10)
     phasePage.SendSizeEvent()
     phasePage.Scroll(0,Scroll)

trunk/GSASIIplot.py ¶

@@ -5711 +5711 @@
     uColors = [Rd,Gr,Bl,Wt-Bc, Wt-Bc,Wt-Bc,Wt-Bc,Wt-Bc, Wt-Bc,Wt-Bc,Wt-Bc,Wt-Bc]
     G2frame.tau = 0.
+    G2frame.seq = 0
     
     def OnKeyBox(event):
@@ -5856 +5857 @@
                 elif key == '-':
                     G2frame.tau -= 0.1
-                G2frame.tau %= 1.   #force 0-1 range
+                G2frame.tau %= 1.   #force 0-1 range; makes loop
                 G2frame.G2plotNB.status.SetStatusText('Modulation tau = %.2f'%(G2frame.tau),1)
                 data['Drawing']['Atoms'],Fade = G2mth.ApplyModulation(data,G2frame.tau)     #modifies drawing atom array!          
@@ -5864 +5865 @@
                     Fade += 1
                 Draw('key down',Fade)
-            else:
-                pass        #TODO sequential result movie here
+            else:        #TODO sequential result movie here
+                SeqId = G2gd.GetGPXtreeItemId(G2frame, G2frame.root, 'Sequential results')
+                if SeqId:
+                    Seqdata = G2frame.GPXtree.GetItemPyData(SeqId)
+                    histNames = [seqKey for seqKey in Seqdata.keys() if 'PWDR' in seqKey]
+                    histNames.sort()
+                    if key == '0':
+                        G2frame.seq = 0
+                    elif key in ['=','+']:
+                        G2frame.seq += 1
+                    elif key in ['-','_']:
+                        G2frame.seq -= 1
+                    G2frame.seq %= len(histNames)   #makes loop
+                    G2frame.G2plotNB.status.SetStatusText('Seq. data file: %s'%(histNames[G2frame.seq]),1)
+                    
+                    
+                    
+                    SetDrawAtomsText(data['Drawing']['Atoms'])
+                    G2phG.FindBondsDraw(data)           #rebuild bonds & polygons
+                    Draw('key down')                    
+                else:
+                    pass
             
     def GetTruePosition(xy,Add=False):

trunk/GSASIIpwdGUI.py ¶

@@ -878 +878 @@
 #    G2frame.dataWindow.Bind(wg.EVT_GRID_CELL_LEFT_DCLICK, onCellListDClick)
     reflGrid.AutoSizeColumns(False)
-    reflGrid.SetScrollRate(1,1)
+    reflGrid.SetScrollRate(10,10)
     G2frame.reflGrid = reflGrid
     mainSizer.Add(reflGrid,1,wx.ALL|wx.EXPAND,1)
@@ -2608 +2608 @@
     G2frame.indxPeaks = G2G.GSGrid(parent=G2frame.dataWindow)                
     G2frame.indxPeaks.SetTable(G2frame.IndexPeaksTable, True)
-    G2frame.indxPeaks.SetScrollRate(1,1)
+    G2frame.indxPeaks.SetScrollRate(10,10)
     XY = []
     Sigs = []
@@ -3570 +3570 @@
             G2frame.refTable[phase] = G2G.GSGrid(parent=G2frame.refBook)
             G2frame.refBook.AddPage(G2frame.refTable[phase],phase)
-            G2frame.refTable[phase].SetScrollRate(1,1) # reflection grids (inside tab) need scroll bars 
+            G2frame.refTable[phase].SetScrollRate(10,10) # reflection grids (inside tab) need scroll bars 
         elif len(data[phase]):              #else dict for PWDR
             G2frame.refTable[phase] = G2G.GSGrid(parent=G2frame.refBook)
             G2frame.refBook.AddPage(G2frame.refTable[phase],phase)
-            G2frame.refTable[phase].SetScrollRate(1,1) # as above
+            G2frame.refTable[phase].SetScrollRate(10,10) # as above
         else:       #cleanup deleted phase reflection lists
             del data[phase]

trunk/exports/G2export_CIF.py ¶

@@ -361 +361 @@
           histOnly: used to export only one histogram
           IncludeOnlyHist: used for a full CIF that includes only one of the
-            histograms (from a sequential fit) TODO: needs lots of work!
+            histograms (from a sequential fit) #TODO: needs lots of work!
         '''