Refactor en threedi research tools update (#60)

* Create model_splitter_dialog.py * update * reference new project - referentiemodel ingevoegd * Update environment.yml * refactor 0d1d en 1d2d test * deprecate htt qgis folder * deprecate layer interaction Was allemaal al niet meer in gebruik * refactor deprecate vervolg Was allemaal al niet meer in gebruik * ignore ipynb_checkpoints * datachecker gdb to gpkg * reference model wanneer niet ingevuld * add gpkg vector type * Update env for ThreediToolbox 2.5.2 * schema raster source loadloayers * update env * refactor 1d2d test * update sqlite test * update_werkt niet * damo hdb .gdb to .gpkg * SqliteTest to SqliteCheck * update widget height * Nieuw project update werkend * change relative path model_settings/default * Changed_fixed * model_settings refactor --------- Co-authored-by: jkaptein <[email protected]>
threedi · May 10, 2023 · 9e5a30a · 9e5a30a
1 parent 1c215de
commit 9e5a30a
Show file tree

Hide file tree

Showing 75 changed files with 437 additions and 803 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,14 +11,13 @@ hhnk_threedi_plugin\external-dependencies
 hhnk_threedi_plugin/api_key.txt
 *.bak
 local_settings.py
-*.bak
-*.bak
 hhnk_threedi_plugin/env/environment_spyder_dev.yml
 hhnk_threedi_plugin/external-dependencies/*
 hhnk_threedi_plugin/logs/*
 hhnk_threedi_plugin/resources_rc.py
 hhnk_threedi_plugin/hhnk_toolbox_dockwidget_base_ui.py
 Thumbs.db
+.ipynb_checkpoints
 
 # documenation
 _build/*

diff --git a/deprecated/functionality_controllers/test_controllers/run_1d2d_tests.py b/deprecated/functionality_controllers/test_controllers/run_1d2d_tests.py
@@ -2,7 +2,7 @@
 
 from qgis.core import QgsApplication
 from PyQt5.QtCore import QMutex, QWaitCondition
-from hhnk_threedi_plugin.qgis_interaction.layers_management.removing_layers import remove_layers
+from deprecated.qgis_interaction.layers_management.removing_layers import remove_layers
 from hhnk_threedi_plugin.tasks.load_3di_results_tasks import load3diResultsTask
 # from hhnk_threedi_plugin.tasks.tests_tasks.one_d_two_d.read_nodes_task import readNodesTask
 # from hhnk_threedi_plugin.tasks.tests_tasks.one_d_two_d.flowlines_task import flowLinesTask

diff --git a/deprecated/functionality_controllers/test_controllers/run_hydraulic_tests.py b/deprecated/functionality_controllers/test_controllers/run_hydraulic_tests.py
@@ -1,6 +1,6 @@
 from qgis.core import QgsApplication
 from PyQt5.QtCore import QMutex, QWaitCondition
-from hhnk_threedi_plugin.qgis_interaction.layers_management.removing_layers import remove_layers
+from deprecated.qgis_interaction.layers_management.removing_layers import remove_layers
 from hhnk_threedi_plugin.tasks.load_3di_results_tasks import load3diResultsTask
 from hhnk_threedi_plugin.tasks.tests_tasks.zero_d_one_d.zero_d_one_d_task import zeroDOneDTask
 from hhnk_threedi_plugin.tasks.tests_tasks.zero_d_one_d.hydraulic_tests_task import hydraulicTestsTask

diff --git a/deprecated/functionality_controllers/test_controllers/run_sqlite_tests.py b/deprecated/functionality_controllers/test_controllers/run_sqlite_tests.py
@@ -1,6 +1,6 @@
 from qgis.core import QgsApplication
 from PyQt5.QtCore import QMutex, QWaitCondition
-from hhnk_threedi_plugin.qgis_interaction.layers_management.removing_layers import remove_layers
+from deprecated.qgis_interaction.layers_management.removing_layers import remove_layers
 from hhnk_threedi_plugin.tasks.sqlite_test_tasks.profiles_used_task import profilesUsedTask
 from hhnk_threedi_plugin.tasks.sqlite_test_tasks.isolated_channels_task import isolatedChannelsTask
 from hhnk_threedi_plugin.tasks.sqlite_test_tasks.controlled_structs_task import controlledStructsTask

diff --git a/...s/bank_levels/verify_bank_levels_input.py → ...s/bank_levels/verify_bank_levels_input.py b/...s/bank_levels/verify_bank_levels_input.py → ...s/bank_levels/verify_bank_levels_input.py
diff --git a/deprecated/gui/tests/sqlite_check_popup.py → deprecated/gui/checks/sqlite_check_popup.py b/deprecated/gui/tests/sqlite_check_popup.py → deprecated/gui/checks/sqlite_check_popup.py
@@ -18,7 +18,7 @@
 from qgis.gui import QgsMessageBar
 from .verify_sqlite_tests_input import verify_input
 from ...utility.file_widget import fileWidget
-from hhnk_threedi_plugin.qgis_interaction.layers_management.layers.get_layers_list import (
+from deprecated.qgis_interaction.get_layers_list import (
     get_layers_list,
 )
 from hhnk_threedi_plugin.qgis_interaction.layers_management.groups.layer_groups_structure import (

diff --git a/...ecated/gui/tests/sqlite_tests/__init__.py → ...cated/gui/checks/sqlite_tests/__init__.py b/...ecated/gui/tests/sqlite_tests/__init__.py → ...cated/gui/checks/sqlite_tests/__init__.py
diff --git a/...sqlite_tests/verify_sqlite_tests_input.py → ...sqlite_tests/verify_sqlite_tests_input.py b/...sqlite_tests/verify_sqlite_tests_input.py → ...sqlite_tests/verify_sqlite_tests_input.py
diff --git a/...ecated/gui/tests/verify_one_d_two_d_ui.py → ...cated/gui/checks/verify_one_d_two_d_ui.py b/...ecated/gui/tests/verify_one_d_two_d_ui.py → ...cated/gui/checks/verify_one_d_two_d_ui.py
diff --git a/...ugin/gui/checks/verify_zero_d_one_d_ui.py → ...ated/gui/checks/verify_zero_d_one_d_ui.py b/...ugin/gui/checks/verify_zero_d_one_d_ui.py → ...ated/gui/checks/verify_zero_d_one_d_ui.py
@@ -1,6 +1,6 @@
 from hhnk_threedi_plugin.error_messages.input_error_messages import no_output_folder, no_result_selected
 
-
+#Verplaatst naar \hhnk_threedi_plugin\gui\checks\zero_d_one_d.py
 def verify_input(output_path, revision_selected):
     """
     Checks whether all fields are correctly filled out

diff --git a/.../klimaatsommen/verify_klimaatsommen_ui.py → .../klimaatsommen/verify_klimaatsommen_ui.py b/.../klimaatsommen/verify_klimaatsommen_ui.py → .../klimaatsommen/verify_klimaatsommen_ui.py
@@ -1,9 +1,9 @@
-from ...error_messages.input_error_messages import (
+from ....hhnk_threedi_plugin.error_messages.input_error_messages import (
     no_output_folder,
     no_result_selected,
     invalid_model_path,
 )
-from ...gui.path_verification_functions import is_valid_raster, is_valid_model_path
+from ....hhnk_threedi_plugin.gui.path_verification_functions import is_valid_raster, is_valid_model_path
 
 
 def verify_input(revision_selected, dem_path, model_path, output_path):

diff --git a/hhnk_threedi_plugin/gui/utility_functions.py → deprecated/gui/utility_functions.py b/hhnk_threedi_plugin/gui/utility_functions.py → deprecated/gui/utility_functions.py
diff --git a/...agement/layers/build_layer_styles_dict.py → ...is_interaction/build_layer_styles_dict.py b/...agement/layers/build_layer_styles_dict.py → ...is_interaction/build_layer_styles_dict.py
diff --git a/hhnk_threedi_plugin/gui/tools/__init__.py → ...ated/qgis_interaction/configs/__init__.py b/hhnk_threedi_plugin/gui/tools/__init__.py → ...ated/qgis_interaction/configs/__init__.py
diff --git a/...n/qgis_interaction/configs/achtergrond.py → ...d/qgis_interaction/configs/achtergrond.py b/...n/qgis_interaction/configs/achtergrond.py → ...d/qgis_interaction/configs/achtergrond.py
diff --git a/...yers_management/layers/get_layers_list.py → ...cated/qgis_interaction/get_layers_list.py b/...yers_management/layers/get_layers_list.py → ...cated/qgis_interaction/get_layers_list.py
@@ -1,11 +1,11 @@
-from ..groups.layer_groups_structure import QgisLayerStructure
+from ...hhnk_threedi_plugin.qgis_interaction.layers_management.groups.layer_groups_structure import QgisLayerStructure
 import os
 import re
-from ..groups.project_groups_dicts import build_groups_dict
-from ..layers.build_layer_names_dict import build_layer_dicts
-from ..layers.layer_variable import layerVariables
-from ..layers.build_layer_styles_dict import build_layer_styles_dict
-from ..layers.layer_types_definition import VECTOR, VIRTUAL, RASTER
+from .layers_management.groups.project_groups_dicts import build_groups_dict
+from .layers_management.layers.build_layer_names_dict import build_layer_dicts
+from ...hhnk_threedi_plugin.qgis_interaction.layers_management.layers.layer_variable import layerVariables
+from .build_layer_styles_dict import build_layer_styles_dict
+from ...hhnk_threedi_plugin.qgis_interaction.layers_management.layers.layer_types_definition import VECTOR, VIRTUAL, RASTER
 
 
 from hhnk_research_tools.variables import file_types_dict, GPKG, TIF

diff --git a/...action/layers_management/adding_layers.py → ...action/layers_management/adding_layers.py b/...action/layers_management/adding_layers.py → ...action/layers_management/adding_layers.py
@@ -1,7 +1,7 @@
 import os
 import re
 import copy
-from .layers.layer_types_definition import VECTOR, VIRTUAL, RASTER
+from ....hhnk_threedi_plugin.qgis_interaction.layers_management.layers.layer_types_definition import VECTOR, VIRTUAL, RASTER
 from qgis.core import (
     QgsProject,
     QgsVectorLayer,

diff --git a/...ugin/qgis_interaction/configs/__init__.py → ...tion/layers_management/groups/__init__.py b/...ugin/qgis_interaction/configs/__init__.py → ...tion/layers_management/groups/__init__.py
diff --git a/.../layers_management/groups/group_orders.py → .../layers_management/groups/group_orders.py b/.../layers_management/groups/group_orders.py → .../layers_management/groups/group_orders.py
@@ -1,4 +1,4 @@
-from .layer_groups_structure import QgisLayerStructure
+from .....hhnk_threedi_plugin.qgis_interaction.layers_management.groups.layer_groups_structure import QgisLayerStructure
 
 
 def build_group_order(qls):

diff --git a/...nagement/groups/layer_groups_structure.py → ...nagement/groups/layer_groups_structure.py b/...nagement/groups/layer_groups_structure.py → ...nagement/groups/layer_groups_structure.py
diff --git a/...management/groups/project_groups_dicts.py → ...management/groups/project_groups_dicts.py b/...management/groups/project_groups_dicts.py → ...management/groups/project_groups_dicts.py
diff --git a/...interaction/layers_management/__init__.py → ...tion/layers_management/layers/__init__.py b/...interaction/layers_management/__init__.py → ...tion/layers_management/layers/__init__.py
diff --git a/...nagement/layers/build_layer_names_dict.py → ...nagement/layers/build_layer_names_dict.py b/...nagement/layers/build_layer_names_dict.py → ...nagement/layers/build_layer_names_dict.py
diff --git a/...nagement/layers/layer_types_definition.py → ...nagement/layers/layer_types_definition.py b/...nagement/layers/layer_types_definition.py → ...nagement/layers/layer_types_definition.py
diff --git a/...ayers_management/layers/layer_variable.py → ...ayers_management/layers/layer_variable.py b/...ayers_management/layers/layer_variable.py → ...ayers_management/layers/layer_variable.py
diff --git a/...tion/layers_management/removing_layers.py → ...tion/layers_management/removing_layers.py b/...tion/layers_management/removing_layers.py → ...tion/layers_management/removing_layers.py
diff --git a/...yer_styles/bank_levels/1d2d_flowlines.qml → ...yer_styles/bank_levels/1d2d_flowlines.qml b/...yer_styles/bank_levels/1d2d_flowlines.qml → ...yer_styles/bank_levels/1d2d_flowlines.qml
diff --git a/...s/bank_levels/cross_section_locations.qml → ...s/bank_levels/cross_section_locations.qml b/...s/bank_levels/cross_section_locations.qml → ...s/bank_levels/cross_section_locations.qml
diff --git a/...styles/bank_levels/flow_1d2d_channels.qml → ...styles/bank_levels/flow_1d2d_channels.qml b/...styles/bank_levels/flow_1d2d_channels.qml → ...styles/bank_levels/flow_1d2d_channels.qml
diff --git a/...gis_layer_styles/bank_levels/manholes.qml → ...gis_layer_styles/bank_levels/manholes.qml b/...gis_layer_styles/bank_levels/manholes.qml → ...gis_layer_styles/bank_levels/manholes.qml
diff --git a/deprecated/tasks/tests_tasks/one_d_two_d/flowlines_task.py b/deprecated/tasks/tests_tasks/one_d_two_d/flowlines_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 
 
 # old

diff --git a/deprecated/tasks/tests_tasks/one_d_two_d/read_nodes_task.py b/deprecated/tasks/tests_tasks/one_d_two_d/read_nodes_task.py
@@ -2,11 +2,8 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 
-# old
-# from hhnk_threedi_tools.tests.one_d_two_d.read_nodes_results import read_node_results
-# import hhnk_research_tools as hrt
 
 # new
 from hhnk_threedi_tools import OneDTwoDTest

diff --git a/deprecated/tasks/tests_tasks/one_d_two_d/waterlevels_task.py b/deprecated/tasks/tests_tasks/one_d_two_d/waterlevels_task.py
@@ -1,12 +1,9 @@
 import copy
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 from hhnk_threedi_plugin.qgis_interaction.layers_management.layers.layer_variable import layerVariables
 
-# old
-# from hhnk_threedi_tools.folder_structure_and_paths.paths_functions import create_tif_path
-# from hhnk_threedi_tools.tests.one_d_two_d.get_waterlevel_at_timesteps import calc_waterlevel_depth_at_timesteps
 
 from hhnk_threedi_tools import OneDTwoDTest
 

diff --git a/deprecated/tasks/tests_tasks/sqlite/controlled_structs_task.py b/deprecated/tasks/tests_tasks/sqlite/controlled_structs_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 from hhnk_threedi_plugin.gui.checks.sqlite_test_widgets.controlled_structs_result import (
     create_controlled_structs_widget,
 )

diff --git a/deprecated/tasks/tests_tasks/sqlite/dewatering_task.py b/deprecated/tasks/tests_tasks/sqlite/dewatering_task.py
@@ -1,7 +1,7 @@
 import copy
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 
 description = "bepalen ontwateringsdiepte op basis van DEM hoogtes"
 

diff --git a/deprecated/tasks/tests_tasks/sqlite/isolated_channels_task.py b/deprecated/tasks/tests_tasks/sqlite/isolated_channels_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 from hhnk_threedi_plugin.gui.checks.sqlite_test_widgets.isolated_channels_result import (
     create_isolated_channels_result_widget,
 )

diff --git a/deprecated/tasks/tests_tasks/sqlite/profiles_used_task.py b/deprecated/tasks/tests_tasks/sqlite/profiles_used_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 from hhnk_threedi_plugin.gui.checks.sqlite_test_widgets.profiles_used_result import (
     create_profiles_used_widget,
 )

diff --git a/deprecated/tasks/tests_tasks/sqlite/sqlite_test_task.py b/deprecated/tasks/tests_tasks/sqlite/sqlite_test_task.py
@@ -3,7 +3,7 @@
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
 from PyQt5.QtCore import QMutex, QWaitCondition
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 from hhnk_threedi_plugin.gui.checks.sqlite_test_widgets.isolated_channels_result import (
     create_isolated_channels_result_widget,
 )

diff --git a/deprecated/tasks/tests_tasks/sqlite/structs_channel_task.py b/deprecated/tasks/tests_tasks/sqlite/structs_channel_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 from hhnk_threedi_plugin.gui.checks.sqlite_test_widgets.structs_channels_result import (
     create_structs_channels_result_widget,
 )

diff --git a/deprecated/tasks/tests_tasks/sqlite/watersurface_area_task.py b/deprecated/tasks/tests_tasks/sqlite/watersurface_area_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 from hhnk_threedi_plugin.gui.checks.sqlite_test_widgets.watersurface_area_result import (
     create_watersurface_area_result_widget,
 )

diff --git a/deprecated/tasks/tests_tasks/sqlite/weir_height_task.py b/deprecated/tasks/tests_tasks/sqlite/weir_height_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 from hhnk_threedi_plugin.gui.checks.sqlite_test_widgets.weir_height_result import (
     create_weir_height_widget,
 )

diff --git a/deprecated/tasks/tests_tasks/zero_d_one_d/zero_d_one_d/hydraulic_tests_task.py b/deprecated/tasks/tests_tasks/zero_d_one_d/zero_d_one_d/hydraulic_tests_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 
 # hhnk-threedi-tests
 from hhnk_threedi_tools import ZeroDOneDTest

diff --git a/deprecated/tasks/tests_tasks/zero_d_one_d/zero_d_one_d/zero_d_one_d_task.py b/deprecated/tasks/tests_tasks/zero_d_one_d/zero_d_one_d/zero_d_one_d_task.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import pyqtSignal
 from qgis.core import QgsTask, Qgis
 from qgis.utils import QgsMessageLog, iface
-from hhnk_threedi_plugin.qgis_interaction.layers_management.adding_layers import add_layers
+from deprecated.qgis_interaction.layers_management.adding_layers import add_layers
 
 
 description = "0d1d tests uitvoeren"

diff --git a/hhnk_threedi_plugin/.ipynb_checkpoints/Untitled-checkpoint.ipynb b/hhnk_threedi_plugin/.ipynb_checkpoints/Untitled-checkpoint.ipynb
diff --git a/hhnk_threedi_plugin/env/environment.yml b/hhnk_threedi_plugin/env/environment.yml
@@ -47,13 +47,13 @@ dependencies:
   - pip: # 3Di packages are not conda installable and are therefore installed by PIP
     # - et-xmlfile==1.1.0
     - openpyxl==3.1.2
-    - threedi_modelchecker==1.0.1
+    - threedi_modelchecker==2.1.0 #ThreediToolbox 2.5.2
     - threedi_scenario_downloader==0.16
-    - threedi_schema==0.214.4
+    - threedi_schema==0.216.4 #ThreediToolbox 2.5.2
     - threedi_raster_edits==0.26
     - threedi-api-client==4.1.1
-    - threedigrid_builder==1.8.0
+    - threedigrid_builder==1.10.0 #ThreediToolbox 2.5.2
 
     #Plugin
-    - hhnk_research_tools==2023.1
-    - hhnk_threedi_tools==2023.1
+    - hhnk_research_tools==2023.2
+    - hhnk_threedi_tools==2023.2
diff --git a/hhnk_threedi_plugin/env/environment_dev.yml b/hhnk_threedi_plugin/env/environment_dev.yml
@@ -35,9 +35,9 @@ dependencies:
   - pip: # 3Di packages are not conda installable and are therefore installed by PIP
     - et-xmlfile==1.1.0
     - openpyxl==3.1.2
-    - threedi_modelchecker==1.0.1
+    - threedi_modelchecker==2.1.0 #ThreediToolbox 2.5.2
     - threedi_scenario_downloader==0.16
-    - threedi_schema==0.214.4
+    - threedi_schema==0.216.4 #ThreediToolbox 2.5.2
     - threedi_raster_edits==0.26
     - threedi-api-client==4.1.1
-    - threedigrid_builder==1.8.0
+    - threedigrid_builder==1.10.0 #ThreediToolbox 2.5.2