[med-svn] [Git][med-team/camitk][master] 6 commits: patch from Bernhard Übelacker + VTK7 compatibility
Emmanuel Promayon
gitlab at salsa.debian.org
Tue Oct 23 11:01:24 BST 2018
Emmanuel Promayon pushed to branch master at Debian Med / camitk
Commits:
0f4ceef4 by Emmanuel Promayon at 2018-10-22T16:21:48Z
patch from Bernhard Übelacker + VTK7 compatibility
- - - - -
961b1161 by Emmanuel Promayon at 2018-10-22T16:32:50Z
add patches to series
- - - - -
1fd3487c by Emmanuel Promayon at 2018-10-22T18:20:11Z
update to vtk7 + fix multiarch
- - - - -
301e32dd by Emmanuel Promayon at 2018-10-22T19:04:35Z
fix vtk7 compatibility in tutorials as well
- - - - -
8084f155 by Emmanuel Promayon at 2018-10-22T19:56:25Z
Fix d/c thanks to cme + fix test failure with vtk7
- - - - -
9a0b6163 by Emmanuel Promayon at 2018-10-23T08:23:11Z
update changelog
- - - - -
6 changed files:
- debian/changelog
- debian/compat
- debian/control
- + debian/patches/0010-Make-loop-safe-for-removal-of-elements.patch
- + debian/patches/0100-vtk7-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+camitk (4.1.2-2) UNRELEASED; urgency=medium
+
+ * VTK7 compatibility. Closes: #909120
+ * Avoid double delete (patch from Bernhard Übelacker)
+ * update d/control: multiarch, debphelper and compat
+
+ -- Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr> Tue, 23 Oct 2018 10:19:39 +0200
+
camitk (4.1.2-1) unstable; urgency=medium
* New upstream version 4.1.2
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
@@ -4,10 +4,10 @@ Uploaders: Andreas Tille <tille at debian.org>,
Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11),
cmake,
- libvtk6-dev,
- libvtk6-qt-dev,
+ libvtk7-dev,
+ libvtk7-qt-dev,
qtbase5-dev,
libqt5xmlpatterns5-dev,
libqt5opengl5-dev,
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 10),
xauth,
doxygen,
graphviz
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/med-team/camitk
Vcs-Git: https://salsa.debian.org/med-team/camitk.git
Homepage: https://camitk.imag.fr/
@@ -45,8 +45,10 @@ Architecture: any
Depends: libcamitk4 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Replaces: libcamitk3, libcamitk4 (<< 4.1.2)
-Breaks: libcamitk3, libcamitk4 (<< 4.1.2)
+Breaks: libcamitk3,
+ libcamitk4 (<< 4.1.2)
+Replaces: libcamitk3,
+ libcamitk4 (<< 4.1.2)
Description: Computer Assisted Medical Intervention Tool Kit - config
Helps researchers and clinicians to easily and rapidly collaborate in
order to prototype CAMI applications, that feature medical images,
@@ -62,8 +64,8 @@ Depends: libcamitk4 (= ${binary:Version}),
camitk-config,
libqtpropertybrowser-dev,
cmake,
- libvtk6-dev,
- libvtk6-qt-dev,
+ libvtk7-dev,
+ libvtk7-qt-dev,
qtbase5-dev,
libqt5xmlpatterns5-dev,
libqt5opengl5-dev,
@@ -92,6 +94,7 @@ Description: Computer Assisted Medical Intervention Tool Kit - development
Package: libcamitk4-data
Architecture: all
+Multi-Arch: foreign
Section: doc
Depends: ${misc:Depends}
Description: Computer Assisted Medical Intervention Tool Kit - data
@@ -103,6 +106,7 @@ Description: Computer Assisted Medical Intervention Tool Kit - data
Package: libcamitk4-doc
Architecture: all
+Multi-Arch: foreign
Section: doc
Depends: ${misc:Depends}
Description: Computer Assisted Medical Intervention Tool Kit - documentation
@@ -166,8 +170,7 @@ Package: libqtpropertybrowser-dev
Architecture: any
Section: libdevel
Depends: libqtpropertybrowser4 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ ${misc:Depends}
Breaks: libqtpropertybrowser3-dev
Replaces: libqtpropertybrowser3-dev
Description: Qt Property Browser Library - development
=====================================
debian/patches/0010-Make-loop-safe-for-removal-of-elements.patch
=====================================
@@ -0,0 +1,33 @@
+From 52f172e553ebddf068b8e35601da5eefd295cf3d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernhardu at mailbox.org>
+Date: Thu, 20 Sep 2018 17:42:14 +0200
+Subject: [PATCH] Make loop safe for removal of elements.
+
+Bug-Debian: https://bugs.debian.org/909120
+Forwarded: no
+Last-Update: 2018-09-20
+
+---
+ modeling/libraries/pml/MultiComponent.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modeling/libraries/pml/MultiComponent.cpp b/modeling/libraries/pml/MultiComponent.cpp
+index 5a3a9ab..3f32d7b 100644
+--- a/modeling/libraries/pml/MultiComponent.cpp
++++ b/modeling/libraries/pml/MultiComponent.cpp
+@@ -46,8 +46,10 @@ MultiComponent::~MultiComponent() {
+
+ // ------------------ deleteAllSubComponents ---------------------
+ void MultiComponent::deleteAllSubComponents() {
+- for (auto& component : components) {
+- delete component;
++ auto component = components.begin();
++ while (component != components.end()) {
++ delete *component;
++ component = components.begin();
+ }
+ components.clear();
+ }
+--
+2.18.0
+
=====================================
debian/patches/0100-vtk7-compatibility.patch
=====================================
@@ -0,0 +1,1151 @@
+From: Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr>
+Date: Mon, 22 Oct 2018 21:01:43 +0200
+Subject: FIXED spelling errors mispells
+
+---
+ .../itkfilters/integration-testdata/output-7.vtk | 51 +++----
+ .../itkfilters/integration-testdata/output-8.vtk | 35 ++---
+ .../integration-testdata/output-1.vtk | 155 +++++++++++----------
+ sdk/actions/mesh/meshprocessing/MeshClipping.cpp | 1 -
+ .../vtkmesh/testdata/brainImageSmooth.vtk | 2 +-
+ .../testdata/check-with-color-pointdata.vtk | 2 +-
+ .../testdata/cube-with-point-and-cell-data.vtk | 8 +-
+ .../vtkmesh/testdata/cube-with-tensors.vtk | 8 +-
+ sdk/components/vtkmesh/testdata/female.vtk | 2 +-
+ sdk/components/vtkmesh/testdata/fieldfile.vtk | 8 +-
+ .../vtkmesh/testdata/imageBoundingBox.vtk | 2 +-
+ sdk/components/vtkmesh/testdata/male.vtk | 2 +-
+ .../vtkmesh/testdata/plate-with-data.vtk | 2 +-
+ .../vtkmesh/testdata/pointcloud-with-data.vtk | 8 +-
+ .../vtkmesh/testdata/polydata-with-data.vtk | 8 +-
+ sdk/components/vtkmesh/testdata/simple.vtk | 2 +-
+ sdk/components/vtkmesh/testdata/sinus_skin.vtk | 2 +-
+ sdk/components/vtkmesh/testdata/sinus_skull.vtk | 2 +-
+ sdk/components/vtkmesh/testdata/structured.vtk | 5 +-
+ .../vtkmesh/testdata/structuredgrid-with-data.vtk | 8 +-
+ sdk/libraries/core/viewer/RendererWidget.cpp | 59 ++++++++
+ sdk/libraries/core/viewer/RendererWidget.h | 25 +++-
+ tutorials/actions/vtkwidget/BoxWidget.cpp | 1 +
+ 23 files changed, 263 insertions(+), 135 deletions(-)
+
+diff --git a/imaging/actions/itkfilters/integration-testdata/output-7.vtk b/imaging/actions/itkfilters/integration-testdata/output-7.vtk
+index 33388713..b63857f9 100644
+--- a/imaging/actions/itkfilters/integration-testdata/output-7.vtk
++++ b/imaging/actions/itkfilters/integration-testdata/output-7.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ output-7.vtk
+ ASCII
+ DATASET POLYDATA
+@@ -888,28 +888,28 @@ NORMALS Normals float
+ -1 0 0 -0.484852 0.484853 -0.727898 -0.484852 0.484853 -0.727899
+ -0.340276 0.437543 -0.832327 -0.887645 0.393036 -0.240017 0 -0.289596 -0.957149
+ 0 -0.881582 -0.472031 0 0.289596 -0.957149 0 -1 0
+-0 0.826309 -0.563217 -0.572444 -0.4733 -0.669548 0.110199 -0.550996 -0.8272
++0 0.826309 -0.563217 -0.572444 -0.4733 -0.669548 0.110199 -0.550996 -0.827199
+ 0.278473 -0.767503 -0.577401 0.287839 0.287838 -0.913399 0.751489 0.389983 -0.532144
+ 0.682484 0.682484 -0.261591 -0.550997 0.110199 -0.827199 -0.332638 -0.522804 -0.784875
+ -0.484853 -0.484852 -0.727898 0.0947286 -0.121894 -0.988012 -0.281092 -0.281091 -0.917592
+ -0.484852 0.484852 -0.727898 -0.889131 0.457653 0 -0.622643 0.622643 -0.473953
+--0.818642 0.536261 -0.205545 -0.622643 0.622643 -0.473953 -0.0807755 0.377185 -0.922609
++-0.818642 0.536261 -0.205545 -0.622643 0.622643 -0.473953 -0.0807755 0.377185 -0.922608
+ -0.707107 0.707107 0 0.343943 -0.224294 -0.911809 0.280642 -0.777139 -0.563289
+ 0.186901 0.286602 -0.939642 0.304346 -0.945392 -0.116654 -0.0745844 0.654807 -0.752107
+-0 -0.881582 -0.472031 -0.0577448 -0.821446 -0.567356 0.205446 -0.928796 -0.308431
++0 -0.881582 -0.472031 -0.0577449 -0.821446 -0.567356 0.205446 -0.928796 -0.308431
+ 0.362652 -9.53464e-08 -0.931925 0.484853 -0.484852 -0.727899 2.49329e-07 -0.554373 -0.832268
+ 0.662578 -1.70725e-07 -0.748993 0.8524 0.204764 -0.48113 -0.327757 0.327757 -0.886088
+ -0.795339 0.376864 -0.474772 -0.202662 0.88591 -0.417242 -1 0 0
+ -0.887646 0.393036 -0.240017 -0.484852 -0.484853 -0.727898 0.0532365 0.648917 -0.758994
+--0.638733 -0.505395 -0.580168 -0.484853 -0.484852 -0.727898 -1 0 0
+--0.682484 0.682484 -0.261591 -0.707107 0.707107 0 -0.889131 0.457652 0
++-0.638733 -0.505395 -0.580168 -0.484853 -0.484853 -0.727898 -1 0 0
++-0.682484 0.682484 -0.261592 -0.707107 0.707107 0 -0.889131 0.457652 0
+ -0.484852 0.484852 -0.727899 -0.484853 0.484852 -0.727898 -0.682485 0.682484 -0.261592
+-0.0561866 0.780221 -0.622975 -0.707107 0.707107 0 0.814735 -0.448028 -0.368074
++0.0561867 0.780221 -0.622975 -0.707107 0.707107 0 0.814735 -0.448028 -0.368074
+ 0.840966 0.160578 -0.516712 0.300083 0.528824 -0.793912 0.830605 -0.329168 -0.44916
+ 0.302554 -0.631524 -0.71389 0.291894 0.458767 -0.839244 0.0947286 -0.121894 -0.988012
+ -0.181714 -0.545144 -0.818412 0.795339 -0.376865 -0.474772 0.204764 -0.8524 -0.48113
+ 0.479082 -0.125036 -0.868819 0.194922 -0.291427 -0.936523 0.0532363 0.648917 -0.758994
+--0.81862 -0.212193 -0.533701 0.110199 -0.550997 -0.827199 2.86601e-07 -2.59305e-07 -1
++-0.81862 -0.212193 -0.5337 0.110199 -0.550997 -0.827199 2.86601e-07 -2.59305e-07 -1
+ 0 -4.0943e-07 -1 -0.122332 0.285205 -0.950628 -0.670354 0.186058 -0.718337
+ -0.780221 -0.0561866 -0.622975 -1 0 0 -0.92388 0.382683 0
+ -0.523795 -0.465072 -0.713686 0 4.0943e-07 -1 -0.853448 4.26772e-07 -0.521178
+@@ -926,24 +926,24 @@ NORMALS Normals float
+ -4.0943e-07 4.0943e-07 -1 -0.821446 0.0577451 -0.567355 0.550996 -0.110199 -0.8272
+ -0.791824 -0.411673 -0.451155 -0.71513 -0.521239 -0.465724 0.110199 0.550997 -0.827199
+ -1 0 0 -0.92388 0.382683 0 -0.763288 -0.5106 -0.395826
+-0.551347 -0.508036 -0.661752 -0.55066 -0.823021 -0.13932 0.538948 -0.538949 -0.647356
++0.551347 -0.508036 -0.661752 -0.55066 -0.823021 -0.13932 0.538948 -0.538948 -0.647356
+ -0.859274 -0.359858 0.363525 -0.682484 -0.682485 0.261591 -0.875521 -0.373345 0.30672
+ -0.682485 0.682484 0.261591 -0.740463 0.606032 0.290584 -0.560598 0.809309 0.175353
+ 0 1 0 -0.538299 0.538299 0.648435 -0.585403 0.659096 0.472118
+ 0 1 0 0 1 0 0 1 0
+-0 1 0 0.528824 0.300083 -0.793912 0.843748 0.305282 -0.441466
++0 1 0 0.528824 0.300083 -0.793911 0.843748 0.305282 -0.441466
+ 0.801975 0.408898 -0.435475 0.849329 0.235395 -0.472472 0.916526 -0.0794443 -0.392007
+ 1 0 0 0.484853 0.484852 -0.727898 0.602611 -0.602611 -0.523183
+-0.814735 -0.448027 -0.368074 -0.492652 -0.460173 -0.738603 -0.296307 -0.374248 -0.878716
++0.814735 -0.448027 -0.368074 -0.492652 -0.460173 -0.738603 -0.296306 -0.374248 -0.878716
+ 0.186542 -0.544642 0.817659 -0.0692445 -0.346221 -0.935594 -0.0174722 0.563046 -0.826241
+-0.0789486 -0.552643 -0.829671 -3.40755e-07 -0.554373 -0.832268 -0.184858 -0.882984 -0.431471
++0.0789486 -0.552643 -0.82967 -3.40755e-07 -0.554373 -0.832268 -0.184858 -0.882984 -0.431471
+ -0.658296 -0.75276 0 -0.658296 -0.75276 0 0.166537 -0.385153 -0.907702
+ 0.458606 0.843355 -0.280059 -0.881582 0 0.472031 -0.777139 0.280642 0.56329
+ -0.889131 -0.457652 0 -0.457652 -0.889131 0 -0.181715 -0.545144 -0.818412
+ -0.92388 -0.382683 0 -0.945391 -0.304347 0.116654 -0.622643 -0.622643 0.473953
+ -0.546652 -0.166319 0.820677 -0.528824 0.300083 0.793912 -0.902236 0.115663 0.415443
+ -0.76705 0.463115 0.444025 -0.463596 0.767504 0.442737 -0.465974 0.703152 0.537071
+--0.0838519 0.800971 0.592802 0.548342 0.548341 0.631382 -0.153382 0.697862 0.699616
++-0.0838519 0.800971 0.592802 0.548342 0.548341 0.631382 -0.153382 0.697863 0.699616
+ 0.551425 0.692515 0.465137 0 1 0 0.382683 0.92388 0
+ 0.382683 0.92388 0 -0.110199 0.550997 0.827199 -0.323883 0.903344 0.281193
+ 0.667463 0.603148 -0.436698 0.769684 0.486426 -0.413493 0.813234 0.581937 0
+@@ -952,9 +952,9 @@ NORMALS Normals float
+ 0.52062 -0.109557 -0.84673 -0.124985 -0.499849 -0.857047 -0.484853 -0.484853 -0.727898
+ -0.550997 -0.110199 -0.827199 -0.0328984 1.00847e-08 -0.999459 0.707107 -0.707107 0
+ 0.484853 -0.484852 -0.727898 0.622643 -0.622643 -0.473953 0.484853 -0.484852 -0.727898
+-0.484852 -0.484852 -0.727898 0.484852 -0.484852 -0.727899 0.185556 -0.780423 -0.597084
++0.484852 -0.484853 -0.727899 0.484852 -0.484852 -0.727899 0.185556 -0.780423 -0.597084
+ -0.554373 0 0.832268 -0.621117 -0.775608 -0.112454 -0.622643 -0.622643 -0.473953
+--0.484853 -0.484853 -0.727898 -0.887645 -0.393036 0.240017 -1 0 0
++-0.484852 -0.484852 -0.727898 -0.887645 -0.393036 0.240017 -1 0 0
+ -0.911969 -0.160088 0.377736 -0.881582 0 0.472031 -0.881582 0 0.472031
+ -0.781729 0.21258 0.586267 -0.301253 0.56875 0.765357 -0.19363 0.570244 0.798329
+ 0.0829073 0.711517 0.69776 0.255335 0.936805 0.239167 0 0.826309 0.563217
+@@ -964,7 +964,7 @@ NORMALS Normals float
+ 1 0 0 0.904255 0.332443 -0.267965 0.682485 -0.682484 -0.261591
+ 0.931286 -0.275082 -0.238825 1 0 0 1 0 0
+ -0.0273849 -0.554165 -0.831956 -0.241419 -0.831352 -0.500571 0.484852 -0.484853 -0.727898
+-0.484853 -0.484852 -0.727898 0.484853 -0.484852 -0.727898 0.484852 -0.484853 0.727898
++0.484853 -0.484852 -0.727898 0.484853 -0.484852 -0.727898 0.484852 -0.484852 0.727898
+ 0.602611 -0.602611 0.523183 0.484852 -0.484852 0.727898 0 -1 0
+ -0.622643 -0.622643 0.473953 -0.64917 -0.64917 0.396431 -0.393036 -0.887646 -0.240017
+ -0.484853 -0.484852 0.727898 -0.831352 -0.241418 0.500571 -0.881582 0 0.472031
+@@ -980,11 +980,11 @@ NORMALS Normals float
+ -0.417868 -0.804485 0.422127 -0.484853 -0.484852 0.727898 -0.513742 -0.565747 0.644981
+ 0 -1 0 -0.484853 -0.484852 0.727898 -0.546652 -0.166319 0.820676
+ -0.554373 0 0.832268 -0.546652 0.166319 0.820677 -0.300083 0.528824 0.793911
+--0.07186 0.482678 0.872845 0.535331 0.669351 0.515161 0.319914 0.73279 0.600561
++-0.07186 0.482678 0.872845 0.535331 0.66935 0.515161 0.319914 0.73279 0.600561
+ 0.0313505 0.567801 0.822569 0 0.554373 0.832268 0 0.554373 0.832268
+ 0.606156 0.606156 0.514927 0.664451 0.66445 0.342069 0.914572 0.288923 0.282987
+ 0.881582 0 0.472031 0.866349 0.0451453 0.497394 0.373345 -0.875521 0.30672
+-0.528824 -0.300083 0.793912 0.554373 0 0.832268 0.777138 -0.280642 0.56329
++0.528824 -0.300083 0.793912 0.554373 0 0.832268 0.777139 -0.280642 0.56329
+ 0.685324 -0.107229 0.720301 0.64917 -0.64917 0.396431 0.528824 -0.300083 0.793911
+ 0.332638 -0.522804 0.784874 0.214485 -0.541471 0.812899 -0.556881 -0.556881 0.616253
+ -0.567534 -0.284691 0.772564 -0.524581 -0.379838 0.76193 -0.482845 -0.521345 0.703605
+@@ -1000,18 +1000,18 @@ NORMALS Normals float
+ 0.343943 0.224294 0.911809 0.512865 0.379661 0.769953 0.512106 0.160404 0.843812
+ 0.244642 0.2224 0.943763 0.568063 0.0107009 0.822915 0.519899 -0.0941328 0.849025
+ 0.487681 0.0491402 0.871638 0.289596 0 0.957149 0.214412 -0.0232693 0.976466
+-0.214412 -0.0232693 0.976466 0.214412 -0.0232693 0.976466 0.214412 -0.0232693 0.976466
+-0.214412 -0.0232693 0.976466 0.214412 -0.0232693 0.976466 0.214412 -0.0232693 0.976466
+-0.214412 -0.0232693 0.976466 0.214412 -0.0232693 0.976466 0.214412 -0.0232693 0.976466
+-0.214412 -0.0232693 0.976466 -0.181715 -0.545143 -0.818412 -1 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 -0.181715 -0.545143 -0.818412 -1 0 0
+ 0.484852 -0.484852 -0.727899 0 1 0 -0.602611 0.602611 -0.523183
+ -1 0 0 0 0.554373 -0.832268 -1 0 0
+ -0.769645 0.482122 -0.418575 0 0.554373 -0.832268 -0.484853 -0.484853 -0.727898
+ -0.707106 0.707107 0 -1 0 0 -0.484853 -0.484852 0.727898
+--1 0 0 -0.484852 0.484853 0.727898 0 -1 0
++-1 0 0 -0.484853 0.484853 0.727898 0 -1 0
+ -0.484853 -0.484853 -0.727898 -0.328866 -0.386604 -0.861618 0.652934 -0.652934 -0.383868
+ 0.610824 -0.438935 -0.658962 -0.396379 -0.396379 0.828111 0.612093 -0.554475 -0.563826
+--0.484853 -0.484852 0.727898 0 1 0 -0.484853 0.484852 0.727898
++-0.484853 -0.484852 0.727898 0 1 0 -0.484853 0.484852 0.727899
+ 0 1 0 1 0 0 0.484853 -0.484852 0.727898
+ 0.717127 -0.490308 -0.495305 -0.0154679 0.554307 -0.832169 0.102213 -0.55147 0.827909
+ -0.331096 -0.486601 0.808452 0.477752 -0.454899 -0.751545 0 1 0
+@@ -1071,3 +1071,6 @@ unknown 1 428 float
+ 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5
+ 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5
+ 127.5 127.5 127.5 127.5 127.5
++METADATA
++INFORMATION 0
++
+diff --git a/imaging/actions/itkfilters/integration-testdata/output-8.vtk b/imaging/actions/itkfilters/integration-testdata/output-8.vtk
+index 08a1465f..eedc3159 100644
+--- a/imaging/actions/itkfilters/integration-testdata/output-8.vtk
++++ b/imaging/actions/itkfilters/integration-testdata/output-8.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ output-8.vtk
+ ASCII
+ DATASET POLYDATA
+@@ -875,19 +875,19 @@ NORMALS Normals float
+ -0.340276 0.437543 -0.832327 -0.887645 0.393036 -0.240017 0.287839 0.287838 -0.913399
+ 0.751489 0.389983 -0.532144 0.682484 0.682484 -0.261591 -0.327757 0.327757 -0.886088
+ -0.795339 0.376864 -0.474772 0.291894 0.458767 -0.839244 0.484852 0.484853 -0.727899
+--0.622643 0.622643 -0.473953 -0.682485 0.682484 -0.261592 -0.0807755 0.377185 -0.922609
++-0.622643 0.622643 -0.473953 -0.682485 0.682484 -0.261592 -0.0807755 0.377185 -0.922608
+ 0.662578 -1.70725e-07 -0.748993 -0.122332 0.285205 -0.950628 -0.670354 0.186058 -0.718337
+-0.484853 0.484852 -0.727898 0.484853 0.484853 -0.727898 0.0561866 0.780221 -0.622975
++0.484853 0.484852 -0.727898 0.484853 0.484853 -0.727898 0.0561867 0.780221 -0.622975
+ 0.110199 0.550997 -0.827199 0 4.0943e-07 -1 -0.246444 -0.773178 -0.584347
+ -0.853448 4.26772e-07 -0.521178 0.479082 -0.125036 -0.868819 -4.0943e-07 4.0943e-07 -1
+-0.0789486 -0.552643 -0.829671 -0.821446 0.0577451 -0.567355 0.550996 -0.110199 -0.8272
+-0.0532365 0.648917 -0.758994 0.110199 -0.550996 -0.8272 -0.0577448 -0.821446 -0.567356
++0.0789486 -0.552643 -0.82967 -0.821446 0.0577451 -0.567355 0.550996 -0.110199 -0.8272
++0.0532365 0.648917 -0.758994 0.110199 -0.550996 -0.827199 -0.0577449 -0.821446 -0.567356
+ -0.572444 -0.4733 -0.669548 0.484853 -0.484852 -0.727899 0.0532363 0.648917 -0.758994
+ -0.550997 -0.1102 -0.827199 -0.354179 -0.638041 -0.683711 -0.550997 0.110199 -0.827199
+ 0 -0.826309 -0.563217 -0.160578 -0.840966 -0.516712 0.278473 -0.767503 -0.577401
+ 0 -0.881582 -0.472031 0.546652 -0.166319 -0.820676 0.302554 -0.631524 -0.71389
+ 0.767503 -0.278473 -0.577401 -0.484852 0.484853 -0.727898 -0.484852 0.484853 -0.727899
+-0.528824 0.300083 -0.793912 0.849329 0.235395 -0.472472 -0.889131 0.457653 0
++0.528824 0.300083 -0.793911 0.849329 0.235395 -0.472472 -0.889131 0.457653 0
+ 0.8524 0.204764 -0.48113 -0.202662 0.88591 -0.417242 -0.780221 -0.0561866 -0.622975
+ 0.843748 0.305282 -0.441466 0.667463 0.603148 -0.436698 -0.707107 0.707107 0
+ -0.707107 0.707107 0 0.110199 -0.550997 -0.827199 2.86601e-07 -2.59305e-07 -1
+@@ -897,7 +897,7 @@ NORMALS Normals float
+ 0.780423 -0.185556 -0.597084 -3.40755e-07 -0.554373 -0.832268 -0.184858 -0.882984 -0.431471
+ -0.791824 -0.411673 -0.451155 0.665197 -0.665198 -0.339153 -0.782825 -0.438996 -0.440985
+ -0.638733 -0.505395 -0.580168 0.362652 -9.53464e-08 -0.931925 0.795339 -0.376865 -0.474772
+--0.81862 -0.212193 -0.533701 0.479656 1.36001e-07 -0.877457 0.602611 -0.602611 -0.523183
++-0.81862 -0.212193 -0.5337 0.479656 1.36001e-07 -0.877457 0.602611 -0.602611 -0.523183
+ 0.814735 -0.448027 -0.368074 -0.332638 -0.522804 -0.784875 -0.484852 -0.484853 -0.727898
+ -0.484853 -0.484852 -0.727898 0.0947286 -0.121894 -0.988012 -0.281092 -0.281091 -0.917592
+ 0.205446 -0.928796 -0.308431 2.49329e-07 -0.554373 -0.832268 -0.181714 -0.545144 -0.818412
+@@ -905,14 +905,14 @@ NORMALS Normals float
+ -1 0 0 1 0 0 -0.484852 0.484852 -0.727898
+ -0.887646 0.393036 -0.240017 0.961113 0.241714 -0.133551 -0.622643 0.622643 -0.473953
+ -0.818642 0.536261 -0.205545 0 -4.0943e-07 -1 0.769684 0.486426 -0.413493
+-0.693325 0.49125 -0.527232 -0.682484 0.682484 -0.261591 -0.622643 0.622643 -0.473953
++0.693325 0.49125 -0.527232 -0.682484 0.682484 -0.261592 -0.622643 0.622643 -0.473953
+ 0.813234 0.581937 0 -0.304347 0.945391 -0.116654 0 1 0
+ 0 1 0 0.382683 0.92388 0 -0.63203 -0.465009 -0.619923
+ -0.55066 -0.823021 -0.13932 -0.763288 -0.5106 -0.395826 0.186542 -0.544642 0.817659
+-0.538948 -0.538949 -0.647356 -0.0328984 1.00847e-08 -0.999459 -0.0273849 -0.554165 -0.831956
++0.538948 -0.538948 -0.647356 -0.0328984 1.00847e-08 -0.999459 -0.0273849 -0.554165 -0.831956
+ -0.550997 -0.110199 -0.827199 0.52062 -0.109557 -0.84673 -0.658296 -0.75276 0
+ -0.71513 -0.521239 -0.465724 0.707107 -0.707107 0 -0.523795 -0.465072 -0.713686
+--0.484852 -0.484852 -0.727899 -0.484853 -0.484852 -0.727898 0.551347 -0.508036 -0.661752
++-0.484852 -0.484852 -0.727899 -0.484853 -0.484853 -0.727898 0.551347 -0.508036 -0.661752
+ -0.0174722 0.563046 -0.826241 0.484853 -0.484852 0.727898 -0.492652 -0.460173 -0.738603
+ -0.497168 -0.469631 -0.729569 -0.482442 -0.462839 -0.74366 0.707107 -0.707107 0
+ 0.92388 -0.382683 0 -1 0 0 0.204764 -0.8524 -0.48113
+@@ -925,7 +925,7 @@ NORMALS Normals float
+ -0.124985 -0.499849 -0.857047 -0.241419 -0.831352 -0.500571 -0.484853 -0.484853 -0.727898
+ 0.166537 -0.385153 -0.907702 0.185556 -0.780423 -0.597084 0.484853 -0.484852 -0.727898
+ -0.457652 -0.889131 0 -0.889131 -0.457652 0 -0.0692445 -0.346221 -0.935594
+--0.181715 -0.545144 -0.818412 -0.296307 -0.374248 -0.878716 -0.658296 -0.75276 0
++-0.181715 -0.545144 -0.818412 -0.296306 -0.374248 -0.878716 -0.658296 -0.75276 0
+ 0.622643 -0.622643 -0.473953 -0.484853 -0.484853 0.727898 -0.859274 -0.359858 0.363525
+ -0.00231351 -0.547339 -0.836907 0.682485 -0.682484 -0.261591 0.931286 -0.275082 -0.238825
+ -0.682484 -0.682485 0.261591 -0.931286 -0.275082 0.238824 1 0 0
+@@ -935,22 +935,22 @@ NORMALS Normals float
+ -0.585403 0.659096 0.472118 -0.110199 0.550997 0.827199 0.548342 0.548341 0.631382
+ 0.0979747 0.85289 0.512815 -0.682485 0.682484 0.261591 0.665197 0.665197 0.339153
+ 0.64917 0.64917 0.396431 -0.538299 0.538299 0.648435 -0.323883 0.903344 0.281193
+-0.359857 0.859274 0.363525 -0.484853 -0.484853 -0.727898 -0.393036 -0.887646 -0.240017
++0.359857 0.859274 0.363525 -0.484852 -0.484852 -0.727898 -0.393036 -0.887646 -0.240017
+ -0.622643 -0.622643 -0.473953 0 -1 0 0 -1 0
+ 0.484853 -0.484852 -0.727898 0.484852 -0.484853 -0.727898 0.484852 -0.484852 -0.727899
+ -0.621117 -0.775608 -0.112454 -0.92388 -0.382683 0 0.484853 -0.484852 -0.727898
+-0.484852 -0.484852 -0.727898 0.484853 -0.484852 -0.727898 -0.945391 -0.304347 0.116654
++0.484852 -0.484853 -0.727899 0.484853 -0.484852 -0.727898 -0.945391 -0.304347 0.116654
+ 1 0 0 -0.622643 -0.622643 0.473953 -0.875521 -0.373345 0.30672
+ 1 0 0 -0.881582 0 0.472031 1 0 0
+ -0.777139 0.280642 0.56329 0.914572 0.288923 0.282987 -0.682485 0.682484 0.261591
+ -0.740463 0.606032 0.290584 0.484853 0.484852 0.727898 0.606156 0.606156 0.514927
+ 0.664451 0.66445 0.342069 -0.560598 0.809309 0.175353 -0.465974 0.703152 0.537071
+ 0.255335 0.936805 0.239167 -0.622643 0.622643 0.473953 0.484852 0.484852 0.727899
+-0.484853 0.484852 0.727899 0.535331 0.669351 0.515161 -0.204765 0.8524 0.48113
++0.484853 0.484852 0.727899 0.535331 0.66935 0.515161 -0.204765 0.8524 0.48113
+ -0.417868 -0.804485 0.422127 -0.64917 -0.64917 0.396431 0 -1 0
+ 0.275082 -0.931285 0.238825 0.484852 -0.484852 0.727898 0.682485 -0.682484 0.261591
+ -0.622643 -0.622643 0.473953 -0.887645 -0.393036 0.240017 0.602611 -0.602611 0.523183
+-0.484852 -0.484853 0.727898 0.700031 -0.539239 0.468164 -1 0 0
++0.484852 -0.484852 0.727898 0.700031 -0.539239 0.468164 -1 0 0
+ 0.484853 -0.484852 0.727898 0.840966 -0.160578 0.516711 -0.546652 -0.166319 0.820677
+ -0.911969 -0.160088 0.377736 0.881582 0 0.472031 -0.554373 0 0.832268
+ -0.881582 0 0.472031 0.866349 0.0451453 0.497394 -0.528824 0.300083 0.793912
+@@ -960,7 +960,7 @@ NORMALS Normals float
+ 0.110199 0.550996 0.8272 0.319914 0.73279 0.600561 -0.484853 -0.484852 0.727898
+ -0.482845 -0.521345 0.703605 -0.185556 -0.780423 0.597084 0.373345 -0.875521 0.30672
+ 0.64917 -0.64917 0.396431 -0.484853 -0.484852 0.727898 -0.560237 -0.482277 0.673456
+--0.513742 -0.565747 0.644981 0.64917 -0.64917 0.396431 0.777138 -0.280642 0.56329
++-0.513742 -0.565747 0.644981 0.64917 -0.64917 0.396431 0.777139 -0.280642 0.56329
+ -0.484853 -0.484852 0.727898 -0.831352 -0.241418 0.500571 0.528824 -0.300083 0.793912
+ 0.685324 -0.107229 0.720301 -0.881582 0 0.472031 0.554373 0 0.832268
+ 0.629605 0.0279137 0.776414 -0.881582 0 0.472031 0.554246 0.0213907 0.832078
+@@ -1026,3 +1026,6 @@ unknown 1 363 float
+ 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5
+ 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5
+ 127.5 127.5 127.5
++METADATA
++INFORMATION 0
++
+diff --git a/sdk/actions/image/reconstruction/integration-testdata/output-1.vtk b/sdk/actions/image/reconstruction/integration-testdata/output-1.vtk
+index eac4008c..a783f942 100644
+--- a/sdk/actions/image/reconstruction/integration-testdata/output-1.vtk
++++ b/sdk/actions/image/reconstruction/integration-testdata/output-1.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ output-1.vtk
+ ASCII
+ DATASET POLYDATA
+@@ -3623,16 +3623,16 @@ NORMALS Normals float
+ -0.367989 0.174302 -0.913347 0.300083 -0.528823 -0.793912 0.0859081 -0.28236 -0.955454
+ 0.0887636 -0.206944 -0.974318 -0.622643 -0.622643 -0.473953 0.202662 -0.885911 -0.417242
+ -0.682484 -0.682485 -0.261591 0.814734 -0.448028 -0.368075 0.951064 -0.171298 -0.257165
+-0.804485 -0.417868 -0.422127 0.224294 -0.343943 -0.911809 -0.567178 -0.335857 -0.752003
++0.804485 -0.417868 -0.422127 0.224294 -0.343943 -0.911809 -0.567178 -0.335857 -0.752004
+ 0.501592 -0.739249 -0.449351 -0.504943 -0.533821 -0.678283 -0.570616 -0.369073 -0.733609
+ -0.682484 -0.682485 -0.261592 -0.786478 -0.504362 -0.35647 -0.777139 -0.280642 -0.56329
+ -0.29304 0.00187612 -0.956098 -0.00187612 0.29304 -0.956098 -0.24621 0.252324 -0.935795
+ -0.528233 0.303453 -0.793023 -0.493333 0.679742 -0.542746 -0.0787405 0.393703 -0.915859
+ 0.162039 -0.547047 -0.821269 0.372534 0.0807597 -0.924498 -0.437543 -0.340276 -0.832327
+--0.346881 0 -0.937909 -0.150485 -0.0767809 -0.985626 -0.458605 -0.843355 -0.280059
++-0.346881 0 -0.937909 -0.150485 -0.0767808 -0.985626 -0.458605 -0.843355 -0.280059
+ -0.110199 -0.550997 -0.827199 -0.51343 -0.792991 -0.327955 0.177885 0.616152 -0.767277
+ 0.330872 -0.173866 -0.927521 0.821446 0.0577451 -0.567355 0.175233 -0.666735 -0.724401
+-0.13497 -0.236088 -0.962313 -0.487964 -0.150704 -0.859755 -0.484595 -0.281462 -0.828219
++0.13497 -0.236088 -0.962313 -0.487965 -0.150704 -0.859755 -0.484595 -0.281462 -0.828219
+ 0.483776 -0.196043 -0.852953 -0.441869 -0.441869 -0.780707 -0.467626 -0.214668 -0.857463
+ -0.486414 -0.317375 -0.814048 -0.524523 -0.184753 -0.831109 -0.622643 -0.622643 -0.473953
+ -0.945391 -0.304347 -0.116654 -0.881582 0 -0.472031 -0.343943 0.224294 -0.911809
+@@ -3649,13 +3649,13 @@ NORMALS Normals float
+ -0.484852 -0.484853 -0.727898 -0.780423 -0.185556 -0.597084 -0.911969 -0.160088 -0.377736
+ -1 0 0 -1 0 0 -0.87552 0.373346 -0.30672
+ -0.382683 0.92388 0 0 1 0 0 1 0
+--0.382683 0.92388 0 -0.707107 0.707107 0 -0.138937 0.96409 -0.226336
++-0.382683 0.92388 0 -0.707107 0.707107 0 -0.138937 0.96409 -0.226335
+ 0.598766 0.697671 -0.393364 0.371204 0.66261 -0.650505 0.13602 0.613637 -0.777784
+ -0.186901 -0.286602 -0.939642 -0.289596 0 -0.957149 0.185556 -0.780423 -0.597084
+ 0 -0.881582 -0.472031 -0.34411 0.218735 -0.913096 0.0014814 0.556423 -0.830898
+ 0.00156211 0.287258 -0.957852 -0.00146332 0.552343 -0.833615 -0.166319 -0.546652 -0.820676
+ -0.265124 -0.635185 -0.725431 0.110199 -0.550996 -0.8272 -0.140908 0.6064 -0.782575
+--0.587321 -0.587321 -0.556874 0.0790116 -0.0465275 -0.995787 0.288753 -0.793294 -0.536009
++-0.58732 -0.587321 -0.556874 0.0790116 -0.0465275 -0.995787 0.288753 -0.793294 -0.536009
+ 0.484852 -0.484852 -0.727899 -0.439678 -0.832222 -0.337772 0 -0.989709 -0.143093
+ -0.762789 -0.603813 -0.231437 -0.484853 -0.484853 -0.727898 -0.804485 -0.417868 -0.422127
+ -1 0 0 -0.916526 -0.0794443 -0.392007 -0.923879 0.382684 0
+@@ -3665,7 +3665,7 @@ NORMALS Normals float
+ 0.101743 0.913486 -0.393944 0.0782382 0.583918 -0.808033 0.149362 0.652873 -0.742595
+ 0.166319 0.546652 -0.820677 0.259944 -0.359016 -0.896402 0 0 -1
+ 0.484853 -0.484852 -0.727898 0.328143 -0.659908 -0.675902 0.0522361 -0.575563 -0.816087
+-0.165486 0.550681 -0.818147 0.185803 0.282045 -0.941238 0.3028 0.523628 -0.79632
++0.165486 0.550681 -0.818147 0.185803 0.282045 -0.941237 0.3028 0.523628 -0.79632
+ 0.0361855 -0.55401 -0.831723 -0.181714 -0.545144 -0.818412 -0.159989 -0.136814 -0.977592
+ -0.853447 0 -0.521179 0.309662 0.131786 -0.94167 0.29904 0.459336 -0.836413
+ -0.31956 -0.87444 -0.365016 -0.35307 -0.813493 -0.462137 -0.250404 -0.536712 -0.805753
+@@ -3685,7 +3685,7 @@ NORMALS Normals float
+ 0.106818 -0.875758 -0.470784 -0.373345 -0.875521 -0.30672 0.300083 -0.528824 -0.793911
+ 0.280642 -0.777139 -0.56329 0.381605 -0.78335 -0.490654 0.682485 -0.682484 -0.261591
+ 0.622643 -0.622643 -0.473953 0.326732 -0.384614 -0.863318 0.484853 -0.484852 -0.727898
+-0.484852 -0.484852 -0.727899 0.0561862 -0.780222 -0.622975 -0.682484 -0.682485 -0.261591
++0.484852 -0.484852 -0.727899 0.0561862 -0.780221 -0.622975 -0.682484 -0.682485 -0.261591
+ -0.604864 -0.753249 -0.258371 -0.706987 -0.706988 -0.0183603 -0.204764 -0.8524 -0.48113
+ -0.649169 -0.64917 -0.396431 -0.484852 -0.484852 -0.727899 -0.522804 -0.332638 -0.784874
+ -0.536712 -0.250404 -0.805753 -0.484853 -0.484852 -0.727899 -0.541471 -0.214485 -0.812899
+@@ -3694,13 +3694,13 @@ NORMALS Normals float
+ 0 0.826309 -0.563217 0 0.881582 -0.472031 -0.373345 0.875521 -0.30672
+ -0.682485 0.682484 -0.261591 -0.505322 0.719249 -0.476793 -0.371168 0.696437 -0.614174
+ 0.484853 0.484852 0.727898 -0.00619569 0.517815 -0.85547 0.602611 0.602611 -0.523182
+-0.166319 0.546652 0.820677 0.707106 0.707107 0 0.300083 0.528824 0.793912
++0.166319 0.546652 0.820677 0.707106 0.707107 0 0.300083 0.528824 0.793911
+ 0.0794444 0.916526 0.392007 0.457651 0.889132 0 0.707106 0.707107 0
+ 0.528824 -0.300083 -0.793912 0.602611 -0.602611 -0.523183 0.74751 -0.350528 -0.564234
+-0.891404 -0.447672 -0.0706289 0.707058 -0.707057 -0.0118385 0.665198 0.665197 -0.339153
++0.891404 -0.447672 -0.0706289 0.707057 -0.707057 -0.0118385 0.665198 0.665197 -0.339153
+ 0.546652 -0.166319 -0.820676 0.536712 0.250403 -0.805753 0.482122 -0.769645 -0.418575
+ -0.275082 -0.931286 -0.238825 0.304346 -0.945392 -0.116654 0.682484 -0.682485 -0.261591
+-0.622644 -0.622642 -0.473953 0.661782 -0.643002 -0.385479 0.832221 -0.439679 -0.337772
++0.622644 -0.622643 -0.473953 0.661782 -0.643002 -0.385479 0.832221 -0.439679 -0.337772
+ 0.484852 -0.484852 -0.727899 0.484852 -0.484852 -0.727899 -0.110199 -0.550997 -0.827199
+ -0.407824 -0.881309 -0.23869 -0.475526 -0.879622 0.0117862 -0.695343 -0.718613 -0.00965372
+ -0.374906 -0.92701 -0.00990316 -0.622643 -0.622643 -0.473953 -0.682484 -0.682484 -0.261591
+@@ -3713,14 +3713,14 @@ NORMALS Normals float
+ 0.56687 0.668837 -0.480952 0.247615 0.860493 -0.445241 0.706988 0.706988 -0.0183604
+ 0.707107 0.707106 0 0.311851 0.844976 -0.43447 0.275082 0.931286 -0.238824
+ 0.682484 0.682485 -0.261591 0.707107 0.707106 0 0.814735 -0.448027 -0.368074
+-0.865367 -0.192593 -0.462653 0.764543 -0.292542 -0.574364 0.686357 -0.672477 -0.276926
++0.865367 -0.192593 -0.462653 0.764542 -0.292542 -0.574364 0.686357 -0.672477 -0.276926
+ 0.925938 -0.377622 -0.00639278 0.849329 0.235395 -0.472472 0.92388 0.382683 0
+ 0.458606 -0.843355 -0.280058 0.417868 -0.804485 -0.422127 0.181715 -0.545143 -0.818412
+ 0 -1 0 0 -1 0 0.622643 -0.622643 -0.473953
+-0.484853 -0.484852 -0.727898 0.484852 -0.484852 -0.727899 0.711696 -0.500348 -0.493092
++0.484853 -0.484852 -0.727898 0.484852 -0.484852 -0.727899 0.711697 -0.500348 -0.493092
+ 0.635453 -0.550745 -0.541184 0.685242 -0.633146 -0.359958 0 -1 0
+ -0.382683 -0.92388 0 -0.707107 -0.707107 0 -0.390681 -0.920217 0.0238713
+--0.701015 -0.712632 0.0270833 -0.36729 -0.930059 0.00937303 -0.707107 -0.707107 0
++-0.701015 -0.712632 0.0270832 -0.36729 -0.930059 0.00937303 -0.707107 -0.707107 0
+ -0.923879 -0.382684 0 -0.682485 -0.682484 -0.261591 -0.92388 -0.382683 0
+ -0.777139 -0.280642 -0.56329 -0.881582 0 -0.472031 -0.911969 -0.160088 -0.377736
+ -0.274338 0.274338 -0.921671 -1 0 0 -0.916526 0.0794444 -0.392007
+@@ -3747,12 +3747,12 @@ NORMALS Normals float
+ 0.0194444 0.482162 -0.875867 -0.622642 0.622644 -0.473953 -0.304347 0.945391 -0.116654
+ 0.286969 0.95794 0 -0.00720706 0.745035 -0.666986 -0.184982 0.231053 -0.955194
+ 0.181028 0.284146 -0.941536 8.52939e-07 0.312772 -0.949828 -0.176043 0.949634 -0.259238
+--0.519876 0.337507 -0.784741 0.881582 0 -0.472032 -0.139194 0.356874 -0.923724
++-0.519876 0.337506 -0.784741 0.881582 0 -0.472032 -0.139194 0.356874 -0.923724
+ 0.442128 0.0164632 -0.896801 0.0223352 0.0223352 -0.999501 -0.271891 0.412737 -0.869324
+ -0.427866 0.483691 -0.763528 0.554373 0 -0.832268 0.7683 -0.331861 -0.547342
+ 0.72721 -0.2062 -0.654712 0.359857 -0.859274 0.363525 0.457652 -0.889131 0
+ 0.682484 -0.682485 0.261591 -0.202662 -0.885911 0.417242 0.382683 -0.92388 0
+--0.682484 -0.682485 0.261592 -0.402595 -0.797856 0.448713 0.382657 -0.923299 0.0330501
++-0.682484 -0.682485 0.261592 -0.402595 -0.797856 0.448712 0.382657 -0.923299 0.0330501
+ 0.682484 -0.682485 0.261591 0.923524 -0.351651 -0.153116 0.910023 -0.407775 -0.0746804
+ 0.707107 -0.707107 0 0.707107 -0.707107 0 -0.382683 -0.92388 0
+ -0.707107 -0.707107 0 -0.275082 -0.931286 0.238825 -0.682484 -0.682485 0.261591
+@@ -3764,7 +3764,7 @@ NORMALS Normals float
+ -0.631524 0.302554 -0.71389 -0.509134 -0.19889 -0.837392 -0.527532 0.201737 -0.825235
+ -0.183732 -0.338082 -0.923008 0.338414 -0.284367 -0.897001 0.599156 -0.301518 -0.741686
+ 0.494038 -0.465553 -0.734293 0.483024 -0.172212 -0.858505 0.756364 0.248051 -0.605297
+-0.181715 0.545143 -0.818412 0 1 0 -0.533658 0.176048 -0.827174
++0.181715 0.545143 -0.818412 0 1 0 -0.533658 0.176047 -0.827174
+ -0.0840469 -0.245254 -0.965809 -0.417027 -0.234495 -0.878124 0.148219 -0.232954 -0.961126
+ -0.682485 0.682484 -0.261591 -0.382658 0.923299 -0.0330502 -0.713441 0.0284839 -0.700136
+ -0.622642 0.622644 -0.473953 0.546652 -0.166319 -0.820677 -0.142304 0.220224 -0.965013
+@@ -3776,7 +3776,7 @@ NORMALS Normals float
+ 0.698715 -0.714436 0.0371411 0.804484 -0.417868 -0.422127 0.682484 -0.682484 -0.261592
+ 0.775608 -0.621117 -0.112454 0.707107 -0.707107 0 0.707107 -0.707107 0
+ -0.417868 -0.804485 0.422126 -0.682485 -0.682484 0.261591 0 -1 0
+--0.405927 -0.506645 0.760614 -0.244239 -0.870851 0.426573 -0.354531 -0.75144 0.556458
++-0.405927 -0.506645 0.760614 -0.244239 -0.870852 0.426573 -0.354531 -0.75144 0.556458
+ -0.603813 -0.762789 0.231437 -0.923879 -0.382684 0 -0.707107 -0.707107 0
+ -0.92388 -0.382683 0 -0.92388 -0.382683 0 -0.484853 -0.484853 -0.727898
+ -1 0 0 -0.911969 -0.160088 0.377736 -0.546652 -0.166319 -0.820676
+@@ -3793,7 +3793,7 @@ NORMALS Normals float
+ -0.682484 0.682485 -0.261591 -0.385747 0.853787 -0.349639 -0.756177 0.0619156 -0.651432
+ -0.976305 0.185404 -0.111594 -0.923577 0.358015 -0.137224 0.814735 -0.448027 -0.368074
+ 0.272039 0.429361 -0.861188 0.484852 -0.484853 -0.727898 0.479544 -0.436889 -0.761029
+-1 0 0 0.701362 -0.283158 -0.65415 0.827648 0.102715 -0.551768
++1 0 0 0.701362 -0.283158 -0.65415 0.827649 0.102715 -0.551768
+ 0.265236 0.534517 -0.80246 0.931286 -0.275082 -0.238825 0.290113 -0.949118 0.122517
+ 0.382683 -0.92388 0 0.658431 -0.726383 0.19707 0.382683 -0.92388 0
+ -0.304113 -0.827517 0.471944 0.173355 -0.673208 0.718845 -0.105866 -0.582425 0.805961
+@@ -3801,7 +3801,7 @@ NORMALS Normals float
+ 0.707107 -0.707107 0 0.707107 -0.707107 0 0.707107 -0.707107 0
+ 0.707107 -0.707107 0 -0.484853 -0.484853 0.727898 -0.484853 -0.484853 0.727898
+ -0.484853 -0.484852 0.727898 0 -1 0 -0.368363 -0.538832 0.757607
+--2.79937e-06 -0.717019 0.697053 0.159284 -0.889651 0.427961 -0.382683 -0.92388 0
++-2.79937e-06 -0.717019 0.697053 0.159284 -0.88965 0.427961 -0.382683 -0.92388 0
+ -0.923879 -0.382684 0 -0.484853 -0.484852 0.727898 -0.707107 -0.707107 0
+ -0.92388 -0.382683 0 -0.92388 -0.382683 0 -0.546652 -0.166319 0.820676
+ -1 0 0 -1 0 0 -1 0 0
+@@ -3814,7 +3814,7 @@ NORMALS Normals float
+ 0.824088 0.202393 -0.529071 0.693145 0.664953 -0.278188 0.247604 0.784332 -0.568784
+ -0.239201 -0.399063 -0.885173 0.344151 0.0609309 -0.936935 -0.410567 -0.101188 -0.906198
+ 0.475087 0.484414 -0.734599 0.469888 0.493677 -0.731771 0.48881 0.472844 -0.733133
+-0.476259 0.483281 -0.734586 -0.749889 0.305598 -0.586751 -0.528824 0.300083 -0.793912
++0.476259 0.483281 -0.734586 -0.749889 0.305598 -0.586751 -0.528824 0.300084 -0.793912
+ -0.639187 0.0731501 -0.765565 -0.849328 0.235396 -0.472473 -0.248614 0.358253 -0.899914
+ -0.222782 0.569743 -0.791051 -0.402033 0.00337235 -0.915619 -0.484853 -0.484853 -0.727898
+ -0.927069 0.146808 0.344951 0.865179 0.273313 -0.420435 0.496923 0.46793 -0.730828
+@@ -3828,7 +3828,7 @@ NORMALS Normals float
+ 0.0773393 -0.991571 0.103948 0.110199 -0.550997 0.827199 0.484853 -0.484853 0.727898
+ 0.181715 -0.545143 -0.818412 -0.417868 -0.804485 0.422126 -0.887645 -0.393036 0.240017
+ 0 -1 0 -0.458606 -0.843355 0.280059 -0.707107 -0.707107 0
+--0.92388 -0.382683 0 -0.923577 -0.358014 0.137224 -1 0 0
++-0.92388 -0.382683 0 -0.923578 -0.358014 0.137224 -1 0 0
+ -1 0 0 -0.945391 0.304347 0.116654 -1 0 0
+ -1 0 0 -0.622643 0.622643 0.473953 -0.546652 0.166319 0.820676
+ -0.484852 0.484852 -0.727899 -0.528824 0.300083 0.793912 -0.889131 0.457653 0
+@@ -3862,12 +3862,12 @@ NORMALS Normals float
+ -0.804485 0.417868 0.422126 -0.448027 0.814735 0.368074 -0.33484 0.815605 -0.471879
+ -0.484852 0.484852 -0.727899 -0.682485 0.682484 -0.261592 -0.0947379 0.870609 -0.482768
+ 0.180578 0.551848 -0.814159 0.185556 0.780422 -0.597085 0.622643 0.622643 0.473953
+-0.682484 0.682484 -0.261591 0.280642 0.777139 -0.56329 0.33603 0.64889 -0.682661
++0.682484 0.682484 -0.261592 0.280642 0.777139 -0.56329 0.33603 0.64889 -0.682661
+ 0.531899 -0.0881369 -0.842209 0.0190942 -0.0286468 -0.999407 0.199014 0.067662 -0.977658
+ 0.616097 0.375401 -0.692459 0.484853 0.484853 -0.727898 0.484853 0.484853 -0.727898
+ 0.484852 0.484853 -0.727898 0.602611 0.602611 -0.523183 0.665197 0.665198 -0.339153
+ 0.679742 0.493333 -0.542746 0.484852 0.484852 -0.727899 0.484852 0.484852 -0.727899
+-0.484852 0.484853 -0.727899 -0.286531 0.633995 -0.718297 -0.162713 0.287291 -0.943922
++0.484852 0.484853 -0.727899 -0.286531 0.633995 -0.718297 -0.162713 0.287292 -0.943922
+ 0.0786644 0.216594 -0.973087 -0.389983 0.751489 -0.532144 -0.0807762 0.377185 -0.922608
+ 0.777138 0.280642 -0.56329 -0.682485 0.682484 -0.261591 -0.707107 0.707106 0
+ -0.622643 0.622643 0.473953 0 0.826309 -0.563217 -0.484852 0.484853 0.727898
+@@ -3881,7 +3881,7 @@ NORMALS Normals float
+ -0.295938 -0.783871 0.545864 0 -1 0 0.241418 -0.831352 0.500571
+ -0.484852 -0.484852 0.727898 -0.484852 -0.484853 0.727899 -0.627409 -0.495148 0.600987
+ -0.6628 -0.6406 0.387721 -0.622643 -0.622643 0.473953 -0.536261 -0.818642 0.205545
+--0.484853 -0.484852 0.727898 -0.654745 -0.53175 0.537169 -0.484853 -0.484852 0.727898
++-0.484852 -0.484852 0.727898 -0.654745 -0.53175 0.537169 -0.484853 -0.484852 0.727898
+ -0.931286 -0.275082 0.238824 -0.682484 -0.682484 0.261591 -0.92412 0.149707 0.351552
+ -0.92388 0.382683 0 -0.707107 0.707107 0 -0.92388 0.382683 0
+ -0.899975 0 0.435941 -0.9287 -0.0743083 0.36331 -0.945392 0.304346 0.116654
+@@ -3905,10 +3905,10 @@ NORMALS Normals float
+ -0.300083 -0.528823 0.793912 0.166319 -0.546652 0.820677 0.547477 -0.547478 0.63288
+ 0.561879 -0.561878 0.607113 -0.300083 -0.528823 0.793912 0.166319 -0.546652 0.820677
+ 0.484853 -0.484852 0.727898 0.484852 -0.484852 0.727899 -0.484853 -0.484852 0.727898
+--0.767504 -0.463596 0.442737 -0.661856 -0.375205 0.648975 -0.636213 -0.573425 0.516156
++-0.767504 -0.463596 0.442737 -0.661856 -0.375205 0.648975 -0.636213 -0.573424 0.516156
+ -0.69862 -0.655367 0.287096 -0.417868 -0.804485 0.422127 -0.0794443 -0.916526 0.392007
+ -0.622643 -0.622643 0.473953 -0.484853 -0.484853 0.727898 -0.797858 -0.293994 0.526299
+--0.610169 -0.652773 0.448979 -0.854545 -0.218988 0.470953 -0.50597 0.455659 0.732372
++-0.610169 -0.652772 0.448978 -0.854545 -0.218988 0.470953 -0.50597 0.455659 0.732372
+ -0.579877 0.162516 0.79833 -0.889131 0.457652 0 -0.707107 0.707107 0
+ -0.92388 0.382683 0 -0.587624 0 0.809134 -0.568275 -0.290797 0.769741
+ -0.796731 -0.0331694 0.603423 -0.931286 0.275082 -0.238825 -0.682485 0.682484 -0.261591
+@@ -3918,12 +3918,12 @@ NORMALS Normals float
+ 0.353071 0.813493 0.462137 0.843355 0.458606 0.280058 1 0 0
+ 0.484852 0.484853 0.727898 0.804485 0.417867 0.422126 0.484852 0.484852 0.727899
+ 0.931285 0.275083 0.238825 0.484852 0.484853 -0.727898 0.302554 0.631524 -0.71389
+--0.586731 0.481031 -0.651425 0.0561863 0.780222 -0.622974 -0.0124383 0.627566 -0.778464
++-0.586731 0.481032 -0.651425 0.0561863 0.780222 -0.622974 -0.0124383 0.627566 -0.778464
+ 0.0949195 0.400337 -0.911439 -0.37392 0.524691 -0.764777 0.278473 0.767503 -0.577401
+ 0.484853 0.484853 -0.727898 0.431641 0.431642 0.792068 0.950804 0 0.309792
+ 0.923879 -0.382684 0 1 0 0 1 0 0
+ 1 0 0 0.707107 -0.707107 0 0.92388 -0.382683 0
+-0.622644 -0.622642 0.473953 0.804485 -0.417868 0.422127 0.484852 -0.484853 0.727899
++0.622644 -0.622643 0.473953 0.804485 -0.417868 0.422127 0.484852 -0.484853 0.727899
+ 0.843355 -0.458606 0.280059 0.859274 -0.359857 0.363525 0.484853 -0.484852 0.727899
+ 0 -1 0 0.484853 -0.484853 0.727898 0.187866 -0.876475 0.44328
+ 0.0932064 -0.883058 0.459914 -0.13613 -0.728195 0.671715 0.187866 -0.876475 0.44328
+@@ -3954,7 +3954,7 @@ NORMALS Normals float
+ -0.621347 -0.335741 0.707959 -0.353437 -0.703646 0.616413 -0.375772 -0.473851 0.796405
+ -0.28097 -0.773749 0.567775 -0.931286 0.275082 0.238825 -0.998461 0 0.0554525
+ -0.818811 -0.0952868 0.5661 -1 0 0 -0.622643 0.622643 -0.473953
+--0.923879 0.382684 0 -0.707107 0.707107 0 -0.923578 0.358014 -0.137224
++-0.923879 0.382684 0 -0.707107 0.707107 0 -0.923577 0.358014 -0.137224
+ -0.484852 0.484853 -0.727898 -0.887645 0.393036 -0.240017 -0.455443 0.493539 -0.740939
+ -0.484852 0.484853 -0.727898 -0.444562 0.503946 -0.740543 -0.2615 0.764448 -0.589268
+ 0.92388 0.382683 0 1 0 0 0.859274 0.359857 -0.363525
+@@ -3962,14 +3962,14 @@ NORMALS Normals float
+ 0.923879 0.382684 0 0.300083 0.528824 -0.793911 0.166319 0.546652 -0.820676
+ 0.446684 0.497131 -0.743865 -0.119851 0.832284 -0.541238 0.281438 0.721814 -0.63228
+ 0.45044 0.481049 -0.752128 0.484852 0.484852 -0.727899 0.185556 0.780422 -0.597085
+-0.13613 0.728195 -0.671715 -0.484852 0.484853 -0.727899 -0.484853 0.484852 -0.727899
++0.13613 0.728195 -0.671715 -0.484852 0.484853 -0.727899 -0.484852 0.484852 -0.727899
+ -0.288613 0.731254 -0.618037 0.484852 0.484853 -0.727898 0.682484 0.682485 -0.261591
+ 0.923879 0.382684 0 0.448027 0.814735 -0.368074 0.92388 0.382683 0
+ 0.859274 -0.359858 0.363525 1 0 0 0.484852 -0.484852 0.727899
+ 0.484853 -0.484852 0.727898 0.456237 -0.481744 0.748178 0.486595 -0.450208 0.748691
+ 0.85043 -0.340657 0.400901 0.493539 -0.455443 0.74094 0.476758 -0.558466 0.678836
+ 0.495627 -0.448005 0.744073 0.495477 -0.470492 0.730164 0.250404 -0.536712 0.805754
+--0.300084 -0.528824 0.793911 0.110199 -0.550996 0.8272 -0.55956 -0.475396 0.67889
++-0.300084 -0.528824 0.793911 0.110199 -0.550997 0.8272 -0.55956 -0.475396 0.67889
+ 0.0652477 -0.568172 0.820319 0.484852 -0.484853 0.727899 -0.405927 -0.506644 0.760615
+ -0.42561 -0.308161 0.850819 -0.484852 -0.484853 0.727898 -0.464852 -0.483491 0.74172
+ -0.478804 -0.462827 0.746015 0.181714 -0.545144 0.818412 -1 0 0
+@@ -3989,8 +3989,8 @@ NORMALS Normals float
+ -0.289122 0.575911 -0.76468 0.707106 0.707107 0 0.945391 0.304347 0.116654
+ 0.914859 0.400343 0.0525288 0.484852 -0.484853 0.727899 0.99629 0 0.0860606
+ 0.484852 -0.484853 0.727898 0.484853 -0.484852 0.727898 0.446683 -0.497131 0.743865
+-0.500448 -0.526765 0.687074 0.504071 -0.498799 0.705062 0.564824 -0.451807 0.690539
+-0.805142 -0.190301 0.561722 0.574186 -0.518596 0.633537 0.539375 -0.593843 0.597014
++0.500448 -0.526765 0.687074 0.504071 -0.498799 0.705062 0.564824 -0.451808 0.690539
++0.805142 -0.190301 0.561722 0.574186 -0.518596 0.633537 0.539375 -0.593842 0.597014
+ 0.452289 -0.574657 0.682059 0.300083 -0.528824 0.793911 -0.166319 -0.546652 0.820676
+ -0.353071 -0.813492 0.462138 -0.0354404 -0.331168 0.942906 0.0934367 -0.820585 0.563835
+ 0.169061 -0.377291 0.910533 0.495077 -0.511785 0.702122 0.458169 -0.484154 0.745437
+@@ -4005,11 +4005,11 @@ NORMALS Normals float
+ -0.484852 0.484853 0.727898 -0.62565 0.625649 -0.465968 -0.602611 0.60261 0.523183
+ -0.665197 0.665198 0.339153 0.707107 0.707107 0 0.945392 0.304346 0.116654
+ 1 0 0 0.843355 0.458606 0.280058 0.484852 -0.484852 0.727899
+-0.550996 0.1102 0.8272 0.550996 0.1102 0.8272 0.484852 -0.484852 0.727899
++0.550996 0.1102 0.8272 0.550996 0.1102 0.827199 0.484852 -0.484852 0.727899
+ 0.852399 0.204765 0.481131 -0.275774 0.886801 -0.370854 -0.323882 0.903344 -0.281192
+ -0.300083 0.528824 -0.793911 0.166319 0.546652 -0.820677 0.484853 0.484852 -0.727898
+ 0.484853 0.484853 -0.727898 0.0794443 0.916526 -0.392007 0.448026 0.814735 -0.368074
+-0.682484 0.682484 0.261592 0.606032 0.740463 0.290584 -0.375037 0.697365 -0.610762
++0.682484 0.682484 0.261592 0.606032 0.740463 0.290584 -0.375037 0.697364 -0.610762
+ 0.622642 0.622644 0.473953 0.484851 0.484853 0.727899 0.902352 0.117712 0.414615
+ 0.767504 0.463596 0.442737 0.870055 -0.221356 0.440462 0.550997 -0.110199 0.827199
+ 0.545144 0.181715 0.818412 0.527029 -0.527029 0.666694 0.597283 -0.274723 0.753512
+@@ -4025,7 +4025,7 @@ NORMALS Normals float
+ -0.64917 0.649169 0.396431 -0.344057 0.839536 -0.420482 -0.484852 0.484852 0.727898
+ -0.682484 0.682484 0.261592 -0.64917 0.64917 0.396431 -0.622643 0.622643 0.473953
+ 0.622643 0.622643 0.473953 0.545144 0.181715 0.818412 0.881582 0 0.472031
+-0.767503 0.278472 0.577401 0.484853 0.484853 0.727898 0.484852 0.484853 0.727898
++0.767503 0.278472 0.577401 0.484852 0.484853 0.727898 0.484852 0.484853 0.727898
+ 0.550997 -0.110199 0.827199 0.550997 -0.110199 0.827199 -0.0773392 0.991571 -0.103948
+ -0.304346 0.945392 0.116654 -0.682484 0.682484 -0.261591 -0.280643 0.777138 -0.56329
+ 0.464166 0.877695 0.119165 0.504529 0.512953 0.6945 0.296022 0.835949 0.462126
+@@ -4042,7 +4042,7 @@ NORMALS Normals float
+ -0.286603 -0.186901 0.939642 0.165862 -0.374397 0.912314 -0.880052 -0.0558056 0.471587
+ -0.780423 0.185556 0.597084 -0.780423 0.185556 0.597084 -0.484852 0.484853 0.727898
+ -0.458767 0.291893 0.839244 -0.484852 0.484853 0.727898 -0.484852 0.484852 0.727899
+--0.484853 0.484852 0.727898 -0.484853 0.484853 0.727898 -0.275082 0.931286 0.238825
++-0.484853 0.484853 0.727898 -0.484853 0.484853 0.727898 -0.275082 0.931286 0.238825
+ -0.622643 0.622643 0.473953 -0.458605 0.843355 0.280058 -0.484852 0.484853 0.727898
+ -0.494375 0.652252 0.574596 -0.674942 0.535448 0.50769 0.592572 0.111374 0.797781
+ 0.554373 0 0.832268 0.546652 0.166319 0.820677 0 1 0
+@@ -4057,7 +4057,7 @@ NORMALS Normals float
+ 0.826309 0 0.563216 0.670542 0.0250569 0.741448 0.227006 -0.311235 0.922822
+ 0.043172 -0.520393 0.852835 -0.483384 -0.490222 0.725274 0.00902792 -0.600557 0.799531
+ -0.373372 -0.502069 0.780077 0.212383 -0.559725 0.801 0.514846 -0.116134 0.84938
+--0.57467 -0.199456 0.793708 -0.5707 -0.0129794 0.821056 -0.318003 -0.148365 0.936409
++-0.57467 -0.199456 0.793707 -0.5707 -0.0129794 0.821056 -0.318003 -0.148365 0.936409
+ -0.237797 -0.153219 0.959154 0.488726 -0.493703 0.719308 -0.105356 -0.57058 0.814456
+ -0.0115304 -0.0115304 0.999867 -0.10996 -0.254964 0.960678 -0.554186 -0.0259398 0.831988
+ -0.536711 0.250404 0.805753 -0.359016 0.259944 0.896402 -0.484853 0.484852 0.727899
+@@ -4075,22 +4075,22 @@ NORMALS Normals float
+ 0.52987 -0.179481 0.828869 0.383161 -0.520856 0.762821 0.0667324 -0.437549 0.896715
+ -0.0050179 -0.514593 0.85742 -0.507879 -0.348308 0.787871 0.0533421 -0.528641 0.847168
+ 0.0151719 -0.310682 0.950393 0.59298 -0.17762 0.785383 0.508392 0.0238028 0.860797
+-0.602675 -0.0248715 0.797599 -0.289597 0 0.957149 -0.0172936 0 0.99985
++0.602676 -0.0248715 0.797599 -0.289597 0 0.957149 -0.0172936 0 0.99985
+ -0.24675 -0.0702522 0.966529 -0.164977 -0.238136 0.957117 -0.192585 -0.292009 0.936825
+ -0.528549 -0.161663 0.833367 -0.484853 0.484852 0.727899 -0.515485 0.431695 0.740212
+ -0.359016 0.259944 0.896402 -0.647582 0.307602 0.69715 -0.538215 0.406084 0.738526
+-0.235395 0.849329 0.472471 -0.166319 0.546652 0.820677 -0.215439 0.431916 0.875805
++0.235395 0.849329 0.472471 -0.166319 0.546651 0.820677 -0.215439 0.431916 0.875805
+ 0.0745844 0.654807 0.752107 0 0.409027 0.912522 -0.564605 0.28307 0.775301
+ -0.377154 0.130521 0.916907 0.682485 0.682485 0.261591 0.202661 0.88591 0.417243
+ -0.682485 0.682484 0.261591 -0.204765 0.8524 0.481129 0.484853 0.484853 0.727898
+ 0.60248 0.60248 0.523485 0.459392 0.57763 0.674761 0.534436 0.662549 0.524793
+ 0.300083 0.528824 0.793912 0.767503 0.278473 0.577401 0.546652 0.166318 0.820677
+ 0.484853 0.484852 0.727899 0.484853 -0.484852 0.727898 0.465676 -0.0774898 0.881556
+-0.651016 0.150768 0.743941 0.523561 -0.0389634 0.851097 0.523466 -0.329236 0.785867
++0.651016 0.150767 0.743941 0.523561 -0.0389634 0.851097 0.523466 -0.329236 0.785867
+ 0.241675 -0.324813 0.914379 -0.0994606 -0.284415 0.953528 0.484853 -0.484853 0.727898
+-0.346882 0 0.937909 0.586841 -0.0118739 0.809615 0.521983 -0.170419 0.835757
++0.346882 0 0.937909 0.586841 -0.0118739 0.809616 0.521983 -0.170419 0.835757
+ -0.289596 0 0.957149 -0.538313 -0.285292 0.792986 -0.554374 0 0.832268
+--0.175112 -0.527312 0.831431 -0.288811 -0.509304 0.810677 -0.217334 -0.139068 0.96614
++-0.175112 -0.527312 0.831431 -0.288811 -0.509304 0.810677 -0.217335 -0.139068 0.96614
+ -0.439524 0.225962 0.869345 -0.401619 0.448468 0.798485 -0.2774 0.495509 0.823116
+ -0.530278 0.172189 0.830154 0.300084 0.528824 0.793911 0.602611 0.602611 0.523183
+ 0 0.826309 0.563216 -0.0462639 0.513841 0.856637 -0.255402 0.410036 0.87558
+@@ -4115,32 +4115,32 @@ NORMALS Normals float
+ 0.301912 0.233102 0.924399 0.289597 0 0.957149 0.133172 0.279477 0.950872
+ 0.546652 0.166318 0.820676 -0.0942084 0.559569 0.823412 0.343943 0.224294 0.911809
+ 0.528824 0.300083 0.793911 0.414899 0.193572 0.889038 0.34688 0 0.937909
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.554374 0 0.832268
+-0.554374 0 0.832268 0.554374 0 0.832268 0.501065 -0.427871 -0.752237
++0.554374 0 0.832268 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0 0 0
++0 0 0 0 0 0 0.501065 -0.427871 -0.752237
+ 0.484852 -0.484853 -0.727898 0 -0.554373 -0.832268 -0.481604 0.470857 -0.739156
+ -0.484852 -0.484852 -0.727899 -0.707106 0.707107 0 -0.181714 -0.545144 -0.818412
+ 0 -1 0 0.484853 0.484852 0.727899 0.332638 0.522803 0.784875
+@@ -4165,10 +4165,10 @@ NORMALS Normals float
+ 0 -1 0 -1 0 0 0.484853 0.484852 0.727899
+ 0.484852 0.484852 0.727899 0.484852 0.484852 0.727899 1 0 0
+ 0.484852 0.484852 0.727899 0.273764 0.712592 -0.645961 -0.690039 -0.503433 0.520001
+--0.482122 -0.769645 0.418575 0 0.881582 0.47203 -0.496551 0.544729 -0.675801
++-0.482122 -0.769645 0.418575 0 0.881582 0.472031 -0.496551 0.544729 -0.675801
+ -0.495108 0.533377 -0.68584 1 0 0 0.484852 0.484853 0.727899
+-0.602611 0.602611 -0.523183 0 0.554373 0.832268 0 0.881582 0.47203
+--0.537564 -0.537564 0.649654 0 -1 0 -0.538874 0.503457 -0.675386
++0.602611 0.602611 -0.523183 0 0.554373 0.832268 0 0.881582 0.472031
++-0.537564 -0.537563 0.649654 0 -1 0 -0.538874 0.503457 -0.675386
+ -0.137007 0.979355 -0.148637 0.44675 0.521597 -0.726878 0.484853 0.484853 -0.727898
+ 0.484853 0.484853 -0.727898 0 -1 0 0.484852 -0.484853 0.727898
+ -0.273765 -0.712592 0.645961 0.484854 0.484852 0.727898 0.484854 0.484852 -0.727898
+@@ -4177,13 +4177,13 @@ NORMALS Normals float
+ -1 0 0 -0.545143 0.181715 0.818412 0.273765 0.712591 -0.645962
+ 1 0 0 0.484853 -0.484853 0.727898 1 0 0
+ 0.545142 -0.181714 0.818413 0 1 0 0.998655 -0.028909 0.043044
+--0.5437 -0.497073 0.676246 -0.818643 0.53626 0.205545 -0.484853 0.484852 0.727898
+-1 0 0 0.526885 0.526884 0.666922 0.181821 0.958329 0.220331
++-0.5437 -0.497073 0.676246 -0.818643 0.536261 0.205545 -0.484853 0.484852 0.727898
++1 0 0 0.526885 0.526884 0.666922 0.181821 0.95833 0.220331
+ 1 0 0 1 0 0 -0.712592 0.273765 0.645961
+ -1 0 0 -0.484852 0.484853 0.727898 0.826309 0 0.563217
+ 1 0 0 0.484853 0.484853 0.727898 0.181714 0.545144 0.818412
+ 0.484852 0.484853 0.727898 1 0 0 1 0 0
+-0.470482 -0.426348 0.772576 -0.682486 0.682483 0.261591 0 1 0
++0.470482 -0.426348 0.772576 -0.682485 0.682483 0.261591 0 1 0
+ 0.426349 0.47048 0.772577 0.0777669 -0.552693 0.829748
+ FIELD FieldData 1
+ unknown 1 1724 float
+@@ -4379,3 +4379,6 @@ unknown 1 1724 float
+ 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5
+ 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5 127.5
+ 127.5 127.5 127.5 127.5 127.5
++METADATA
++INFORMATION 0
++
+diff --git a/sdk/actions/mesh/meshprocessing/MeshClipping.cpp b/sdk/actions/mesh/meshprocessing/MeshClipping.cpp
+index c11f880b..773a4ce4 100644
+--- a/sdk/actions/mesh/meshprocessing/MeshClipping.cpp
++++ b/sdk/actions/mesh/meshprocessing/MeshClipping.cpp
+@@ -336,7 +336,6 @@ Action::ApplyStatus MeshClipping::clipMesh(MeshComponent* mesh, vtkSmartPointer
+ filter->SetInputConnection(mesh->getDataPort());
+ filter->ExtractInsideOn();
+ filter->SetImplicitFunction(plane);
+- filter->Update();
+ mesh->setDataConnection(filter->GetOutputPort());
+ if (save) {
+ new MeshComponent((vtkPointSet*)filter->GetOutput(), mesh->getName() + " clipped");
+diff --git a/sdk/components/vtkmesh/testdata/brainImageSmooth.vtk b/sdk/components/vtkmesh/testdata/brainImageSmooth.vtk
+index fe796ffc..4055ebf9 100644
+--- a/sdk/components/vtkmesh/testdata/brainImageSmooth.vtk
++++ b/sdk/components/vtkmesh/testdata/brainImageSmooth.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ vtk output
+ ASCII
+ DATASET POLYDATA
+diff --git a/sdk/components/vtkmesh/testdata/check-with-color-pointdata.vtk b/sdk/components/vtkmesh/testdata/check-with-color-pointdata.vtk
+index 1103c6db..9e6bdfed 100644
+--- a/sdk/components/vtkmesh/testdata/check-with-color-pointdata.vtk
++++ b/sdk/components/vtkmesh/testdata/check-with-color-pointdata.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ color data (not implemented yet!)
+ ASCII
+ DATASET POLYDATA
+diff --git a/sdk/components/vtkmesh/testdata/cube-with-point-and-cell-data.vtk b/sdk/components/vtkmesh/testdata/cube-with-point-and-cell-data.vtk
+index 4609e009..1d4b7a91 100644
+--- a/sdk/components/vtkmesh/testdata/cube-with-point-and-cell-data.vtk
++++ b/sdk/components/vtkmesh/testdata/cube-with-point-and-cell-data.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ Cube example
+ ASCII
+ DATASET POLYDATA
+@@ -22,7 +22,13 @@ NORMALS cell_normals float
+ FIELD FieldData 1
+ cell_scalars 1 6 int
+ 0 1 2 3 4 5
++METADATA
++INFORMATION 0
++
+ POINT_DATA 8
+ FIELD FieldData 1
+ my_scalars 1 8 float
+ 0 1 2 3 4 5 6 7
++METADATA
++INFORMATION 0
++
+diff --git a/sdk/components/vtkmesh/testdata/cube-with-tensors.vtk b/sdk/components/vtkmesh/testdata/cube-with-tensors.vtk
+index 85113b30..8cf1cd04 100644
+--- a/sdk/components/vtkmesh/testdata/cube-with-tensors.vtk
++++ b/sdk/components/vtkmesh/testdata/cube-with-tensors.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ Random data to test tensors
+ ASCII
+ DATASET UNSTRUCTURED_GRID
+@@ -16,8 +16,14 @@ POINT_DATA 8
+ FIELD FieldData 3
+ scalars 1 8 float
+ 0 1 2 3 4 3 2 0
++METADATA
++INFORMATION 0
++
+ other_scalars 1 8 float
+ 0 6 2 3 4 7 5 1
++METADATA
++INFORMATION 0
++
+ tensors1 9 8 float
+ 1 0 0 0 1 0 0 0 1
+ -2 0 0 0 -2 0 0 0 3
+diff --git a/sdk/components/vtkmesh/testdata/female.vtk b/sdk/components/vtkmesh/testdata/female.vtk
+index 39b31c16..c8f3504f 100644
+--- a/sdk/components/vtkmesh/testdata/female.vtk
++++ b/sdk/components/vtkmesh/testdata/female.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ female
+ ASCII
+ DATASET POLYDATA
+diff --git a/sdk/components/vtkmesh/testdata/fieldfile.vtk b/sdk/components/vtkmesh/testdata/fieldfile.vtk
+index 849c22ab..e2f30d05 100644
+--- a/sdk/components/vtkmesh/testdata/fieldfile.vtk
++++ b/sdk/components/vtkmesh/testdata/fieldfile.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ cell attributes
+ ASCII
+ DATASET UNSTRUCTURED_GRID
+@@ -24,7 +24,13 @@ CELL_DATA 3
+ FIELD FieldData 3
+ group 1 3 int
+ 1 2 1
++METADATA
++INFORMATION 0
++
+ material 1 3 int
+ 100 200 300
++METADATA
++INFORMATION 0
++
+ group_and_material 2 3 int
+ 1 100 2 200 1 300
+diff --git a/sdk/components/vtkmesh/testdata/imageBoundingBox.vtk b/sdk/components/vtkmesh/testdata/imageBoundingBox.vtk
+index b0a86592..66970be1 100644
+--- a/sdk/components/vtkmesh/testdata/imageBoundingBox.vtk
++++ b/sdk/components/vtkmesh/testdata/imageBoundingBox.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ ImageBoundingBox
+ ASCII
+ DATASET UNSTRUCTURED_GRID
+diff --git a/sdk/components/vtkmesh/testdata/male.vtk b/sdk/components/vtkmesh/testdata/male.vtk
+index 09c658e9..396e4dae 100644
+--- a/sdk/components/vtkmesh/testdata/male.vtk
++++ b/sdk/components/vtkmesh/testdata/male.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ male
+ ASCII
+ DATASET POLYDATA
+diff --git a/sdk/components/vtkmesh/testdata/plate-with-data.vtk b/sdk/components/vtkmesh/testdata/plate-with-data.vtk
+index ea6920a5..a0d84325 100644
+--- a/sdk/components/vtkmesh/testdata/plate-with-data.vtk
++++ b/sdk/components/vtkmesh/testdata/plate-with-data.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ Vibrational modes of plate
+ ASCII
+ DATASET POLYDATA
+diff --git a/sdk/components/vtkmesh/testdata/pointcloud-with-data.vtk b/sdk/components/vtkmesh/testdata/pointcloud-with-data.vtk
+index e6284f72..71d2a321 100644
+--- a/sdk/components/vtkmesh/testdata/pointcloud-with-data.vtk
++++ b/sdk/components/vtkmesh/testdata/pointcloud-with-data.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ Mesh
+ ASCII
+ DATASET POLYDATA
+@@ -1507,6 +1507,9 @@ Index 1 3368 double
+ 3348 3349 3350 3351 3352 3353 3354 3355 3356
+ 3357 3358 3359 3360 3361 3362 3363 3364 3365
+ 3366 3367
++METADATA
++INFORMATION 0
++
+ Random 1 3368 double
+ 37.5735 9.9921 81.7932 15.9868 52.9596 90.722 85.213 35.4049 80.3806
+ 88.9878 76.3551 42.9786 44.1994 68.9098 58.1614 23.7956 17.9852 39.8805
+@@ -1883,3 +1886,6 @@ Random 1 3368 double
+ 68.2547 23.7653 86.5094 26.2236 79.4749 11.3349 84.078 3.12886 78.6114
+ 32.9222 33.1601 58.7918 91.1638 64.9267 54.293 12.8086 40.3804 99.085
+ 15.3981 20.6827
++METADATA
++INFORMATION 0
++
+diff --git a/sdk/components/vtkmesh/testdata/polydata-with-data.vtk b/sdk/components/vtkmesh/testdata/polydata-with-data.vtk
+index db6dd5b0..191cdcec 100644
+--- a/sdk/components/vtkmesh/testdata/polydata-with-data.vtk
++++ b/sdk/components/vtkmesh/testdata/polydata-with-data.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ vtk output
+ ASCII
+ DATASET POLYDATA
+@@ -16,7 +16,13 @@ CELL_DATA 5
+ FIELD FieldData 1
+ cellvar 1 5 float
+ 2 2.4 2.1 2.2 2.3
++METADATA
++INFORMATION 0
++
+ POINT_DATA 4
+ FIELD FieldData 1
+ pointvar 1 4 float
+ 1.2 1.3 1.4 1.5
++METADATA
++INFORMATION 0
++
+diff --git a/sdk/components/vtkmesh/testdata/simple.vtk b/sdk/components/vtkmesh/testdata/simple.vtk
+index 0e7df7bf..aab559cf 100644
+--- a/sdk/components/vtkmesh/testdata/simple.vtk
++++ b/sdk/components/vtkmesh/testdata/simple.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ Simple Hexahedron
+ ASCII
+ DATASET UNSTRUCTURED_GRID
+diff --git a/sdk/components/vtkmesh/testdata/sinus_skin.vtk b/sdk/components/vtkmesh/testdata/sinus_skin.vtk
+index ab914c52..a3ba826c 100644
+--- a/sdk/components/vtkmesh/testdata/sinus_skin.vtk
++++ b/sdk/components/vtkmesh/testdata/sinus_skin.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ sinus_skin
+ ASCII
+ DATASET POLYDATA
+diff --git a/sdk/components/vtkmesh/testdata/sinus_skull.vtk b/sdk/components/vtkmesh/testdata/sinus_skull.vtk
+index 316635e5..539a430a 100644
+--- a/sdk/components/vtkmesh/testdata/sinus_skull.vtk
++++ b/sdk/components/vtkmesh/testdata/sinus_skull.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ sinus_skull
+ ASCII
+ DATASET POLYDATA
+diff --git a/sdk/components/vtkmesh/testdata/structured.vtk b/sdk/components/vtkmesh/testdata/structured.vtk
+index 65f217cc..98fc7b26 100644
+--- a/sdk/components/vtkmesh/testdata/structured.vtk
++++ b/sdk/components/vtkmesh/testdata/structured.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ vtk output
+ ASCII
+ DATASET STRUCTURED_GRID
+@@ -11,6 +11,9 @@ CELL_DATA 1
+ FIELD FieldData 2
+ cellval 1 1 float
+ 1489
++METADATA
++INFORMATION 0
++
+ cellvec 3 1 float
+ 0.6 0.7 0.5
+ POINT_DATA 8
+diff --git a/sdk/components/vtkmesh/testdata/structuredgrid-with-data.vtk b/sdk/components/vtkmesh/testdata/structuredgrid-with-data.vtk
+index f0b2eb5e..7e53d44b 100644
+--- a/sdk/components/vtkmesh/testdata/structuredgrid-with-data.vtk
++++ b/sdk/components/vtkmesh/testdata/structuredgrid-with-data.vtk
+@@ -1,4 +1,4 @@
+-# vtk DataFile Version 4.0
++# vtk DataFile Version 4.1
+ vtk output
+ ASCII
+ DATASET STRUCTURED_GRID
+@@ -11,12 +11,18 @@ CELL_DATA 1
+ FIELD FieldData 2
+ cellval 1 1 float
+ 1489
++METADATA
++INFORMATION 0
++
+ cellvec 3 1 float
+ 0.6 0.7 0.5
+ POINT_DATA 8
+ FIELD FieldData 2
+ ptval 1 8 float
+ 0 1 2 3 4 5 6 7
++METADATA
++INFORMATION 0
++
+ ptvec 3 8 float
+ 0 0.0287671 0 0 0.0258604 0 0 0.0287671 0
+ 0 0.0258604 0 0 0.0287671 0 0 0.0258604 0
+diff --git a/sdk/libraries/core/viewer/RendererWidget.cpp b/sdk/libraries/core/viewer/RendererWidget.cpp
+index ee6f08e5..b853e8c6 100644
+--- a/sdk/libraries/core/viewer/RendererWidget.cpp
++++ b/sdk/libraries/core/viewer/RendererWidget.cpp
+@@ -363,7 +363,16 @@ void vtkInteractorStylePick::PrintSelf(ostream& os, vtkIndent indent) {
+ QMap <RendererWidget::ScreenshotFormat, RendererWidget::ScreenshotFormatInfo*> screenshotMap;
+
+ //---------------------- Constructor ------------------------
++#if VTK_MAJOR_VERSION == 6
+ RendererWidget::RendererWidget(QWidget* parent, ControlMode mode) : QVTKWidget2(parent) {
++
++#elif VTK_MAJOR_VERSION == 7
++RendererWidget::RendererWidget(QWidget* parent, ControlMode mode) : QVTKWidget(parent) {
++
++#else
++#error "Invalid VTK version: not (yet) supported."
++#endif
++
+ setObjectName("RendererWidget");
+
+ //-- initialize screenshotMap only at the first invocation of constructor
+@@ -380,6 +389,7 @@ RendererWidget::RendererWidget(QWidget* parent, ControlMode mode) : QVTKWidget2(
+ policy.setHeightForWidth(false);
+ setSizePolicy(policy);
+
++#if VTK_MAJOR_VERSION == 6
+ //-- OpenGL context on integrated card
+ // For more information about this problem
+ // see https://bugzilla-timc.imag.fr/show_bug.cgi?id=181
+@@ -437,6 +447,30 @@ RendererWidget::RendererWidget(QWidget* parent, ControlMode mode) : QVTKWidget2(
+ newFormat.setStencilBufferSize(context()->format().stencilBufferSize());
+ context()->setFormat(newFormat);
+ }
++#elif VTK_MAJOR_VERSION == 7
++ auto window = windowHandle();
++
++ if (window != nullptr) {
++ QSurfaceFormat surfaceFormat = window->format();
++ surfaceFormat.setDepthBufferSize(8);
++ surfaceFormat.setSamples(8);
++ surfaceFormat.setAlphaBufferSize(8);
++ surfaceFormat.setStencilBufferSize(8);
++ //surfaceFormat.setStereo(1);
++ window->setFormat(surfaceFormat);
++ } else {
++ qWarning("Can't set surface format: No associated QWindow");
++ }
++// QSurfaceFormat fmt;
++// fmt.setDepthBufferSize(8);
++// fmt.setSamples(1);
++// fmt.setAlphaBufferSize(8);
++// fmt.setStereo(1);
++// fmt.setStencilBufferSize(8);
++// QSurfaceFormat::setDefaultFormat(fmt);
++#else
++#error "Invalid VTK version: not (yet) supported."
++#endif
+
+ //-- display options (this is not a state managed by the renderer, but a property of the actors)
+ backfaceCulling = false;
+@@ -1357,13 +1391,29 @@ void RendererWidget::mousePressEvent(QMouseEvent* event) {
+ if (event->button() == Qt::RightButton) {
+ emit rightButtonPressed();
+ }
++#if VTK_MAJOR_VERSION == 6
+ QVTKWidget2::mousePressEvent(event);
++
++#elif VTK_MAJOR_VERSION == 7
++ QVTKWidget::mousePressEvent(event);
++
++#else
++#error "Invalid VTK version: not (yet) supported."
++#endif
+ }
+ }
+
+ //--------------------- mouseReleaseEvent ----------------------------------
+ void RendererWidget::mouseReleaseEvent(QMouseEvent* event) {
++#if VTK_MAJOR_VERSION == 6
+ QVTKWidget2::mouseReleaseEvent(event);
++
++#elif VTK_MAJOR_VERSION == 7
++ QVTKWidget::mouseReleaseEvent(event);
++
++#else
++#error "Invalid VTK version: not (yet) supported."
++#endif
+ endPicking();
+ }
+
+@@ -1403,7 +1453,16 @@ void RendererWidget::mouseMoveEvent(QMouseEvent* event) {
+ // just keep the button pressed
+ //pick();
+ }
++
++#if VTK_MAJOR_VERSION == 6
+ QVTKWidget2::mouseMoveEvent(event);
++
++#elif VTK_MAJOR_VERSION == 7
++ QVTKWidget::mouseMoveEvent(event);
++
++#else
++#error "Invalid VTK version: not (yet) supported."
++#endif
+ }
+
+
+diff --git a/sdk/libraries/core/viewer/RendererWidget.h b/sdk/libraries/core/viewer/RendererWidget.h
+index 55757b1d..aca75bf8 100644
+--- a/sdk/libraries/core/viewer/RendererWidget.h
++++ b/sdk/libraries/core/viewer/RendererWidget.h
+@@ -34,11 +34,24 @@
+ #include "CamiTKAPI.h"
+
+ // -- VTK stuff
++#include <vtkVersion.h>
++
++#if VTK_MAJOR_VERSION == 6
+ #include <QVTKWidget2.h>
+-#include <vtkSmartPointer.h>
+-#include <vtkInteractorStyle.h>
+ // additional needed headers for QVTKWidget2
+ #include <vtkGenericOpenGLRenderWindow.h>
++
++#elif VTK_MAJOR_VERSION == 7
++#include <QVTKWidget.h>
++// additional needed headers for QVTKWidget
++#include <QWindow>
++#else
++#error "Invalid VTK version: not (yet) supported."
++// for VTK8, check for instance https://www.slicer.org/wiki/Documentation/Labs/Qt5-and-VTK8#Qt5:_QVTKOpenGLWidget
++#endif
++
++#include <vtkSmartPointer.h>
++#include <vtkInteractorStyle.h>
+ #include <vtkRenderWindowInteractor.h>
+ #include <QVTKInteractor.h>
+
+@@ -123,7 +136,15 @@ namespace camitk {
+ *
+ *
+ **/
++#if VTK_MAJOR_VERSION == 6
+ class CAMITK_API RendererWidget : public QVTKWidget2 {
++
++#elif VTK_MAJOR_VERSION == 7
++class CAMITK_API RendererWidget : public QVTKWidget {
++
++#else
++#error "Invalid VTK version: not (yet) supported."
++#endif
+ Q_OBJECT
+ Q_ENUMS(ControlMode CameraOrientation); // so that it can be used in property editor
+
+diff --git a/tutorials/actions/vtkwidget/BoxWidget.cpp b/tutorials/actions/vtkwidget/BoxWidget.cpp
+index 23bed221..e52703e6 100644
+--- a/tutorials/actions/vtkwidget/BoxWidget.cpp
++++ b/tutorials/actions/vtkwidget/BoxWidget.cpp
+@@ -32,6 +32,7 @@
+ #include <Log.h>
+
+ #include <vtkBoxWidget.h>
++#include <vtkRenderWindow.h>
+
+ #include <QVector3D>
+
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,5 @@
0003-FIXED-warning-from-dpkg-about-no-newline.patch
0004-FIXED-monitorgui-lib-should-not-depends-on-camitk-co.patch
0005-FIXED-config-test-needs-to-ignore-stderr.patch
+0010-Make-loop-safe-for-removal-of-elements.patch
+0100-vtk7-compatibility.patch
View it on GitLab: https://salsa.debian.org/med-team/camitk/compare/5067a1cb2fe525836dc2c65429cd2bef8ac83bd9...9a0b6163e997dfa65b0c5b845407a64c48998205
--
View it on GitLab: https://salsa.debian.org/med-team/camitk/compare/5067a1cb2fe525836dc2c65429cd2bef8ac83bd9...9a0b6163e997dfa65b0c5b845407a64c48998205
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181023/c2494664/attachment-0001.html>
More information about the debian-med-commit
mailing list