X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=3d9aaffe7c788714885f7751918ab54a6c283339;hp=160883b9f186feb19eee0e2bf95365b90a613e4f;hb=144579b29d2b49e7f3845c33d50e5811d3c2f3ae;hpb=ea028163f9ab1801b4b719a178184047531da5c1 diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index 160883b..3d9aaff 100644 --- a/sface/screens/mainscreen.py +++ b/sface/screens/mainscreen.py @@ -9,6 +9,8 @@ from sface.config import config from sface.sfiprocess import SfiProcess from sface.screens.sfascreen import SfaScreen +already_in_nodes = [] + class NodeView(QTreeView): def __init__(self, parent): QTreeView.__init__(self, parent) @@ -21,18 +23,37 @@ class NodeView(QTreeView): self.setAttribute(Qt.WA_MacShowFocusRect, 0) self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) -class SelectDelegate(QStyledItemDelegate): - pass + def mouseDoubleClickEvent(self, event): + index = self.currentIndex() + model = index.model() + select_index = model.index(index.row(), 2, index.parent()) + select_data = select_index.data().toString() + hostname_index = model.index(index.row(), 1, index.parent()) + hostname_data = hostname_index.data().toString() + + if select_data == "true": + model.setData(select_index, QString("remove")) + elif select_data == "false": + model.setData(select_index, QString("add")) + elif select_data in ("add", "remove"): + if hostname_data in already_in_nodes: model.setData(select_index, QString("true")) + else: model.setData(select_index, QString("false")) + + model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), hostname_index, hostname_index) + + class NodeNameDelegate(QStyledItemDelegate): def __init__(self, parent): - QStyledItemDelegate.__init__(self) + QStyledItemDelegate.__init__(self, parent) 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": +# model.setData(select_index, QString("add")) if select_data not in ("true", "add", "remove"): # default view QStyledItemDelegate.paint(self, painter, option, index) @@ -61,12 +82,14 @@ class NodeNameDelegate(QStyledItemDelegate): 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() @@ -217,7 +240,7 @@ class NodeModel(QAbstractItemModel): def flags(self, index): if not index.isValid(): return 0 - return Qt.ItemIsEnabled | Qt.ItemIsSelectable | Qt.ItemIsEditable + return Qt.ItemIsEnabled | Qt.ItemIsSelectable# | Qt.ItemIsEditable def setData(self, index, value, role): if role != Qt.EditRole: @@ -235,6 +258,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) @@ -251,14 +276,8 @@ 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.filterModel) - self.nodeView.setModel(self.nodeModel) self.nodeNameDelegate = NodeNameDelegate(self) - self.selectDelegate = SelectDelegate(self) refresh = QPushButton("Update Slice Data", self) refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum) @@ -283,9 +302,14 @@ class SliceWidget(QWidget): self.updateView() - def filter(self, filter): - print self.filterModel.rowCount(), self.nodeModel.rowCount() - 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) @@ -314,19 +338,26 @@ class SliceWidget(QWidget): self.updateView() def updateView(self): + global already_in_nodes + already_in_nodes = [] + self.network_names = [] self.nodeModel.clear() + rspec_string = self.readSliceRSpec() if not rspec_string: return None 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) sliver_nodes = rspec_get_sliver_nodes_from_network(rspec_string, network) available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes) + already_in_nodes += sliver_nodes + for node in sliver_nodes: nodeItem = TreeItem([QString(""), QString("%s" % node), QString("true")], networkItem) networkItem.appendChild(nodeItem) @@ -337,11 +368,14 @@ class SliceWidget(QWidget): self.nodeModel.rootItem.appendChild(networkItem) + self.filterModel.setSourceModel(self.nodeModel) + self.filterModel.setFilterKeyColumn(-1) + self.filterModel.setDynamicSortFilter(True) + + self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate) + self.nodeView.setModel(self.filterModel) self.nodeView.expandAll() self.nodeView.resizeColumnToContents(1) - self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate) - self.nodeView.setItemDelegateForColumn(2, self.selectDelegate) - self.filterModel.setFilterKeyColumn(1) class MainScreen(SfaScreen):