git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TreeItem.clear() is already implemented, using it.
[sface.git]
/
sface
/
screens
/
mainscreen.py
diff --git
a/sface/screens/mainscreen.py
b/sface/screens/mainscreen.py
index
2b8b88f
..
575d5f9
100644
(file)
--- a/
sface/screens/mainscreen.py
+++ b/
sface/screens/mainscreen.py
@@
-14,7
+14,7
@@
class NodeView(QTreeView):
QTreeView.__init__(self, parent)
self.setItemsExpandable(True)
QTreeView.__init__(self, parent)
self.setItemsExpandable(True)
- self.setRootIsDecorated(
Fals
e)
+ self.setRootIsDecorated(
Tru
e)
self.setAlternatingRowColors(True)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
self.setAlternatingRowColors(True)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
@@
-24,6
+24,13
@@
class TreeItem:
self.itemData = data
self.childItems = []
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 appendChild(self, child):
self.childItems.append(child)
@@
-34,7
+41,6
@@
class TreeItem:
return len(self.childItems)
def columnCount(self):
return len(self.childItems)
def columnCount(self):
- print len(self.itemData)
return len(self.itemData)
def data(self, column):
return len(self.itemData)
def data(self, column):
@@
-42,9
+48,11
@@
class TreeItem:
def row(self):
if (self.parentItem):
def row(self):
if (self.parentItem):
- for i in self.parentItem.childItems:
- if i is self:
- return i
+ try:
+ return self.parentItem.childItems.index(self)
+ except ValueError:
+ return 0
+ return 0
def parent(self):
return self.parentItem
def parent(self):
return self.parentItem
@@
-54,17
+62,19
@@
class TreeItem:
class NodeModel(QAbstractItemModel):
def __init__(self, parent):
QAbstractItemModel.__init__(self, parent)
class NodeModel(QAbstractItemModel):
def __init__(self, parent):
QAbstractItemModel.__init__(self, parent)
- self.
rootItem = TreeItem([QString("Testbed"), QString("Hostname")]
)
+ self.
__initRoot(
)
- def addToRoot(self, item):
- self.rootItem.appendChild(item)
+ def clear(self):
+ self.rootItem.clear()
+ self.__initRoot()
+
+ def __initRoot(self):
+ self.rootItem = TreeItem([QString("Testbed"), QString("Hostname")])
def columnCount(self, parent):
if parent.isValid():
def columnCount(self, parent):
if parent.isValid():
- print "toto"
- parent.internalPointer().columnCount()
+ return parent.internalPointer().columnCount()
else:
else:
- print "lala"
return self.rootItem.columnCount()
def data(self, index, role):
return self.rootItem.columnCount()
def data(self, index, role):
@@
-82,6
+92,11
@@
class NodeModel(QAbstractItemModel):
return self.rootItem.data(section)
return QVariant()
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()
def index(self, row, column, parent):
if not self.hasIndex(row, column, parent):
return QModelIndex()
@@
-108,10
+123,10
@@
class NodeModel(QAbstractItemModel):
if not parentItem:
return QModelIndex()
if not parentItem:
return QModelIndex()
- if parentItem
==
self.rootItem:
+ if parentItem
is
self.rootItem:
return QModelIndex()
return QModelIndex()
- return self.createIndex(parentItem.row(), 0, parentItem)
;
+ return self.createIndex(parentItem.row(), 0, parentItem)
def rowCount(self, parent):
if parent.column() > 0:
def rowCount(self, parent):
if parent.column() > 0:
@@
-178,18
+193,21
@@
class SliceWidget(QWidget):
self.updateView()
def updateView(self):
self.updateView()
def updateView(self):
+ self.nodeModel.clear()
rspec_string = self.readSliceRSpec()
networks = rspec_get_networks(rspec_string)
for network in networks:
rspec_string = self.readSliceRSpec()
networks = rspec_get_networks(rspec_string)
for network in networks:
- networkItem = TreeItem([QString(network), QString("")])
+ networkItem = TreeItem([QString(network), QString("")]
, self.nodeModel.rootItem
)
all_nodes = rspec_get_nodes_from_network(rspec_string, network)
for node in all_nodes:
all_nodes = rspec_get_nodes_from_network(rspec_string, network)
for node in all_nodes:
- nodeItem = TreeItem([QString(""), QString(node)])
+ nodeItem = TreeItem([QString(""), QString(node)]
, networkItem
)
networkItem.appendChild(nodeItem)
networkItem.appendChild(nodeItem)
- self.nodeModel.addToRoot(networkItem)
+ self.nodeModel.rootItem.appendChild(networkItem)
+
+ self.nodeView.expandAll()
class MainScreen(SfaScreen):
class MainScreen(SfaScreen):