X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fxmlwidget.py;h=47dedebd0c5f65fcfeff788784aa9dc0ba855c75;hp=512d35a1efb0f1e4239577c309f4bc92a167159d;hb=e05a4f6ac4c3e6d0e8a88ad31ec8516440cdd2b3;hpb=6ba5d90f9b2b0ba25aeb46d0d92f22b1f8d33e90 diff --git a/sface/xmlwidget.py b/sface/xmlwidget.py index 512d35a..47dedeb 100644 --- a/sface/xmlwidget.py +++ b/sface/xmlwidget.py @@ -1,4 +1,5 @@ import os +import shlex import sys from PyQt4.QtCore import * @@ -12,14 +13,6 @@ class DomModel(QAbstractItemModel): def __init__(self, document, parent = 0): QAbstractItemModel.__init__(self, parent) self.domDocument = document - # one of the children of the rootItem is the 'xml' thing. - # here I delete it. - childList = document.childNodes() - for i in range(childList.count()): - currElem = childList.item(i) - if (currElem.nodeType() == QDomNode.ProcessingInstructionNode): - document.removeChild(currElem) - break self.rootItem = DomItem(document, 0); def data(self, index, role = Qt.DisplayRole): @@ -39,7 +32,7 @@ class DomModel(QAbstractItemModel): attr = attributeMap.item(i) elem = ' %s="%s"' % (attr.nodeName(), attr.nodeValue()) qslist.append(elem) - ElemNameAndAtts = QString('<%s%s>'% (node.nodeName(), qslist.join(' '))) + ElemNameAndAtts = '%s%s'% (node.nodeName(), qslist.join(' ')) obj = QObject() obj.setProperty('nodeType', QString('element')) obj.setProperty('content', ElemNameAndAtts) @@ -58,7 +51,10 @@ class DomModel(QAbstractItemModel): elif node.nodeType() == QDomNode.EntityNode: return QString('unsupported node type') elif node.nodeType() == QDomNode.ProcessingInstructionNode: - return QVariant() + obj = QObject() + obj.setProperty('nodeType', QString('element')) + obj.setProperty('content', node.nodeName() + " " + node.nodeValue()) + return obj elif node.nodeType() == QDomNode.CommentNode: obj = QObject() obj.setProperty('nodeType', QString('comment')) @@ -85,7 +81,7 @@ class DomModel(QAbstractItemModel): if not index.isValid(): return Qt.ItemIsEnabled return Qt.ItemIsEnabled | Qt.ItemIsSelectable - + def headerData(self, section, orientation, role): return QVariant() @@ -176,7 +172,7 @@ class XmlWindow(QDialog): self.model = None self.title = title - self.view = XmlView(self) + self.view = self.initView() self.delegate = XmlDelegate(self) self.view.setItemDelegate(self.delegate) self.delegate.insertNodeDelegate('element', ElemNodeDelegate()) @@ -188,10 +184,13 @@ class XmlWindow(QDialog): self.updateView() + def initView(self): + return XmlView(self) + def show(self): self.updateView() QDialog.show(self) - + def updateView(self): del self.document del self.model @@ -202,7 +201,6 @@ class XmlWindow(QDialog): 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() @@ -211,6 +209,18 @@ class XmlWindow(QDialog): self.document.setContent(open(rspec_file,'r').read()) + if self.document.childNodes().count() == 0: + # empty document - do nothing + pass + elif self.document.childNodes().item(0).nodeType() == QDomNode.ProcessingInstructionNode: + # the first item is the tag, so expand the second + self.view.expand(self.model.index(1,0)) + else: + # the document didn't start with an tag; let's try to expand + # the first item on the assumption that it is our root level xml + # tag. + self.view.expand(self.model.index(0,0)) + class XmlDelegate(QItemDelegate): @@ -228,31 +238,99 @@ class XmlDelegate(QItemDelegate): del self.delegates[nodeType] def paint(self, painter, option, index): + if isinstance(index.model().data(index),QVariant): + return nodeType = index.model().data(index).property('nodeType') delegate = self.delegates.get(str(nodeType.toString())) - print "TYPE:", str(type(str(nodeType.toString()))) - print "DELEGS DICT:", self.delegates - print "NODETYPE:", nodeType.toString() + #print "TYPE:", str(type(str(nodeType.toString()))) + #print "DELEGS DICT:", self.delegates + #print "NODETYPE:", nodeType.toString() if delegate is not None: - print "WOW DELEG ISNT NONE" + #print "WOW DELEG ISNT NONE" delegate.paint(painter, option, index) else: - print "ELSE BRANCH" + #print "ELSE BRANCH" # not sure this will ever work. this delegate # doesn't know about my QObject strategy. QItemDelegate.paint(self, painter, option, index) + def sizeHint(self, option, index): + fm = option.fontMetrics + if isinstance(index.model().data(index),QVariant): + return QSize(0, 0) + text = index.model().data(index).property('content').toString() + document = QTextDocument() + document.setDefaultFont(option.font) + document.setHtml(text) + # the +5 is for margin. The +4 is voodoo; + # fm.height just give it too small. + return QSize(document.idealWidth() + 5, fm.height() + 4) + class ElemNodeDelegate(QAbstractItemDelegate): def paint(self, painter, option, index): - print "ELEM DELEG CALLED" - paint(self, painter, option, index) + text = index.model().data(index) + palette = QApplication.palette() + document = QTextDocument() + document.setDefaultFont(option.font) + nonHighGlobPattern = '<%s%s>' + nonHighAttPattern = ' %s="%s"' + highGlobPattern = '<%s%s>' + highAttPattern = ' %s="%s"' + def getHtmlText(plainText, globPattern, attPattern): +# print "PLAIN TEXT:", plainText + tmp = plainText.split(' ', 1) +# print "TMP:", tmp + elemName = tmp[0] + AttListHtml = '' + if len(tmp) > 1: + # many elems don't have atts... + # use shlex.split so we can handle quoted strings with spaces + # in them, like . Note that there are + # documented problems with shlex.split and unicode, so we + # convert any potential unicode to a string first. + attList = shlex.split(str(tmp[1])) + for att in attList: + tmp = att.split('=',1) + if len(tmp)>=2: + attName = tmp[0] + attValue = tmp[1] + else: + # this shouldn't happen, but if it does, pretend the + # attribute value is blank. + attName = tmp[0] + attValue = "" + AttListHtml += (nonHighAttPattern % (attName, attValue)) + html = (globPattern % (elemName, AttListHtml)) + return html + def colorize(color, text): + return '' + text + '' + text = str(index.model().data(index).property('content').toString()) +# print "TEXT:", text + if option.state & QStyle.State_Selected: + htmlText = colorize(palette.highlightedText().color().name(), + getHtmlText(text, highGlobPattern, highAttPattern)) + document.setHtml(QString(htmlText)) + else: + htmlText = getHtmlText(text, nonHighGlobPattern, nonHighAttPattern) + document.setHtml(QString(htmlText)) + color = palette.highlight().color() \ + if option.state & QStyle.State_Selected \ + else palette.base().color() + painter.save() +# print "COLOR:", color.name() + # voodoo: if not highlighted, filling the rect + # with the base color makes no difference + painter.fillRect(option.rect, color) + painter.translate(option.rect.x(), option.rect.y()) + document.drawContents(painter) + painter.restore() def sizeHint(self, option, index): sizeHint(self, option, index) class TextNodeDelegate(QAbstractItemDelegate): def paint(self, painter, option, index): - print "TEXT DELEG CALLED" + #print "TEXT DELEG CALLED" paint(self, painter, option, index) def sizeHint(self, option, index): @@ -260,13 +338,9 @@ class TextNodeDelegate(QAbstractItemDelegate): class CommentNodeDelegate(QAbstractItemDelegate): def paint(self, painter, option, index): - print "TEXT DELEG CALLED" + #print "TEXT DELEG CALLED" paint(self, painter, option, index) - def sizeHint(self, option, index): - sizeHint(self, option, index) - - def paint(self, painter, option, index): text = index.model().data(index).property('content').toString() palette = QApplication.palette() @@ -294,12 +368,4 @@ def paint(self, painter, option, index): document.drawContents(painter) painter.restore() -def sizeHint(self, option, index): - fm = option.fontMetrics - text = index.model().data(index) - document = QTextDocument() - document.setDefaultFont(option.font) - document.setHtml(text) - # the +5 is for margin. The +4 is voodoo; - # fm.height just give it too small. - return QSize(document.idealWidth() + 5, fm.height() + 4) +