X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=ae18c9dc0b980f90209f99667c830f2d5af364bd;hp=32d984901fccb4c4b05ad227426d0e5ea13d1c5e;hb=304f915f071d6fee7ad674824a25713da2d4bb7c;hpb=a8f5d8a8a1fc3baf55c85d8af3243944a2dca26c

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 32d9849..ae18c9d 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -5,7 +5,7 @@ from PyQt4.QtGui import *
 
 from sfa.util.rspecHelper import RSpec
 from sface.sfahelper import *
-from sface.sficonfig import config
+from sface.config import config
 from sface.sfiprocess import SfiProcess
 from sface.screens.sfascreen import SfaScreen
 
@@ -13,29 +13,46 @@ class NodeView(QTreeView):
     def __init__(self, parent):
         QTreeView.__init__(self, parent)
 
+        self.setAnimated(True)
         self.setItemsExpandable(True)
         self.setRootIsDecorated(True)
         self.setAlternatingRowColors(True)
-        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.setAttribute(Qt.WA_MacShowFocusRect, 0)
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-class ItemDelegate(QStyledItemDelegate):
+class SelectDelegate(QStyledItemDelegate):
+    pass
+
+class NodeNameDelegate(QStyledItemDelegate):
     def __init__(self, parent):
         QStyledItemDelegate.__init__(self)
 
     def paint(self, painter, option, index):
         data = "%s" % index.data().toString()
+        model = index.model()
+        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 data.startswith("*"): # already in the sliver
-            data = " %s " % data[1:]
 
-            rect = option.rect
+        if select_data == "true": # already in the sliver
             fm = QFontMetrics(option.font)
-            w = fm.width(QString(data))
-            rect.setWidth(w)
+            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.fillRect(rect, QColor.fromRgb(0, 250, 0))
+            painter.setRenderHint(QPainter.Antialiasing)
+            painter.drawRoundedRect(rect, 4, 4)
+            painter.fillPath(path, QColor.fromRgb(0, 250, 0))
             painter.setPen(QColor.fromRgb(0, 0, 0))
             painter.drawText(option.rect, 0, QString(data))
             painter.restore()
@@ -64,12 +81,47 @@ class TreeItem:
     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 row(self):
         if (self.parentItem):
             try:
@@ -95,41 +147,23 @@ class NodeModel(QAbstractItemModel):
     def __initRoot(self):
         self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")])
 
-    def columnCount(self, parent):
-        if parent.isValid():
-            return parent.internalPointer().columnCount()
-        else:
-            return self.rootItem.columnCount()
 
-    def data(self, index, role):
-        if not index.isValid():
-            return QVariant()
-
-        if role != Qt.DisplayRole:
-            return QVariant()
-
-        item = index.internalPointer()
-        return item.data(index.column())
+    def getItem(self, index):
+        if index.isValid():
+            item = index.internalPointer()
+            if item: return item
+        return self.rootItem
 
     def headerData(self, section, orientation, role):
         if orientation == Qt.Horizontal and role == Qt.DisplayRole:
             return self.rootItem.data(section)
         return QVariant()
 
-    def flags(self, index):
-        if not index.isValid():
-            return 0
-        return Qt.ItemIsEnabled | Qt.ItemIsSelectable # | Qt.ItemIsEditable
-
     def index(self, row, column, parent):
         if not self.hasIndex(row, column, parent):
             return QModelIndex()
 
-        parentItem = None
-        if not parent.isValid():
-            parentItem = self.rootItem
-        else:
-            parentItem = parent.internalPointer()
+        parentItem = self.getItem(parent)
             
         childItem = parentItem.child(row)
         if childItem:
@@ -137,78 +171,130 @@ class NodeModel(QAbstractItemModel):
         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 = index.internalPointer()
+        childItem = self.getItem(index)
         parentItem = childItem.parent()
 
-        if not parentItem:
-            return QModelIndex()
-
         if parentItem is self.rootItem:
             return QModelIndex()
 
         return self.createIndex(parentItem.row(), 0, parentItem)
 
-    def rowCount(self, parent):
-        if parent.column() > 0:
+    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 flags(self, index):
+        if not index.isValid():
             return 0
+        return Qt.ItemIsEnabled | Qt.ItemIsSelectable | Qt.ItemIsEditable
 
-        parentItem = None
-        if not parent.isValid():
-            parentItem = self.rootItem
-        else:
-            parentItem = parent.internalPointer()
+    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
 
