Changeset 2640

Timestamp:

Jan 17, 2017 5:11:27 PM (5 years ago)

Author:

vondreele

Message:

change Width to Size in setSizePosLeft
kluge to get correct scrolling in Phase windows in SetPhaseWinows?

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -2542 +2542 @@
         self.userReSize = True
         
-    def setSizePosLeft(self,Width):
+    def setSizePosLeft(self,Size):
         '''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)
+        Size = list(Size)
         id = self.G2frame.PatternTree.GetSelection()
         try:            #avoid bad tree item on start via gpx file selection 
@@ -2557 +2557 @@
             # is this a phase window and has a previous window has been resized?
             if self.manualPhaseSize and parent == "Phases":
-                Width = list(self.manualPhaseSize)
+                Size = list(self.manualPhaseSize)
         Pos = self.GetPosition()
         clientSize = wx.ClientDisplayRect()     #display window size (e.g. 1304x768)
-        Width[1] = min(Width[1],clientSize[2]-300)
-        Width[0] = max(Width[0],300)
+        Size[1] = min(Size[1],clientSize[2]-300)
+        Size[0] = max(Size[0],300)
 #        print 'current position/width:',Pos,Width
-        self.SetSize(Width)
+        self.SetSize(Size)
         if self.lastSize[0]:
-            Pos[0] += self.lastSize[0]-Width[0]
+            Pos[0] += self.lastSize[0]-Size[0]
         offSet = 0
         if Pos[0] < clientSize[2]:
-            offSet = Pos[0]+Width[0]-clientSize[2]
+            offSet = Pos[0]+Size[0]-clientSize[2]
         if offSet > 0:
             Pos[0] -= offSet
         self.SetPosition(wx.Point(Pos[0],Pos[1]))
-        self.lastSize = Width
+        self.lastSize = Size
         self.userReSize = True
         

trunk/GSASIIphsGUI.py

@@ -75 +75 @@
     phasePage.Scroll(0,Scroll)
     Size[1] = min(500,Size[1])
+    mainFrame.setSizePosLeft(Size)
+    Size[1] += 1                    #kluge to get correct scrolling!
     mainFrame.setSizePosLeft(Size)
     
@@ -3056 +3058 @@
                 attr.SetEditor(G2G.GridFractionEditor(atomGrid))
                 atomGrid.SetColAttr(c, attr)
+            for row,atom in enumerate(Layer['Atoms']):
+                atomGrid.SetReadOnly(row,1,True)
             atomGrid.Bind(wg.EVT_GRID_CELL_LEFT_DCLICK, AtomTypeSelect)
             atomGrid.AutoSizeColumns(True)