Changeset 2949

Timestamp:

Jul 30, 2017 2:16:54 PM (6 years ago)

Author:

vondreele

Message:

fix window behavior - use wx.ScrolledWindow? instead of ScrolledPanel?
remove the special sizing stuff for phase windows - not needed

Location:

branch/2frame

Files:

• GSASIIdataGUI.py (modified) (4 diffs)
• GSASIIimgGUI.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (1 diff)

branch/2frame/GSASIIdataGUI.py

@@ -2885 +2885 @@
         self.root = self.GPXtree.root        
 
-        self.dataWindow.SetupScrolling()
+#        self.dataWindow.SetupScrolling()
                 
         self.plotFrame = wx.Frame(None,-1,'GSASII Plots',size=wx.Size(700,600), \
@@ -4675 +4675 @@
 # Data window side of main GUI
 ################################################################################
-class G2DataWindow(wxscroll.ScrolledPanel):
+class G2DataWindow(wx.ScrolledWindow):      #wxscroll.ScrolledPanel):
     '''Create the data item window entries in menus used in
     that window. The menu entries are created for all
@@ -4737 +4737 @@
     '''
     # TODO: debug code ######################################################################
-    def Bind(self,eventtype,handler,*args,**kwargs):  # PATCH: debug code: catch when a menu is bind'ed to
-        # the dataWindow as this should not be done in the 2 frame version. 
-        if eventtype == wx.wx.EVT_MENU:
-            print 'wx.EVT_MENU Bind to dataWindow'
-            G2obj.HowDidIgetHere(True)
-            wx.Frame.Bind(self.GetTopLevelParent(),eventtype,handler,*args,**kwargs)
-        else:
-            wxscroll.ScrolledPanel.Bind(self,eventtype,handler,*args,**kwargs)
-    def DestroyChildren(self):
-        print 'Fix this: dataWindow.DestroyChildren called'
-        G2obj.HowDidIgetHere()
-    def SetTitle(self,*args):
-        print('Warning: attempt to label dataWindow')
-        G2obj.HowDidIgetHere(True)
-        self.G2frame.SetTitle(*args)
-    def SetLabel(self,*args):
-        print('Warning: attempt to label dataWindow')
-        G2obj.HowDidIgetHere(True)
-        self.G2frame.SetTitle(*args)
+#    def Bind(self,eventtype,handler,*args,**kwargs):  # PATCH: debug code: catch when a menu is bind'ed to
+#        # the dataWindow as this should not be done in the 2 frame version. 
+#        if eventtype == wx.wx.EVT_MENU:
+#            print 'wx.EVT_MENU Bind to dataWindow'
+#            G2obj.HowDidIgetHere(True)
+#            wx.Frame.Bind(self.GetTopLevelParent(),eventtype,handler,*args,**kwargs)
+#        else:
+#            wxscroll.ScrolledPanel.Bind(self,eventtype,handler,*args,**kwargs)
+#    def DestroyChildren(self):
+#        print 'Fix this: dataWindow.DestroyChildren called'
+#        G2obj.HowDidIgetHere()
+#    def SetTitle(self,*args):
+#        print('Warning: attempt to label dataWindow')
+#        G2obj.HowDidIgetHere(True)
+#        self.G2frame.SetTitle(*args)
+#    def SetLabel(self,*args):
+#        print('Warning: attempt to label dataWindow')
+#        G2obj.HowDidIgetHere(True)
+#        self.G2frame.SetTitle(*args)
     # end TODO: remove this later ############################################################
 
     def __init__(self,parent):
-        wxscroll.ScrolledPanel.__init__(self,parent,wx.ID_ANY,size=parent.GetSize())
+#        wxscroll.ScrolledPanel.__init__(self,parent,wx.ID_ANY,size=parent.GetSize())
+        wx.ScrolledWindow.__init__(self,parent,wx.ID_ANY,size=parent.GetSize())
         self.parent = parent
         self._initMenus()
@@ -4785 +4786 @@
             print 'No sizer in dataWindow'
             raise Exception
-#        self.Layout()
         self.SetAutoLayout(True)
-        self.SetupScrolling()
+        self.SetScrollRate(1,1)
+#        self.SetupScrolling()      #TODO - setscrollbars here
         self.SendSizeEvent()
 

branch/2frame/GSASIIimgGUI.py

@@ -1609 +1609 @@
     littleSizer.Add(upperThreshold,0,WACV)
     mainSizer.Add(littleSizer,0,)
-    if len(Spots):
+    if len(Spots):      #TODO: replace with a GSTable
         lbl = wx.StaticText(parent=G2frame.dataWindow,label=' Spot masks')
         lbl.SetBackgroundColour(wx.Colour(200,200,210))
@@ -2044 +2044 @@
         return samSizer
         
-    def DzeroSizer():
+    def DzeroSizer():       #TODO replace with a GSTable
     
         def OnDzero(invalid,value,tc):

branch/2frame/GSASIIphsGUI.py

@@ -986 +986 @@
 def SetPhaseWindow(phasePage,mainSizer=None,size=None,Scroll=0):
     phasePage.SetAutoLayout(True)
-    if not mainSizer is None: 
-        phasePage.SetSizer(mainSizer)
-        Size = mainSizer.GetMinSize()
-    else:
-        Size = phasePage.GetBestSize()
-    Size[0] += 40
-    phasePage.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-    phasePage.Scroll(0,Scroll)
-    phasePage.GetTopLevelParent().dataWindow.SetDataSize()
+    phasePage.SetScrollRate(1,1)
+    phasePage.SendSizeEvent()
+
+#    if not mainSizer is None: 
+#        phasePage.SetSizer(mainSizer)
+#        Size = mainSizer.GetMinSize()
+#    else:
+#        Size = phasePage.GetBestSize()
+#    Size[0] += 40
+#    phasePage.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
+#    phasePage.Scroll(0,Scroll)
+#    phasePage.GetTopLevelParent().dataWindow.SetDataSize()
     
 def FindBondsDraw(data):