change windows of sub-basin preprocessing, soil converter and land use mapping QMainWindow (no child)

Author: lorenz3tla

QTalsim/qtalsim.py

@@ -808,10 +808,7 @@ def checkGaps(self, layer, extent):
         for feature in gapsLayer.getFeatures():
             feature['gapFeature'] = 1  # Set identifier
             gapsLayer.updateFeature(feature)
-        gapsLayer.commitChanges()
-
-        self.log_to_qtalsim_tab("Existing gaps are represented in temporary layer 'Gaps'.",Qgis.Info)
-        QgsProject.instance().addMapLayer(gapsLayer)
+        gapsLayer.commitChanges()        
 
         return gapsLayer
 
@@ -943,7 +940,7 @@ def clean_geometry(geom): #Function to clean the geometry as complex geometries
             'INPUT': merged_layer,
             'MODE': mode,  
             'OUTPUT': 'TEMPORARY_OUTPUT'
-        },feedback=self.feedback)
+        }, feedback=self.feedback)
         layer_without_gaps = result_eliminate['OUTPUT']
 
         layer_without_gaps, _ = self.make_geometries_valid(layer_without_gaps)
@@ -1739,7 +1736,9 @@ def checkGapsSoil(self):
             self.log_to_qtalsim_tab("QTalsim is currently loading, checking for gaps in soil layer.", Qgis.Info)
             self.start_operation()
             self.soilGaps = self.checkGaps(self.soilLayerIntermediate, self.clippingEZG)
-
+            self.soilGaps.setName('GapsSoil')
+            QgsProject.instance().addMapLayer(self.soilGaps)
+            self.log_to_qtalsim_tab("Existing gaps are represented in temporary layer 'GapsSoil'.",Qgis.Info)
             #Add checkmark when process is finished
             current_text = self.dlg.onCheckGapsSoil.text()
             if "✓" not in current_text:  #Avoid duplicate checkmarks
@@ -2323,12 +2322,14 @@ def checkGapsLanduse(self):
             Checks for gaps in the land use layer and adds a layer representing the gaps.
         '''
         try:
-            self.log_to_qtalsim_tab("QTalsim is currently loading, checking for gaps in soil layer.", Qgis.Info)
+            self.log_to_qtalsim_tab("QTalsim is currently loading, checking for gaps in land use layer.", Qgis.Info)
             self.start_operation()
             self.landuseGaps = self.checkGaps(self.landuseTalsim, self.clippingEZG)
-
+            self.landuseGaps.setName('GapsLanduse')
+            QgsProject.instance().addMapLayer(self.landuseGaps)
             #Add checkmark when process is finished
             current_text = self.dlg.onCheckGapsLanduse.text()
+            self.log_to_qtalsim_tab("Existing gaps are represented in temporary layer 'GapsLanduse'.", Qgis.Info)
             if "✓" not in current_text:  #Avoid duplicate checkmarks
                 self.dlg.onCheckGapsLanduse.setText(f"{current_text} ✓")
         except Exception as e:
@@ -4409,55 +4410,10 @@ def run(self):
         self.dlg.show()
 
         #Run the dialog event loop
-        result = self.dlg.exec_()
+        #result = self.dlg.exec_()
         if self.dialog_status == 'Reset':
             return
 
-        #See if OK was pressed
-        '''
-        if result:
-            
-                Saving to Geopackage.
-            
-            try:
-                geopackage_name, ok = QInputDialog.getText(None, "GeoPackage Name", "Enter the name of the GeoPackage:")
-                self.geopackage_path = os.path.join(self.outputFolder, f"{geopackage_name}.gpkg")
-                self.start_operation()
-                self.log_to_qtalsim_tab(f"Saving the layers to {self.outputFolder}.", Qgis.Info)
-                def create_gpkg_save_layer(layer, gpkg_path, layer_name):
-                    params = {
-                        'INPUT': layer,
-                        'OUTPUT': gpkg_path,
-                        'LAYER_NAME': layer_name,
-                        'OVERWRITE': True,
-                    }
-                    processing.run("native:savefeatures", params)
-                    
-                def add_layers_to_gpkg(layer, gpkg_path, layer_name):    
-                    params = {'INPUT': layer,
-                            'OPTIONS': f'-update -nln {layer_name} -nlt MULTIPOLYGON', #added -nlt MULTIPOLYGON
-                            'OUTPUT': gpkg_path}
-                    processing.run("gdal:convertformat", params)
-                
-                gpkg_path = self.geopackage_path
-                if os.path.exists(gpkg_path): 
-                    try:
-                        os.remove(gpkg_path)
-                    except Exception as e:
-                        self.log_to_qtalsim_tab(f"Failed to delete existing GeoPackage: {e}",Qgis.Critical)
-                create_gpkg_save_layer(self.eflLayer, gpkg_path,'hru') 
-                add_layers_to_gpkg(self.landuseFinal, gpkg_path, 'landuse')
-                add_layers_to_gpkg(self.soilTextureFinal, gpkg_path, 'soiltexture') 
-                add_layers_to_gpkg(self.soilTypeFinal, gpkg_path, 'soiltype') 
-                self.log_to_qtalsim_tab(f"File was saved to this folder: {self.outputFolder}", Qgis.Info)
-
-            except Exception as e:
-                self.log_to_qtalsim_tab(f"Error: {e}", Qgis.Critical)
-
-            finally:
-                self.end_operation()
-        '''
-
     def open_sql_connect_dock(self):
         '''
         Method to open or show the SQL Connect dock.
