Changeset 2619

Timestamp:

Jan 10, 2017 10:25:29 PM (6 years ago)

Author:

toby

Message:

note when Phase window is resized and use that size

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIgrid.py (modified) (4 diffs)
• GSASIIphsGUI.py (modified) (4 diffs)

trunk/GSASII.py

@@ -2422 +2422 @@
         self.dataDisplayPhaseText = ''
         self.lastTreeSetting = []
-        self.lastSize = [0,0]
         
         arg = sys.argv

trunk/GSASIIgrid.py

@@ -2510 +2510 @@
         self.AtomGrid = []
         self.selectedRow = 0
+        self.lastSize = [0,0]        
+        self.manualPhaseSize = None
+        wx.Frame.Bind(self,wx.EVT_SIZE,self.OnReSize)
+        self.userReSize = False
+            
+    def OnReSize(self,event):
+        '''Keep track of size changes for Phase windows
+        '''
+        id = self.G2frame.PatternTree.GetSelection()
+        parent = self.G2frame.PatternTree.GetItemParent(id)
+        if self.userReSize and parent and self.G2frame.PatternTree.GetItemText(parent) == "Phases": 
+            self.manualPhaseSize = event.EventObject.GetSize()
+            if GSASIIpath.GetConfigValue('debug'): print 'Saving Phase size=',self.manualPhaseSize             
+        event.Skip()
+
+    def SendSizeEvent(self):
+        '''Prevent SendSizeEvent from overriding the saved size
+        '''
+        self.userReSize = False
+        wx.Frame.SendSizeEvent(self)
+        self.userReSize = True
         
     def setSizePosLeft(self,Width):
+        '''Place the dataFrame window so that the upper left-hand corner remains in the same place;
+        The size is dictated by parameter Width, unless overridden by a previous Phase window resize
+        '''
+        self.userReSize = False
         Width = list(Width)
+        id = self.G2frame.PatternTree.GetSelection()
+        pid = self.G2frame.PatternTree.GetItemParent(id)
+        if pid:
+            parent = self.G2frame.PatternTree.GetItemText(pid)
+            # is this a phase window and has a previous window has been resized?
+            if self.manualPhaseSize and parent == "Phases":
+                Width = list(self.manualPhaseSize)
         Pos = self.GetPosition()
-        lastSize = self.G2frame.lastSize
         clientSize = wx.ClientDisplayRect()     #display window size (e.g. 1304x768)
         Width[1] = min(Width[1],clientSize[2]-300)
         Width[0] = max(Width[0],300)
         self.SetSize(Width)
-        if lastSize[0]:
-            Pos[0] += lastSize[0]-Width[0]
+        if self.lastSize[0]:
+            Pos[0] += self.lastSize[0]-Width[0]
         offSet = 0
         if Pos[0] < clientSize[2]:
@@ -2527 +2558 @@
             Pos[0] -= offSet
         self.SetPosition(wx.Point(Pos[0],Pos[1]))
-        self.G2frame.lastSize = Width
+        self.lastSize = Width
+        self.userReSize = True
         
     def Clear(self):
@@ -2803 +2835 @@
     mainSizer.Layout()    
     G2frame.dataDisplay.SetSizer(mainSizer)
-    G2frame.dataDisplay.SetSize(mainSizer.Fit(G2frame.dataFrame))
+    #G2frame.dataDisplay.SetSize(mainSizer.Fit(G2frame.dataFrame))
     G2frame.dataFrame.setSizePosLeft(mainSizer.Fit(G2frame.dataFrame))
      
@@ -3979 +4011 @@
     G2frame.dataDisplay.AutoSizeColumns(True)
     if prevSize:
-        G2frame.dataDisplay.SetSize(prevSize)
+        #G2frame.dataDisplay.SetSize(prevSize)
+        G2frame.dataFrame.setSizePosLeft(prevSize)
     else:
         G2frame.dataFrame.setSizePosLeft([700,350])

trunk/GSASIIphsGUI.py

@@ -66 +66 @@
 acosd = lambda x: 180.*np.arccos(x)/np.pi
 atan2d = lambda x,y: 180.*np.arctan2(y,x)/np.pi
-    
+
 def SetPhaseWindow(mainFrame,phasePage,mainSizer,Scroll=0):
     phasePage.SetSizer(mainSizer)
@@ -7886 +7886 @@
         for page in G2frame.dataDisplay.gridList: # clear out all grids, forcing edits in progress to complete
             page.ClearGrid()
-        wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine
         page = event.GetSelection()
         ChangePage(page)
@@ -8091 +8090 @@
     G2frame.dataDisplay.gridList = [] # list of all grids in notebook
     Pages = []    
-    wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine
     G2frame.dataDisplay.gridList = []
     General = wx.ScrolledWindow(G2frame.dataDisplay)
@@ -8142 +8140 @@
     if oldPage is None or oldPage == 0:
         ChangePage(0)
+        wx.CallAfter(G2frame.dataDisplay.SendSizeEvent)
     elif oldPage:
         SetupGeneral()    # not sure why one might need this when moving from phase to phase; but does not hurt