restore baris tree expansion feature. Removed >print< statements.
[sface.git] / sface / xmlwidget.py
index 633c95a..2c0f53c 100644 (file)
@@ -8,6 +8,17 @@ from PyQt4.QtXml import *
 from sface.config import config
 from sface.screens.sfascreen import SfaScreen
 
+class nodeData(QVariant):
+    def __init__(self, *args, **kws):
+        QVariant.__init__(self, *args, **kws)
+        self.type = None
+
+    def setType(self, typ):
+        self.type = typ
+
+    def getType(self):
+        return self.type
+
 class DomModel(QAbstractItemModel):
     def __init__(self, document, parent = 0):
         QAbstractItemModel.__init__(self, parent)
@@ -23,7 +34,7 @@ class DomModel(QAbstractItemModel):
         self.rootItem = DomItem(document, 0);
 
     def data(self, index, role = Qt.DisplayRole):
-        # sometimes it return a QString, sometimes a QVariant. not good.
+        # for interesting nodes, returns a dict wrapped into a QVariant.
         if not index.isValid():
             return QVariant()
         if role != Qt.DisplayRole:
@@ -40,17 +51,15 @@ class DomModel(QAbstractItemModel):
                     elem = ' %s="%s"' % (attr.nodeName(), attr.nodeValue())
                     qslist.append(elem)
                 ElemNameAndAtts = '%s%s'% (node.nodeName(), qslist.join(' '))
-                obj = QObject()
-                obj.setProperty('nodeType', QString('element'))
-                obj.setProperty('content', ElemNameAndAtts)
-                return obj
+                answer = nodeData(ElemNameAndAtts)
+                answer.setType('element')
+                return answer
             elif node.nodeType() == QDomNode.AttributeNode:
                 return QVariant()
             elif node.nodeType() == QDomNode.TextNode:
-                obj = QObject()
-                obj.setProperty('nodeType', QString('text'))
-                obj.setProperty('content', node.nodeValue())
-                return obj
+                answer = nodeData(node.nodeValue())
+                answer.setType('text')
+                return answer
             elif node.nodeType() == QDomNode.CDATASectionNode:
                 return QString('unsupported node type')
             elif node.nodeType() == QDomNode.EntityReferenceNode:
@@ -60,10 +69,9 @@ class DomModel(QAbstractItemModel):
             elif node.nodeType() == QDomNode.ProcessingInstructionNode:
                 return QVariant()
             elif node.nodeType() == QDomNode.CommentNode:
-                obj = QObject()
-                obj.setProperty('nodeType', QString('comment'))
-                obj.setProperty('content', node.nodeValue())
-                return obj
+                answer = nodeData(node.nodeValue())
+                answer.setType('comment')
+                return answer
             elif node.nodeType() == QDomNode.DocumentNode:
                 return QString('unsupported node type')
             elif node.nodeType() == QDomNode.DocumentTypeNode:
@@ -157,9 +165,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)
@@ -167,52 +181,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):
@@ -228,29 +196,32 @@ class XmlDelegate(QItemDelegate):
             del self.delegates[nodeType]
     
     def paint(self, painter, option, index):
-        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()
+        nodeData = index.model().data(index)
+        nodeType = nodeData.getType()
+        delegate = self.delegates.get(nodeType)
         if delegate is not None:
-            #print "WOW DELEG ISNT NONE"
             delegate.paint(painter, option, index)
         else:
-            #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
-        text = index.model().data(index).property('content').toString()
+        nodeData = index.model().data(index)
+        nodeType = nodeData.getType()
+        text = nodeData.toString()
+        if nodeType == 'element' or nodeType == 'comment':
+            numlines = 1
+        elif nodeType == 'text':
+            nl = text.count('\n')
+            numlines = nl if nl > 0 else 1
+        else:
+            numlines = 1
         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)    
+        return QSize(document.idealWidth() + 5, (fm.height() + 4) * numlines)    
 
 class ElemNodeDelegate(QAbstractItemDelegate):
     def paint(self, painter, option, index): 
@@ -272,12 +243,15 @@ class ElemNodeDelegate(QAbstractItemDelegate):
                     tmp = att.split('=')
                     attName = tmp[0]
                     attValue = tmp[1][1:-1]
-                    AttListHtml += (nonHighAttPattern % (attName, attValue))
+                    AttListHtml += (attPattern % (attName, attValue))
             html = (globPattern % (elemName, AttListHtml))
             return html
         def colorize(color, text):
             return '<font color=' + color + '>' + text + '</font>'
-        text = str(index.model().data(index).property('content').toString())
+        nodeData = index.model().data(index)
+        nodeType = nodeData.getType()
+        # Uff... QString Vs string...
+        text = str(nodeData.toString())
         if option.state & QStyle.State_Selected:
             htmlText = colorize(palette.highlightedText().color().name(),
                                 getHtmlText(text, highGlobPattern, highAttPattern))
@@ -296,9 +270,6 @@ class ElemNodeDelegate(QAbstractItemDelegate):
         document.drawContents(painter)
         painter.restore()
 
-    def sizeHint(self, option, index):
-        sizeHint(self, option, index)
-
 class TextNodeDelegate(QAbstractItemDelegate):
     def paint(self, painter, option, index): 
         palette = QApplication.palette()
@@ -309,7 +280,9 @@ class TextNodeDelegate(QAbstractItemDelegate):
             return '<pre>' + text + '</pre'
         def colorize(color, text):
             return '<font color=' + color + '>' + text + '</font>'
-        text = str(index.model().data(index).property('content').toString())
+        nodeData = index.model().data(index)
+        nodeType = nodeData.getType()
+        text = nodeData.toString()
         if option.state & QStyle.State_Selected:
             htmlText = colorize(palette.highlightedText().color().name(),
                                 verbatimize(text))
@@ -328,13 +301,8 @@ class TextNodeDelegate(QAbstractItemDelegate):
         document.drawContents(painter)
         painter.restore()
 
-    def sizeHint(self, option, index):
-        sizeHint(self, option, index)
-
 class CommentNodeDelegate(QAbstractItemDelegate):
     def paint(self, painter, option, index): 
-
-
         paint(self, painter, option, index)
 
 def paint(self, painter, option, index):