From: Andy Bavier Date: Wed, 23 Feb 2011 17:50:13 +0000 (-0500) Subject: Rewrote using QStandardItemModel X-Git-Tag: sface-0.1-5~4 X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=90a6da70989aabd72a5bd813d5c9c0539c4f0c11;hp=36c83a6d4bcb418e1b848eb71733a8decf798c7e Rewrote using QStandardItemModel When trying to implement adding tags to the RSpec, I spent a fair amount of time fighting the TreeItem and NodeModel classes. It seemed like there was an issue with the interaction between the NodeModel and TreeView but I couldn't figure it out. Scrapping the custom model and replacing it with QStandardItem and QStandardItemModel fixed my problems. Now adding and removing tags appears to be working. --- diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index 5e2d090..0cdb3da 100644 --- a/sface/screens/mainscreen.py +++ b/sface/screens/mainscreen.py @@ -41,18 +41,19 @@ class NodeView(QTreeView): # self.setSelectionMode(self.MultiSelection) self.setAttribute(Qt.WA_MacShowFocusRect, 0) self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) - self.setToolTip("Double click on a row to change its status") + self.setToolTip("Double click on a row to change its status. Right click on a host to add a tag.") def mouseDoubleClickEvent(self, event): index = self.currentIndex() model = index.model() - status_index = model.index(index.row(), 2, index.parent()) + status_index = model.index(index.row(), 1, index.parent()) status_data = status_index.data().toString() - node_index = model.index(index.row(), 1, index.parent()) + node_index = model.index(index.row(), 0, index.parent()) node_data = node_index.data().toString() if itemType(node_index) == "tag": - tagname, value = node_index.data().toStringList() + data = node_index.data().toString() + tagname, value = data.split(": ") if tagname not in settable_tags: # Pop up error msg QMessageBox.warning(self, "Not settable", "Insufficient permission to change '%s' tag" % tagname) @@ -76,9 +77,56 @@ class NodeView(QTreeView): model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index) + def mousePressEvent(self, event): + QTreeView.mousePressEvent(self, event) + if event.button() == Qt.LeftButton: + return + + # Right click + index = self.currentIndex() + model = index.model() + status_index = model.index(index.row(), 1, index.parent()) + status_data = status_index.data().toString() + node_index = model.index(index.row(), 0, index.parent()) + node_data = node_index.data().toString() + + if itemType(node_index) == "node": + # This is a hostname + if status_data in (node_status['in'], node_status['add'], ""): + # Pop up a dialog box for adding a new attribute + tagname, ok = QInputDialog.getItem(self, "Add tag", + "Tag name:", settable_tags) + if ok: + value, ok = QInputDialog.getText(self, "Add tag", + "Value for tag '%s'" % tagname) + if ok: + # Add a new row to the model for the tag + + # For testing with the QStandardItemModel + #nodeItem = model.itemFromIndex(index) + #tagstring = QString("%s: %s" % (tagname, value)) + #tagItem = QStandardItem(tagstring) + #status = QStandardItem(QString(tag_status['add'])) + #nodeItem.appendRow([tagItem, status]) + + # We're using the QSortFilterProxyModel here + src_index = model.mapToSource(index) + src_model = src_index.model() + nodeItem = src_model.itemFromIndex(src_index) + tagstring = QString("%s: %s" % (tagname, value)) + tagItem = QStandardItem(tagstring) + status = QStandardItem(QString(tag_status['add'])) + nodeItem.appendRow([tagItem, status]) + + elif status_data in (node_status['out'], node_status['remove']): + QMessageBox.warning(self, "Not selected", "Can only add tags to selected nodes") + return + + model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index) + def currentChanged(self, current, previous): model = current.model() - node_index = model.index(current.row(), 1, current.parent()) + node_index = model.index(current.row(), 0, current.parent()) node_data = node_index.data().toString() self.emit(SIGNAL('hostnameClicked(QString)'), node_data) @@ -90,31 +138,27 @@ class NodeNameDelegate(QStyledItemDelegate): def paint(self, painter, option, index): model = index.model() - status_index = model.index(index.row(), 2, index.parent()) + status_index = model.index(index.row(), 1, index.parent()) status_data = status_index.data().toString() fm = QFontMetrics(option.font) rect = option.rect - if itemType(index) == "node": - data = "%s" % index.data().toString() - #if status_data not in (node_status['in'], node_status['remove'], node_status['add']): - # default view - # QStyledItemDelegate.paint(self, painter, option, index) - # return + data = index.data().toString() + rect.setHeight(rect.height() - 2) + rect.setWidth(fm.width(QString(data)) + 6) + rect.setX(rect.x() + 5) + rect.setY(rect.y() - 1) - rect.setHeight(rect.height() - 2) - rect.setWidth(fm.width(QString(data)) + 6) - rect.setX(rect.x() + 5) - rect.setY(rect.y() - 1) - x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width() + x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width() - path = QPainterPath() - path.addRoundedRect(x - 1, y + 1, w, h, 4, 4) + path = QPainterPath() + path.addRoundedRect(x - 1, y + 1, w, h, 4, 4) - painter.save() - painter.setRenderHint(QPainter.Antialiasing) + painter.save() + painter.setRenderHint(QPainter.Antialiasing) + if itemType(index) == "node": if status_data == node_status['in']: # already in the slice painter.fillPath(path, QColor("cyan")) painter.setPen(QColor.fromRgb(0, 0, 0)) @@ -135,22 +179,6 @@ class NodeNameDelegate(QStyledItemDelegate): painter.drawText(option.rect, 0, QString(data)) else: - indent = 16 - tag = index.data().toStringList() - data = "%s: %s" % (tag[0], tag[1]) - rect.setHeight(rect.height() - 2) - rect.setWidth(fm.width(QString(data)) + 6 + indent) - rect.setX(rect.x() + 4 + indent) - rect.setY(rect.y() - 1) - - x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width() - - path = QPainterPath() - path.addRoundedRect(x - 1, y + 1, w, h, 4, 4) - - painter.save() - painter.setRenderHint(QPainter.Antialiasing) - if status_data == tag_status['in']: # already in the slice painter.fillPath(path, QColor("cyan")) painter.setPen(QColor.fromRgb(0, 0, 0)) @@ -172,181 +200,6 @@ class NodeNameDelegate(QStyledItemDelegate): painter.restore() - -class TreeItem: - def __init__(self, data, parent=None): - self.parentItem = parent - self.itemData = data - self.childItems = [] - - def clear(self): - for child in self.childItems: - child.clear() - del child - del self.childItems - self.childItems = [] - - def allChildItems(self): - all = [] - for c in self.childItems: - all.append(c) - if c.childItems: - all.extend(c.allChildItems()) - return all - - def appendChild(self, child): - self.childItems.append(child) - - def child(self, row): - return self.childItems[row] - - def childCount(self): - return len(self.childItems) - - def childNumber(self): - if self.parentItem: - return self.parentItem.childItems.index(self) - return 0 - - def columnCount(self): - return len(self.itemData) - - def data(self, column): - return self.itemData[column] - - def insertChildren(self, position, count, columns): - if position < 0 or position > len(self.childItems): - return False - - for row in range(count): - data = self.data(columns) - item = TreeItem(data, self) - self.childItems.insert(position, item) - - return True - - def insertColumns(self, position, columns): - if position < 0 or position > len(self.itemData): - return False - - for column in range(columns): - self.itemData.insert(position, QVariant()) - - for child in self.childItems: - child.insertColumns(position, columns) - - return True - - def setData(self, column, value): - if column < 0 or column >= len(self.itemData): - return False - - self.itemData[column] = value - return True - - def parent(self): - return self.parentItem - - -class NodeModel(QAbstractItemModel): - def __init__(self, parent): - QAbstractItemModel.__init__(self, parent) - self.__initRoot() - - def clear(self): - self.rootItem.clear() - self.__initRoot() - - def __initRoot(self): - self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Status")]) - - def getItem(self, index): - if index.isValid(): - item = index.internalPointer() - if isinstance(item, TreeItem): - return item - return self.rootItem - - def headerData(self, section, orientation, role): - if orientation == Qt.Horizontal and role in (Qt.DisplayRole, Qt.EditRole): - return self.rootItem.data(section) - return QVariant() - - def index(self, row, column, parent): - if not self.hasIndex(row, column, parent): - return QModelIndex() - - parentItem = self.getItem(parent) - childItem = parentItem.child(row) - if childItem: - return self.createIndex(row, column, childItem) - else: - return QModelIndex() - - def insertColumns(self, position, columns, parent): - self.beginInsertColumns(parent, position, position + columns -1) - ret = self.rootItem.insertColumns(position, columns) - self.endInsertColumns() - return ret - - def insertRows(self, position, rows, parent): - parentItem = self.getItem(parent) - self.beginInsertRows(parent, position, position + rows -1) - ret = parentItem.insertChildren(position, rows, self.rootItem.columnCount()) - self.endInsertRows() - return ret - - def parent(self, index): - if not index.isValid(): - return QModelIndex() - - childItem = self.getItem(index) - parentItem = childItem.parent() - if parentItem is self.rootItem: - return QModelIndex() - - return self.createIndex(parentItem.childNumber(), 0, parentItem) - - def rowCount(self, parent=QModelIndex()): - parentItem = self.getItem(parent) - return parentItem.childCount() - - def columnCount(self, parent=None): - return self.rootItem.columnCount() - - def data(self, index, role): - if not index.isValid(): - return QVariant() - - if role != Qt.DisplayRole and role != Qt.EditRole: - return QVariant() - - item = self.getItem(index) - return item.data(index.column()) - - def nodestatus(self, index): - if not index.isValid(): - return QVariant() - - item = self.getItem(index) - return item.nodestatus(index.column()) - - def flags(self, index): - if not index.isValid(): - return 0 - return Qt.ItemIsEnabled | Qt.ItemIsSelectable# | Qt.ItemIsEditable - - def setData(self, index, value, role): - if role != Qt.EditRole: - return False - - item = self.getItem(index) - ret = item.setData(index.column(), value) - if ret: - self.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), index, index) - return ret - - class SliceWidget(QWidget): def __init__(self, parent): QWidget.__init__(self, parent) @@ -369,7 +222,7 @@ class SliceWidget(QWidget): toplayout.addWidget(searchbox, 0, Qt.AlignRight) self.nodeView = NodeView(self) - self.nodeModel = NodeModel(self) + self.nodeModel = QStandardItemModel(0, 2, self) self.filterModel = QSortFilterProxyModel(self) # enable filtering self.nodeNameDelegate = NodeNameDelegate(self) @@ -433,60 +286,69 @@ class SliceWidget(QWidget): filters = networks + [str(filter_string)] self.filterModel.setFilterRegExp(QRegExp('|'.join(filters))) - def levels_down(self, item): - if item == self.nodeModel.rootItem: - return 0 - else: - return self.levels_down(item.parent()) + 1 + def itemStatus(self, item): + statusItem = item.parent().child(item.row(), 1) + return statusItem.data(Qt.DisplayRole).toString() + + def itemText(self, item): + return item.data(Qt.DisplayRole).toString() + + # Recursively walk the tree, making changes to the RSpec + def process_subtree(self, rspec, item, depth = 0): + change = False + model = self.nodeModel + + if depth in [0, 1]: + pass + elif depth == 2: # Hostname + hostname = self.itemText(item) + testbed = self.itemText(item.parent()) + status = self.itemStatus(item) + if status == node_status['add']: + print "Add hostname: %s" % hostname + rspec.add_sliver(hostname, testbed) + change = True + elif status == node_status['remove']: + print "Remove hostname: %s" % hostname + rspec.remove_sliver(hostname, testbed) + change = True + elif depth == 3: # Tag + tag, value = self.itemText(item).split(": ") + status = self.itemStatus(item) + tag = "%s" % tag # Prevent weird error from lxml + value = "%s" % value # Prevent weird error from lxml + node = self.itemText(item.parent()) + testbed = self.itemText(item.parent().parent()) + if status == tag_status['add']: + print "Add tag to (%s, %s): %s/%s " % (testbed, node, tag, value) + if node.startsWith(default_tags): + rspec.add_default_sliver_attribute(tag, value, testbed) + else: + rspec.add_sliver_attribute(node, tag, value, testbed) + change = True + elif status == tag_status['remove']: + print "Remove tag from (%s, %s): %s/%s " % (testbed, node, tag, value) + if node.startsWith(default_tags): + rspec.remove_default_sliver_attribute(tag, value, testbed) + else: + rspec.remove_sliver_attribute(node, tag, value, testbed) + change = True + + children = item.rowCount() + for row in range(0, children): + status = self.process_subtree(rspec, item.child(row), depth + 1) + change = change or status + + return change def submit(self): if self.checkRunningProcess(): return rspec = self.readSliceRSpec() - - no_change = True - all_child = self.nodeModel.rootItem.allChildItems() - for c in all_child: - testbed, name, status = c.itemData - - if isinstance(status, QVariant): - status = status.toString() - - treelevel = self.levels_down(c) - - if treelevel == 2: - testbed = c.parent().itemData[0] - if status == node_status['add']: - #print "Add hostname: %s" % name - rspec.add_sliver(name, testbed) - no_change = False - elif status == node_status['remove']: - #print "Remove hostname: %s" % name - rspec.remove_sliver(name, testbed) - no_change = False - elif treelevel == 3: - # A tag entry - tag, value = name - tag = "%s" % tag # Prevent weird error from lxml - node = c.parent().itemData[1] - testbed = c.parent().parent().itemData[0] - if status == tag_status['add']: - #print "Add tag: %s/%s " % (tag, value) - if node.startswith(default_tags): - rspec.add_default_sliver.attribute(tag, value, testbed) - else: - rspec.add_sliver_attribute(tag, value, node, testbed) - no_change = False - elif status == node_status['remove']: - #print "Remove tag: %s/%s" % (tag, value) - if node.startsWith(default_tags): - rspec.remove_default_sliver_attribute(tag, value, testbed) - else: - rspec.remove_sliver_attribute(node, tag, value, testbed) - no_change = False - - if no_change: + change = self.process_subtree(rspec, self.nodeModel.invisibleRootItem()) + + if not change: self.setStatus("No change in slice data. Not submitting!", timeout=3000) return @@ -517,16 +379,18 @@ class SliceWidget(QWidget): already_in_nodes = [] self.network_names = [] self.nodeModel.clear() - + rspec = self.readSliceRSpec() if not rspec: return None + rootItem = self.nodeModel.invisibleRootItem() networks = rspec.get_network_list() for network in networks: self.network_names.append(network) - data = [QString(network), QString(""), QString("")] - networkItem = TreeItem(data, self.nodeModel.rootItem) + networkItem = QStandardItem(QString(network)) + rootItem.appendRow([networkItem, QStandardItem(QString(""))]) + all_nodes = rspec.get_node_list(network) sliver_nodes = rspec.get_sliver_list(network) available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes) @@ -534,43 +398,45 @@ class SliceWidget(QWidget): already_in_nodes += sliver_nodes # Add default slice tags - data = [QString(""), QString("%s for %s" % (default_tags, network)), - QString("")] - nodeItem = TreeItem(data, networkItem) - networkItem.appendChild(nodeItem) + nodeItem = QStandardItem(QString("%s for %s" % (default_tags, network))) + statusItem = QStandardItem(QString("")) + networkItem.appendRow([nodeItem, statusItem]) attrs = rspec.get_default_sliver_attributes(network) for (name, value) in attrs: - tagstring = QStringList([name, value]) - data = [QString(""), tagstring, QString(tag_status['in'])] - tagItem = TreeItem(data, nodeItem) - nodeItem.appendChild(tagItem) + tagstring = QString("%s: %s" % (name, value)) + tagItem = QStandardItem(tagstring) + status = QStandardItem(QString(tag_status['in'])) + nodeItem.appendRow([tagItem, status]) for node in sliver_nodes: - data = [QString(""), QString(node), QString(node_status['in'])] - nodeItem = TreeItem(data, networkItem) - networkItem.appendChild(nodeItem) + nodeItem = QStandardItem(QString(node)) + statusItem = QStandardItem(QString(node_status['in'])) + networkItem.appendRow([nodeItem, statusItem]) attrs = rspec.get_sliver_attributes(node, network) for (name, value) in attrs: - tagstring = QStringList([name, value]) - data = [QString(""), tagstring, QString(tag_status['in'])] - tagItem = TreeItem(data, nodeItem) - nodeItem.appendChild(tagItem) + tagstring = QString("%s: %s" % (name, value)) + tagItem = QStandardItem(tagstring) + statusItem = QStandardItem(QString(tag_status['in'])) + nodeItem.appendRow([tagItem, statusItem]) for node in available_nodes: - nodeItem = TreeItem([QString(""), QString(node), QString(node_status['out'])], networkItem) - networkItem.appendChild(nodeItem) - - self.nodeModel.rootItem.appendChild(networkItem) + nodeItem = QStandardItem(QString(node)) + statusItem = QStandardItem(QString(node_status['out'])) + networkItem.appendRow([nodeItem, statusItem]) self.filterModel.setSourceModel(self.nodeModel) self.filterModel.setFilterKeyColumn(-1) self.filterModel.setDynamicSortFilter(True) - self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate) + headers = QStringList() << "Hostname or Tag" << "Status" + self.nodeModel.setHorizontalHeaderLabels(headers) + + self.nodeView.setItemDelegateForColumn(0, self.nodeNameDelegate) self.nodeView.setModel(self.filterModel) self.nodeView.expandAll() - self.nodeView.resizeColumnToContents(1) + self.nodeView.resizeColumnToContents(0) + self.nodeView.collapseAll() def updateSliceName(self): self.slicename.setText("Slice : %s" % (config.getSlice() or "None"))