Specify "cyan" as RGB value

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

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 0cdb3da..c573aea 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -160,7 +160,7 @@ class NodeNameDelegate(QStyledItemDelegate):
 
         if itemType(index) == "node":
             if status_data == node_status['in']: # already in the slice
-                painter.fillPath(path, QColor("cyan"))
+                painter.fillPath(path, QColor.fromRgb(0, 250, 250))
                 painter.setPen(QColor.fromRgb(0, 0, 0))
                 painter.drawText(option.rect, 0, QString(data))
 
@@ -180,7 +180,7 @@ class NodeNameDelegate(QStyledItemDelegate):
 
         else:
             if status_data == tag_status['in']: # already in the slice
-                painter.fillPath(path, QColor("cyan"))
+                painter.fillPath(path, QColor.fromRgb(0, 250, 250))
                 painter.setPen(QColor.fromRgb(0, 0, 0))
                 painter.drawText(option.rect, 0, QString(data))
 
@@ -385,15 +385,17 @@ class SliceWidget(QWidget):
             return None
 
         rootItem = self.nodeModel.invisibleRootItem()
-        networks = rspec.get_network_list()
+        networks = sorted(rspec.get_network_list())
         for network in networks:
             self.network_names.append(network)
-            networkItem = QStandardItem(QString(network))
-            rootItem.appendRow([networkItem, QStandardItem(QString(""))])
 
             all_nodes = rspec.get_node_list(network)
             sliver_nodes = rspec.get_sliver_list(network)
-            available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
+            available_nodes = [ node for node in all_nodes if node not in sliver_nodes ]
+
+            networkItem = QStandardItem(QString(network))
+            msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes))
+            rootItem.appendRow([networkItem, QStandardItem(QString(msg))])
 
             already_in_nodes += sliver_nodes
 
@@ -449,7 +451,7 @@ class MainScreen(SfaScreen):
         SfaScreen.__init__(self, parent)
 
         slice = SliceWidget(self)
-        self.init(slice, "Main Window", "OneLab Federation GUI")
+        self.init(slice, "Main Window", "OneLab SFA crawler")
 
     def rspecUpdated(self):
         self.mainwin.rspecWindow.updateView()