@@ -4483,10 +4439,11 @@ def onDockDestroyed(self, obj=None):
     def open_sub_basin_window(self):
         if self.first_start:
             self.first_start = False
-        if not hasattr(self, 'subBasinWindow'):
-            self.subBasinWindow = QMainWindow(self.iface.mainWindow())
+        if not hasattr(self, 'subBasinWindow') or self.subBasinWindow is None:
+            self.subBasinWindow = QMainWindow()
             self.subBasinWindow.setWindowTitle("Sub-basin preprocessing")
-            self.subBasinDialog = SubBasinPreprocessingDialog(self.iface.mainWindow(), self)
+            self.subBasinWindow.setAttribute(Qt.WA_DeleteOnClose)
+            self.subBasinDialog = SubBasinPreprocessingDialog(self.subBasinWindow, self)
             self.subBasinWindow.setCentralWidget(self.subBasinDialog)
         else:
             self.subBasinDialog.initialize_parameters()
@@ -4498,9 +4455,10 @@ def open_sub_basin_window(self):
     def open_soil_window(self):
         if self.first_start:
             self.first_start = False
-        if not hasattr(self, 'soilWindow'):
-            self.soilWindow = QMainWindow(self.iface.mainWindow())
+        if not hasattr(self, 'soilWindow') or self.soilWindow is None:
+            self.soilWindow = QMainWindow()
             self.soilWindow.setWindowTitle("ISRIC Soil Type Converter")
+            self.soilWindow.setAttribute(Qt.WA_DeleteOnClose)
             self.soilDialog = SoilPreprocessingDialog(self.iface.mainWindow(), self)
             self.soilWindow.setCentralWidget(self.soilDialog)
         else:
@@ -4513,9 +4471,10 @@ def open_soil_window(self):
     def open_landuse_window(self):
         if self.first_start:
             self.first_start = False
-        if not hasattr(self, 'landuseWindow'):
-            self.landuseWindow = QMainWindow(self.iface.mainWindow())
+        if not hasattr(self, 'landuseWindow') or self.landuseWindow is None:
+            self.landuseWindow = QMainWindow()
             self.landuseWindow.setWindowTitle("Land use mapping")
+            self.landuseWindow.setAttribute(Qt.WA_DeleteOnClose)
             self.landuseDialog = LanduseAssignmentDialog(self.iface.mainWindow(), self)
             self.landuseWindow.setCentralWidget(self.landuseDialog)
         else:

docs/hrus_step_by_step.rst

@@ -145,15 +145,15 @@ Select and Edit Land use layer
 
 	The table below shows the necessary types for these parameters. Additionally, it also shows the required unit and restrictions of the parameters. If the user-mapped field has a different datatype, the plugin, where possible, converts the field’s values to the parameter’s type. 
 
-	If ‘Parameter not available’ is selected, the plugin is trying to fill those parameters with Talsim parameters using the "Name"-field. The list with land use names and their parameters can be found here: :download:`Land use parameters file <_static/landuseParameterValues.csv>`. If the land use name is not found, that parameter will be added with null values. Only for pTAW 0,5 is used as default value, if the user does not insert a parameter. 
+	If ‘Parameter not available’ is selected, the plugin is trying to fill those parameters with Talsim parameters using the "Name"-field. If you used QTalsim "Land Use Mapping" for creating the land use layer, the name is stored in the field "OBJART_NEU" The list with land use names and their parameters can be found here: :download:`Land use parameters file <_static/landuseParameterValues.csv>`. If the land use name is not found, that parameter will be added with null values. Only for pTAW 0,5 is used as default value, if the user does not insert a parameter. 
 
-         After completing the mapping, click ‘Confirm Landuse Mapping’ to create a new
-         layer containing the input fields from your layer and the
-         Talsim parameter values. If the user defines area/percentage thresholds, land use features below these thresholds are
-	 deleted during this step. The user can set a minimum size of
-         the land use features [m²] and a minimum percentage of the land use features relative to the
-         corresponding sub-basin's area. Land use features that fall below the specified size or
-         percentage share are deleted and filled using the ‘Eliminate’-tool.
+	After completing the mapping, click ‘Confirm Landuse Mapping’ to create a new
+	layer containing the input fields from your layer and the
+	Talsim parameter values. If the user defines area/percentage thresholds, land use features below these thresholds are
+	deleted during this step. The user can set a minimum size of
+	the land use features [m²] and a minimum percentage of the land use features relative to the
+	corresponding sub-basin's area. Land use features that fall below the specified size or
+	percentage share are deleted and filled using the ‘Eliminate’-tool.
 
 
          ==============================     ======     =====     =====================