diff --git a/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt b/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt index df517339576a94495dd805e4631534567d75a20d..baaa7112efa2df7e4c7677fc3bc2b896b701ed23 100644 --- a/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt +++ b/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt @@ -1,3 +1,3 @@ add_library(NetCdfDialogLib NetCdfConfigureDialog.cpp NetCdfConfigureDialog.h) -target_link_libraries(NetCdfDialogLib PUBLIC Qt5::Widgets PRIVATE MathLib) +target_link_libraries(NetCdfDialogLib PUBLIC Qt5::Widgets PRIVATE MathLib vtknetcdfcpp) set_property(TARGET NetCdfDialogLib PROPERTY FOLDER "DataExplorer") diff --git a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp b/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp index 338d737b7dd6ec266e97713dd0a7bb2c6f0503b1..31edbeb32ad7ed89570e3630e762e56d566126e2 100644 --- a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp +++ b/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp @@ -306,7 +306,7 @@ double NetCdfConfigureDialog::getResolution() void NetCdfConfigureDialog::createDataObject() { - auto* length = new long[_currentVar->num_dims()]; + auto* length = new std::size_t[_currentVar->num_dims()]; double originLon = 0, originLat = 0; double lastLon = 0, lastLat = 0; unsigned sizeLon = 0, sizeLat = 0; diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt index 69dee55ba5ffd2a19cab9addaced855099b79bae..19835cc8f7a2bad077bfec0ae876e6bc3ec62d94 100644 --- a/Applications/DataExplorer/VtkVis/CMakeLists.txt +++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt @@ -135,7 +135,7 @@ if(GEOTIFF_FOUND) endif() # GEOTIFF_FOUND target_link_libraries(VtkVis - PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase + PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase vtkIOImage PRIVATE MathLib ApplicationsFileIO Qt5::Gui logog ) set_property(TARGET VtkVis PROPERTY FOLDER "DataExplorer") diff --git a/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui b/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui index 4b3c4df1105c21220c18afd924a8f6b08ae8f59a..80476d5e960bd5c6d713bebb8101334ff6370f5b 100644 --- a/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui +++ b/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui @@ -535,7 +535,7 @@ </layout> </item> <item> - <widget class="QVTKWidget2" name="vtkWidget" native="true"> + <widget class="QVTKWidget" name="vtkWidget" native="true"> <property name="sizePolicy"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> @@ -548,9 +548,9 @@ </widget> <customwidgets> <customwidget> - <class>QVTKWidget2</class> + <class>QVTKWidget</class> <extends>QWidget</extends> - <header>QVTKWidget2.h</header> + <header>QVTKWidget.h</header> </customwidget> </customwidgets> <resources> diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 11b32b59f8f97d31f6a26af89819a9d8d877a466..5ffdf44999fffeebcbf84b7c2d7a92cf081fa7d4 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -18,13 +18,13 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake) set(CONAN_REQUIRES Boost/1.64.0@conan/stable Eigen3/3.2.9@bilke/stable - VTK/8.1.0@bilke/testing + VTK/8.1.0@bilke/stable CACHE INTERNAL "" ) set(CONAN_OPTIONS Boost:header_only=True - Qt:xmlpatterns=True + Qt:qtxmlpatterns=True CACHE INTERNAL "" ) @@ -48,7 +48,7 @@ if(OGS_BUILD_GUI) set(CONAN_REQUIRES ${CONAN_REQUIRES} Shapelib/1.3.0@bilke/stable libgeotiff/1.4.2@bilke/stable - Qt/5.11@bincrafters/stable + Qt/5.11.0@bilke/stable ) set(CONAN_OPTIONS ${CONAN_OPTIONS} VTK:qt=True) endif() diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 7e9df44766403f8fb2d8c58c512eac0e93385283..f0aa58133cae498dff3355d01be0b1fa1aa9e419 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -66,7 +66,7 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) include(VtkModules) #find_package(VTK COMPONENTS ${VTK_MODULES} REQUIRED) -find_package(VTK 8.0.0 REQUIRED) +find_package(VTK 8.1.0 REQUIRED) include(${VTK_USE_FILE}) find_package(Eigen3 3.2.9 REQUIRED)