X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=sface%2Fscreens%2Fmainscreen.py;h=4b636bc0249dd09dfe2e93eec3634200d8afe929;hb=e5eb62ef022ab41be7f2eb0b3ac8723874d1601a;hp=117d0abc98711d644fa79fb8a68bfbe5344c35ea;hpb=b354b717a51518ac6c8ffd9eb060a69ab94a7912;p=sface.git
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 117d0ab..4b636bc 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -13,27 +13,140 @@ class NodeView(QTreeView):
def __init__(self, parent):
QTreeView.__init__(self, parent)
- self.setRootIsDecorated(False)
+ self.setItemsExpandable(True)
+ self.setRootIsDecorated(True)
self.setAlternatingRowColors(True)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-
-class NodeModel(QStandardItemModel):
+ self.setAttribute(Qt.WA_MacShowFocusRect, 0)
+
+class TreeItem:
+ def __init__(self, data, parent=None):
+ self.parentItem = parent
+ self.itemData = data
+ self.childItems = []
+
+ def clear(self):
+ for child in self.childItems:
+ child.clear()
+ del child
+ del self.childItems
+ self.childItems = []
+
+ def appendChild(self, child):
+ self.childItems.append(child)
+
+ def child(self, row):
+ return self.childItems[row]
+
+ def childCount(self):
+ return len(self.childItems)
+
+ def columnCount(self):
+ return len(self.itemData)
+
+ def data(self, column):
+ return self.itemData[column]
+
+ 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
+
+
+
+class NodeModel(QAbstractItemModel):
def __init__(self, parent):
- QStandardItemModel.__init__(self, 0, 3, parent)
- self.setHeaderData(0, Qt.Horizontal, QString("Testbed"))
- self.setHeaderData(1, Qt.Horizontal, QString("Hostname"))
- self.setHeaderData(2, Qt.Horizontal, QString("IsIn"))
+ QAbstractItemModel.__init__(self, parent)
+ self.__initRoot()
+
+ def clear(self):
+ self.rootItem.clear()
+ self.__initRoot()
+
+ 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 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()
+
+ childItem = parentItem.child(row)
+ if childItem:
+ return self.createIndex(row, column, childItem)
+ else:
+ return QModelIndex()
+
+ def parent(self, index):
+ if not index.isValid():
+ return QModelIndex()
+
+ childItem = index.internalPointer()
+ 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:
+ return 0
+
+ parentItem = None
+ if not parent.isValid():
+ parentItem = self.rootItem
+ else:
+ parentItem = parent.internalPointer()
+
+ return parentItem.childCount()
class SliceWidget(QWidget):
def __init__(self, parent):
QWidget.__init__(self, parent)
- self.nodeView = NodeView(self)
- self.nodeModel = NodeModel(self)
- self.nodeView.setModel(self.nodeModel)
-
- refresh = QLabel("Refresh", self)
+ refresh = QLabel("Update Slice Data", self)
refresh.setScaledContents(False)
slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
slicename.setScaledContents(False)
@@ -43,68 +156,75 @@ class SliceWidget(QWidget):
hlayout.addStretch()
hlayout.addWidget(refresh)
+ self.nodeView = NodeView(self)
+ self.nodeModel = NodeModel(self)
+ self.nodeView.setModel(self.nodeModel)
+
+ submit = QPushButton("Submit", self)
+ submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
+
layout = QVBoxLayout()
layout.addLayout(hlayout)
layout.addWidget(self.nodeView)
+ layout.addWidget(submit, 0, Qt.AlignRight)
self.setLayout(layout)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
self.connect(refresh, SIGNAL('linkActivated(QString)'), self.refresh)
+ self.connect(submit, SIGNAL('clicked()'), self.submit)
rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
if os.path.exists(rspec_file):
self.updateView()
+
+ 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())
+ rspec_file = config.getSliceRSpecFile()
xml = open(rspec_file).read()
return xml
def refresh(self, link=None):
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)
- networks.reverse()
for network in networks:
-# nodes = self.rspec_get_sliver_nodes_from_network(rspec_string, network)
-# for node in nodes: self.addNode(network, node, True)
-# nodes = self.rspec_get_other_nodes_from_network(rspec_string, network)
-# for node in nodes: self.addNode(network, node, False)
- # hacky - i'm just gettin used to this xml navigation stuff
- xml_nodes = rspec_get_xml_nodes_from_network(rspec_string, network)
- from lxml import etree
- # addNode inserts before, so let's start with the ones that are not in
- for xml_node in xml_nodes:
- if not xml_node.xpath('sliver'):
- self.addNode(network, xml_node.xpath('hostname/text()')[0],False)
- for xml_node in xml_nodes:
- if xml_node.xpath('sliver'):
- self.addNode(network, xml_node.xpath('hostname/text()')[0],True)
-
-
- def addNode(self, testbed, hostname, mark):
- self.nodeModel.insertRow(0)
- self.nodeModel.setData(self.nodeModel.index(0,0), QString(testbed))
- self.nodeModel.setData(self.nodeModel.index(0,1), QString(hostname))
- if mark:msg="x"
- else: msg="-"
- self.nodeModel.setData(self.nodeModel.index(0,2), QString(msg))
+ 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(node), QString("True")], networkItem)
+ networkItem.appendChild(nodeItem)
+
+ for node in available_nodes:
+ nodeItem = TreeItem([QString(""), QString(node), QString("False")], networkItem)
+ networkItem.appendChild(nodeItem)
+
+ self.nodeModel.rootItem.appendChild(networkItem)
+
+ self.nodeView.expandAll()
+ self.nodeView.resizeColumnToContents(1)
class MainScreen(SfaScreen):
@@ -112,4 +232,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")