X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fxmlwidget.py;h=b24de60248a918289c4fb3d6e77ff03135e34196;hb=9c27ebe87eabf14d9bcc3d7b54e88ce6b33b3be6;hp=34578df222e363df253941b376a68c1d555794d9;hpb=5c18c5b0393cb0970ccc6b839d056a504e4177d7;p=sface.git
diff --git a/sface/xmlwidget.py b/sface/xmlwidget.py
index 34578df..b24de60 100644
--- a/sface/xmlwidget.py
+++ b/sface/xmlwidget.py
@@ -8,6 +8,19 @@ from PyQt4.QtXml import *
from sface.config import config
from sface.screens.sfascreen import SfaScreen
+def QVarMapAccess(qv, key):
+ # helper function. qv is a dict wrapped into a QVariant
+ print 10*'='
+ print "DICT:", qv.toMap()
+ if len(qv.toMap().keys()) == 0:
+ print "EMPTY!"
+ import traceback
+ traceback.print_stack()
+ return None
+ else:
+ return qv.toMap()[QString(key)].toString()
+
+
class DomModel(QAbstractItemModel):
def __init__(self, document, parent = 0):
QAbstractItemModel.__init__(self, parent)
@@ -19,6 +32,7 @@ class DomModel(QAbstractItemModel):
currElem = childList.item(i)
if (currElem.nodeType() == QDomNode.ProcessingInstructionNode):
document.removeChild(currElem)
+ print "REMOVED!"
break
self.rootItem = DomItem(document, 0);
@@ -40,42 +54,58 @@ class DomModel(QAbstractItemModel):
elem = ' %s="%s"' % (attr.nodeName(), attr.nodeValue())
qslist.append(elem)
ElemNameAndAtts = '%s%s'% (node.nodeName(), qslist.join(' '))
+ print "1"
return QVariant(
- {QString('nodeType'):QVariant(QString('element')),
- QString('content'):ElemNameAndAtts})
+ {'nodeType':QVariant(QString('element')),
+ 'content':ElemNameAndAtts})
elif node.nodeType() == QDomNode.AttributeNode:
+ print "2"
return QVariant()
elif node.nodeType() == QDomNode.TextNode:
+ print "3"
return QVariant(
- {QString('nodeType'):QVariant(QString('text')),
- QString('content'):node.nodeValue()})
+ {'nodeType':QVariant(QString('text')),
+ 'content':node.nodeValue()})
elif node.nodeType() == QDomNode.CDATASectionNode:
+ print "4"
return QString('unsupported node type')
elif node.nodeType() == QDomNode.EntityReferenceNode:
+ print "5"
return QString('unsupported node type')
elif node.nodeType() == QDomNode.EntityNode:
+ print "6"
return QString('unsupported node type')
elif node.nodeType() == QDomNode.ProcessingInstructionNode:
+ print "7"
return QVariant()
elif node.nodeType() == QDomNode.CommentNode:
+ print "8"
return QVariant(
- {QString('nodeType'):QVariant(QString('comment')),
- QString('content'):node.nodeValue()})
+ {'nodeType':QVariant(QString('comment')),
+ 'content':node.nodeValue()})
elif node.nodeType() == QDomNode.DocumentNode:
+ print "9"
return QString('unsupported node type')
elif node.nodeType() == QDomNode.DocumentTypeNode:
+ print "10"
return QString('unsupported node type')
elif node.nodeType() == QDomNode.DocumentFragmentNode:
+ print "12"
return QString('unsupported node type')
elif node.nodeType() == QDomNode.NotationNode:
+ print "13"
return QString('unsupported node type')
elif node.nodeType() == QDomNode.BaseNode:
+ print "14"
return QString('unsupported node type')
elif node.nodeType() == QDomNode.CharacterDataNode:
+ print "15"
return QString('unsupported node type')
else:
+ print "16"
return QVariant()
else:
+ print "17"
return QVariant()
def flags(self, index):
@@ -154,9 +184,15 @@ class DomItem:
return self.rowNumber
class XmlView(QTreeView):
- def __init__(self, parent):
+ def __init__(self, parent=None):
QTreeView.__init__(self, parent)
+ delegate = XmlDelegate(self)
+ delegate.insertNodeDelegate('element', ElemNodeDelegate())
+ delegate.insertNodeDelegate('text', TextNodeDelegate())
+ delegate.insertNodeDelegate('comment', CommentNodeDelegate())
+ self.setItemDelegate(delegate)
+
self.setAnimated(True)
self.setItemsExpandable(True)
self.setRootIsDecorated(True)
@@ -164,52 +200,6 @@ class XmlView(QTreeView):
self.setAttribute(Qt.WA_MacShowFocusRect, 0)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-class XmlWindow(QDialog):
- def __init__(self, parent=None, title='XML Window'):
- QDialog.__init__(self, parent)
- self.setWindowTitle(title)
-
- self.document = None
- self.model = None
- self.title = title
-
- self.view = XmlView(self)
- self.delegate = XmlDelegate(self)
- self.view.setItemDelegate(self.delegate)
- self.delegate.insertNodeDelegate('element', ElemNodeDelegate())
- self.delegate.insertNodeDelegate('text', TextNodeDelegate())
- self.delegate.insertNodeDelegate('comment', CommentNodeDelegate())
- layout = QVBoxLayout()
- layout.addWidget(self.view)
- self.setLayout(layout)
-
- self.updateView()
-
- def show(self):
- self.updateView()
- QDialog.show(self)
-
- def updateView(self):
- del self.document
- del self.model
- self.document = None
- self.model = None
-
- self.document = QDomDocument(self.title)
- self.model = DomModel(self.document, self)
-
- self.view.setModel(self.model)
- self.view.expand(self.model.index(0, 0)) #expand first level only
-
- #move the code below to rspec window
- rspec_file = config.getSliceRSpecFile()
- if not os.path.exists(rspec_file):
- return
-
- self.document.setContent(open(rspec_file,'r').read())
-
-
-
class XmlDelegate(QItemDelegate):
def __init__(self, parent=None):
@@ -225,12 +215,11 @@ class XmlDelegate(QItemDelegate):
del self.delegates[nodeType]
def paint(self, painter, option, index):
- QVarMapAccess = lambda qv, key: qv.toMap()[QString(key)].toString()
+ print "ASKING FOR DATA"
dataAsQVarMap = index.model().data(index)
+ print "GOT DATA"
nodeType = str(QVarMapAccess(dataAsQVarMap, 'nodeType'))
delegate = self.delegates.get(nodeType)
- print "WTF IS THIS TYPE:", type(index.model().data(index))
- print "NODE TYPE:", nodeType
#print "DELEGS DICT:", self.delegates
#print "NODETYPE:", nodeType.toString()
if delegate is not None:
@@ -239,7 +228,7 @@ class XmlDelegate(QItemDelegate):
else:
#print "ELSE BRANCH"
# not sure this will ever work. this delegate
- # doesn't know about my QObject strategy.
+ # doesn't know about my QMap strategy.
QItemDelegate.paint(self, painter, option, index)
# def sizeHint(self, option, index):
@@ -287,7 +276,6 @@ class ElemNodeDelegate(QAbstractItemDelegate):
return html
def colorize(color, text):
return '' + text + ''
- QVarMapAccess = lambda qv, key: qv.toMap()[QString(key)].toString()
dataAsQVarMap = index.model().data(index)
text = str(QVarMapAccess(dataAsQVarMap, 'content'))
if option.state & QStyle.State_Selected:
@@ -318,7 +306,6 @@ class TextNodeDelegate(QAbstractItemDelegate):
return '' + text + '' + text + ''
- QVarMapAccess = lambda qv, key: qv.toMap()[QString(key)].toString()
dataAsQVarMap = index.model().data(index)
text = str(QVarMapAccess(dataAsQVarMap, 'content'))
if option.state & QStyle.State_Selected: