Merge pull request #184 from QGEP/2024-12-11-fix-ara-bauwerk-export-2…

…nd-attempt 2024 12 11 fix ara bauwerk export 2nd attempt
QGEP · Dec 20, 2024 · d641adc · d641adc
2 parents 53ed91e + 59d05a1
commit d641adc
Show file tree

Hide file tree

Showing 6 changed files with 2,728 additions and 435 deletions.
diff --git a/qgepqwat2ili/gui/__init__.py b/qgepqwat2ili/gui/__init__.py
@@ -658,7 +658,11 @@ def action_do_export():
             #            try:
 
             # add logger info to check what selection is used
+            # 18.12.2024
             logger.info(f"Start Exporting with selection {str(export_dialog.selected_ids)}")
+            # logger.info(
+            # f"Start Exporting with selection {str(export_dialog.selected_ids)} - without automatic extension of neigbouring wwn elements"
+            # )
 
             if emodel == "VSA_KEK_2019_LV95":
                 logger.info("Start Exporting VSA_KEK_2019_LV95")

diff --git a/qgepqwat2ili/gui/gui_export.py b/qgepqwat2ili/gui/gui_export.py
@@ -209,14 +209,18 @@ def logs_next_to_file(self):
 
     @property
     def selected_ids(self):
+        # Variable to choose if automatic selection_extend or not
+        selection_extend = True
+
         if self.limit_checkbox.isChecked():
             ids = []
             for struct in self.structures:
                 ids.append(str(struct["wn_obj_id"]))
             for reach in self.reaches:
                 ids.append(str(reach["obj_id"]))
-                ids.append(str(reach["rp_from_fk_wastewater_networkelement"]))
-                ids.append(str(reach["rp_to_fk_wastewater_networkelement"]))
+                if selection_extend:
+                    ids.append(str(reach["rp_from_fk_wastewater_networkelement"]))
+                    ids.append(str(reach["rp_to_fk_wastewater_networkelement"]))
             return ids
         else:
             return None