From 1d1f5861495fc6e07d8a683ca8dbbaa43936b212 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:43:15 +0000
Subject: [PATCH] Fixes conflicts after merge
---
python/parse_vtu.py | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/python/parse_vtu.py b/python/parse_vtu.py
index 02113c2..3f864c3 100755
--- a/python/parse_vtu.py
+++ b/python/parse_vtu.py
@@ -6,7 +6,13 @@
tree = ET.parse('../src/timestep_000000.vtu')
root = tree.getroot()
trisurf=root.find('trisurf')
+version=root.find('trisurfversion')
+print(version.text);
print(trisurf.items())
-xml=zlib.decompress(base64.b64decode(trisurf.text))
-tree2=ET.ElementTree(ET.fromstring("<root>"+str(xml)[0:-1]+"</root>"))
+#xml=zlib.decompress(base64.b64decode(trisurf.text))
+#xml=trisurf.text
+#print(xml)
+
+#tree2=ET.ElementTree(ET.fromstring(str(xml))
+#tree2=ET.ElementTree(ET.fromstring("<root>"+str(xml)[0:-1]+"</root>"))
--
Gitblit v1.9.3