Update for QGIS 3.36.02

Deltares-research · May 6, 2024 · 3b25f71 · 3b25f71
1 parent 33d1a7c
commit 3b25f71
Show file tree

Hide file tree

Showing 27 changed files with 4,926 additions and 5,631 deletions.
diff --git a/lib/x64/debug/qgis_analysis.lib b/lib/x64/debug/qgis_analysis.lib
diff --git a/lib/x64/debug/qgis_core.lib b/lib/x64/debug/qgis_core.lib
diff --git a/lib/x64/debug/qgis_gui.lib b/lib/x64/debug/qgis_gui.lib
diff --git a/lib/x64/release/qgis_analysis.lib b/lib/x64/release/qgis_analysis.lib
diff --git a/lib/x64/release/qgis_core.lib b/lib/x64/release/qgis_core.lib
diff --git a/lib/x64/release/qgis_gui.lib b/lib/x64/release/qgis_gui.lib
diff --git a/packages/include/MyDrawingCanvas.h b/packages/include/MyDrawingCanvas.h
@@ -13,29 +13,28 @@
 #include "map_property.h"
 
 #define GUI_EXPORT __declspec(dllimport)
-#include "qgisinterface.h"
-#include "qgsmaptool.h"
-#include "qgsmaptoolemitpoint.h"
-#include "qgspointxy.h"
-#include "qgsmapcanvas.h"
-#include "qgsmapcanvasitem.h"
-#include "qgsmapmouseevent.h"
-
-#include <qgsapplication.h>
+#include <qgisinterface.h>
+#include <qgsmaptool.h>
+#include <qgsmaptoolemitpoint.h>
+#include <qgspointxy.h>
+#include <qgsmapcanvas.h>
+#include <qgsmapcanvasitem.h>
+#include <qgsmapmouseevent.h>
+
 #include <qgsgeometry.h>
 #include <qgslayertree.h>
 #include <qgslayertreegroup.h>
 #include <qgsmessagelog.h>
 
-#include "qgsmaptool.h"
-#include "qgsrubberband.h"
+#include <qgsrubberband.h>
 
 
 #include <QtCore/QVector>
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
 
 #include <QtGui/QColor>
+#include <QtGui/QCursor>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPainter>

diff --git a/packages/include/MyEditTool.h b/packages/include/MyEditTool.h
@@ -8,19 +8,13 @@
 #include <assert.h>
 
 #define GUI_EXPORT __declspec(dllimport)
-#include "qgisinterface.h"
-#include "qgsmaptool.h"
-#include "qgsmaptoolemitpoint.h"
-#include "qgspointxy.h"
-#include "qgsmapcanvas.h"
-#include "qgsmapcanvasitem.h"
-#include "qgsmapmouseevent.h"
 
 #include <QtCore/QVector>
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
 
 #include <QtGui/QColor>
+#include <QtGui/QCursor>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPainter>
@@ -30,7 +24,13 @@
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QVBoxLayout>
 
+#include "qgisinterface.h"
 #include "qgsmaptool.h"
+#include "qgsmaptoolemitpoint.h"
+#include "qgsmapcanvas.h"
+#include "qgsmapcanvasitem.h"
+#include "qgsmapmouseevent.h"
+#include "qgspointxy.h"
 #include "qgsrubberband.h"
 
 #define IMAGE_WIDTH  3840 // 1420 // 

diff --git a/packages/include/add_current_view_window.h b/packages/include/add_current_view_window.h
@@ -1,6 +1,5 @@
 #ifndef _INC_ADD_CURRENT_VIEW_WINDOW
 #define _INC_ADD_CURRENT_VIEW_WINDOW
-#include <QtWidgets\QApplication>
 #include <QtWidgets\QCheckBox>
 #include <QtWidgets\QDateTimeEdit>
 #include <QtWidgets\QDockWidget>

