Changeset 2908 for branch/2frame/GSASIIphsGUI.py

Timestamp:

Jul 4, 2017 11:33:37 PM (6 years ago)

Author:

toby

Message:

Scroll bars work for Phase & Histogram windows; Constraints, Restraints & Rigid Bodies -- not yet

File:

• branch/2frame/GSASIIphsGUI.py (modified) (13 diffs)

branch/2frame/GSASIIphsGUI.py

@@ -984 +984 @@
     
     
-def SetPhaseWindow(mainFrame,phasePage,mainSizer=None,size=None,Scroll=0):
+def SetPhaseWindow(phasePage,mainSizer=None,size=None,Scroll=0):
     if not mainSizer is None: 
         phasePage.SetSizer(mainSizer)
@@ -2321 +2321 @@
             mainSizer.Add(MCSASizer())
         G2frame.GetStatusBar().SetStatusText('')
-        SetPhaseWindow(G2frame.dataWindow,General,mainSizer,Scroll=Scroll)
+        SetPhaseWindow(General,mainSizer,Scroll=Scroll)
         
     def OnTransform(event):
@@ -2758 +2758 @@
                             Atoms.SetCellStyle(row,c,VERY_LIGHT_GREY,True)
             Atoms.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataWindow,Atoms,size=[700,300])
+            SetPhaseWindow(Atoms,size=[700,300])
 
         # FillAtomsGrid executable code starts here
@@ -4374 +4374 @@
         bottomSizer.Add(StackSizer())
         mainSizer.Add(bottomSizer)
-        SetPhaseWindow(G2frame.dataWindow,G2frame.layerData,mainSizer,Scroll=Scroll)
+        SetPhaseWindow(G2frame.layerData,mainSizer,Scroll=Scroll)
         
     def OnCopyPhase(event):
@@ -4811 +4811 @@
         G2frame.bottomSizer = ShowAtomInfo()
         mainSizer.Add(G2frame.bottomSizer)
-        SetPhaseWindow(G2frame.dataWindow,G2frame.waveData,mainSizer,Scroll=Scroll)
+        SetPhaseWindow(G2frame.waveData,mainSizer,Scroll=Scroll)
     
     def OnWaveVary(event):
@@ -5181 +5181 @@
            if colLabels[c] not in ['Style','Label','Color']:
                 drawAtoms.SetColAttr(c,attr)
-        SetPhaseWindow(G2frame.dataWindow,drawAtoms,size=[600,300])
+        SetPhaseWindow(drawAtoms,size=[600,300])
 
         FindBondsDraw(data)
@@ -6092 +6092 @@
         mainSizer.Add((5,5),0)
         mainSizer.Add(PlaneSizer(),0,)
-        SetPhaseWindow(G2frame.dataWindow,drawOptions,mainSizer)
+        SetPhaseWindow(drawOptions,mainSizer)
 
 ################################################################################
@@ -6473 +6473 @@
         mainSizer.Add(angSizer,0,WACV|wx.LEFT,5)
 #        mainSizer.Add(SHPenalty(textureData['Penalty']),0,WACV|wx.LEFT,5)  for future
-        SetPhaseWindow(G2frame.dataWindow,Texture,mainSizer)
+        SetPhaseWindow(Texture,mainSizer)
 
 ################################################################################
@@ -7145 +7145 @@
                 mainSizer.Add(VecrbSizer(RBObj))
 
-        SetPhaseWindow(G2frame.dataWindow,RigidBodies,mainSizer)
+        SetPhaseWindow(RigidBodies,mainSizer)
 
     def OnRBCopyParms(event):
@@ -7475 +7475 @@
             btnSizer.Add((20,20),1)
             mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
-            SetPhaseWindow(G2frame.dataWindow,RigidBodies,mainSizer)
+            SetPhaseWindow(RigidBodies,mainSizer)
         wx.CallAfter(Draw)
         
@@ -8042 +8042 @@
             mainSizer.Add(ResultsSizer(Results))
             
-        SetPhaseWindow(G2frame.dataWindow,G2frame.MCSA,mainSizer)
+        SetPhaseWindow(G2frame.MCSA,mainSizer)
         
     def SetSolution(result,Models):
@@ -8275 +8275 @@
             G2frame.PawleyRefl.SetMargins(0,0)
             G2frame.PawleyRefl.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataWindow,G2frame.PawleyRefl,size=[450,300])
+            SetPhaseWindow(G2frame.PawleyRefl,size=[450,300])
                     
     def OnPawleySet(event):
@@ -8576 +8576 @@
             MapPeaks.SetMargins(0,0)
             MapPeaks.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataWindow,MapPeaks,size=[440,300])
+            SetPhaseWindow(MapPeaks,size=[440,300])
                     
     def OnPeaksMove(event):