caiyu/openEMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial support for vtk 6.x

Browse Source 
run qmake with vtk-version given, e.g.:
qmake VTK_6_VERSION=6.1
or put this in localPaths.pri

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
This commit is contained in:
Thorsten Liebig 2014-01-29 14:51:00 +01:00
parent 6f6ed4feac
commit 6da9213e62
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FDTD/operator.cpp
View File

@ -721,7 +721,11 @@ void Operator::DumpPEC2File(string filename , unsigned int *range)
filename += ".vtp"; filename += ".vtp";
writer->SetFileName(filename.c_str()); writer->SetFileName(filename.c_str());
#if VTK_MAJOR_VERSION==6
writer->SetInputData(polydata);
#else
writer->SetInput(polydata); writer->SetInput(polydata);
#endif
writer->Write(); writer->Write();
writer->Delete(); writer->Delete();

15
openEMS.pro
View File

@ -98,6 +98,7 @@ win32 {
DEFINES += TIXML_USE_STL DEFINES += TIXML_USE_STL
LIBS += -lboost_thread -lboost_system LIBS += -lboost_thread -lboost_system
LIBS += -lhdf5_hl -lhdf5 LIBS += -lhdf5_hl -lhdf5
### vtk ### ### vtk ###
isEmpty(VTK_INCLUDEPATH) { isEmpty(VTK_INCLUDEPATH) {
INCLUDEPATH += /usr/include/vtk-5.2 \ INCLUDEPATH += /usr/include/vtk-5.2 \
@ -105,6 +106,8 @@ win32 {
/usr/include/vtk-5.6 \ /usr/include/vtk-5.6 \
/usr/include/vtk-5.8 \ /usr/include/vtk-5.8 \
/usr/include/vtk-5.10 \ /usr/include/vtk-5.10 \
/usr/include/vtk-6.0 \
/usr/include/vtk-6.1 \
/usr/include/vtk /usr/include/vtk
} else { } else {
INCLUDEPATH += $$VTK_INCLUDEPATH INCLUDEPATH += $$VTK_INCLUDEPATH
@ -112,11 +115,23 @@ win32 {
isEmpty(VTK_LIBRARYPATH){ isEmpty(VTK_LIBRARYPATH){
} else { } else {
LIBS +=-L$$VTK_LIBRARYPATH LIBS +=-L$$VTK_LIBRARYPATH
QMAKE_LFLAGS += \'-Wl,-rpath,$$VTK_LIBRARYPATH\'
} }
isEmpty(VTK_6_VERSION){
LIBS += -lvtkCommon \ LIBS += -lvtkCommon \
-lvtkIO \ -lvtkIO \
-lvtksys \ -lvtksys \
-lvtkFiltering -lvtkFiltering
} else {
LIBS += -lvtkCommonCore-$$VTK_6_VERSION \
-lvtkCommonDataModel-$$VTK_6_VERSION \
-lvtkIOLegacy-$$VTK_6_VERSION \
-lvtkIOXML-$$VTK_6_VERSION \
-lvtkIOGeometry-$$VTK_6_VERSION \
-lvtkIOPLY-$$VTK_6_VERSION \
-lvtksys-$$VTK_6_VERSION \
-lvtkIOCore-$$VTK_6_VERSION
}
} }
# vtk includes deprecated header files; silence the corresponding warning # vtk includes deprecated header files; silence the corresponding warning

8
tools/vtk_file_writer.cpp
View File

@ -285,7 +285,11 @@ bool VTK_File_Writer::WriteASCII()
} }
writer->SetHeader(m_header.c_str()); writer->SetHeader(m_header.c_str());
#if VTK_MAJOR_VERSION==6
writer->SetInputData(m_GridData);
#else
writer->SetInput(m_GridData); writer->SetInput(m_GridData);
#endif
string filename = GetTimestepFilename() + ".vtk"; string filename = GetTimestepFilename() + ".vtk";
writer->SetFileName(filename.c_str()); writer->SetFileName(filename.c_str());
@ -312,7 +316,11 @@ bool VTK_File_Writer::WriteXML()
return false; return false;
} }
#if VTK_MAJOR_VERSION==6
writer->SetInputData(m_GridData);
#else
writer->SetInput(m_GridData); writer->SetInput(m_GridData);
#endif
string filename = GetTimestepFilename() + "." + writer->GetDefaultFileExtension(); string filename = GetTimestepFilename() + "." + writer->GetDefaultFileExtension();
writer->SetFileName(filename.c_str()); writer->SetFileName(filename.c_str());