diff --git a/packages/include/edit_observation_points_window.h b/packages/include/edit_observation_points_window.h
@@ -23,7 +23,6 @@
 #include <QVBoxLayout>
 
 #include <qmath.h>
-#include <qgsapplication.h>
 #include <QgsLayerTreeView.h>
 #include <qgsmapmouseevent.h>
 

diff --git a/packages/include/handle_vector_layers.h b/packages/include/handle_vector_layers.h
@@ -0,0 +1,115 @@
+#ifndef HANDLE_VECTOR_LAYER_H
+#define HANDLE_VECTOR_LAYER_H
+
+#include <boost/property_tree/ptree.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/property_tree/json_parser.hpp>
+
+#include <QObject>
+#include <iostream>
+
+#include <QAction>
+#include <QComboBox>
+#include <QDesktopWidget>
+#include <QIcon>
+#include <QLayout> 
+#include <QMenu>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QProcessEnvironment>
+#include <QProgressBar>
+#include <QSizePolicy> 
+#include <QSpacerItem> 
+#include <QToolBar>
+#include <QTreeWidget>
+#include <QtMath>
+#include <QFile>
+#include <QFileInfo>
+#include <QFileDialog>
+
+#include <qgslayertree.h>
+#include <QgsLayerTreeView.h>
+#include <qgsvectorlayer.h>
+#include <qgisinterface.h>
+#include <qgsmultilinestring.h>
+#include <qgslinesymbollayer.h>
+#include <qgsmarkersymbol.h>
+#include <qgsmarkersymbollayer.h>
+#include <QgsSingleSymbolRenderer.h>
+#include <qgssymbol.h>
+
+#include "ugrid.h"
+#include "his_cf.h"
+#include "json_reader.h"
+#include "perf_timer.h"
+
+#include <direct.h> // for getcwd
+#include <stdlib.h> // for MAX_PATH
+
+#define MSG_LENGTH 101
+#define PATH_LENGTH 1024
+
+#define    WAIT_MODE 1
+#define NO_WAIT_MODE 0
+
+class QAction;
+class UGRID;
+
+class HVL
+    : public QObject
+
+{
+    Q_OBJECT
+
+    public:
+        HVL(QgisInterface* iface);
+        ~HVL();
+
+        void set_ugrid_file(std::vector<UGRID *>);
+        UGRID* get_active_ugrid_file(QString layer_id);
+
+        //  qgis_umesh functions
+        void create_vector_layer_data_on_edges(QString, _variable * var, struct _feature *, struct _edge *, double *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_edge_type(QString, _variable * var, struct _feature *, struct _edge *, double *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_data_on_nodes(QString, _variable * var, struct _feature *, double *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_nodes(QString, QString, struct _feature *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_edges(QString, QString, struct _feature *, struct _edge *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_geometry(QString, QString, struct _ntw_geom *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_observation_point(QString, QString, _location_type *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_observation_polyline(QString, QString, _location_type *, long, QgsLayerTreeGroup *);
+
+        // Reading input files (ie JSON format)
+        void create_vector_layer_1D_external_forcing(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_1D_structure(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_chainage_observation_point(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_crs_observation_point(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_fixed_weir(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_thin_dams(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_observation_point(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_observation_cross_section(UGRID*, JSON_READER*, long, QgsLayerTreeGroup*);
+        void create_vector_layer_1D_observation_cross_section(UGRID*, JSON_READER*, long, QgsLayerTreeGroup*);
+        void create_vector_layer_2D_observation_cross_section(UGRID*, JSON_READER*, long, QgsLayerTreeGroup*);
+        void create_vector_layer_structure(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_drypoints(UGRID*, JSON_READER*, long, QgsLayerTreeGroup*);
+        void create_vector_layer_1D_cross_section(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+        void create_vector_layer_1D_retention(UGRID*, JSON_READER*, long, QgsLayerTreeGroup*);
+        void create_vector_layer_sample_point(UGRID *, JSON_READER *, long, QgsLayerTreeGroup *);
+
+        void create_vector_layer_1D2D_link(JSON_READER *, long);
+        long compute_location_along_geometry(struct _ntw_geom *, struct _ntw_edges *, std::string, double, double *, double *, double *);
+        long find_location_boundary(struct _ntw_nodes *, std::string, double *, double *);
+
+        QgsLayerTreeGroup* get_subgroup(QgsLayerTreeGroup*, QString);
+        void add_layer_to_group(QgsVectorLayer*, QgsLayerTreeGroup*);
+
+    private slots:
+
+    private:
+        void CrsChanged();
+        std::vector<std::string> tokenize(const std::string& s, char c);
+        std::vector<std::string> tokenize(const std::string& s, std::size_t count);
+
+        QgisInterface* m_QGisIface;
+        std::vector<UGRID*> m_ugrid_file;
+};
+#endif  // HANDLE_VECTOR_LAYER_H
diff --git a/packages/include/his_cf.h b/packages/include/his_cf.h
@@ -10,7 +10,6 @@
 #include <QtCore/qtextcodec.h>
 #include <QtCore/qdebug.h>
 
-#include <QtWidgets/QApplication>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QProgressBar>
 

diff --git a/packages/include/map_property.h b/packages/include/map_property.h
@@ -1,7 +1,6 @@
 #ifndef _INC_MAP_PROPERTY
 #define _INC_MAP_PROPERTY
 
-#include <QApplication>
 #include <QDateTimeEdit>
 #include <QGroupBox>
 #include <QGridLayout>

diff --git a/packages/include/map_property_window.h b/packages/include/map_property_window.h
@@ -1,6 +1,6 @@
 #ifndef _INC_MAP_PROPERTY_WINDOW
 #define _INC_MAP_PROPERTY_WINDOW
-#include <QApplication>
+
 #include <QCheckBox>
 #include <QCloseEvent>
 #include <QDateTimeEdit>

diff --git a/packages/include/map_time_manager_window.h b/packages/include/map_time_manager_window.h
@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include <QAction>
+#include <QApplication>
 #include <QButtonGroup>
 #include <QComboBox>
 #include <QDateTime>
@@ -26,7 +27,6 @@
 #include <QVBoxLayout>
 
 #include <qmath.h>
-#include <qgsapplication.h>
 #include <qgisinterface.h>
 #include <qgisplugin.h>
 

diff --git a/packages/include/my_date_time_edit.h b/packages/include/my_date_time_edit.h
@@ -1,7 +1,6 @@
 #ifndef _INC_MYQDATETIMEEDIT
 #define _INC_MYQDATETIMEEDIT
 
-#include <QtWidgets/QApplication>
 #include <QtWidgets/QDateTimeEdit>
 
 class MyQDateTimeEdit : public QDateTimeEdit

diff --git a/packages/include/perf_timer.h b/packages/include/perf_timer.h
@@ -3,6 +3,8 @@
 // Date: 14 April 2021
 // Email: jan.mooiman@deltares.nl
 //
+#ifndef PERF_TIMER_H
+#define PERF_TIMER_H
 #include <cstdlib>
 #include <vector>
 #include <iostream>
@@ -25,9 +27,9 @@
 #else
 #   define START_TIMERN(x)
 #   define START_TIMER(x)
-#   define CLEAR_TIMER(x)
-#   define DELETE_TIMER(x)
-#   define DELETE_TIMERN(x)
+#   define CLEAR_TIMER()
+#   define DELETE_TIMER()
+#   define DELETE_TIMERN()
 #   define STOP_TIMER(x)
 #   define PRINT_TIMERN(x)
 #   define PRINT_TIMERS(x)
@@ -101,4 +103,5 @@ class TestTimer
         std::string m_filename;
         std::string m_functionname;
         int m_line_number;
-};
+};
+#endif  // PERF_TIMER_H