Changeset 2908 for branch/2frame/GSASIIdataGUI.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/GSASIIdataGUI.py (modified) (4 diffs)

branch/2frame/GSASIIdataGUI.py

@@ -3065 +3065 @@
         self.LastGPXdir = None    # directory where a GPX file was last read
         self.LastExportDir = None  # the last directory used for exports, if any.
+        self.dataDisplay = None
         self.dataDisplayPhaseText = ''
         self.lastTreeSetting = []
@@ -7284 +7285 @@
             del G2frame.colSigs[l]
 
-    G2frame.dataWindow.ClearData()
     G2frame.dataWindow.currentGrids = []
     G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataWindow)
-    G2frame.dataDisplay.SetSize(G2frame.dataWindow.GetSize())
+    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
         colLabels=colLabels,rowLabels=histNames,types=Types)
@@ -7637 +7637 @@
                  
 ################################################################################
-#####  Pattern tree routines
+#####  Data (GPX) tree routines
 ################################################################################           
        
@@ -7836 +7836 @@
         elif G2frame.GPXtree.GetItemText(item) == 'Phases':
             G2frame.dataWindow.GetSizer().Add(
-                wx.TextCtrl(G2frame.dataWindow,size=G2frame.dataWindow.GetClientSize(),
-                            value='Select one phase to see its parameters')
+                wx.StaticText(G2frame.dataWindow,wx.ID_ANY,
+                                'Select one phase to see its parameters')
                 )
     ############################################################################