Changeset 2530

Timestamp:

Nov 17, 2016 10:14:24 AM (7 years ago)

Author:

vondreele

Message:

finish window placement rules - data display window upper right is always conserved unless user moves it.

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIgrid.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIrestrGUI.py (modified) (8 diffs)

trunk/GSASIIIO.py

@@ -814 +814 @@
     finally:
         wx.EndBusyCursor()
-        G2frame.Status.SetStatusText('To reorder tree items, use mouse RB to drag/drop them')
+        G2frame.Status.SetStatusText('Mouse RB click item to refresh/raise; RB drag/drop to reorder')
     
 def ProjFileSave(G2frame):

trunk/GSASIIgrid.py

@@ -2522 +2522 @@
         if lastSize[0]:
             Pos[0] += lastSize[0]-Width[0]
-        offSet = Pos[0]+Width[0]-clientSize[2]
+        offSet = 0
+        if Pos[0] < clientSize[2]:
+            offSet = Pos[0]+Width[0]-clientSize[2]
         if offSet > 0:
             Pos[0] -= offSet
-#        self.SetPosition(wx.Point(clientSize[2]-Width[0],clientSize[1]+250))
         self.SetPosition(wx.Point(Pos[0],Pos[1]))
         self.G2frame.lastSize = Width

trunk/GSASIIphsGUI.py

@@ -7005 +7005 @@
         Size = G2frame.MCSA.GetSize()
         Size[0] = Xsize+40
-        G2frame.dataFrame.SetSize(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
         G2frame.MCSA.Scroll(0,Scroll)
         

trunk/GSASIIrestrGUI.py

@@ -963 +963 @@
         BondRestr.SetSize(Size)
         BondRestr.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        G2frame.dataFrame.SetSize(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
         
     def UpdateAngleRestr(angleRestData):
@@ -1094 +1094 @@
         AngleRestr.SetSize(Size)
         AngleRestr.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        G2frame.dataFrame.SetSize(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
     
     def UpdatePlaneRestr(planeRestData):
@@ -1221 +1221 @@
         PlaneRestr.SetSize(Size)
         PlaneRestr.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        G2frame.dataFrame.SetSize(Size)
-#        G2frame.dataFrame.setSizePosLeft(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
     
     def UpdateChiralRestr(chiralRestData):
@@ -1353 +1352 @@
         ChiralRestr.SetSize(Size)
         ChiralRestr.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        G2frame.dataFrame.SetSize(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
     
     def UpdateTorsionRestr(torsionRestData):
@@ -1474 +1473 @@
         TorsionRestr.SetSize(Size)
         TorsionRestr.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        G2frame.dataFrame.SetSize(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
 
     def UpdateRamaRestr(ramaRestData):
@@ -1597 +1596 @@
         RamaRestr.SetSize(Size)
         RamaRestr.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        G2frame.dataFrame.SetSize(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
 
     def UpdateChemcompRestr(chemcompRestData):
@@ -1729 +1728 @@
         ChemCompRestr.SetSize(Size)
         ChemCompRestr.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        G2frame.dataFrame.SetSize(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
     
         
@@ -1809 +1808 @@
         TextureRestr.SetSize(Size)
         TextureRestr.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        G2frame.dataFrame.SetSize(Size)
+        G2frame.dataFrame.setSizePosLeft(Size)
             
     def OnPageChanged(event):