1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/CSXCAD/src/CSPrimPolyhedronReader.cpp
===================================================================
--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/CSXCAD/src/CSPrimPolyhedronReader.cpp
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/CSXCAD/src/CSPrimPolyhedronReader.cpp
@@ -163,7 +163,7 @@ bool CSPrimPolyhedronReader::ReadFile()
AddVertex(polydata->GetPoint(n));
vtkIdType numP;
- vtkIdType *vertices = new vtkIdType[10];
+ vtkIdType const *vertices = new vtkIdType[10];
while (verts->GetNextCell(numP, vertices))
{
face f;
Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/CMakeLists.txt
===================================================================
--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/CMakeLists.txt
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/CMakeLists.txt
@@ -6,7 +6,7 @@ ELSE()
SET( CMAKE_BUILD_TYPE Release CACHE STRING "Set to either \"Release\" or \"Debug\"" )
ENDIF()
-PROJECT( QCSXCAD CXX)
+PROJECT( QCSXCAD C CXX)
cmake_minimum_required(VERSION 2.8)
@@ -100,6 +100,8 @@ find_package(VTK REQUIRED)
message(STATUS "Found package VTK. Using version " ${VTK_VERSION})
include(${VTK_USE_FILE})
INCLUDE_DIRECTORIES (${VTK_INCLUDE_DIRS})
+message("VTK_MAJOR_VERSION: ${VTK_MAJOR_VERSION}")
+add_compile_definitions(VTK_MAJOR_VERSION=${VTK_MAJOR_VERSION})
# Qt
SET(RESOURCES resources.qrc)
Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QCSXCAD.cpp
===================================================================
--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/QCSXCAD.cpp
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QCSXCAD.cpp
@@ -58,7 +58,7 @@
#include "CSPrimWire.h"
#include "CSPrimUserDefined.h"
-#include <QVTKWidget.h>
+#include <QVTKOpenGLNativeWidget.h>
#include <vtkRendererCollection.h>
#include <vtkRenderWindow.h>
#include <vtkRenderer.h>
Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QVTKStructure.cpp
===================================================================
--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/QVTKStructure.cpp
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QVTKStructure.cpp
@@ -20,7 +20,10 @@
#include "QVTKStructure.h"
#include "vtkCommand.h"
-#if VTK_MAJOR_VERSION>=8
+#if VTK_MAJOR_VERSION>=9
+ #include "QVTKOpenGLNativeWidget.h"
+ #include "vtkGenericOpenGLRenderWindow.h"
+#elif VTK_MAJOR_VERSION>=8
#include "QVTKOpenGLWidget.h"
#include "vtkGenericOpenGLRenderWindow.h"
#else
@@ -99,7 +102,10 @@ QVTKStructure::QVTKStructure()
iResolution=32;
AllowUpdate=true;
-#if VTK_MAJOR_VERSION>=8
+#if VTK_MAJOR_VERSION>=9
+ VTKWidget = new QVTKOpenGLNativeWidget();
+ VTKWidget->SetRenderWindow(vtkGenericOpenGLRenderWindow::New());
+#elif VTK_MAJOR_VERSION>=8
VTKWidget = new QVTKOpenGLWidget();
VTKWidget->SetRenderWindow(vtkGenericOpenGLRenderWindow::New());
#else
Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QVTKStructure.h
===================================================================
--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/QVTKStructure.h
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QVTKStructure.h
@@ -21,7 +21,9 @@
#include <QtGui>
#include "vtkCommand.h"
-#if VTK_MAJOR_VERSION>=8
+#if VTK_MAJOR_VERSION>=9
+ class QVTKOpenGLNativeWidget;
+#elif VTK_MAJOR_VERSION>=8
class QVTKOpenGLWidget;
#else
class QVTKWidget;
@@ -100,7 +102,9 @@ protected:
unsigned int uID;
} VTKLayerStruct;
-#if VTK_MAJOR_VERSION>=8
+#if VTK_MAJOR_VERSION>=9
+ QVTKOpenGLNativeWidget *VTKWidget;
+#elif VTK_MAJOR_VERSION>=8
QVTKOpenGLWidget *VTKWidget;
#else
QVTKWidget *VTKWidget;
Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/export_pov.cpp
===================================================================
--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/export_pov.cpp
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/export_pov.cpp
@@ -18,7 +18,7 @@
#include <QMessageBox>
#include <QtXml>
-#include <QVTKWidget.h>
+#include <QVTKOpenGLNativeWidget.h>
#include <vtkRendererCollection.h>
#include <vtkRenderWindow.h>
#include <vtkRenderer.h>
@@ -201,7 +201,7 @@ void export_pov::export_wire( QTextStrea
QString export_pov::get_camera()
{
- vtkRendererCollection* collection = ((QVTKWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
+ vtkRendererCollection* collection = ((QVTKOpenGLNativeWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
vtkRenderer *r = collection->GetFirstRenderer();
if (!r)
return QString();
@@ -231,7 +231,7 @@ QString export_pov::get_camera()
QString export_pov::get_light()
{
- vtkRendererCollection* collection = ((QVTKWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
+ vtkRendererCollection* collection = ((QVTKOpenGLNativeWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
vtkRenderer *r = collection->GetFirstRenderer();
if (!r)
return QString();
Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/export_x3d.cpp
===================================================================
--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/export_x3d.cpp
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/export_x3d.cpp
@@ -17,7 +17,7 @@
#include <QMessageBox>
-#include <QVTKWidget.h>
+#include <QVTKOpenGLNativeWidget.h>
#include <vtkRendererCollection.h>
#include <vtkRenderWindow.h>
#include <vtkRenderer.h>
@@ -70,7 +70,7 @@ void export_X3D::save( QString filename
export_properties( Scene, properties, Material );
// create camera
- vtkRendererCollection* collection = ((QVTKWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
+ vtkRendererCollection* collection = ((QVTKOpenGLNativeWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
vtkRenderer *r = collection->GetFirstRenderer();
if (!r)
return;
Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/openEMS/CMakeLists.txt
===================================================================
--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/openEMS/CMakeLists.txt
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/openEMS/CMakeLists.txt
@@ -122,7 +122,7 @@ find_package(Boost 1.46 COMPONENTS
)
# vtk
-find_package(VTK COMPONENTS vtkIOXML vtkIOGeometry vtkIOLegacy vtkIOPLY NO_MODULE REQUIRED)
+find_package(VTK COMPONENTS IOXML IOGeometry IOLegacy IOPLY NO_MODULE REQUIRED)
message(STATUS "Found package VTK. Using version " ${VTK_VERSION})
if("${VTK_MAJOR_VERSION}" GREATER 5)
@@ -174,7 +174,7 @@ TARGET_LINK_LIBRARIES( openEMS
${HDF5_LIBRARIES}
${HDF5_HL_LIBRARIES}
${Boost_LIBRARIES}
- ${vtk_LIBS}
+ ${VTK_LIBRARIES}
${MPI_LIBRARIES}
hdf5_serial_hl
)
|