-        return parentItem.childCount()
 
 
 class SliceWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
 
-        refresh = QLabel("<a href='refresh'>Update Slice Data</a>", self)
-        refresh.setScaledContents(False)
         slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
         slicename.setScaledContents(False)
+        searchlabel = QLabel ("Search: ", self)
+        searchlabel.setScaledContents(False)
+        searchbox = QLineEdit(self)
+        searchbox.setAttribute(Qt.WA_MacShowFocusRect, 0)
 
-        hlayout = QHBoxLayout()
-        hlayout.addWidget(slicename)
-        hlayout.addStretch()
-        hlayout.addWidget(refresh)
+        toplayout = QHBoxLayout()
+        toplayout.addWidget(slicename, 0, Qt.AlignLeft)
+        toplayout.addStretch()
+        toplayout.addWidget(searchlabel, 0, Qt.AlignRight)
+        toplayout.addWidget(searchbox, 0, Qt.AlignRight)
 
         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)
+
+        refresh = QPushButton("Update Slice Data", self)
+        refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
         submit = QPushButton("Submit", self)
         submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
 
+        bottomlayout = QHBoxLayout()
+        bottomlayout.addWidget(refresh, 0, Qt.AlignLeft)
+        bottomlayout.addStretch()
+        bottomlayout.addWidget(submit, 0, Qt.AlignRight)
+
         layout = QVBoxLayout()
-        layout.addLayout(hlayout)
+        layout.addLayout(toplayout)
         layout.addWidget(self.nodeView)
-        layout.addWidget(submit, 0, Qt.AlignRight)
+        layout.addLayout(bottomlayout)
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-        self.connect(refresh, SIGNAL('linkActivated(QString)'), self.refresh)
+        self.connect(refresh, SIGNAL('clicked()'), self.refresh)
         self.connect(submit, SIGNAL('clicked()'), self.submit)
+        self.connect(searchbox, SIGNAL('textChanged(QString)'), self.filter)
 
-        rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
-        if os.path.exists(rspec_file):
-            self.updateView()
+        self.updateView()
+
+    def filter(self, filter):
+        self.filterModel.setFilterRegExp(QRegExp(filter))
 
     def submit(self):
         self.parent().setStatus("TODO: Submit not implemented yet!", 3000)
         
     def readSliceRSpec(self):
         rspec_file = config.getSliceRSpecFile()
-        xml = open(rspec_file).read()
-        return xml
+        if os.path.exists(rspec_file):
+            xml = open(rspec_file).read()
+            return xml
+        return None
 
-    def refresh(self, link=None):
+    def refresh(self):
         if not config.getSlice():
             self.parent().setStatus("<font color='red'>Slice not set yet!</font>", timeout=None)
             return
@@ -227,8 +313,10 @@ class SliceWidget(QWidget):
     def updateView(self):
         self.nodeModel.clear()
         rspec_string = self.readSliceRSpec()
-        networks = rspec_get_networks(rspec_string)
+        if not rspec_string:
+            return None
 
+        networks = rspec_get_networks(rspec_string)
         for network in networks:
             networkItem = TreeItem([QString(network), QString(""), QString("")], self.nodeModel.rootItem)
 
@@ -237,20 +325,19 @@ class SliceWidget(QWidget):
             available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
 
             for node in sliver_nodes:
-                nodeItem = TreeItem([QString(""), QString("*%s" % node), QString("Implement Checkbox")], networkItem)
+                nodeItem = TreeItem([QString(""), QString("%s" % node), QString("true")], networkItem)
                 networkItem.appendChild(nodeItem)
 
             for node in available_nodes:
-                nodeItem = TreeItem([QString(""), QString(node), QString("Implement Checkbox")], networkItem)
+                nodeItem = TreeItem([QString(""), QString(node), QString("false")], networkItem)
                 networkItem.appendChild(nodeItem)
 
             self.nodeModel.rootItem.appendChild(networkItem)
 
         self.nodeView.expandAll()
         self.nodeView.resizeColumnToContents(1)
-
-        self.delegate = ItemDelegate(self)
-        self.nodeView.setItemDelegateForColumn(1, self.delegate)
+        self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate)
+        self.nodeView.setItemDelegateForColumn(2, self.selectDelegate)
 
 
 class MainScreen(SfaScreen):