X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=ac0dedbe804627cb8ba135fac1010b6b31d2f7ed;hp=0ae1cbd509c7935261835aa2668f74ce7663168e;hb=bf6d88f9dd5b19d12b2c59c5db1cdfea48e54716;hpb=e545d8ccf099ea9ab890e24234f7e3e5bcd2b41f
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 0ae1cbd..ac0dedb 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,11 +13,54 @@ 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 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:]
+
+ 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)
+ 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)
class TreeItem:
def __init__(self, data, parent=None):
@@ -41,12 +84,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:
@@ -70,43 +148,25 @@ class NodeModel(QAbstractItemModel):
self.__initRoot()
def __initRoot(self):
- self.rootItem = TreeItem([QString("Testbed"), QString("Hostname")])
-
- 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()
+ self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")])
- 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
-
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:
@@ -114,108 +174,173 @@ 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)
+ 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)
+
+ 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)
- refresh = QLabel("Refresh", self)
- refresh.setScaledContents(False)
- slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
- slicename.setScaledContents(False)
+ self.nodeNameDelegate = NodeNameDelegate(self)
+ self.selectDelegate = SelectDelegate(self)
- hlayout = QHBoxLayout()
- hlayout.addWidget(slicename)
- hlayout.addStretch()
- hlayout.addWidget(refresh)
+ 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.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 = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
- xml = open(rspec_file).read()
- return xml
+ rspec_file = config.getSliceRSpecFile()
+ 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("Slice not set yet!")
+ self.parent().setStatus("Slice not set yet!", timeout=None)
return
self.process = SfiProcess()
outfile = self.process.getRSpecFromSM()
- self.parent().setStatus("Updating slice data. This may take some time...")
+ self.parent().setStatus("Updating slice data. This may take some time...", timeout=None)
self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
def refreshFinished(self):
del self.process
- self.parent().setStatus("Slice data updated.")
+ self.parent().setStatus("Slice data updated.", timeout=5000)
self.updateView()
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("")], self.nodeModel.rootItem)
+ 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)
for node in sliver_nodes:
- nodeItem = TreeItem([QString(""), QString("%s (selected)" % node)], networkItem)
+ nodeItem = TreeItem([QString(""), QString("*%s" % node), QString("true")], networkItem)
networkItem.appendChild(nodeItem)
for node in available_nodes:
- nodeItem = TreeItem([QString(""), QString(node)], 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.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate)
+ self.nodeView.setItemDelegateForColumn(2, self.selectDelegate)
class MainScreen(SfaScreen):
@@ -223,4 +348,4 @@ class MainScreen(SfaScreen):
SfaScreen.__init__(self, parent)
slice = SliceWidget(self)
- self.init(slice, "Main Window", "PlanetLab Federation GUI")
+ self.init(slice, "Main Window", "OneLab Federation GUI")