Applications/DataExplorer/Base/modeltest.h

-/****************************************************************************
-**
-** Copyright (C) 2007 Trolltech ASA. All rights reserved.
-**
-** This file is part of the Qt Concurrent project on Trolltech Labs.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales@trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QObject>
-#include <QtCore/QStack>
-
-class ModelTest : public QObject
-{
-    Q_OBJECT
-
-public:
-    ModelTest(QAbstractItemModel* model, QObject* parent = 0);
-
-private Q_SLOTS:
-    void nonDestructiveBasicTest();
-    void rowCount();
-    void columnCount();
-    void hasIndex();
-    void index();
-    void parent();
-    void data();
-
-protected Q_SLOTS:
-    void runAllTests();
-    void layoutAboutToBeChanged();
-    void layoutChanged();
-    void rowsAboutToBeInserted(const QModelIndex &parent, int start, int end);
-    void rowsInserted(const QModelIndex & parent, int start, int end);
-    void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
-    void rowsRemoved(const QModelIndex & parent, int start, int end);
-
-private:
-    void checkChildren(const QModelIndex &parent, int currentDepth = 0);
-
-    QAbstractItemModel* model;
-
-    struct Changing
-    {
-        QModelIndex parent;
-        int oldSize;
-        QVariant last;
-        QVariant next;
-    };
-    QStack<Changing> insert;
-    QStack<Changing> remove;
-
-    bool fetchingMore;
-
-    QList<QPersistentModelIndex> changing;
-};

Applications/DataExplorer/CMakeLists.txt

 if(MSVC)
     add_definitions(-DVTKGUISUPPORTQT_STATIC_DEFINE)
 endif()
-
-if(VTKFBXCONVERTER_FOUND)
-    add_definitions(-DVTKFBXCONVERTER_FOUND)
+if(OGS_USE_NETCDF)
+    add_compile_options(-DOGS_USE_NETCDF)
 endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

Applications/DataExplorer/DataExplorer.cmake

 # Source files
-set(SOURCES
-    mainwindow.cpp
-    mainwindow.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/Img/icons.qrc
+set(SOURCES mainwindow.cpp mainwindow.h
+            ${CMAKE_CURRENT_SOURCE_DIR}/Img/icons.qrc
 )
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/Base
-    ${CMAKE_CURRENT_SOURCE_DIR}/DataView
-    ${CMAKE_CURRENT_SOURCE_DIR}/DataView/StratView
-    ${CMAKE_CURRENT_SOURCE_DIR}/DataView/DiagramView
-    ${CMAKE_CURRENT_SOURCE_DIR}/VtkVis
-)
 
 # Put moc files in a project folder
 source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
@@ -23,15 +14,15 @@ source_group("UI Files" FILES ${UIS})
 set(APP_ICON ${SOURCE_DIR_REL}/scripts/packaging/ogs-de-icon.icns)
 
 # Create the executable
-add_executable(DataExplorer
-    main.cpp
-    ${SOURCES}
-    ${UIS}
-    ${APP_ICON}
-    exe-icon.rc
+ogs_add_executable(
+    DataExplorer main.cpp ${SOURCES} ${UIS} ${APP_ICON} exe-icon.rc
+)
+target_compile_definitions(
+    DataExplorer PUBLIC $<$<BOOL:${VTK_ADDED}>:VTK_VIA_CPM>
 )
 
-target_link_libraries(DataExplorer
+target_link_libraries(
+    DataExplorer
     BaseLib
     GeoLib
     GitInfoLib
@@ -43,50 +34,65 @@ target_link_libraries(DataExplorer
     QtDataView
     QtDiagramView
     VtkVis
-    Threads::Threads
     Qt5::Core
     Qt5::Gui
     Qt5::Widgets
     Qt5::Xml
     Qt5::Network
-    spdlog::spdlog
-    ${VTK_LIBRARIES}
+    spdlog
+    VTK::IOExport
 )
 
 if(UNIX AND NOT APPLE)
     target_link_libraries(DataExplorer Qt5::X11Extras)
 endif()
 
-# Workaround for Windows conan tiff-package
-if(OGS_USE_CONAN AND WIN32)
-    find_package(ZLIB REQUIRED)
-    target_link_libraries(DataExplorer ${ZLIB_LIBRARIES})
-endif()
-
 if(GEOTIFF_FOUND)
-    target_link_libraries(DataExplorer ${GEOTIFF_LIBRARIES} )
+    target_link_libraries(DataExplorer ${GEOTIFF_LIBRARIES})
 endif()
 
 if(MSVC)
     # Set linker flags
-    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT /IGNORE:4099")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG
+        "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT /IGNORE:4099"
+    )
     target_link_libraries(DataExplorer winmm)
 endif()
 
-if(VTKFBXCONVERTER_FOUND)
-    target_link_libraries(DataExplorer ${VTKFBXCONVERTER_LIBRARIES})
-endif()
-
 set_property(TARGET DataExplorer PROPERTY FOLDER "DataExplorer")
 
 # ---- Installation ----
-install(TARGETS DataExplorer RUNTIME DESTINATION bin COMPONENT ogs_gui)
+install(TARGETS DataExplorer RUNTIME DESTINATION bin)
 
-cpack_add_component(ogs_gui
+cpack_add_component(
+    ogs_gui
     DISPLAY_NAME "OGS Data Explorer"
     DESCRIPTION "The graphical user interface for OpenGeoSys."
     GROUP Applications
 )
-set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "DataExplorer" "OGS Data Explorer" PARENT_SCOPE)
-set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/DataExplorer.exe" "Data Explorer" PARENT_SCOPE)
+set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "DataExplorer"
+                              "OGS Data Explorer" PARENT_SCOPE
+)
+set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/DataExplorer.exe"
+                          "Data Explorer" PARENT_SCOPE
+)
 
+if(MSVC)
+    # Install qt libraries
+    get_target_property(mocExe Qt5::moc IMPORTED_LOCATION)
+    get_filename_component(qtBinDir "${mocExe}" DIRECTORY)
+    find_program(
+        DEPLOYQT_EXECUTABLE windeployqt PATHS "${qtBinDir}" NO_DEFAULT_PATH
+    )
+    set(DEPLOY_OPTIONS
+        [[bin/DataExplorer.exe --dir . --libdir bin --plugindir plugins]]
+    )
+    configure_file(
+        ${PROJECT_SOURCE_DIR}/scripts/cmake/packaging/deployapp.cmake.in
+        deployapp.cmake @ONLY
+    )
+    install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/deployapp.cmake)
+    install(FILES ${PROJECT_SOURCE_DIR}/scripts/cmake/packaging/qt.conf
+            TYPE BIN
+    )
+endif()

Applications/DataExplorer/DataView/AddLayerToMeshDialog.h

@@ -5,7 +5,7 @@
  * \brief  Definition of the AddLayerToMeshDialog class.
  *
  * \copyright
- * Copyright (c) 2012-2021, OpenGeoSys Community (http://www.opengeosys.org)
+ * Copyright (c) 2012-2025, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license

Applications/DataExplorer/DataView/BaseItem.h

@@ -5,7 +5,7 @@
  * \brief  Definition of the BaseItem class.
  *
  * \copyright
- * Copyright (c) 2012-2021, OpenGeoSys Community (http://www.opengeosys.org)
+ * Copyright (c) 2012-2025, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license
@@ -13,7 +13,7 @@
  */
 #pragma once
 
-#include "VtkStationSource.h"
+#include "VtkVis/VtkStationSource.h"
 #include <QModelIndex>
 #include <vtkPolyDataAlgorithm.h>
 

Applications/DataExplorer/DataView/ColorTableModel.h

@@ -5,7 +5,7 @@
  * \brief  Definition of the ColorTableModel class.
  *
  * \copyright
- * Copyright (c) 2012-2021, OpenGeoSys Community (http://www.opengeosys.org)
+ * Copyright (c) 2012-2025, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license