ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Container.py : fix RecursionError

Browse Source
This commit is contained in:
KIU Shueng Chuan 2021-01-18 12:24:20 +08:00
parent 8a091859f1
commit 6dbda78231
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pyqtgraph/dockarea/Container.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from ..Qt import QtCore, QtGui from ..Qt import QtCore, QtGui, QtWidgets
import weakref import weakref
class Container(object): class Container(object):
@ -76,7 +76,11 @@ class Container(object):
self.area.topContainer = None self.area.topContainer = None
self.containerChanged(None) self.containerChanged(None)
def childEvent(self, ev): def childEvent_(self, ev):
# NOTE: this method has been renamed to avoid having the same method name as
# QSplitter.childEvent()
# this causes problems for PyQt6 since SplitContainer inherits from
# Container and QSplitter.
ch = ev.child() ch = ev.child()
if ev.removed() and hasattr(ch, 'sigStretchChanged'): if ev.removed() and hasattr(ch, 'sigStretchChanged'):
#print "Child", ev.child(), "removed, updating", self #print "Child", ev.child(), "removed, updating", self
@ -133,8 +137,8 @@ class SplitContainer(Container, QtGui.QSplitter):
self.setStretchFactor(i, sizes[i]) self.setStretchFactor(i, sizes[i])
def childEvent(self, ev): def childEvent(self, ev):
QtGui.QSplitter.childEvent(self, ev) super().childEvent(ev) # call QSplitter.childEvent()
Container.childEvent(self, ev) Container.childEvent_(self, ev)
#def restretchChildren(self): #def restretchChildren(self):
#sizes = self.sizes() #sizes = self.sizes()
@ -204,6 +208,16 @@ class VContainer(SplitContainer):
self.setSizes([int(s*scale) for s in sizes]) self.setSizes([int(s*scale) for s in sizes])
class StackedWidget(QtWidgets.QStackedWidget):
def __init__(self, *, container):
super().__init__()
self.container = container
def childEvent(self, ev):
super().childEvent(ev)
self.container.childEvent_(ev)
class TContainer(Container, QtGui.QWidget): class TContainer(Container, QtGui.QWidget):
sigStretchChanged = QtCore.Signal() sigStretchChanged = QtCore.Signal()
def __init__(self, area): def __init__(self, area):
@ -221,9 +235,8 @@ class TContainer(Container, QtGui.QWidget):
self.hTabLayout.setContentsMargins(0,0,0,0) self.hTabLayout.setContentsMargins(0,0,0,0)
self.layout.addWidget(self.hTabBox, 0, 1) self.layout.addWidget(self.hTabBox, 0, 1)
self.stack = QtGui.QStackedWidget() self.stack = StackedWidget(container=self)
self.layout.addWidget(self.stack, 1, 1) self.layout.addWidget(self.stack, 1, 1)
self.stack.childEvent = self.stackChildEvent
self.setLayout(self.layout) self.setLayout(self.layout)
@ -276,8 +289,4 @@ class TContainer(Container, QtGui.QWidget):
y = max(y, wy) y = max(y, wy)
self.setStretch(x, y) self.setStretch(x, y)
def stackChildEvent(self, ev):
QtGui.QStackedWidget.childEvent(self.stack, ev)
Container.childEvent(self, ev)
from . import Dock from . import Dock