make filtering work for simple regexp

[sface.git] / sface / screens / mainscreen.py

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 160883b..3ac5520 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -29,8 +29,8 @@ 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()
 
@@ -61,12 +61,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()
@@ -235,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)
@@ -251,11 +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.filterModel)
-        self.nodeView.setModel(self.nodeModel)
 
         self.nodeNameDelegate = NodeNameDelegate(self)
         self.selectDelegate = SelectDelegate(self)
@@ -283,9 +282,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,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:
@@ -321,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)
@@ -337,11 +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.filterModel.setFilterKeyColumn(1)
+        self.nodeView.setModel(self.filterModel)
+        self.nodeView.expandAll()
+        self.nodeView.resizeColumnToContents(1)
 
 
 class MainScreen(SfaScreen):