From: Giovanni Gherdovich <ggherdov@brentaal.inria.fr>
Date: Tue, 19 Oct 2010 14:50:10 +0000 (+0200)
Subject: first get the xml doc, then pass it to DomModel. Not the other way around
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=9c27ebe87eabf14d9bcc3d7b54e88ce6b33b3be6

first get the xml doc, then pass it to DomModel. Not the other way around
---

diff --git a/sface/rspecwindow.py b/sface/rspecwindow.py
index d407114..b6b8f0a 100644
--- a/sface/rspecwindow.py
+++ b/sface/rspecwindow.py
@@ -72,13 +72,18 @@ class RSpecWindow(QDialog):
         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
 
         rspec_file = config.getSliceRSpecFile()
         if not os.path.exists(rspec_file):
             return
 
         self.document.setContent(open(rspec_file,'r').read())
+        # DomModel.__init__ is gonna purge the doc
+        # from the "xml bla bla bla" node.
+        # so the arg 'document' needs to be not None
+        # for this to happen
+        self.model = DomModel(self.document, self)
+
+        self.view.setModel(self.model)
+        self.view.expand(self.model.index(0, 0)) #expand first level only
+
diff --git a/sface/xmlwidget.py b/sface/xmlwidget.py
index 2aa7238..b24de60 100644
--- a/sface/xmlwidget.py
+++ b/sface/xmlwidget.py
@@ -32,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);