Changeset 433

Timestamp:

Dec 6, 2011 4:17:59 PM (14 years ago)

Author:

vondreele

Message:

see mods to near bottom of UpdateDData (line 2609)

File:

• trunk/GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASIIphsGUI.py ¶

@@ -2607 +2607 @@
             extSizer.Add(extVal,0,wx.ALIGN_CENTER_VERTICAL)
             return extSizer
-                                    
-        if DData.GetChildren():
-            dataDisplay = DData.GetChildren()[0]
-            mainSizer = dataDisplay.GetSizer()
-            mainSizer.Clear()
-        else:
-            dataDisplay = wx.Panel(DData)
-            mainSizer = wx.BoxSizer(wx.VERTICAL)
+#1 DData must be global but still this didn't work!                                     
+#        pageNo = self.dataDisplay.GetSelection()
+#        if self.dataDisplay.GetPageText(pageNo) == 'Data':
+#            self.dataDisplay.DeletePage(pageNo)
+#            DData = wx.ScrolledWindow(self.dataDisplay)
+#            self.dataDisplay.InsertPage(pageNo,DData,'Data')
+#            self.dataDisplay.ChangeSelection(pageNo)
+#2 This works but overwrites new sizer stuff on top of old stuff  both still active
+#        if DData.GetChildren():
+#            dataDisplay = DData.GetChildren()[0]
+#            mainSizer = dataDisplay.GetSizer()
+#            mainSizer.Clear()
+#        else:
+#            dataDisplay = wx.Panel(DData)
+#            mainSizer = wx.BoxSizer(wx.VERTICAL)
+
+#        DData.DestroyChildren()        #not doing this is equiv to #2 above
+        dataDisplay = wx.Panel(DData)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add(wx.StaticText(dataDisplay,-1,'Histogram data for '+PhaseName+':'),0,wx.ALIGN_CENTER_VERTICAL)
         mainSizer.Add(PlotSizer())            
@@ -2709 +2720 @@
 
         dataDisplay.SetSizer(mainSizer,True)
-        mainSizer.FitInside(self.dataFrame)
+        mainSizer.Fit(self.dataFrame)
         Size = mainSizer.GetMinSize()
         Size[0] += 40