X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=4b636bc0249dd09dfe2e93eec3634200d8afe929;hp=6a2b95b508e2c9ea0a309c4800caccf24d9cef60;hb=e5eb62ef022ab41be7f2eb0b3ac8723874d1601a;hpb=5cfdb943593ce3ac4b958b90bc621bda6953bf00
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 6a2b95b..4b636bc 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -14,9 +14,10 @@ class NodeView(QTreeView):
QTreeView.__init__(self, parent)
self.setItemsExpandable(True)
- self.setRootIsDecorated(False)
+ self.setRootIsDecorated(True)
self.setAlternatingRowColors(True)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+ self.setAttribute(Qt.WA_MacShowFocusRect, 0)
class TreeItem:
def __init__(self, data, parent=None):
@@ -25,7 +26,6 @@ class TreeItem:
self.childItems = []
def clear(self):
- print "TODO: TreeItem.clear()"
for child in self.childItems:
child.clear()
del child
@@ -70,7 +70,7 @@ class NodeModel(QAbstractItemModel):
self.__initRoot()
def __initRoot(self):
- self.rootItem = TreeItem([QString("Testbed"), QString("Hostname")])
+ self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")])
def columnCount(self, parent):
if parent.isValid():
@@ -93,6 +93,11 @@ class NodeModel(QAbstractItemModel):
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()
@@ -141,11 +146,7 @@ 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)
@@ -155,54 +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)
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)
- for node in all_nodes:
- nodeItem = TreeItem([QString(""), QString(node)], networkItem)
+ 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):
@@ -210,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")