X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=3ac5520c7b265565b8d93c3cf36f43039d6ea8e7;hp=ae18c9dc0b980f90209f99667c830f2d5af364bd;hb=7c3b04b5d6a6674a197fa6bf28bfd7ae5e15170d;hpb=304f915f071d6fee7ad674824a25713da2d4bb7c diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index ae18c9d..3ac5520 100644 --- a/sface/screens/mainscreen.py +++ b/sface/screens/mainscreen.py @@ -17,6 +17,7 @@ class NodeView(QTreeView): self.setItemsExpandable(True) self.setRootIsDecorated(True) self.setAlternatingRowColors(True) +# self.setSelectionMode(self.MultiSelection) self.setAttribute(Qt.WA_MacShowFocusRect, 0) self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) @@ -28,36 +29,49 @@ class NodeNameDelegate(QStyledItemDelegate): QStyledItemDelegate.__init__(self) def paint(self, painter, option, index): - data = "%s" % index.data().toString() model = index.model() + data = "%s" % index.data().toString() select_index = model.index(index.row(), 2, index.parent()) select_data = select_index.data().toString() -# if select_data == "false": -# print select_data -# model.setData(index, QString("*%s" % data), Qt.EditRole) -# model.setData(select_index, QString("true"), Qt.EditRole) - - - if select_data == "true": # already in the sliver - fm = QFontMetrics(option.font) - rect = option.rect - rect.setWidth(fm.width(QString(data))) - rect.setHeight(rect.height() - 2) - rect.setX(rect.x() + 1) - x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width() - - path = QPainterPath() - path.addRoundedRect(x, y, w, h, 4, 4) - - painter.save() - painter.setRenderHint(QPainter.Antialiasing) - painter.drawRoundedRect(rect, 4, 4) + + if select_data not in ("true", "add", "remove"): # default view + QStyledItemDelegate.paint(self, painter, option, index) + return + + fm = QFontMetrics(option.font) + rect = option.rect + rect.setWidth(fm.width(QString(data)) + 8) + rect.setHeight(rect.height() - 2) + rect.setX(rect.x() + 4) + x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width() + + path = QPainterPath() + path.addRoundedRect(x, y, w, h, 4, 4) + + painter.save() + painter.setRenderHint(QPainter.Antialiasing) + painter.drawRoundedRect(rect, 4, 4) + + if select_data == "true": # already in the slice painter.fillPath(path, QColor.fromRgb(0, 250, 0)) painter.setPen(QColor.fromRgb(0, 0, 0)) painter.drawText(option.rect, 0, QString(data)) - painter.restore() - else: # others, fall back to default view - QStyledItemDelegate.paint(self, painter, option, index) + + elif select_data == "add": # newly added to the slice + painter.fillPath(path, QColor.fromRgb(0, 250, 0)) + painter.setPen(QColor.fromRgb(0, 0, 0)) + painter.drawText(option.rect, 0, QString(data)) + painter.drawRect(x + w + 10, y + 3, 10, 10) + painter.fillRect(x + w + 10, y + 3, 10, 10, QColor.fromRgb(0, 250, 0)) + + elif select_data == "remove": # removed from the slice + painter.fillPath(path, QColor.fromRgb(250, 0, 0)) + painter.setPen(QColor.fromRgb(0, 0, 0)) + painter.drawText(option.rect, 0, QString(data)) + painter.drawRect(x + w + 10, y + 3, 10, 10) + painter.fillRect(x + w + 10, y + 3, 10, 10, QColor.fromRgb(250, 0, 0)) + + painter.restore() class TreeItem: def __init__(self, data, parent=None): @@ -121,14 +135,6 @@ class TreeItem: self.itemData[column] = value return True - - def row(self): - if (self.parentItem): - try: - return self.parentItem.childItems.index(self) - except ValueError: - return 0 - return 0 def parent(self): return self.parentItem @@ -147,7 +153,6 @@ class NodeModel(QAbstractItemModel): def __initRoot(self): self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")]) - def getItem(self, index): if index.isValid(): item = index.internalPointer() @@ -155,7 +160,7 @@ class NodeModel(QAbstractItemModel): return self.rootItem def headerData(self, section, orientation, role): - if orientation == Qt.Horizontal and role == Qt.DisplayRole: + if orientation == Qt.Horizontal and role in (Qt.DisplayRole, Qt.EditRole): return self.rootItem.data(section) return QVariant() @@ -164,7 +169,6 @@ class NodeModel(QAbstractItemModel): return QModelIndex() parentItem = self.getItem(parent) - childItem = parentItem.child(row) if childItem: return self.createIndex(row, column, childItem) @@ -190,11 +194,10 @@ class NodeModel(QAbstractItemModel): childItem = self.getItem(index) parentItem = childItem.parent() - if parentItem is self.rootItem: return QModelIndex() - return self.createIndex(parentItem.row(), 0, parentItem) + return self.createIndex(parentItem.childNumber(), 0, parentItem) def rowCount(self, parent=QModelIndex()): parentItem = self.getItem(parent) @@ -234,6 +237,8 @@ class SliceWidget(QWidget): def __init__(self, parent): QWidget.__init__(self, parent) + self.network_names = [] + slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self) slicename.setScaledContents(False) searchlabel = QLabel ("Search: ", self) @@ -250,10 +255,6 @@ class SliceWidget(QWidget): self.nodeView = NodeView(self) self.nodeModel = NodeModel(self) self.filterModel = QSortFilterProxyModel(self) # enable filtering - self.filterModel.setSourceModel(self.nodeModel) - self.nodeView.setModel(self.filterModel) - self.filterModel.setDynamicSortFilter(True) - self.nodeView.setModel(self.nodeModel) self.nodeNameDelegate = NodeNameDelegate(self) self.selectDelegate = SelectDelegate(self) @@ -281,8 +282,14 @@ class SliceWidget(QWidget): self.updateView() - def filter(self, filter): - self.filterModel.setFilterRegExp(QRegExp(filter)) + def filter(self, filter_string): + # for hierarchical models QSortFilterProxyModel applies the + # sort recursively. if the parent doesn't match the criteria + # we won't be able to match the children. so we need to match + # parent (by matching the network_names) + networks = ["^%s$" % n for n in self.network_names] + filters = networks + [str(filter_string)] + self.filterModel.setFilterRegExp(QRegExp('|'.join(filters))) def submit(self): self.parent().setStatus("TODO: Submit not implemented yet!", 3000) @@ -311,6 +318,7 @@ class SliceWidget(QWidget): self.updateView() def updateView(self): + self.network_names = [] self.nodeModel.clear() rspec_string = self.readSliceRSpec() if not rspec_string: @@ -318,6 +326,7 @@ class SliceWidget(QWidget): networks = rspec_get_networks(rspec_string) for network in networks: + self.network_names.append(network) networkItem = TreeItem([QString(network), QString(""), QString("")], self.nodeModel.rootItem) all_nodes = rspec_get_nodes_from_network(rspec_string, network) @@ -334,10 +343,15 @@ class SliceWidget(QWidget): self.nodeModel.rootItem.appendChild(networkItem) - self.nodeView.expandAll() - self.nodeView.resizeColumnToContents(1) + self.filterModel.setSourceModel(self.nodeModel) + self.filterModel.setFilterKeyColumn(-1) + self.filterModel.setDynamicSortFilter(True) + self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate) self.nodeView.setItemDelegateForColumn(2, self.selectDelegate) + self.nodeView.setModel(self.filterModel) + self.nodeView.expandAll() + self.nodeView.resizeColumnToContents(1) class MainScreen(SfaScreen):