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

Provide size hints for nicer looking trees that don't need to be manually sized

This commit is contained in:
Daniel Lidstrom 2020-12-17 17:45:04 -08:00
parent db43c9447c
commit ba304faa05
4 changed files with 69 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/parametertree.py
View File

@ -171,7 +171,6 @@ layout.addWidget(QtGui.QLabel("These are two views of the same data. They should
layout.addWidget(t, 1, 0, 1, 1)
layout.addWidget(t2, 1, 1, 1, 1)
win.show()
win.resize(800,800)
## test save/restore
s = p.saveState()

5
pyqtgraph/parametertree/ParameterItem.py
View File

@ -159,6 +159,11 @@ class ParameterItem(QtGui.QTreeWidgetItem):
def titleChanged(self):
# called when the user-visble title has changed (either opts['title'], or name if title is None)
self.setText(0, self.param.title())
fm = QtGui.QFontMetrics(self.font(0))
size = fm.size(QtCore.Qt.TextSingleLine, self.text(0))
size.setHeight(size.height() * 1.35)
size.setWidth(size.width() * 1.15)
self.setSizeHint(0, size)
def limitsChanged(self, param, limits):
"""Called when the parameter's limits have changed"""

29
pyqtgraph/parametertree/ParameterTree.py
View File

@ -162,3 +162,32 @@ class ParameterTree(TreeWidget):
def wheelEvent(self, ev):
self.clearSelection()
return TreeWidget.wheelEvent(self, ev)
def sizeHint(self):
w, h = 0, 0
ind = self.indentation()
for x in self.listAllItems():
if x.isHidden():
continue
try:
depth = x.depth
except AttributeError:
depth = 0
s0 = x.sizeHint(0)
s1 = x.sizeHint(1)
w = max(w, depth * ind + max(0, s0.width()) + max(0, s1.width()))
h += max(0, s0.height(), s1.height())
# typ = x.param.opts['type'] if isinstance(x, ParameterItem) else x
# print(typ, depth * ind, (s0.width(), s0.height()), (s1.width(), s1.height()), (w, h))
# todo: find out if this alternative can be made to work (currently fails when color or colormap are present)
# print('custom', (w, h))
# w = self.sizeHintForColumn(0) + self.sizeHintForColumn(1)
# h = self.viewportSizeHint().height()
# print('alternative', (w, h))
if not self.header().isHidden():
h += self.header().height()
return QtCore.QSize(w, h)

42
pyqtgraph/parametertree/parameterTypes.py
View File

@ -48,6 +48,7 @@ class WidgetParameterItem(ParameterItem):
if self.asSubItem:
self.subItem = QtGui.QTreeWidgetItem()
self.subItem.depth = self.depth + 1
self.addChild(self.subItem)
self.defaultBtn = QtGui.QPushButton()
@ -63,7 +64,8 @@ class WidgetParameterItem(ParameterItem):
layout = QtGui.QHBoxLayout()
layout.setContentsMargins(0, 0, 0, 0)
layout.setSpacing(2)
layout.addWidget(w, 1)
if not self.asSubItem:
layout.addWidget(w, 1)
layout.addWidget(self.displayLabel, 1)
layout.addStretch(0)
layout.addWidget(self.defaultBtn)
@ -88,6 +90,30 @@ class WidgetParameterItem(ParameterItem):
self.optsChanged(self.param, self.param.opts)
# set size hints
sw = self.widget.sizeHint()
sb = self.defaultBtn.sizeHint()
# shrink row heights a bit for more compact look
sw.setHeight(sw.height() * 0.9)
sb.setHeight(sb.height() * 0.9)
# manually override size hints for certain parameter types
t = self.param.opts['type']
if t == 'text':
sw.setWidth(100)
sw.setHeight(100)
elif t == 'color':
sw.setWidth(100)
elif t == 'colormap':
sw.setWidth(100)
sw.setHeight(35)
if self.asSubItem:
self.setSizeHint(1, sb)
self.subItem.setSizeHint(0, sw)
else:
w = sw.width() + sb.width()
h = max(sw.height(), sb.height())
self.setSizeHint(1, QtCore.QSize(w, h))
def makeWidget(self):
"""
Return a single widget that should be placed in the second tree column.
@ -407,7 +433,9 @@ class GroupParameterItem(ParameterItem):
self.addWidgetBox = w
self.addItem = QtGui.QTreeWidgetItem([])
self.addItem.setFlags(QtCore.Qt.ItemIsEnabled)
self.addItem.depth = self.depth + 1
ParameterItem.addChild(self, self.addItem)
self.addItem.setSizeHint(0, self.addWidgetBox.sizeHint())
def updateDepth(self, depth):
## Change item's appearance based on its depth in the tree
@ -420,7 +448,6 @@ class GroupParameterItem(ParameterItem):
font.setBold(True)
font.setPointSize(font.pointSize()+1)
self.setFont(c, font)
self.setSizeHint(0, QtCore.QSize(0, 25))
else:
for c in [0,1]:
self.setBackground(c, QtGui.QBrush(QtGui.QColor(220,220,220)))
@ -429,8 +456,8 @@ class GroupParameterItem(ParameterItem):
font.setBold(True)
#font.setPointSize(font.pointSize()+1)
self.setFont(c, font)
self.setSizeHint(0, QtCore.QSize(0, 20))
self.titleChanged() # sets the size hint for column 0 which is based on the new font
def addClicked(self):
"""Called when "add new" button is clicked
The parameter MUST have an 'addNew' method defined.
@ -620,12 +647,13 @@ class ActionParameterItem(ParameterItem):
self.layout = QtGui.QHBoxLayout()
self.layout.setContentsMargins(0, 0, 0, 0)
self.layoutWidget.setLayout(self.layout)
self.button = QtGui.QPushButton(param.title())
self.button = QtGui.QPushButton()
#self.layout.addSpacing(100)
self.layout.addWidget(self.button)
self.layout.addStretch()
self.button.clicked.connect(self.buttonClicked)
self.titleChanged()
def treeWidgetChanged(self):
ParameterItem.treeWidgetChanged(self)
tree = self.treeWidget()
@ -637,7 +665,7 @@ class ActionParameterItem(ParameterItem):
def titleChanged(self):
self.button.setText(self.param.title())
ParameterItem.titleChanged(self)
self.setSizeHint(0, self.button.sizeHint())
def buttonClicked(self):
self.param.activate()