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
run in background
[sface.git]
/
sface
/
screens
/
rspecscreen.py
diff --git
a/sface/screens/rspecscreen.py
b/sface/screens/rspecscreen.py
index
dc79c83
..
e7edb47
100644
(file)
--- a/
sface/screens/rspecscreen.py
+++ b/
sface/screens/rspecscreen.py
@@
-30,8
+30,7
@@
class DomModel(QAbstractItemModel):
childList = document.childNodes()
for i in range(childList.count()):
currElem = childList.item(i)
childList = document.childNodes()
for i in range(childList.count()):
currElem = childList.item(i)
- if (currElem.nodeType() ==
- QDomNode.ProcessingInstructionNode):
+ if (currElem.nodeType() == QDomNode.ProcessingInstructionNode):
document.removeChild(currElem)
break
self.rootItem = DomItem(document, 0);
document.removeChild(currElem)
break
self.rootItem = DomItem(document, 0);
@@
-50,16
+49,9
@@
class DomModel(QAbstractItemModel):
qslist = QStringList()
for i in range(attributeMap.count()):
attr = attributeMap.item(i)
qslist = QStringList()
for i in range(attributeMap.count()):
attr = attributeMap.item(i)
- elem = (attr.nodeName()
- .append(QString('="'))
- .append(attr.nodeValue())
- .append(QString('"')))
+ elem = '%s="%s"' % (attr.nodeName(), attr.nodeValue())
qslist.append(elem)
qslist.append(elem)
- return (QString('<').
- append(node.nodeName()).
- append(' ').
- append(qslist.join(' ')).
- append('>'))
+ return QString("<%s %s>" % (node.nodeName(), qslist.join(' ')))
elif node.nodeType() == QDomNode.AttributeNode:
return QString('Whozat?!')
elif node.nodeType() == QDomNode.TextNode:
elif node.nodeType() == QDomNode.AttributeNode:
return QString('Whozat?!')
elif node.nodeType() == QDomNode.TextNode:
@@
-95,14
+87,13
@@
class DomModel(QAbstractItemModel):
def flags(self, index):
if not index.isValid():
return Qt.ItemIsEnabled
def flags(self, index):
if not index.isValid():
return Qt.ItemIsEnabled
- # does this `|` thing hold?
return Qt.ItemIsEnabled | Qt.ItemIsSelectable
def headerData(self, section, orientation, role):
return QVariant()
return Qt.ItemIsEnabled | Qt.ItemIsSelectable
def headerData(self, section, orientation, role):
return QVariant()
- def index(self, row, column, parent):
- if not parent.isValid():
+ def index(self, row, column, parent
=None
):
+ if not parent
or not parent
.isValid():
parentItem = self.rootItem
else:
parentItem = parent.internalPointer()
parentItem = self.rootItem
else:
parentItem = parent.internalPointer()
@@
-133,16
+124,14
@@
class DomModel(QAbstractItemModel):
return parentItem.node().childNodes().count()
def columnCount(self, parent):
return parentItem.node().childNodes().count()
def columnCount(self, parent):
- # just one column
- # we'll print tag name (and attributes)
- # or the tag content
+ # just one column we'll print tag name (and attributes) or the
+ # tag content
return 1
class DomItem:
return 1
class DomItem:
- # wrapper around PyQt4.QtXml.QDomNode
- # it keeps an hash of childrens for
- # performance reasons
+ # wrapper around PyQt4.QtXml.QDomNode it keeps an hash of
+ # childrens for performance reasons
def __init__(self, node, row, parent = 0):
# node is of type PyQt4.QtXml.QDomNode
def __init__(self, node, row, parent = 0):
# node is of type PyQt4.QtXml.QDomNode
@@
-171,12
+160,13
@@
class DomItem:
return self.rowNumber
return self.rowNumber
-
class RSpecWidget(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
class RSpecWidget(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
- self.updateView()
+ self.view = RSpecView(self)
+ self.updateView()
+
def updateView(self):
document = QDomDocument("RSpec")
rspec_file = config.getSliceRSpecFile()
def updateView(self):
document = QDomDocument("RSpec")
rspec_file = config.getSliceRSpecFile()
@@
-188,8
+178,7
@@
class RSpecWidget(QWidget):
view = RSpecView(self)
view.setModel(model)
view = RSpecView(self)
view.setModel(model)
-# too slow!
-# view.expandAll()
+ view.expand(model.index(0, 0)) #expand first level only
layout = QVBoxLayout()
layout.addWidget(view)
layout = QVBoxLayout()
layout.addWidget(view)