From db67f2f8c5e666ff6bb007932d4bc217d359c046 Mon Sep 17 00:00:00 2001 From: signedav Date: Tue, 16 Jul 2024 13:49:36 +0200 Subject: [PATCH] set the list panel with the db_id instead of the mode. Might resolve #945* --- .../gui/workflow_wizard/database_selection_page.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/QgisModelBaker/gui/workflow_wizard/database_selection_page.py b/QgisModelBaker/gui/workflow_wizard/database_selection_page.py index 8388630c..6cd22d52 100644 --- a/QgisModelBaker/gui/workflow_wizard/database_selection_page.py +++ b/QgisModelBaker/gui/workflow_wizard/database_selection_page.py @@ -88,9 +88,9 @@ def _type_changed(self): value._show_panel() def restore_configuration(self, configuration, get_config_from_project=False): - configuration = Ili2DbCommandConfiguration() valid = False mode = None + layer_configuration = Ili2DbCommandConfiguration() if get_config_from_project: # tries to take settings from the project @@ -98,12 +98,14 @@ def restore_configuration(self, configuration, get_config_from_project=False): if layer: source_provider = layer.dataProvider() valid, mode = db_utils.get_configuration_from_sourceprovider( - source_provider, configuration + source_provider, layer_configuration ) if valid and mode: # uses the settings from the project and provides it to the gui + configuration = layer_configuration configuration.tool = mode + self._lst_panel[mode].set_fields(configuration) else: # takes settings from QSettings and provides it to the gui settings = QSettings() @@ -112,13 +114,12 @@ def restore_configuration(self, configuration, get_config_from_project=False): db_factory = self.db_simple_factory.create_factory(db_id) config_manager = db_factory.get_db_command_config_manager(configuration) config_manager.load_config_from_qsettings() + self._lst_panel[db_id].set_fields(configuration) mode = settings.value("QgisModelBaker/importtype") mode = DbIliMode[mode] if mode else self.db_simple_factory.default_database mode = mode & ~DbIliMode.ili - configuration.tool = mode - self._lst_panel[mode].set_fields(configuration) self.type_combo_box.setCurrentIndex(self.type_combo_box.findData(mode)) self._type_changed()