From 42ac757c981c2ff78ab58a88e06bfa48d2d8cc47 Mon Sep 17 00:00:00 2001 From: Damiano Lombardi Date: Thu, 10 Aug 2023 13:03:46 +0200 Subject: [PATCH 1/2] Remove old unused files --- QgisModelBaker/gui/export.py | 655 ------------ QgisModelBaker/gui/generate_project.py | 1355 ------------------------ QgisModelBaker/gui/import_data.py | 600 ----------- QgisModelBaker/gui/multiple_models.py | 67 -- QgisModelBaker/qgismodelbaker.py | 100 -- QgisModelBaker/ui/export.ui | 233 ---- QgisModelBaker/ui/generate_project.ui | 328 ------ QgisModelBaker/ui/import_data.ui | 276 ----- QgisModelBaker/ui/multiple_models.ui | 181 ---- 9 files changed, 3795 deletions(-) delete mode 100644 QgisModelBaker/gui/export.py delete mode 100644 QgisModelBaker/gui/generate_project.py delete mode 100644 QgisModelBaker/gui/import_data.py delete mode 100644 QgisModelBaker/gui/multiple_models.py delete mode 100644 QgisModelBaker/ui/export.ui delete mode 100644 QgisModelBaker/ui/generate_project.ui delete mode 100644 QgisModelBaker/ui/import_data.ui delete mode 100644 QgisModelBaker/ui/multiple_models.ui diff --git a/QgisModelBaker/gui/export.py b/QgisModelBaker/gui/export.py deleted file mode 100644 index 2de3ceaf8..000000000 --- a/QgisModelBaker/gui/export.py +++ /dev/null @@ -1,655 +0,0 @@ -""" -/*************************************************************************** - ------------------- - begin : 30/05/17 - git sha : :%H$ - copyright : (C) 2017 by Germán Carrillo (BSF-Swissphoto) - email : gcarrillo@linuxmail.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ -""" - -import os -import os.path -import re -import webbrowser - -from qgis.core import Qgis -from qgis.gui import QgsGui, QgsMessageBar -from qgis.PyQt.QtCore import ( - QCoreApplication, - QLocale, - QSettings, - QStringListModel, - Qt, - QTimer, -) -from qgis.PyQt.QtGui import QColor, QDesktopServices, QValidator -from qgis.PyQt.QtWidgets import ( - QAction, - QDialog, - QDialogButtonBox, - QGridLayout, - QMessageBox, - QSizePolicy, -) - -from QgisModelBaker.gui.edit_command import EditCommandDialog -from QgisModelBaker.gui.options import OptionsDialog -from QgisModelBaker.gui.panel import db_panel_utils -from QgisModelBaker.libs.modelbaker.db_factory.db_simple_factory import DbSimpleFactory -from QgisModelBaker.libs.modelbaker.dbconnector.db_connector import DBConnectorError -from QgisModelBaker.libs.modelbaker.iliwrapper import ili2dbconfig, iliexporter -from QgisModelBaker.libs.modelbaker.iliwrapper.globals import DbIliMode -from QgisModelBaker.libs.modelbaker.iliwrapper.ili2dbutils import ( - JavaNotFoundError, - color_log_text, -) -from QgisModelBaker.libs.modelbaker.utils.globals import DbActionType -from QgisModelBaker.libs.modelbaker.utils.qt_utils import ( - FileValidator, - OverrideCursor, - Validators, - make_save_file_selector, -) -from QgisModelBaker.utils import gui_utils -from QgisModelBaker.utils.globals import displayDbIliMode -from QgisModelBaker.utils.gui_utils import LogColor - -DIALOG_UI = gui_utils.get_ui_class("export.ui") - - -class ExportModels(QStringListModel): - - blacklist = [ - "CHBaseEx_MapCatalogue_V1", - "CHBaseEx_WaterNet_V1", - "CHBaseEx_Sewage_V1", - "CHAdminCodes_V1", - "AdministrativeUnits_V1", - "AdministrativeUnitsCH_V1", - "WithOneState_V1", - "WithLatestModification_V1", - "WithModificationObjects_V1", - "GraphicCHLV03_V1", - "GraphicCHLV95_V1", - "NonVector_Base_V2", - "NonVector_Base_V3", - "NonVector_Base_LV03_V3_1", - "NonVector_Base_LV95_V3_1", - "GeometryCHLV03_V1", - "GeometryCHLV95_V1", - "InternationalCodes_V1", - "Localisation_V1", - "LocalisationCH_V1", - "Dictionaries_V1", - "DictionariesCH_V1", - "CatalogueObjects_V1", - "CatalogueObjectTrees_V1", - "AbstractSymbology", - "CodeISO", - "CoordSys", - "GM03_2_1Comprehensive", - "GM03_2_1Core", - "GM03_2Comprehensive", - "GM03_2Core", - "GM03Comprehensive", - "GM03Core", - "IliRepository09", - "IliSite09", - "IlisMeta07", - "IliVErrors", - "INTERLIS_ext", - "RoadsExdm2ben", - "RoadsExdm2ben_10", - "RoadsExgm2ien", - "RoadsExgm2ien_10", - "StandardSymbology", - "StandardSymbology", - "Time", - "Units", - ] - - def __init__(self): - super().__init__() - self._checked_models = None - - def refresh_models(self, db_connector=None): - modelnames = list() - - if db_connector: - if db_connector.db_or_schema_exists() and db_connector.metadata_exists(): - db_models = db_connector.get_models() - regex = re.compile(r"(?:\{[^\}]*\}|\s)") - for db_model in db_models: - for modelname in regex.split(db_model["modelname"]): - if modelname and modelname not in ExportModels.blacklist: - modelnames.append(modelname.strip()) - - self.setStringList(modelnames) - - self._checked_models = {modelname: Qt.Checked for modelname in modelnames} - - def flags(self, index): - return Qt.ItemIsSelectable | Qt.ItemIsEnabled - - def data(self, index, role): - if role == Qt.CheckStateRole: - return self._checked_models[self.data(index, Qt.DisplayRole)] - else: - return QStringListModel.data(self, index, role) - - def setData(self, index, role, data): - if role == Qt.CheckStateRole: - self._checked_models[self.data(index, Qt.DisplayRole)] = data - else: - QStringListModel.setData(self, index, role, data) - - def check(self, index): - if self.data(index, Qt.CheckStateRole) == Qt.Checked: - self.setData(index, Qt.CheckStateRole, Qt.Unchecked) - else: - self.setData(index, Qt.CheckStateRole, Qt.Checked) - - def checked_models(self): - return [ - modelname - for modelname in self.stringList() - if self._checked_models[modelname] == Qt.Checked - ] - - -class ExportDialog(QDialog, DIALOG_UI): - ValidExtensions = ["xtf", "XTF", "itf", "ITF", "gml", "GML", "xml", "XML"] - - def __init__(self, base_config, parent=None): - QDialog.__init__(self, parent) - self.setupUi(self) - self.db_simple_factory = DbSimpleFactory() - QgsGui.instance().enableAutoGeometryRestore(self) - self.buttonBox.accepted.disconnect() - self.buttonBox.clear() - self.buttonBox.addButton(QDialogButtonBox.Cancel) - self.buttonBox.addButton(QDialogButtonBox.Help) - self.buttonBox.helpRequested.connect(self.help_requested) - - self.export_text = self.tr("Export") - self.set_button_to_export_action = QAction(self.export_text, None) - self.set_button_to_export_action.triggered.connect(self.set_button_to_export) - - self.export_without_validation_text = self.tr("Export without validation") - self.set_button_to_export_without_validation_action = QAction( - self.export_without_validation_text, None - ) - self.set_button_to_export_without_validation_action.triggered.connect( - self.set_button_to_export_without_validation - ) - - self.edit_command_action = QAction(self.tr("Edit ili2db command"), None) - self.edit_command_action.triggered.connect(self.edit_command) - - self.export_tool_button.addAction( - self.set_button_to_export_without_validation_action - ) - self.export_tool_button.addAction(self.edit_command_action) - self.export_tool_button.setText(self.export_text) - self.export_tool_button.clicked.connect(self.accepted) - - self.xtf_file_browse_button.clicked.connect( - make_save_file_selector( - self.xtf_file_line_edit, - title=self.tr("Save in XTF Transfer File"), - file_filter=self.tr( - "XTF Transfer File (*.xtf *XTF);;Interlis 1 Transfer File (*.itf *ITF);;XML (*.xml *XML);;GML (*.gml *GML)" - ), - extension=".xtf", - extensions=["." + ext for ext in self.ValidExtensions], - ) - ) - self.xtf_file_browse_button.clicked.connect(self.xtf_browser_opened_to_true) - self.xtf_browser_was_opened = False - - self.type_combo_box.clear() - self._lst_panel = dict() - - for db_id in self.db_simple_factory.get_db_list(False): - self.type_combo_box.addItem(displayDbIliMode[db_id], db_id) - item_panel = db_panel_utils.get_config_panel( - db_id, self, DbActionType.EXPORT - ) - self._lst_panel[db_id] = item_panel - self.db_layout.addWidget(item_panel) - - self.validators = Validators() - - fileValidator = FileValidator( - pattern=["*." + ext for ext in self.ValidExtensions], - allow_non_existing=True, - ) - - self.xtf_file_line_edit.setValidator(fileValidator) - self.xtf_file_line_edit.textChanged.connect(self.validators.validate_line_edits) - self.xtf_file_line_edit.textChanged.connect(self.xtf_browser_opened_to_false) - self.xtf_file_line_edit.textChanged.emit(self.xtf_file_line_edit.text()) - - # Reset to export as default text - self.xtf_file_line_edit.textChanged.connect(self.set_button_to_export) - - # refresh the models on changing values but avoid massive db connects by timer - self.refreshTimer = QTimer() - self.refreshTimer.setSingleShot(True) - self.refreshTimer.timeout.connect(self.refresh_models) - - for key, value in self._lst_panel.items(): - value.notify_fields_modified.connect(self.request_for_refresh_models) - - self.validate_data = True # validates exported data by default, We use --disableValidation when is False - self.base_configuration = base_config - self.restore_configuration() - - self.export_models_model = ExportModels() - self.export_models_view.setModel(self.export_models_model) - self.export_models_view.clicked.connect(self.export_models_model.check) - self.export_models_view.space_pressed.connect(self.export_models_model.check) - self.request_for_refresh_models() - - self.type_combo_box.currentIndexChanged.connect(self.type_changed) - - self.bar = QgsMessageBar() - self.bar.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) - self.txtStdout.setLayout(QGridLayout()) - self.txtStdout.layout().setContentsMargins(0, 0, 0, 0) - self.txtStdout.layout().addWidget(self.bar, 0, 0, Qt.AlignTop) - - def request_for_refresh_models(self): - # hold refresh back - self.refreshTimer.start(500) - - def refresh_models(self): - self.refreshed_export_models_model() - - def refreshed_export_models_model(self): - tool = self.type_combo_box.currentData() & ~DbIliMode.ili - - configuration = self.updated_configuration() - schema = configuration.dbschema - - db_factory = self.db_simple_factory.create_factory(tool) - config_manager = db_factory.get_db_command_config_manager(configuration) - uri_string = config_manager.get_uri(configuration.db_use_super_login) - - db_connector = None - - try: - db_connector = db_factory.get_db_connector(uri_string, schema) - except (DBConnectorError, FileNotFoundError): - # when wrong connection parameters entered, there should just be returned an empty model - so let it pass - pass - - self.export_models_model.refresh_models(db_connector) - - def db_ili_version(self, configuration): - """ - Returns the ili2db version the database has been created with or None if the database - could not be detected as a ili2db database - """ - schema = configuration.dbschema - - db_factory = self.db_simple_factory.create_factory(configuration.tool) - config_manager = db_factory.get_db_command_config_manager(configuration) - uri_string = config_manager.get_uri(configuration.db_use_super_login) - - db_connector = None - - try: - db_connector = db_factory.get_db_connector(uri_string, schema) - return db_connector.ili_version() - except (DBConnectorError, FileNotFoundError): - return None - - def set_button_to_export(self): - """ - Changes the text of the button to export (with validation) and sets the validate_data to true. - So on clicking the button the export will start with validation. - The buttons actions are changed to be able to switch the without-validation mode. - """ - self.validate_data = True - self.export_tool_button.removeAction(self.set_button_to_export_action) - self.export_tool_button.removeAction(self.edit_command_action) - self.export_tool_button.addAction( - self.set_button_to_export_without_validation_action - ) - self.export_tool_button.addAction(self.edit_command_action) - self.export_tool_button.setText(self.export_text) - - def set_button_to_export_without_validation(self): - """ - Changes the text of the button to export without validation and sets the validate_data to false. - So on clicking the button the export will start without validation. - The buttons actions are changed to be able to switch the with-validation mode. - """ - self.validate_data = False - self.export_tool_button.removeAction( - self.set_button_to_export_without_validation_action - ) - self.export_tool_button.removeAction(self.edit_command_action) - self.export_tool_button.addAction(self.set_button_to_export_action) - self.export_tool_button.addAction(self.edit_command_action) - self.export_tool_button.setText(self.export_without_validation_text) - - def edit_command(self): - """ - A dialog opens giving the user the possibility to edit the ili2db command used for the export - """ - exporter = iliexporter.Exporter() - exporter.tool = self.type_combo_box.currentData() - exporter.configuration = self.updated_configuration() - command = exporter.command(True) - edit_command_dialog = EditCommandDialog(self) - edit_command_dialog.command_edit.setPlainText(command) - if edit_command_dialog.exec_(): - edited_command = edit_command_dialog.command_edit.toPlainText() - self.accepted(edited_command) - - def accepted(self, edited_command=None): - db_id = self.type_combo_box.currentData() - - res, message = self._lst_panel[db_id].is_valid() - - if not res: - self.txtStdout.setText(message) - return - - configuration = self.updated_configuration() - - if not edited_command: - if ( - not self.xtf_file_line_edit.validator().validate( - configuration.xtffile, 0 - )[0] - == QValidator.Acceptable - ): - self.txtStdout.setText( - self.tr( - "Please set a valid INTERLIS XTF file before exporting data." - ) - ) - self.xtf_file_line_edit.setFocus() - return - if not configuration.ilimodels: - self.txtStdout.setText( - self.tr("Please set a model before exporting data.") - ) - self.export_models_view.setFocus() - return - - # If xtf browser was opened and the file exists, the user already chose - # to overwrite the file - if ( - os.path.isfile(self.xtf_file_line_edit.text().strip()) - and not self.xtf_browser_was_opened - ): - self.msg = QMessageBox() - self.msg.setIcon(QMessageBox.Warning) - self.msg.setText( - self.tr( - "{filename} already exists.\nDo you want to replace it?" - ).format( - filename=os.path.basename(self.xtf_file_line_edit.text().strip()) - ) - ) - self.msg.setWindowTitle(self.tr("Save in XTF Transfer File")) - self.msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No) - msg_box = self.msg.exec_() - if msg_box == QMessageBox.No: - return - - with OverrideCursor(Qt.WaitCursor): - self.progress_bar.show() - self.progress_bar.setValue(0) - - self.disable() - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.clear() - - exporter = iliexporter.Exporter() - exporter.tool = self.type_combo_box.currentData() - exporter.configuration = configuration - - self.save_configuration(configuration) - - exporter.stdout.connect(self.print_info) - exporter.stderr.connect(self.on_stderr) - exporter.process_started.connect(self.on_process_started) - exporter.process_finished.connect(self.on_process_finished) - - self.progress_bar.setValue(25) - - try: - if exporter.run(edited_command) != iliexporter.Exporter.SUCCESS: - if configuration.db_ili_version == 3: - # failed with a db created by ili2db version 3 - if not edited_command: - # fallback because of issues with --export3 argument - self.show_message( - Qgis.Warning, - self.tr( - "Tried export with ili2db version 3.x.x (fallback)" - ), - ) - - exporter.version = 3 - # ... and enforce the Exporter to use ili2db version 3.x.x - if exporter.run() != iliexporter.Exporter.SUCCESS: - self.enable() - self.progress_bar.hide() - return - else: - self.show_message( - Qgis.Warning, - self.tr( - "Tried export with ili2db version 3.x.x (no fallback with editted command)" - ), - ) - return - else: - self.enable() - self.progress_bar.hide() - return - except JavaNotFoundError as e: - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.clear() - self.txtStdout.setText(e.error_string) - self.enable() - self.progress_bar.hide() - - QApplication.restoreOverrideCursor() - QMessageBox.critical( - self, self.tr("Java not found error"), e.error_string - ) - - return - - self.buttonBox.clear() - self.buttonBox.setEnabled(True) - self.buttonBox.addButton(QDialogButtonBox.Close) - self.progress_bar.setValue(100) - - def print_info(self, text): - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.append(text) - QCoreApplication.processEvents() - - def on_stderr(self, text): - color_log_text(text, self.txtStdout) - self.advance_progress_bar_by_text(text) - QCoreApplication.processEvents() - - def show_message(self, level, message): - if level == Qgis.Warning: - self.bar.pushMessage(message, Qgis.Info, 10) - elif level == Qgis.Critical: - self.bar.pushMessage(message, Qgis.Warning, 10) - - def on_process_started(self, command): - self.disable() - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.clear() - self.txtStdout.setText(command) - QCoreApplication.processEvents() - - def on_process_finished(self, exit_code, result): - color = "#004905" if exit_code == 0 else "#aa2222" - self.txtStdout.setTextColor(QColor(color)) - self.txtStdout.append(self.tr("Finished ({})".format(exit_code))) - if result == iliexporter.Exporter.SUCCESS: - self.buttonBox.clear() - self.buttonBox.setEnabled(True) - self.buttonBox.addButton(QDialogButtonBox.Close) - else: - if self.export_without_validate(): - self.set_button_to_export_without_validation() - self.enable() - - def export_without_validate(self): - """ - Valid if an error occurred that prevents executing the export without validations - :return: True if you can execute the export without validations, False in other case - """ - log = self.txtStdout.toPlainText().lower() - if "permission denied" in log or "access is denied" in log: - return False - return True - - def updated_configuration(self): - """ - Get the configuration that is updated with the user configuration changes on the dialog. - :return: Configuration - """ - configuration = ili2dbconfig.ExportConfiguration() - - mode = self.type_combo_box.currentData() - self._lst_panel[mode].get_fields(configuration) - - configuration.tool = mode - configuration.xtffile = self.xtf_file_line_edit.text().strip() - configuration.ilimodels = ";".join(self.export_models_model.checked_models()) - configuration.base_configuration = self.base_configuration - configuration.db_ili_version = self.db_ili_version(configuration) - - if not self.validate_data: - configuration.disable_validation = True - return configuration - - def save_configuration(self, configuration): - settings = QSettings() - settings.setValue("QgisModelBaker/ili2pg/xtffile_export", configuration.xtffile) - settings.setValue( - "QgisModelBaker/importtype", self.type_combo_box.currentData().name - ) - - mode = self.type_combo_box.currentData() - db_factory = self.db_simple_factory.create_factory(mode) - config_manager = db_factory.get_db_command_config_manager(configuration) - config_manager.save_config_in_qsettings() - - def restore_configuration(self): - settings = QSettings() - - for db_id in self.db_simple_factory.get_db_list(False): - configuration = iliexporter.ExportConfiguration() - 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 - - self.type_combo_box.setCurrentIndex(self.type_combo_box.findData(mode)) - self.refresh_db_panel() - - def disable(self): - self.type_combo_box.setEnabled(False) - for key, value in self._lst_panel.items(): - value.setEnabled(False) - self.ili_config.setEnabled(False) - self.buttonBox.setEnabled(False) - - def enable(self): - self.type_combo_box.setEnabled(True) - for key, value in self._lst_panel.items(): - value.setEnabled(True) - self.ili_config.setEnabled(True) - self.buttonBox.setEnabled(True) - - def type_changed(self): - self.txtStdout.clear() - self.set_button_to_export() - self.refresh_db_panel() - self.refresh_models() - self.txtStdout.clear() - - def refresh_db_panel(self): - self.progress_bar.hide() - - db_id = self.type_combo_box.currentData() - self.db_wrapper_group_box.setTitle(displayDbIliMode[db_id]) - - # Refresh panels - for key, value in self._lst_panel.items(): - value.interlis_mode = False - is_current_panel_selected = db_id == key - value.setVisible(is_current_panel_selected) - if is_current_panel_selected: - value._show_panel() - - def link_activated(self, link): - if link.url() == "#configure": - cfg = OptionsDialog(self.base_configuration) - if cfg.exec_(): - settings = QSettings() - settings.beginGroup("QgisModelBaker/ili2db") - self.base_configuration.save(settings) - else: - QDesktopServices.openUrl(link) - - def help_requested(self): - os_language = QLocale(QSettings().value("locale/userLocale")).name()[:2] - if os_language in ["es", "de"]: - webbrowser.open( - "https://opengisch.github.io/QgisModelBaker/docs/{}/user-guide.html#export-an-interlis-transfer-file-xtf".format( - os_language - ) - ) - else: - webbrowser.open( - "https://opengisch.github.io/QgisModelBaker/docs/user-guide.html#export-an-interlis-transfer-file-xtf" - ) - - def xtf_browser_opened_to_true(self): - """ - Slot. Sets a flag to true to eventually avoid asking a user whether to overwrite a file. - """ - self.xtf_browser_was_opened = True - - def xtf_browser_opened_to_false(self): - """ - Slot. Sets a flag to false to eventually ask a user whether to overwrite a file. - """ - self.xtf_browser_was_opened = False - - def advance_progress_bar_by_text(self, text): - if text.strip() == "Info: compile models…": - self.progress_bar.setValue(50) - elif text.strip() == "Info: create table structure…": - self.progress_bar.setValue(75) diff --git a/QgisModelBaker/gui/generate_project.py b/QgisModelBaker/gui/generate_project.py deleted file mode 100644 index c45960f66..000000000 --- a/QgisModelBaker/gui/generate_project.py +++ /dev/null @@ -1,1355 +0,0 @@ -""" -/*************************************************************************** - ------------------- - begin : 29/03/17 - git sha : :%H$ - copyright : (C) 2017 by OPENGIS.ch - email : info@opengis.ch - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ -""" -import configparser -import os -import re -import webbrowser - -import yaml -from qgis.core import Qgis, QgsCoordinateReferenceSystem, QgsProject -from qgis.gui import QgsGui, QgsMessageBar -from qgis.PyQt.QtCore import ( - QCoreApplication, - QEventLoop, - QLocale, - QSettings, - Qt, - QTimer, -) -from qgis.PyQt.QtGui import QColor, QDesktopServices, QValidator -from qgis.PyQt.QtWidgets import ( - QAction, - QCompleter, - QDialog, - QDialogButtonBox, - QGridLayout, - QMessageBox, - QSizePolicy, -) - -from QgisModelBaker.gui.edit_command import EditCommandDialog -from QgisModelBaker.gui.ili2db_options import Ili2dbOptionsDialog -from QgisModelBaker.gui.multiple_models import MultipleModelsDialog -from QgisModelBaker.gui.options import OptionsDialog -from QgisModelBaker.gui.panel import db_panel_utils -from QgisModelBaker.libs.modelbaker.dataobjects.project import Project -from QgisModelBaker.libs.modelbaker.db_factory.db_simple_factory import DbSimpleFactory -from QgisModelBaker.libs.modelbaker.dbconnector.db_connector import DBConnectorError -from QgisModelBaker.libs.modelbaker.generator.generator import Generator -from QgisModelBaker.libs.modelbaker.iliwrapper import iliimporter -from QgisModelBaker.libs.modelbaker.iliwrapper.globals import DbIliMode -from QgisModelBaker.libs.modelbaker.iliwrapper.ili2dbconfig import ( - ImportDataConfiguration, - SchemaImportConfiguration, -) -from QgisModelBaker.libs.modelbaker.iliwrapper.ili2dbutils import ( - JavaNotFoundError, - color_log_text, -) -from QgisModelBaker.libs.modelbaker.iliwrapper.ilicache import ( - IliCache, - IliDataCache, - IliDataItemModel, - IliToppingFileCache, - IliToppingFileItemModel, - MetaConfigCompleterDelegate, - ModelCompleterDelegate, -) -from QgisModelBaker.libs.modelbaker.utils.globals import DbActionType -from QgisModelBaker.libs.modelbaker.utils.qt_utils import ( - FileValidator, - NonEmptyStringValidator, - OverrideCursor, - Validators, - make_file_selector, -) -from QgisModelBaker.utils import gui_utils -from QgisModelBaker.utils.globals import ( - CATALOGUE_DATASETNAME, - CRS_PATTERNS, - displayDbIliMode, -) -from QgisModelBaker.utils.gui_utils import LogColor - -DIALOG_UI = gui_utils.get_ui_class("generate_project.ui") - - -class GenerateProjectDialog(QDialog, DIALOG_UI): - - ValidExtensions = ["ili"] - - def __init__(self, iface, base_config, parent=None): - QDialog.__init__(self, parent) - self.setupUi(self) - self.iface = iface - self.db_simple_factory = DbSimpleFactory() - QgsGui.instance().enableAutoGeometryRestore(self) - - self.create_text = self.tr("Create") - self.set_button_to_create_action = QAction(self.create_text, None) - self.set_button_to_create_action.triggered.connect(self.set_button_to_create) - - self.create_without_constraints_text = self.tr("Create without constraints") - self.set_button_to_create_without_constraints_action = QAction( - self.create_without_constraints_text, None - ) - self.set_button_to_create_without_constraints_action.triggered.connect( - self.set_button_to_create_without_constraints - ) - - self.edit_command_action = QAction(self.tr("Edit ili2db command"), None) - self.edit_command_action.triggered.connect(self.edit_command) - - self.create_tool_button.addAction( - self.set_button_to_create_without_constraints_action - ) - self.create_tool_button.addAction(self.edit_command_action) - self.create_tool_button.setText(self.create_text) - self.create_tool_button.clicked.connect(self.accepted) - - self.buttonBox.accepted.disconnect() - self.buttonBox.clear() - self.buttonBox.addButton(QDialogButtonBox.Cancel) - - self.create_constraints = True - - self.create_button.setText(self.tr("Create")) - self.create_button.clicked.connect(self.accepted) - self.ili_file_browse_button.clicked.connect( - make_file_selector( - self.ili_file_line_edit, - title=self.tr("Open Interlis Model"), - file_filter=self.tr("Interlis Model File (*.ili *.ILI)"), - ) - ) - self.buttonBox.addButton(QDialogButtonBox.Help) - self.buttonBox.helpRequested.connect(self.help_requested) - self.crs = QgsCoordinateReferenceSystem() - self.ili2db_options = Ili2dbOptionsDialog(self) - self.ili2db_options_button.clicked.connect(self.ili2db_options.open) - self.ili2db_options.finished.connect(self.fill_toml_file_info_label) - self.multiple_models_dialog = MultipleModelsDialog(self) - self.multiple_models_button.clicked.connect(self.multiple_models_dialog.open) - self.multiple_models_dialog.accepted.connect(self.fill_models_line_edit) - - self.type_combo_box.clear() - self._lst_panel = dict() - - for db_id in self.db_simple_factory.get_db_list(True): - self.type_combo_box.addItem(displayDbIliMode[db_id], db_id) - - for db_id in self.db_simple_factory.get_db_list(False): - item_panel = db_panel_utils.get_config_panel( - db_id, self, DbActionType.GENERATE - ) - self._lst_panel[db_id] = item_panel - self.db_layout.addWidget(item_panel) - - self.type_combo_box.currentIndexChanged.connect(self.type_changed) - self.txtStdout.anchorClicked.connect(self.link_activated) - self.crsSelector.crsChanged.connect(self.crs_changed) - self.base_configuration = base_config - - self.bar = QgsMessageBar() - self.bar.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) - self.txtStdout.setLayout(QGridLayout()) - self.txtStdout.layout().setContentsMargins(0, 0, 0, 0) - self.txtStdout.layout().addWidget(self.bar, 0, 0, Qt.AlignTop) - - self.validators = Validators() - nonEmptyValidator = NonEmptyStringValidator() - fileValidator = FileValidator( - pattern=["*." + ext for ext in self.ValidExtensions], allow_empty=True - ) - - self.restore_configuration() - - self.ilimetaconfigcache = IliDataCache(self.base_configuration) - self.metaconfig_delegate = MetaConfigCompleterDelegate() - self.metaconfig = configparser.ConfigParser() - self.current_models = None - self.current_metaconfig_id = None - self.ili_metaconfig_line_edit.setPlaceholderText( - self.tr("[Search metaconfig / topping from UsabILIty Hub]") - ) - self.ili_metaconfig_line_edit.setEnabled(False) - completer = QCompleter( - self.ilimetaconfigcache.model, self.ili_metaconfig_line_edit - ) - completer.setCaseSensitivity(Qt.CaseInsensitive) - completer.setFilterMode(Qt.MatchContains) - completer.popup().setItemDelegate(self.metaconfig_delegate) - self.ili_metaconfig_line_edit.setCompleter(completer) - self.ili_metaconfig_line_edit.textChanged.emit( - self.ili_metaconfig_line_edit.text() - ) - self.ili_metaconfig_line_edit.textChanged.connect( - self.complete_metaconfig_completer - ) - self.ili_metaconfig_line_edit.punched.connect( - self.complete_metaconfig_completer - ) - self.ili_metaconfig_line_edit.textChanged.connect( - self.on_metaconfig_completer_activated - ) - - self.ili_models_line_edit.setValidator(nonEmptyValidator) - self.ili_file_line_edit.setValidator(fileValidator) - - self.ili_models_line_edit.textChanged.connect( - self.validators.validate_line_edits - ) - self.ili_models_line_edit.textChanged.emit(self.ili_models_line_edit.text()) - self.ili_models_line_edit.textChanged.connect(self.on_model_changed) - self.ili_models_line_edit.textChanged.connect(self.complete_models_completer) - self.ili_models_line_edit.punched.connect(self.complete_models_completer) - - self.ilicache = IliCache(self.base_configuration) - self.model_delegate = ModelCompleterDelegate() - self.refresh_ili_models_cache() - self.ili_models_line_edit.setPlaceholderText( - self.tr("[Search model from repository]") - ) - - self.ili_file_line_edit.textChanged.connect(self.validators.validate_line_edits) - self.ili_file_line_edit.textChanged.connect(self.ili_file_changed) - self.ili_file_line_edit.textChanged.emit(self.ili_file_line_edit.text()) - - def set_button_to_create(self): - """ - Changes the text of the button to create (with validation) and sets the validate_data to true. - So on clicking the button the creation will start with validation. - The buttons actions are changed to be able to switch the with-validation mode. - """ - self.create_constraints = True - self.create_tool_button.removeAction(self.set_button_to_create_action) - self.create_tool_button.removeAction(self.edit_command_action) - self.create_tool_button.addAction( - self.set_button_to_create_without_constraints_action - ) - self.create_tool_button.addAction(self.edit_command_action) - self.create_tool_button.setText(self.create_text) - - def set_button_to_create_without_constraints(self): - """ - Changes the text of the button to create without validation and sets the validate_data to false. - So on clicking the button the creation will start without validation. - The buttons actions are changed to be able to switch the with-validation mode. - """ - self.create_constraints = False - self.create_tool_button.removeAction( - self.set_button_to_create_without_constraints_action - ) - self.create_tool_button.removeAction(self.edit_command_action) - self.create_tool_button.addAction(self.set_button_to_create_action) - self.create_tool_button.addAction(self.edit_command_action) - self.create_tool_button.setText(self.create_without_constraints_text) - - def edit_command(self): - """ - A dialog opens giving the user the possibility to edit the ili2db command used for the creation - """ - importer = iliimporter.Importer() - importer.tool = self.type_combo_box.currentData() - importer.configuration = self.updated_configuration() - command = importer.command(True) - edit_command_dialog = EditCommandDialog(self) - edit_command_dialog.command_edit.setPlainText(command) - if edit_command_dialog.exec_(): - edited_command = edit_command_dialog.command_edit.toPlainText() - self.accepted(edited_command) - - def accepted(self, edited_command=None): - ili_mode = self.type_combo_box.currentData() - db_id = ili_mode & ~DbIliMode.ili - interlis_mode = ili_mode & DbIliMode.ili - - res, message = self._lst_panel[db_id].is_valid() - - if not res: - self.txtStdout.setText(message) - return - - configuration = self.updated_configuration() - - if not edited_command: - if interlis_mode: - if not self.ili_file_line_edit.text().strip(): - if not self.ili_models_line_edit.text().strip(): - self.txtStdout.setText( - self.tr( - "Please set a valid INTERLIS model before creating the project." - ) - ) - self.ili_models_line_edit.setFocus() - return - - if ( - self.ili_file_line_edit.text().strip() - and self.ili_file_line_edit.validator().validate( - configuration.ilifile, 0 - )[0] - != QValidator.Acceptable - ): - - self.txtStdout.setText( - self.tr( - "Please set a valid INTERLIS file before creating the project. {}" - ).format(self.ili_file_line_edit.validator().error) - ) - self.ili_file_line_edit.setFocus() - return - - configuration.dbschema = configuration.dbschema or configuration.database - self.save_configuration(configuration) - - db_factory = self.db_simple_factory.create_factory(db_id) - - try: - # raise warning when the schema or the database file already exists - config_manager = db_factory.get_db_command_config_manager(configuration) - db_connector = db_factory.get_db_connector( - config_manager.get_uri(configuration.db_use_super_login) - or config_manager.get_uri(), - configuration.dbschema, - ) - - if db_connector.db_or_schema_exists(): - if interlis_mode: - warning_box = QMessageBox(self) - warning_box.setIcon(QMessageBox.Information) - warning_title = ( - self.tr("{} already exists") - .format(db_factory.get_specific_messages()["db_or_schema"]) - .capitalize() - ) - warning_box.setWindowTitle(warning_title) - warning_box.setText( - self.tr( - "{warning_title}:\n{db_or_schema_name}\n\nDo you want to " - "import into the existing {db_or_schema}?" - ).format( - warning_title=warning_title, - db_or_schema=db_factory.get_specific_messages()[ - "db_or_schema" - ].capitalize(), - db_or_schema_name=configuration.dbschema - or config_manager.get_uri(), - ) - ) - warning_box.setStandardButtons(QMessageBox.Yes | QMessageBox.No) - warning_box_result = warning_box.exec_() - if warning_box_result == QMessageBox.No: - return - except (DBConnectorError, FileNotFoundError): - # we don't mind when the database file is not yet created - pass - - # create schema with superuser - res, message = db_factory.pre_generate_project(configuration) - if not res: - self.txtStdout.setText(message) - return - - with OverrideCursor(Qt.WaitCursor): - self.progress_bar.show() - self.progress_bar.setValue(0) - - self.disable() - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - - if interlis_mode: - importer = iliimporter.Importer() - importer.tool = self.type_combo_box.currentData() - importer.configuration = configuration - importer.stdout.connect(self.print_info) - importer.stderr.connect(self.on_stderr) - importer.process_started.connect(self.on_process_started) - importer.process_finished.connect(self.on_process_finished) - try: - if importer.run(edited_command) != iliimporter.Importer.SUCCESS: - self.enable() - self.progress_bar.hide() - return - except JavaNotFoundError as e: - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.clear() - self.txtStdout.setText(e.error_string) - self.enable() - self.progress_bar.hide() - - QApplication.restoreOverrideCursor() - QMessageBox.critical( - self, self.tr("Java not found error"), e.error_string - ) - - return - - try: - config_manager = db_factory.get_db_command_config_manager(configuration) - uri = config_manager.get_uri(qgis=True) - mgmt_uri = config_manager.get_uri(configuration.db_use_super_login) - generator = Generator( - configuration.tool, - uri, - configuration.inheritance, - configuration.dbschema, - mgmt_uri=mgmt_uri, - consider_basket_handling=True, - ) - generator.stdout.connect(self.print_info) - generator.new_message.connect(self.show_message) - self.progress_bar.setValue(30) - except DBConnectorError as db_connector_error: - self.txtStdout.setText( - self.tr( - "There was an error connecting to the database. Check connection parameters. Error details: {}".format( - db_connector_error - ) - ) - ) - self.progress_bar.setValue(0) - return - except FileNotFoundError as file_not_found_error: - self.txtStdout.setText( - self.tr( - "There was an error connecting to the database. Check connection parameters. Error details: {}".format( - file_not_found_error - ) - ) - ) - self.progress_bar.setValue(0) - return - - if not interlis_mode: - if not generator.db_or_schema_exists(): - self.txtStdout.setText( - self.tr( - "Source {} does not exist. Check connection parameters." - ).format(db_factory.get_specific_messages()["db_or_schema"]) - ) - self.enable() - self.progress_bar.hide() - return - - res, message = db_factory.post_generate_project_validations(configuration) - - if not res: - self.txtStdout.setText(message) - self.enable() - self.progress_bar.hide() - return - - self.print_info( - f'\n{self.tr("Obtaining available layers from the database…")}' - ) - - available_layers = generator.layers() - - if not available_layers: - text = self.tr("The {} has no layers to load into QGIS.").format( - db_factory.get_specific_messages()["layers_source"] - ) - - self.txtStdout.setText(text) - self.enable() - self.progress_bar.hide() - return - - self.progress_bar.setValue(40) - self.print_info(self.tr("Obtaining relations from the database…")) - relations, bags_of_enum = generator.relations(available_layers) - self.progress_bar.setValue(45) - - self.print_info(self.tr("Arranging layers into groups…")) - legend = generator.legend(available_layers) - - custom_layer_order_structure = list() - - # Project topping file for legend and layers: collect and download - projecttopping_file_path_list = [] - if "CONFIGURATION" in self.metaconfig.sections(): - configuration_section = self.metaconfig["CONFIGURATION"] - # get topping referenced in qgis.modelbaker.projecttopping - key = "qgis.modelbaker.projecttopping" - if key not in configuration_section: - key = "qgis.modelbaker.layertree" - self.print_info( - self.tr( - 'Keyword "qgis.modelbaker.layertree" is deprecated (but still working).. Use "qgis.modelbaker.projecttopping" instead.' - ), - LogColor.COLOR_TOPPING, - ) - if key in configuration_section: - self.print_info( - self.tr("Metaconfig contains a project topping."), - LogColor.COLOR_TOPPING, - ) - projecttopping_data_list = configuration_section[key].split(";") - projecttopping_file_path_list = self.get_topping_file_list( - projecttopping_data_list - ) - - if len(projecttopping_file_path_list) > 1: - self.print_info( - self.tr( - "Multiple project toppings can lead to unexpected behavior, when the sections are not clearly separated." - ), - LogColor.COLOR_TOPPING, - ) - - for projecttopping_file_path in projecttopping_file_path_list: - self.print_info( - self.tr("Parse project topping file {}…").format( - projecttopping_file_path - ), - LogColor.COLOR_TOPPING, - ) - with open(projecttopping_file_path) as stream: - try: - projecttopping_data = yaml.safe_load(stream) - layertree_key = "layertree" - if layertree_key not in projecttopping_data: - layertree_key = "legend" - self.print_info( - self.tr( - 'Keyword "legend" is deprecated (but still working).. Use "layertree" instead.' - ), - LogColor.COLOR_TOPPING, - ) - if layertree_key in projecttopping_data: - legend = generator.legend( - available_layers, - layertree_structure=projecttopping_data[layertree_key], - path_resolver=lambda path: self.ilidata_path_resolver( - os.path.dirname(projecttopping_file_path), path - ) - if path - else None, - ) - if "layer-order" in projecttopping_data: - custom_layer_order_structure = projecttopping_data[ - "layer-order" - ] - except yaml.YAMLError as exc: - self.print_info( - self.tr("Unable to parse project topping: {}").format(exc), - LogColor.COLOR_TOPPING, - ) - - self.progress_bar.setValue(55) - - # on geopackages we don't use the transaction mode on default, since this leaded to troubles - auto_transaction = not bool(configuration.tool & DbIliMode.gpkg) - project = Project( - auto_transaction, - context={"catalogue_datasetname": CATALOGUE_DATASETNAME}, - ) - project.layers = available_layers - project.relations = relations - project.bags_of_enum = bags_of_enum - project.legend = legend - project.custom_layer_order_structure = custom_layer_order_structure - - self.print_info(self.tr("Configure forms and widgets…")) - project.post_generate() - - qgis_project = QgsProject.instance() - - self.print_info(self.tr("Generate QGIS project…")) - project.create(None, qgis_project) - - # Set the extent of the mapCanvas from the first layer extent found - for layer in project.layers: - if layer.extent is not None: - self.iface.mapCanvas().setExtent(layer.extent) - self.iface.mapCanvas().refresh() - break - - self.progress_bar.setValue(60) - - # QML Toppings in the metadata: collect, download and apply - # This configuration is legacy (should be in project topping instead), but it's still supported - if "qgis.modelbaker.qml" in self.metaconfig.sections(): - self.print_info( - self.tr( - "Metaconfig contains QML toppings. Better practice would be to define QML toppings in the project topping file." - ), - LogColor.COLOR_TOPPING, - ) - qml_section = dict(self.metaconfig["qgis.modelbaker.qml"]) - qml_file_model = self.get_topping_file_model(list(qml_section.values())) - for layer in project.layers: - if layer.alias: - if any(layer.alias.lower() == s for s in qml_section): - layer_qml = layer.alias.lower() - elif any(f'"{layer.alias.lower()}"' == s for s in qml_section): - layer_qml = f'"{layer.alias.lower()}"' - else: - continue - matches = qml_file_model.match( - qml_file_model.index(0, 0), - Qt.DisplayRole, - qml_section[layer_qml], - 1, - ) - if matches: - style_file_path = matches[0].data( - int(IliToppingFileItemModel.Roles.LOCALFILEPATH) - ) - self.print_info( - self.tr("Apply QML topping on layer {}:{}…").format( - layer.alias, style_file_path - ), - LogColor.COLOR_TOPPING, - ) - layer.layer.loadNamedStyle(style_file_path) - - self.progress_bar.setValue(80) - - # Cataloges and Transferfiles: collect, download and import - if "CONFIGURATION" in self.metaconfig.sections(): - configuration_section = self.metaconfig["CONFIGURATION"] - if "ch.interlis.referenceData" in configuration_section: - self.print_info( - self.tr( - "Metaconfig contains transfer or catalogue toppings (reference data)." - ), - LogColor.COLOR_TOPPING, - ) - reference_data_list = configuration_section[ - "ch.interlis.referenceData" - ].split(";") - referencedata_file_path_list = self.get_topping_file_list( - reference_data_list - ) - for referencedata_file_path in referencedata_file_path_list: - self.print_info( - self.tr("Import reference data file {}…").format( - referencedata_file_path - ) - ) - - configuration = self.updated_referencedata_import_configuration( - referencedata_file_path - ) - - # create schema with superuser - db_factory = self.db_simple_factory.create_factory(db_id) - res, message = db_factory.pre_generate_project(configuration) - - if not res: - self.txtStdout.setText(message) - return - - with OverrideCursor(Qt.WaitCursor): - - dataImporter = iliimporter.Importer(dataImport=True) - - dataImporter.tool = self.type_combo_box.currentData() - dataImporter.configuration = configuration - - dataImporter.stdout.connect(self.print_info) - dataImporter.stderr.connect(self.on_stderr) - dataImporter.process_started.connect( - self.on_process_started - ) - dataImporter.process_finished.connect( - self.on_process_finished - ) - - try: - if ( - dataImporter.run(edited_command) - != iliimporter.Importer.SUCCESS - ): - self.enable() - self.progress_bar.hide() - return - except JavaNotFoundError as e: - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.clear() - self.txtStdout.setText(e.error_string) - self.enable() - self.progress_bar.hide() - - QApplication.restoreOverrideCursor() - QMessageBox.critical( - self, - self.tr("Java not found error"), - e.error_string, - ) - - return - - self.buttonBox.clear() - self.buttonBox.setEnabled(True) - self.buttonBox.addButton(QDialogButtonBox.Close) - self.progress_bar.setValue(100) - self.print_info(self.tr("\nDone!"), "#004905") - - def print_info(self, text, text_color=LogColor.COLOR_INFO): - self.txtStdout.setTextColor(QColor(text_color)) - self.txtStdout.append(text) - QCoreApplication.processEvents() - - def on_stderr(self, text): - color_log_text(text, self.txtStdout) - self.advance_progress_bar_by_text(text) - QCoreApplication.processEvents() - - def on_process_started(self, command): - self.print_info(self.tr("\n--- Process ---")) - self.print_info(command) - QCoreApplication.processEvents() - - def on_process_finished(self, exit_code, result): - if exit_code == 0: - color = LogColor.COLOR_SUCCESS - message = self.tr( - "Interlis model(s) successfully imported into the database!" - ) - else: - color = LogColor.COLOR_FAIL - message = self.tr("Finished with errors!") - - self.txtStdout.setTextColor(QColor(color)) - self.txtStdout.append(message) - - def db_ili_version(self, configuration): - """ - Returns the ili2db version the database has been created with or None if the database - could not be detected as a ili2db database - """ - schema = configuration.dbschema - - db_factory = self.db_simple_factory.create_factory(configuration.tool) - config_manager = db_factory.get_db_command_config_manager(configuration) - uri_string = config_manager.get_uri(configuration.db_use_super_login) - - try: - db_connector = db_factory.get_db_connector(uri_string, schema) - db_connector.new_message.connect(self.show_message) - return db_connector.ili_version() - except (DBConnectorError, FileNotFoundError): - return None - - def updated_configuration(self): - """ - Get the configuration that is updated with the user configuration changes on the dialog. - :return: Configuration - """ - configuration = SchemaImportConfiguration() - configuration.create_basket_col = True - - mode = self.type_combo_box.currentData() - db_id = mode & ~DbIliMode.ili - - self._lst_panel[db_id].get_fields(configuration) - - configuration.tool = mode - configuration.srs_auth = self.srs_auth - configuration.srs_code = self.srs_code - configuration.inheritance = self.ili2db_options.inheritance_type() - configuration.tomlfile = self.ili2db_options.toml_file() - configuration.create_basket_col = self.ili2db_options.create_basket_col() - configuration.create_import_tid = self.ili2db_options.create_import_tid() - configuration.stroke_arcs = self.ili2db_options.stroke_arcs() - configuration.pre_script = self.ili2db_options.pre_script() - configuration.post_script = self.ili2db_options.post_script() - configuration.db_ili_version = self.db_ili_version(configuration) - configuration.metaconfig = self.metaconfig - configuration.metaconfig_id = self.current_metaconfig_id - - configuration.base_configuration = self.base_configuration - if self.ili_file_line_edit.text().strip(): - configuration.ilifile = self.ili_file_line_edit.text().strip() - - if self.ili_models_line_edit.text().strip(): - configuration.ilimodels = self.ili_models_line_edit.text().strip() - - if not self.create_constraints: - configuration.disable_validation = True - - return configuration - - def updated_referencedata_import_configuration(self, file): - """ - Get the configuration that is updated with the user configuration changes on the dialog. - :return: Configuration - """ - configuration = ImportDataConfiguration() - - mode = self.type_combo_box.currentData() - - db_id = mode & ~DbIliMode.ili - self._lst_panel[db_id].get_fields(configuration) - - configuration.tool = mode - configuration.xtffile = file - configuration.delete_data = False - configuration.base_configuration = self.base_configuration - configuration.with_schemaimport = False - # if not self.validate_data: - # configuration.disable_validation = True - return configuration - - def save_configuration(self, configuration): - settings = QSettings() - settings.setValue("QgisModelBaker/ili2db/ilifile", configuration.ilifile) - settings.setValue("QgisModelBaker/ili2db/srs_auth", self.srs_auth) - settings.setValue("QgisModelBaker/ili2db/srs_code", self.srs_code) - settings.setValue( - "QgisModelBaker/importtype", self.type_combo_box.currentData().name - ) - - mode = self.type_combo_box.currentData() - db_factory = self.db_simple_factory.create_factory(mode) - config_manager = db_factory.get_db_command_config_manager(configuration) - config_manager.save_config_in_qsettings() - - def restore_configuration(self): - settings = QSettings() - - self.ili_file_line_edit.setText(settings.value("QgisModelBaker/ili2db/ilifile")) - srs_auth = settings.value("QgisModelBaker/ili2db/srs_auth", "EPSG") - srs_code = settings.value("QgisModelBaker/ili2db/srs_code", 2056, int) - crs = QgsCoordinateReferenceSystem("{}:{}".format(srs_auth, srs_code)) - if not crs.isValid(): - crs = QgsCoordinateReferenceSystem(srs_code) # Fallback - self.crs = crs - self.fill_toml_file_info_label() - self.update_crs_info() - - for db_id in self.db_simple_factory.get_db_list(False): - configuration = SchemaImportConfiguration() - configuration.create_basket_col = True - 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 - - self.type_combo_box.setCurrentIndex(self.type_combo_box.findData(mode)) - self.type_changed() - self.crs_changed() - - def disable(self): - self.type_combo_box.setEnabled(False) - for key, value in self._lst_panel.items(): - value.setEnabled(False) - self.ili_config.setEnabled(False) - self.buttonBox.setEnabled(False) - - def enable(self): - self.type_combo_box.setEnabled(True) - for key, value in self._lst_panel.items(): - value.setEnabled(True) - self.ili_config.setEnabled(True) - self.buttonBox.setEnabled(True) - - def type_changed(self): - self.txtStdout.clear() - self.progress_bar.hide() - - ili_mode = self.type_combo_box.currentData() - db_id = ili_mode & ~DbIliMode.ili - interlis_mode = bool(ili_mode & DbIliMode.ili) - - self.ili_config.setVisible(interlis_mode) - self.db_wrapper_group_box.setTitle(displayDbIliMode[db_id]) - - self.create_button.setVisible(not interlis_mode) - self.create_tool_button.setVisible(interlis_mode) - - # Refresh panels - for key, value in self._lst_panel.items(): - value.interlis_mode = interlis_mode - is_current_panel_selected = db_id == key - value.setVisible(is_current_panel_selected) - if is_current_panel_selected: - value._show_panel() - - def on_model_changed(self, text): - if not text: - self.update_metaconfig_completer(0) - return - for pattern, crs in CRS_PATTERNS.items(): - if re.search(pattern, text): - self.crs = QgsCoordinateReferenceSystem.fromEpsgId(int(crs)) - self.update_crs_info() - break - self.ili2db_options.set_toml_file_key(text) - self.fill_toml_file_info_label() - self.ilimetaconfigcache = IliDataCache(self.base_configuration, models=text) - self.ilimetaconfigcache.file_download_succeeded.connect( - lambda dataset_id, path: self.on_metaconfig_received(path) - ) - self.ilimetaconfigcache.file_download_failed.connect(self.on_metaconfig_failed) - self.ilimetaconfigcache.model_refreshed.connect( - self.update_metaconfig_completer - ) - self.refresh_ili_metaconfig_cache() - - def link_activated(self, link): - if link.url() == "#configure": - cfg = OptionsDialog(self.base_configuration) - if cfg.exec_(): - settings = QSettings() - settings.beginGroup("QgisModelBaker/ili2db") - self.base_configuration.save(settings) - else: - QDesktopServices.openUrl(link) - - def update_crs_info(self): - self.crsSelector.setCrs(self.crs) - - def crs_changed(self): - self.srs_auth = "EPSG" # Default - self.srs_code = 2056 # Default - srs_auth, srs_code = self.crsSelector.crs().authid().split(":") - if srs_auth == "USER": - self.crs_label.setStyleSheet("color: orange") - self.crs_label.setToolTip( - self.tr( - "Please select a valid Coordinate Reference System.\nCRSs from USER are valid for a single computer and therefore, a default EPSG:2056 will be used instead." - ) - ) - else: - self.crs_label.setStyleSheet("") - self.crs_label.setToolTip(self.tr("Coordinate Reference System")) - try: - self.srs_code = int(srs_code) - self.srs_auth = srs_auth - except ValueError: - # Preserve defaults if srs_code is not an integer - self.crs_label.setStyleSheet("color: orange") - self.crs_label.setToolTip( - self.tr( - "The srs code ('{}') should be an integer.\nA default EPSG:2056 will be used.".format( - srs_code - ) - ) - ) - - def ili_file_changed(self): - # If ili file is valid, models is optional - if ( - self.ili_file_line_edit.text().strip() - and self.ili_file_line_edit.validator().validate( - self.ili_file_line_edit.text().strip(), 0 - )[0] - == QValidator.Acceptable - ): - self.ili_models_line_edit.setValidator(None) - self.ili_models_line_edit.textChanged.emit(self.ili_models_line_edit.text()) - - # Update completer to add models from given ili file - self.ilicache = IliCache(None, self.ili_file_line_edit.text().strip()) - self.refresh_ili_models_cache() - models = self.ilicache.process_ili_file( - self.ili_file_line_edit.text().strip() - ) - try: - self.ili_models_line_edit.setText(models[-1]["name"]) - self.ili_models_line_edit.setPlaceholderText(models[-1]["name"]) - except IndexError: - self.ili_models_line_edit.setText("") - self.ili_models_line_edit.setPlaceholderText( - self.tr("[No models found in ili file]") - ) - else: - nonEmptyValidator = NonEmptyStringValidator() - self.ili_models_line_edit.setValidator(nonEmptyValidator) - self.ili_models_line_edit.textChanged.emit(self.ili_models_line_edit.text()) - - # Update completer to add models from given ili file - self.ilicache = IliCache(self.base_configuration) - self.refresh_ili_models_cache() - self.ili_models_line_edit.setPlaceholderText( - self.tr("[Search model from repository]") - ) - - def refresh_ili_models_cache(self): - self.ilicache.new_message.connect(self.show_message) - self.ilicache.refresh() - self.update_models_completer() - - def complete_models_completer(self): - if not self.ili_models_line_edit.text(): - self.ili_models_line_edit.completer().setCompletionMode( - QCompleter.UnfilteredPopupCompletion - ) - self.ili_models_line_edit.completer().complete() - else: - match_contains = ( - self.ili_models_line_edit.completer() - .completionModel() - .match( - self.ili_models_line_edit.completer().completionModel().index(0, 0), - Qt.DisplayRole, - self.ili_models_line_edit.text(), - -1, - Qt.MatchContains, - ) - ) - if len(match_contains) > 1: - self.ili_models_line_edit.completer().setCompletionMode( - QCompleter.PopupCompletion - ) - self.ili_models_line_edit.completer().complete() - - def update_models_completer(self): - completer = QCompleter(self.ilicache.model, self.ili_models_line_edit) - completer.setCaseSensitivity(Qt.CaseInsensitive) - completer.setFilterMode(Qt.MatchContains) - completer.popup().setItemDelegate(self.model_delegate) - self.ili_models_line_edit.setCompleter(completer) - self.multiple_models_dialog.models_line_edit.setCompleter(completer) - - def refresh_ili_metaconfig_cache(self): - self.ilimetaconfigcache.new_message.connect(self.show_message) - self.ilimetaconfigcache.refresh() - - def complete_metaconfig_completer(self): - if not self.ili_metaconfig_line_edit.text(): - self.clean_metaconfig() - self.ili_metaconfig_line_edit.completer().setCompletionMode( - QCompleter.UnfilteredPopupCompletion - ) - self.ili_metaconfig_line_edit.completer().complete() - else: - if ";" not in self.ili_metaconfig_line_edit.text(): - match_contains = ( - self.ili_metaconfig_line_edit.completer() - .completionModel() - .match( - self.ili_metaconfig_line_edit.completer() - .completionModel() - .index(0, 0), - Qt.DisplayRole, - self.ili_metaconfig_line_edit.text(), - -1, - Qt.MatchContains, - ) - ) - if len(match_contains) > 1: - self.ili_metaconfig_line_edit.completer().setCompletionMode( - QCompleter.PopupCompletion - ) - self.ili_metaconfig_line_edit.completer().complete() - - def update_metaconfig_completer(self, rows): - self.ili_metaconfig_line_edit.completer().setModel( - self.ilimetaconfigcache.model - ) - self.ili_metaconfig_line_edit.setEnabled(bool(rows)) - if self.ili_models_line_edit.text() != self.current_models: - self.ili_metaconfig_line_edit.clear() - - def on_metaconfig_completer_activated(self, text=None): - matches = self.ilimetaconfigcache.model.match( - self.ilimetaconfigcache.model.index(0, 0), - Qt.DisplayRole, - self.ili_metaconfig_line_edit.text(), - 1, - Qt.MatchExactly, - ) - if matches: - model_index = matches[0] - metaconfig_id = self.ilimetaconfigcache.model.data( - model_index, int(IliDataItemModel.Roles.ID) - ) - - if self.current_metaconfig_id == metaconfig_id: - return - self.current_metaconfig_id = metaconfig_id - self.metaconfig_file_info_label.setText( - self.tr("Current Metaconfig File: {} ({})").format( - self.ilimetaconfigcache.model.data(model_index, Qt.DisplayRole), - metaconfig_id, - ) - ) - self.metaconfig_file_info_label.setStyleSheet("color: #341d5c") - repository = self.ilimetaconfigcache.model.data( - model_index, int(IliDataItemModel.Roles.ILIREPO) - ) - url = self.ilimetaconfigcache.model.data( - model_index, int(IliDataItemModel.Roles.URL) - ) - path = self.ilimetaconfigcache.model.data( - model_index, int(IliDataItemModel.Roles.RELATIVEFILEPATH) - ) - dataset_id = self.ilimetaconfigcache.model.data( - model_index, int(IliDataItemModel.Roles.ID) - ) - # disable the create button while downloading - self.create_tool_button.setEnabled(False) - if path: - self.ilimetaconfigcache.download_file(repository, url, path, dataset_id) - else: - self.print_info( - self.tr("File not specified for metaconfig with id {}.").format( - dataset_id - ), - LogColor.COLOR_TOPPING, - ) - - self.set_metaconfig_line_edit_state(True) - else: - self.set_metaconfig_line_edit_state( - not self.ili_metaconfig_line_edit.text() - ) - self.clean_metaconfig() - - def clean_metaconfig(self): - self.current_metaconfig_id = None - self.metaconfig.clear() - self.metaconfig_file_info_label.setText("") - self.txtStdout.clear() - - def set_metaconfig_line_edit_state(self, valid): - self.ili_metaconfig_line_edit.setStyleSheet( - "QLineEdit {{ background-color: {} }}".format( - "#ffffff" if valid else "#ffd356" - ) - ) - - def on_metaconfig_received(self, path): - self.txtStdout.clear() - self.print_info( - self.tr("Metaconfig file successfully downloaded: {}").format(path), - LogColor.COLOR_TOPPING, - ) - # parse metaconfig - self.metaconfig.clear() - with open(path) as metaconfig_file: - self.metaconfig.read_file(metaconfig_file) - self.load_metaconfig() - # enable the tool button again - self.create_tool_button.setEnabled(True) - self.fill_toml_file_info_label() - self.print_info( - self.tr("Metaconfig successfully loaded."), LogColor.COLOR_TOPPING - ) - - def on_metaconfig_failed(self, dataset_id, error_msg): - self.print_info( - self.tr("Download of metaconfig file failed: {}.").format(error_msg), - LogColor.COLOR_TOPPING, - ) - # enable the tool button again - self.create_tool_button.setEnabled(True) - - def load_crs_from_metaconfig(self, ili2db_metaconfig): - srs_auth = self.srs_auth - srs_code = self.srs_code - if "defaultSrsAuth" in ili2db_metaconfig: - srs_auth = ili2db_metaconfig.get("defaultSrsAuth") - if "defaultSrsCode" in ili2db_metaconfig: - srs_code = ili2db_metaconfig.get("defaultSrsCode") - - crs = QgsCoordinateReferenceSystem("{}:{}".format(srs_auth, srs_code)) - if not crs.isValid(): - crs = QgsCoordinateReferenceSystem(srs_code) # Fallback - self.crs = crs - self.update_crs_info() - self.crs_changed() - - def load_metaconfig(self): - # load ili2db parameters to the GUI and into the configuration - if "ch.ehi.ili2db" in self.metaconfig.sections(): - self.print_info( - self.tr("Load the ili2db configurations from the metaconfig…"), - LogColor.COLOR_TOPPING, - ) - - ili2db_metaconfig = self.metaconfig["ch.ehi.ili2db"] - - if ( - "defaultSrsAuth" in ili2db_metaconfig - or "defaultSrsCode" in ili2db_metaconfig - ): - self.load_crs_from_metaconfig(ili2db_metaconfig) - self.print_info(self.tr("- Loaded CRS"), LogColor.COLOR_TOPPING) - - if "models" in ili2db_metaconfig: - model_list = self.ili_models_line_edit.text().strip().split( - ";" - ) + ili2db_metaconfig.get("models").strip().split(";") - self.current_models = ";".join(set(model_list)) - self.ili_models_line_edit.setText(self.current_models) - self.print_info(self.tr("- Loaded models"), LogColor.COLOR_TOPPING) - - self.ili2db_options.load_metaconfig(ili2db_metaconfig) - self.print_info(self.tr("- Loaded ili2db options"), LogColor.COLOR_TOPPING) - - # get iliMetaAttrs (toml) - if "iliMetaAttrs" in ili2db_metaconfig: - self.print_info( - self.tr("- Seek for iliMetaAttrs (toml) files:"), - LogColor.COLOR_TOPPING, - ) - ili_meta_attrs_list = ili2db_metaconfig.get("iliMetaAttrs").split(";") - ili_meta_attrs_file_path_list = self.get_topping_file_list( - ili_meta_attrs_list - ) - self.ili2db_options.load_toml_file_path( - self.ili_models_line_edit.text(), - ";".join(ili_meta_attrs_file_path_list), - ) - self.print_info( - self.tr("- Loaded iliMetaAttrs (toml) files"), - LogColor.COLOR_TOPPING, - ) - - # get prescript (sql) - if "prescript" in ili2db_metaconfig: - self.print_info( - self.tr("- Seek for prescript (sql) files:"), LogColor.COLOR_TOPPING - ) - prescript_list = ili2db_metaconfig.get("prescript").split(";") - prescript_file_path_list = self.get_topping_file_list(prescript_list) - self.ili2db_options.load_pre_script_path( - ";".join(prescript_file_path_list) - ) - self.print_info( - self.tr("- Loaded prescript (sql) files"), LogColor.COLOR_TOPPING - ) - - # get postscript (sql) - if "postscript" in ili2db_metaconfig: - self.print_info( - self.tr("- Seek for postscript (sql) files:"), - LogColor.COLOR_TOPPING, - ) - postscript_list = ili2db_metaconfig.get("postscript").split(";") - postscript_file_path_list = self.get_topping_file_list(postscript_list) - self.ili2db_options.load_post_script_path( - ";".join(postscript_file_path_list) - ) - self.print_info( - self.tr("- Loaded postscript (sql) files"), LogColor.COLOR_TOPPING - ) - - def show_message(self, level, message): - if level == Qgis.Warning: - self.bar.pushMessage(message, Qgis.Info, 10) - elif level == Qgis.Critical: - self.bar.pushMessage(message, Qgis.Warning, 10) - - def fill_models_line_edit(self): - self.ili_models_line_edit.setText( - self.multiple_models_dialog.get_models_string() - ) - - def fill_toml_file_info_label(self): - text = None - if self.ili2db_options.toml_file(): - text = self.tr("Extra Meta Attribute File: {}").format( - ( - "…" - + self.ili2db_options.toml_file()[ - len(self.ili2db_options.toml_file()) - 40 : - ] - ) - if len(self.ili2db_options.toml_file()) > 40 - else self.ili2db_options.toml_file() - ) - self.toml_file_info_label.setText(text) - self.toml_file_info_label.setToolTip(self.ili2db_options.toml_file()) - - def help_requested(self): - os_language = QLocale(QSettings().value("locale/userLocale")).name()[:2] - if os_language in ["es", "de"]: - webbrowser.open( - "https://opengisch.github.io/QgisModelBaker/docs/{}/user-guide.html#generate-project".format( - os_language - ) - ) - else: - webbrowser.open( - "https://opengisch.github.io/QgisModelBaker/docs/user-guide.html#generate-project" - ) - - def advance_progress_bar_by_text(self, text): - if text.strip() == "Info: compile models…": - self.progress_bar.setValue(20) - elif text.strip() == "Info: create table structure…": - self.progress_bar.setValue(30) - - def get_topping_file_list(self, id_list): - topping_file_model = self.get_topping_file_model(id_list) - file_path_list = [] - - for file_id in id_list: - matches = topping_file_model.match( - topping_file_model.index(0, 0), Qt.DisplayRole, file_id, 1 - ) - if matches: - file_path = matches[0].data(int(topping_file_model.Roles.LOCALFILEPATH)) - self.print_info( - self.tr("- - Got file {}").format(file_path), LogColor.COLOR_TOPPING - ) - file_path_list.append(file_path) - return file_path_list - - def get_topping_file_model(self, id_list): - topping_file_cache = IliToppingFileCache(self.base_configuration, id_list) - - # we wait for the download or we timeout after 30 seconds and we apply what we have - loop = QEventLoop() - topping_file_cache.download_finished.connect(lambda: loop.quit()) - timer = QTimer() - timer.setSingleShot(True) - timer.timeout.connect(lambda: loop.quit()) - timer.start(30000) - - topping_file_cache.refresh() - self.print_info(self.tr("- - Downloading…"), LogColor.COLOR_TOPPING) - - if len(topping_file_cache.downloaded_files) != len(id_list): - loop.exec() - - if len(topping_file_cache.downloaded_files) == len(id_list): - self.print_info( - self.tr("- - All topping files successfully downloaded"), - LogColor.COLOR_TOPPING, - ) - else: - missing_file_ids = id_list - for downloaded_file_id in topping_file_cache.downloaded_files: - if downloaded_file_id in missing_file_ids: - missing_file_ids.remove(downloaded_file_id) - self.print_info( - self.tr( - "- - Some topping files where not successfully downloaded: {}" - ).format(" ".join(missing_file_ids)), - LogColor.COLOR_TOPPING, - ) - - return topping_file_cache.model - - def ilidata_path_resolver(self, base_path, path): - if "ilidata:" in path or "file:" in path: - data_file_path_list = self.get_topping_file_list([path]) - return data_file_path_list[0] if data_file_path_list else None - return os.path.join(base_path, path) diff --git a/QgisModelBaker/gui/import_data.py b/QgisModelBaker/gui/import_data.py deleted file mode 100644 index 4559d3f7c..000000000 --- a/QgisModelBaker/gui/import_data.py +++ /dev/null @@ -1,600 +0,0 @@ -""" -/*************************************************************************** - ------------------- - begin : 30/05/17 - git sha : :%H$ - copyright : (C) 2017 by Germán Carrillo (BSF-Swissphoto) - email : gcarrillo@linuxmail.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ -""" - -import re -import webbrowser - -from qgis.core import Qgis -from qgis.gui import QgsGui, QgsMessageBar -from qgis.PyQt.QtCore import QCoreApplication, QLocale, QSettings, Qt -from qgis.PyQt.QtGui import QColor, QDesktopServices, QValidator -from qgis.PyQt.QtWidgets import ( - QAction, - QCompleter, - QDialog, - QDialogButtonBox, - QGridLayout, - QMessageBox, - QSizePolicy, -) - -from QgisModelBaker.gui.edit_command import EditCommandDialog -from QgisModelBaker.gui.ili2db_options import Ili2dbOptionsDialog -from QgisModelBaker.gui.multiple_models import MultipleModelsDialog -from QgisModelBaker.gui.options import OptionsDialog -from QgisModelBaker.gui.panel import db_panel_utils -from QgisModelBaker.libs.modelbaker.db_factory.db_simple_factory import DbSimpleFactory -from QgisModelBaker.libs.modelbaker.dbconnector.db_connector import DBConnectorError -from QgisModelBaker.libs.modelbaker.iliwrapper import ili2dbconfig, iliimporter -from QgisModelBaker.libs.modelbaker.iliwrapper.globals import DbIliMode -from QgisModelBaker.libs.modelbaker.iliwrapper.ili2dbutils import ( - JavaNotFoundError, - color_log_text, -) -from QgisModelBaker.libs.modelbaker.iliwrapper.ilicache import ( - IliCache, - ModelCompleterDelegate, -) -from QgisModelBaker.libs.modelbaker.utils.globals import DbActionType -from QgisModelBaker.libs.modelbaker.utils.qt_utils import ( - FileValidator, - OverrideCursor, - Validators, - make_file_selector, -) -from QgisModelBaker.utils import gui_utils -from QgisModelBaker.utils.globals import displayDbIliMode -from QgisModelBaker.utils.gui_utils import LogColor - -DIALOG_UI = gui_utils.get_ui_class("import_data.ui") - - -class ImportDataDialog(QDialog, DIALOG_UI): - - ValidExtensions = [ - "xtf", - "XTF", - "itf", - "ITF", - "pdf", - "PDF", - "xml", - "XML", - "xls", - "XLS", - "xlsx", - "XLSX", - ] - - ModelMissingRegExp = re.compile(r"Error: failed to query .*\.t_ili2db_seq") - - def __init__(self, iface, base_config, parent=None): - - QDialog.__init__(self, parent) - self.iface = iface - self.setupUi(self) - QgsGui.instance().enableAutoGeometryRestore(self) - self.db_simple_factory = DbSimpleFactory() - self.buttonBox.accepted.disconnect() - self.buttonBox.clear() - self.buttonBox.addButton(QDialogButtonBox.Cancel) - self.buttonBox.addButton(QDialogButtonBox.Help) - self.buttonBox.helpRequested.connect(self.help_requested) - - self.import_text = self.tr("Import Data") - self.set_button_to_import_action = QAction(self.import_text, None) - self.set_button_to_import_action.triggered.connect(self.set_button_to_import) - - self.import_without_validation_text = self.tr("Import without validation") - self.set_button_to_import_without_validation_action = QAction( - self.import_without_validation_text, None - ) - self.set_button_to_import_without_validation_action.triggered.connect( - self.set_button_to_import_without_validation - ) - - self.edit_command_action = QAction(self.tr("Edit ili2db command"), None) - self.edit_command_action.triggered.connect(self.edit_command) - - self.import_tool_button.addAction( - self.set_button_to_import_without_validation_action - ) - self.import_tool_button.addAction(self.edit_command_action) - self.import_tool_button.setText(self.import_text) - self.import_tool_button.clicked.connect(self.accepted) - - self.xtf_file_browse_button.clicked.connect( - make_file_selector( - self.xtf_file_line_edit, - title=self.tr("Open Transfer or Catalog File"), - file_filter=self.tr( - "Transfer File (*.xtf *.itf *.XTF *.ITF);;Catalogue File (*.xml *.XML *.xls *.XLS *.xlsx *.XLSX)" - ), - ) - ) - - self.type_combo_box.clear() - self._lst_panel = dict() - - for db_id in self.db_simple_factory.get_db_list(False): - self.type_combo_box.addItem(displayDbIliMode[db_id], db_id) - item_panel = db_panel_utils.get_config_panel( - db_id, self, DbActionType.IMPORT_DATA - ) - self._lst_panel[db_id] = item_panel - self.db_layout.addWidget(item_panel) - - self.type_combo_box.currentIndexChanged.connect(self.type_changed) - self.ili2db_options = Ili2dbOptionsDialog(self, False) - self.ili2db_options_button.clicked.connect(self.ili2db_options.open) - self.ili2db_options.finished.connect(self.fill_toml_file_info_label) - - self.multiple_models_dialog = MultipleModelsDialog(self) - self.multiple_models_button.clicked.connect(self.multiple_models_dialog.open) - self.multiple_models_dialog.accepted.connect(self.fill_models_line_edit) - - self.validate_data = True # validates imported data by default, We use --disableValidation when is False - self.base_configuration = base_config - self.restore_configuration() - - self.validators = Validators() - fileValidator = FileValidator( - pattern=["*." + ext for ext in self.ValidExtensions] - ) - - self.xtf_file_line_edit.setValidator(fileValidator) - - self.ili_models_line_edit.setPlaceholderText( - self.tr("[Search model in repository]") - ) - self.ili_models_line_edit.textChanged.connect(self.complete_models_completer) - self.ili_models_line_edit.punched.connect(self.complete_models_completer) - - self.xtf_file_line_edit.textChanged.connect(self.validators.validate_line_edits) - self.xtf_file_line_edit.textChanged.emit(self.xtf_file_line_edit.text()) - - # Reset to import as default text - self.xtf_file_line_edit.textChanged.connect(self.set_button_to_import) - - settings = QSettings() - ilifile = settings.value("QgisModelBaker/ili2db/ilifile") - self.ilicache = IliCache(base_config, ilifile or None) - self.update_models_completer() - self.ilicache.refresh() - - self.bar = QgsMessageBar() - self.bar.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) - self.txtStdout.setLayout(QGridLayout()) - self.txtStdout.layout().setContentsMargins(0, 0, 0, 0) - self.txtStdout.layout().addWidget(self.bar, 0, 0, Qt.AlignTop) - - def set_button_to_import(self): - """ - Changes the text of the button to import (with validation) and sets the validate_data to true. - So on clicking the button the import will start with validation. - The buttons actions are changed to be able to switch the without-validation mode. - """ - self.validate_data = True - self.import_tool_button.removeAction(self.set_button_to_import_action) - self.import_tool_button.removeAction(self.edit_command_action) - self.import_tool_button.addAction( - self.set_button_to_import_without_validation_action - ) - self.import_tool_button.addAction(self.edit_command_action) - self.import_tool_button.setText(self.import_text) - - def set_button_to_import_without_validation(self): - """ - Changes the text of the button to import without validation and sets the validate_data to false. - So on clicking the button the import will start without validation. - The buttons actions are changed to be able to switch the with-validation mode. - """ - self.validate_data = False - self.import_tool_button.removeAction( - self.set_button_to_import_without_validation_action - ) - self.import_tool_button.removeAction(self.edit_command_action) - self.import_tool_button.addAction(self.set_button_to_import_action) - self.import_tool_button.addAction(self.edit_command_action) - self.import_tool_button.setText(self.import_without_validation_text) - - def edit_command(self): - """ - A dialog opens giving the user the possibility to edit the ili2db command used for the import - """ - importer = iliimporter.Importer() - importer.tool = self.type_combo_box.currentData() - importer.configuration = self.updated_configuration() - command = importer.command(True) - edit_command_dialog = EditCommandDialog(self) - edit_command_dialog.command_edit.setPlainText(command) - if edit_command_dialog.exec_(): - edited_command = edit_command_dialog.command_edit.toPlainText() - self.accepted(edited_command) - - def accepted(self, edited_command=None): - db_id = self.type_combo_box.currentData() - res, message = self._lst_panel[db_id].is_valid() - - if not res: - self.txtStdout.setText(message) - return - - configuration = self.updated_configuration() - - if not edited_command: - if ( - not self.xtf_file_line_edit.validator().validate( - configuration.xtffile, 0 - )[0] - == QValidator.Acceptable - ): - self.txtStdout.setText( - self.tr( - "Please set a valid INTERLIS transfer or catalogue file before importing data." - ) - ) - self.xtf_file_line_edit.setFocus() - return - - # create schema with superuser - db_factory = self.db_simple_factory.create_factory(db_id) - res, message = db_factory.pre_generate_project(configuration) - - if not res: - self.txtStdout.setText(message) - return - - with OverrideCursor(Qt.WaitCursor): - self.progress_bar.show() - self.progress_bar.setValue(0) - - self.disable() - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.clear() - - dataImporter = iliimporter.Importer(dataImport=True) - - dataImporter.tool = self.type_combo_box.currentData() - dataImporter.configuration = configuration - - self.save_configuration(configuration) - - dataImporter.stdout.connect(self.print_info) - dataImporter.stderr.connect(self.on_stderr) - dataImporter.process_started.connect(self.on_process_started) - dataImporter.process_finished.connect(self.on_process_finished) - - self.progress_bar.setValue(25) - - try: - if dataImporter.run(edited_command) != iliimporter.Importer.SUCCESS: - self.enable() - self.progress_bar.hide() - return - except JavaNotFoundError as e: - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.clear() - self.txtStdout.setText(e.error_string) - self.enable() - self.progress_bar.hide() - - QApplication.restoreOverrideCursor() - QMessageBox.critical( - self, self.tr("Java not found error"), e.error_string - ) - - return - - self.buttonBox.clear() - self.buttonBox.setEnabled(True) - self.buttonBox.addButton(QDialogButtonBox.Close) - self.progress_bar.setValue(100) - - self.refresh_layers() - - def refresh_layers(self): - # refresh layers - try: - for layer in self.iface.mapCanvas().layers(): - layer.dataProvider().reloadData() - self.iface.layerTreeView().layerTreeModel().recursivelyEmitDataChanged() - except AttributeError: - pass - - def print_info(self, text, text_color=LogColor.COLOR_INFO): - self.txtStdout.setTextColor(QColor(text_color)) - self.txtStdout.append(text) - QCoreApplication.processEvents() - - def on_stderr(self, text): - color_log_text(text, self.txtStdout) - match = re.match(ImportDataDialog.ModelMissingRegExp, text) - if match: - color_log_text( - "=======================================================================", - self.txtStdout, - ) - color_log_text( - self.tr( - "It looks like the required schema for the imported data has not been generated." - ), - self.txtStdout, - ) - color_log_text( - self.tr("Did you generate the model in the database?"), self.txtStdout - ) - color_log_text( - self.tr( - "Note: the model for a catalogue may be different from the data model itself." - ), - self.txtStdout, - ) - color_log_text( - "=======================================================================", - self.txtStdout, - ) - self.advance_progress_bar_by_text(text) - - def show_message(self, level, message): - if level == Qgis.Warning: - self.bar.pushMessage(message, Qgis.Info, 10) - elif level == Qgis.Critical: - self.bar.pushMessage(message, Qgis.Warning, 10) - - def on_process_started(self, command): - self.disable() - self.txtStdout.setTextColor(QColor(LogColor.COLOR_INFO)) - self.txtStdout.clear() - self.txtStdout.setText(command) - QCoreApplication.processEvents() - - def on_process_finished(self, exit_code, result): - color = "#004905" if exit_code == 0 else "#aa2222" - self.txtStdout.setTextColor(QColor(color)) - self.txtStdout.append("Finished ({})".format(exit_code)) - if result == iliimporter.Importer.SUCCESS: - self.buttonBox.clear() - self.buttonBox.setEnabled(True) - self.buttonBox.addButton(QDialogButtonBox.Close) - else: - if self.import_without_validate(): - self.set_button_to_import_without_validation() - self.enable() - - def import_without_validate(self): - """ - Valid if an error occurred that prevents executing the import without validations - :return: True if you can execute the import without validations, False in other case - """ - log = self.txtStdout.toPlainText().lower() - if "no models given" in log: - return False - if "attribute bid missing in basket" in log: - return False - return True - - def db_ili_version(self, configuration): - """ - Returns the ili2db version the database has been created with or None if the database - could not be detected as a ili2db database - """ - db_connector = self.__db_connector(configuration) - - if db_connector: - return db_connector.ili_version() - - return None - - def updated_configuration(self): - """ - Get the configuration that is updated with the user configuration changes on the dialog. - :return: Configuration - """ - configuration = ili2dbconfig.ImportDataConfiguration() - - mode = self.type_combo_box.currentData() - self._lst_panel[mode].get_fields(configuration) - - configuration.tool = mode - configuration.xtffile = self.xtf_file_line_edit.text().strip() - configuration.delete_data = self.chk_delete_data.isChecked() - configuration.ilimodels = self.ili_models_line_edit.text().strip() - configuration.inheritance = self.ili2db_options.inheritance_type() - configuration.create_basket_col = self.ili2db_options.create_basket_col() - configuration.create_import_tid = self.ili2db_options.create_import_tid() - configuration.stroke_arcs = self.ili2db_options.stroke_arcs() - configuration.pre_script = self.ili2db_options.pre_script() - configuration.post_script = self.ili2db_options.post_script() - configuration.base_configuration = self.base_configuration - configuration.db_ili_version = self.db_ili_version(configuration) - - configuration.with_schemaimport = True - db_connector = self.__db_connector(configuration) - if db_connector and db_connector.db_or_schema_exists(): - configuration.with_schemaimport = False - - if not self.validate_data: - configuration.disable_validation = True - return configuration - - def save_configuration(self, configuration): - settings = QSettings() - settings.setValue("QgisModelBaker/ili2pg/xtffile_import", configuration.xtffile) - settings.setValue("QgisModelBaker/ili2pg/deleteData", configuration.delete_data) - settings.setValue( - "QgisModelBaker/importtype", self.type_combo_box.currentData().name - ) - - mode = self.type_combo_box.currentData() - db_factory = self.db_simple_factory.create_factory(mode) - config_manager = db_factory.get_db_command_config_manager(configuration) - config_manager.save_config_in_qsettings() - - def restore_configuration(self): - settings = QSettings() - self.fill_toml_file_info_label() - self.xtf_file_line_edit.setText( - settings.value("QgisModelBaker/ili2pg/xtffile_import") - ) - # set chk_delete_data always to unchecked because otherwise the user could delete the data accidentally - self.chk_delete_data.setChecked(False) - - for db_id in self.db_simple_factory.get_db_list(False): - configuration = iliimporter.ImportDataConfiguration() - 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 - - self.type_combo_box.setCurrentIndex(self.type_combo_box.findData(mode)) - self.type_changed() - - def disable(self): - self.type_combo_box.setEnabled(False) - for key, value in self._lst_panel.items(): - value.setEnabled(False) - self.ili_config.setEnabled(False) - self.buttonBox.setEnabled(False) - - def enable(self): - self.type_combo_box.setEnabled(True) - for key, value in self._lst_panel.items(): - value.setEnabled(True) - self.ili_config.setEnabled(True) - self.buttonBox.setEnabled(True) - - def type_changed(self): - self.txtStdout.clear() - self.set_button_to_import() - self.progress_bar.hide() - - db_id = self.type_combo_box.currentData() - self.db_wrapper_group_box.setTitle(displayDbIliMode[db_id]) - - # Refresh panels - for key, value in self._lst_panel.items(): - value.interlis_mode = False - is_current_panel_selected = db_id == key - value.setVisible(is_current_panel_selected) - if is_current_panel_selected: - value._show_panel() - - def link_activated(self, link): - if link.url() == "#configure": - cfg = OptionsDialog(self.base_configuration) - if cfg.exec_(): - settings = QSettings() - settings.beginGroup("QgisModelBaker/ili2db") - self.base_configuration.save(settings) - else: - QDesktopServices.openUrl(link) - - def complete_models_completer(self): - if not self.ili_models_line_edit.text(): - self.ili_models_line_edit.completer().setCompletionMode( - QCompleter.UnfilteredPopupCompletion - ) - self.ili_models_line_edit.completer().complete() - else: - match_contains = ( - self.ili_models_line_edit.completer() - .completionModel() - .match( - self.ili_models_line_edit.completer().completionModel().index(0, 0), - Qt.DisplayRole, - self.ili_models_line_edit.text(), - -1, - Qt.MatchContains, - ) - ) - if len(match_contains) > 1: - self.ili_models_line_edit.completer().setCompletionMode( - QCompleter.PopupCompletion - ) - self.ili_models_line_edit.completer().complete() - - def update_models_completer(self): - completer = QCompleter(self.ilicache.model, self.ili_models_line_edit) - completer.setCaseSensitivity(Qt.CaseInsensitive) - completer.setFilterMode(Qt.MatchContains) - self.delegate = ModelCompleterDelegate() - completer.popup().setItemDelegate(self.delegate) - self.ili_models_line_edit.setCompleter(completer) - self.multiple_models_dialog.models_line_edit.setCompleter(completer) - - def fill_models_line_edit(self): - self.ili_models_line_edit.setText( - self.multiple_models_dialog.get_models_string() - ) - - def fill_toml_file_info_label(self): - text = None - if self.ili2db_options.toml_file(): - text = self.tr("Extra Meta Attribute File: {}").format( - ( - "…" - + self.ili2db_options.toml_file()[ - len(self.ili2db_options.toml_file()) - 40 : - ] - ) - if len(self.ili2db_options.toml_file()) > 40 - else self.ili2db_options.toml_file() - ) - self.toml_file_info_label.setText(text) - self.toml_file_info_label.setToolTip(self.ili2db_options.toml_file()) - - def help_requested(self): - os_language = QLocale(QSettings().value("locale/userLocale")).name()[:2] - if os_language in ["es", "de"]: - webbrowser.open( - "https://opengisch.github.io/QgisModelBaker/docs/{}/user-guide.html#import-an-interlis-transfer-file-xtf".format( - os_language - ) - ) - else: - webbrowser.open( - "https://opengisch.github.io/QgisModelBaker/docs/user-guide.html#import-an-interlis-transfer-file-xtf" - ) - - def advance_progress_bar_by_text(self, text): - if text.strip() == "Info: compile models...": - self.progress_bar.setValue(50) - QCoreApplication.processEvents() - elif text.strip() == "Info: create table structure...": - self.progress_bar.setValue(75) - QCoreApplication.processEvents() - - def __db_connector(self, configuration): - db_factory = self.db_simple_factory.create_factory(configuration.tool) - config_manager = db_factory.get_db_command_config_manager(configuration) - try: - db_connector = db_factory.get_db_connector( - config_manager.get_uri(configuration.db_use_super_login) - or config_manager.get_uri(), - configuration.dbschema, - ) - db_connector.new_message.connect(self.show_message) - return db_connector - except (DBConnectorError, FileNotFoundError): - return None diff --git a/QgisModelBaker/gui/multiple_models.py b/QgisModelBaker/gui/multiple_models.py deleted file mode 100644 index b16c9cdf0..000000000 --- a/QgisModelBaker/gui/multiple_models.py +++ /dev/null @@ -1,67 +0,0 @@ -""" -/*************************************************************************** - ------------------- - begin : 25.11.2017 - git sha : :%H$ - copyright : (C) 2017 by Germán Carrillo (BSF-Swissphoto) - email : gcarrillo@linuxmail.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ -""" -from qgis.gui import QgsGui -from qgis.PyQt.QtCore import Qt -from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem - -from QgisModelBaker.utils.gui_utils import get_ui_class - -DIALOG_UI = get_ui_class("multiple_models.ui") - - -class MultipleModelsDialog(QDialog, DIALOG_UI): - def __init__(self, parent=None): - QDialog.__init__(self, parent) - self.setupUi(self) - QgsGui.instance().enableAutoGeometryRestore(self) - self.parent = parent - - self.model_list.itemSelectionChanged.connect(self.on_selection_changed) - self.on_selection_changed() - - self.add_button.clicked.connect(self.add_model) - self.remove_button.clicked.connect(self.remove_model) - self.buttonBox.accepted.connect(self.accepted) - - self.models_line_edit.textChanged.connect(self.update_add_button_state) - self.models_line_edit.textChanged.emit(self.models_line_edit.text()) - - def add_model(self): - model_name = self.models_line_edit.text().strip() - if not self.model_list.findItems(model_name, Qt.MatchExactly): - self.model_list.addItem(QListWidgetItem(model_name)) - self.models_line_edit.setText("") - - def remove_model(self): - for item in self.model_list.selectedItems(): - self.model_list.takeItem(self.model_list.row(item)) - - def get_models_string(self): - items = [self.model_list.item(x) for x in range(self.model_list.count())] - models = ";".join([i.text().strip() for i in items if i.text().strip()]) - return models - - def on_selection_changed(self): - enable = len(self.model_list.selectedItems()) == 1 - self.remove_button.setEnabled(enable) - - def update_add_button_state(self, text): - self.add_button.setEnabled(bool(text.strip())) - self.add_button.setDefault(bool(text.strip())) - self.buttonBox.button(QDialogButtonBox.Ok).setDefault(not bool(text.strip())) diff --git a/QgisModelBaker/qgismodelbaker.py b/QgisModelBaker/qgismodelbaker.py index 27061fae9..54106e1d3 100644 --- a/QgisModelBaker/qgismodelbaker.py +++ b/QgisModelBaker/qgismodelbaker.py @@ -41,9 +41,6 @@ from QgisModelBaker.gui.dataset_manager import DatasetManagerDialog from QgisModelBaker.gui.drop_message import DropMessageDialog -from QgisModelBaker.gui.export import ExportDialog -from QgisModelBaker.gui.generate_project import GenerateProjectDialog -from QgisModelBaker.gui.import_data import ImportDataDialog from QgisModelBaker.gui.options import OptionsDialog from QgisModelBaker.gui.panel.dataset_selector import DatasetSelector from QgisModelBaker.gui.topping_wizard.topping_wizard import ToppingWizardDialog @@ -61,16 +58,10 @@ def __init__(self, iface): self.iface = iface self.plugin_dir = os.path.dirname(__file__) - self.generate_dlg = None - self.export_dlg = None - self.importdata_dlg = None self.workflow_wizard_dlg = None self.datasetmanager_dlg = None self.topping_wizard_dlg = None - self.__generate_action = None - self.__export_action = None - self.__importdata_action = None self.__workflow_wizard_action = None self.__datasetmanager_action = None self.__validate_action = None @@ -121,35 +112,6 @@ def initGui(self): pyplugin_installer.instance().uninstallPlugin( "projectgenerator", quiet=True ) - self.__generate_action = QAction( - QIcon( - os.path.join( - os.path.dirname(__file__), "images/QgisModelBaker-generate-icon.svg" - ) - ), - self.tr("Generate"), - None, - ) - self.__export_action = QAction( - QIcon( - os.path.join( - os.path.dirname(__file__), - "images/QgisModelBaker-xtf-export-icon.svg", - ) - ), - self.tr("Export Interlis Transfer File (.xtf)"), - None, - ) - self.__importdata_action = QAction( - QIcon( - os.path.join( - os.path.dirname(__file__), - "images/QgisModelBaker-xtf-import-icon.svg", - ) - ), - self.tr("Import Interlis Transfer File (.xtf)"), - None, - ) self.__datasetmanager_action = QAction( QIcon( os.path.join( @@ -198,20 +160,14 @@ def initGui(self): self.__about_action = QAction(self.tr("About"), None) # set these actions checkable to visualize that the dialog is open - self.__generate_action.setCheckable(True) - self.__export_action.setCheckable(True) - self.__importdata_action.setCheckable(True) self.__workflow_wizard_action.setCheckable(True) self.__datasetmanager_action.setCheckable(True) self.__validate_action.setCheckable(True) self.__topping_wizard_action.setCheckable(True) - self.__generate_action.triggered.connect(self.show_generate_dialog) self.__configure_action.triggered.connect(self.show_options_dialog) - self.__importdata_action.triggered.connect(self.show_importdata_dialog) self.__datasetmanager_action.triggered.connect(self.show_datasetmanager_dialog) self.__validate_action.triggered.connect(self.show_validate_dock) - self.__export_action.triggered.connect(self.show_export_dialog) self.__workflow_wizard_action.triggered.connect( self.show_workflow_wizard_dialog ) @@ -273,9 +229,6 @@ def unload(self): self.iface.layerTreeView().currentLayerChanged.disconnect( self.__dataset_selector.set_current_layer ) - del self.__generate_action - del self.__export_action - del self.__importdata_action del self.__workflow_wizard_action del self.__datasetmanager_action del self.__validate_action @@ -290,40 +243,6 @@ def unload(self): self.remove_validate_dock() - def show_generate_dialog(self): - if self.generate_dlg: - self.generate_dlg.reject() - else: - self.generate_dlg = GenerateProjectDialog( - self.iface, self.ili2db_configuration, self.iface.mainWindow() - ) - self.generate_dlg.setAttribute(Qt.WA_DeleteOnClose) - self.generate_dlg.setWindowFlags(self.generate_dlg.windowFlags() | Qt.Tool) - self.generate_dlg.show() - self.generate_dlg.finished.connect(self.generate_dialog_finished) - self.__generate_action.setChecked(True) - - def generate_dialog_finished(self): - self.__generate_action.setChecked(False) - self.generate_dlg = None - - def show_export_dialog(self): - if self.export_dlg: - self.export_dlg.reject() - else: - self.export_dlg = ExportDialog( - self.ili2db_configuration, self.iface.mainWindow() - ) - self.export_dlg.setAttribute(Qt.WA_DeleteOnClose) - self.export_dlg.setWindowFlags(self.export_dlg.windowFlags() | Qt.Tool) - self.export_dlg.show() - self.export_dlg.finished.connect(self.export_dialog_finished) - self.__export_action.setChecked(True) - - def export_dialog_finished(self): - self.__export_action.setChecked(False) - self.export_dlg = None - def show_workflow_wizard_dialog(self): if self.workflow_wizard_dlg: self.workflow_wizard_dlg.reject() @@ -366,25 +285,6 @@ def topping_wizard_dialog_finished(self): self.__topping_wizard_action.setChecked(False) self.topping_wizard_dlg = None - def show_importdata_dialog(self): - if self.importdata_dlg: - self.importdata_dlg.reject() - else: - self.importdata_dlg = ImportDataDialog( - self.iface, self.ili2db_configuration, self.iface.mainWindow() - ) - self.importdata_dlg.setAttribute(Qt.WA_DeleteOnClose) - self.importdata_dlg.setWindowFlags( - self.importdata_dlg.windowFlags() | Qt.Tool - ) - self.importdata_dlg.show() - self.importdata_dlg.finished.connect(self.importdata_dialog_finished) - self.__importdata_action.setChecked(True) - - def importdata_dialog_finished(self): - self.__importdata_action.setChecked(False) - self.importdata_dlg = None - def show_datasetmanager_dialog(self): if self.datasetmanager_dlg: self.datasetmanager_dlg.reject() diff --git a/QgisModelBaker/ui/export.ui b/QgisModelBaker/ui/export.ui deleted file mode 100644 index 07997d68e..000000000 --- a/QgisModelBaker/ui/export.ui +++ /dev/null @@ -1,233 +0,0 @@ - - - InterlisExport - - - - 0 - 0 - 718 - 771 - - - - Export Interlis Data - - - - - - - - - 0 - 0 - - - - - 88 - 16777215 - - - - Source - - - - - - - - PostGIS - - - - - GeoPackage - - - - - - - - - - 0 - - - - - - - - - 0 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Help - - - - - - - ... - - - QToolButton::MenuButtonPopup - - - - - - - - - - - - - - - - - false - - - - - - - Interlis - - - - - - - - - Models - - - - - - - Qt::Horizontal - - - - 40 - 3 - - - - - - - - Browse XTF files - - - … - - - - - - - XTF File - - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - - - - - SpaceCheckListView - -
QgisModelBaker.utils.gui_utils
- 1 - - - - type_combo_box - xtf_file_line_edit - xtf_file_browse_button - txtStdout - - - - - buttonBox - accepted() - InterlisExport - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - InterlisExport - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/QgisModelBaker/ui/generate_project.ui b/QgisModelBaker/ui/generate_project.ui deleted file mode 100644 index 7d5687fed..000000000 --- a/QgisModelBaker/ui/generate_project.ui +++ /dev/null @@ -1,328 +0,0 @@ - - - InterlisImport - - - - 0 - 0 - 641 - 803 - - - - Generate Project - - - - - - - 0 - 0 - - - - - 88 - 16777215 - - - - Source - - - - - - - - Interlis (PostGIS) - - - - - Interlis (GeoPackage) - - - - - PostGIS - - - - - GeoPackage - - - - - - - - 0 - - - - - - - - - - false - - - - - - - Interlis - - - - - - - 580 - 16777215 - - - - - - - - - - - Qt::StrongFocus - - - - - - - [Optional] - - - - - - - Coordinate Reference System - - - CRS - - - - - - - Models - - - - - - - Advanced Options - - - - - - - Select multiple Interlis models - - - … - - - - - - - - - - - - - Metaconfiguration / Topping - - - - - - - Interlis File - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Browse Interlis files - - - … - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - 0 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Help - - - - - - - ... - - - QToolButton::MenuButtonPopup - - - - - - - Create - - - - - - - - - - - - - - - QgsProjectionSelectionWidget - QWidget -
qgis.gui
- 1 - - - CompletionLineEdit - -
QgisModelBaker.utils.gui_utils
- 1 - - - - type_combo_box - ili_file_line_edit - ili_file_browse_button - ili_models_line_edit - multiple_models_button - crsSelector - ili2db_options_button - txtStdout - buttonBox - - - - - buttonBox - accepted() - InterlisImport - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - InterlisImport - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/QgisModelBaker/ui/import_data.ui b/QgisModelBaker/ui/import_data.ui deleted file mode 100644 index ad0626191..000000000 --- a/QgisModelBaker/ui/import_data.ui +++ /dev/null @@ -1,276 +0,0 @@ - - - InterlisImportData - - - - 0 - 0 - 718 - 791 - - - - Import Interlis Data - - - - - - - - - 0 - 0 - - - - - 88 - 16777215 - - - - Target - - - - - - - - PostGIS - - - - - GeoPackage - - - - - - - - - - 0 - - - - - - - Interlis - - - - - - Browse XTF files - - - … - - - - - - - Models - - - - - - - Select multiple Interlis models - - - … - - - - - - - Advanced Options - - - - - - - - - - - - - XTF File - - - - - - - Qt::Horizontal - - - - 40 - 3 - - - - - - - - Delete existing data including dependencies like catalogues etc. - - - Delete existing data in affected tables - - - - - - - - 580 - 16777215 - - - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - 0 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Help - - - - - - - ... - - - QToolButton::MenuButtonPopup - - - - - - - - - - CompletionLineEdit - -
QgisModelBaker.utils.gui_utils
- 1 - - - - type_combo_box - xtf_file_line_edit - xtf_file_browse_button - ili_models_line_edit - multiple_models_button - chk_delete_data - txtStdout - - - - - buttonBox - accepted() - InterlisImportData - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - InterlisImportData - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/QgisModelBaker/ui/multiple_models.ui b/QgisModelBaker/ui/multiple_models.ui deleted file mode 100644 index 8b9b9243a..000000000 --- a/QgisModelBaker/ui/multiple_models.ui +++ /dev/null @@ -1,181 +0,0 @@ - - - MultipleModelsDialog - - - - 0 - 0 - 413 - 266 - - - - Select multiple Interlis models - - - - - - - - Start typing a model name - - - - - - - - false - - - - QListWidget::item { border-bottom: 1px #A4A4A4; border-style: dotted;} -QListWidget::item:selected { color: white; background: #6699ff;} - - - QFrame::StyledPanel - - - QFrame::Sunken - - - 0 - - - QAbstractItemView::NoEditTriggers - - - true - - - true - - - QAbstractItemView::SingleSelection - - - false - - - QListView::ListMode - - - false - - - false - - - - - - - - - - - - 101 - 0 - - - - Add - - - false - - - - - - - - 50 - false - false - - - - Remove - - - false - - - false - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - models_line_edit - add_button - model_list - remove_button - buttonBox - - - - - buttonBox - accepted() - MultipleModelsDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - MultipleModelsDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - From ca97dd356a21823e404cb5e8c583eeb076bf79d6 Mon Sep 17 00:00:00 2001 From: Damiano Lombardi Date: Thu, 10 Aug 2023 15:09:53 +0200 Subject: [PATCH 2/2] Remove unused icons --- .../images/QgisModelBaker-generate-icon.svg | 366 ----------------- QgisModelBaker/images/QgisModelBaker-icon.png | Bin 14939 -> 0 bytes .../images/QgisModelBaker-xtf-export-icon.svg | 368 ------------------ .../images/QgisModelBaker-xtf-import-icon.svg | 367 ----------------- 4 files changed, 1101 deletions(-) delete mode 100644 QgisModelBaker/images/QgisModelBaker-generate-icon.svg delete mode 100644 QgisModelBaker/images/QgisModelBaker-icon.png delete mode 100644 QgisModelBaker/images/QgisModelBaker-xtf-export-icon.svg delete mode 100644 QgisModelBaker/images/QgisModelBaker-xtf-import-icon.svg diff --git a/QgisModelBaker/images/QgisModelBaker-generate-icon.svg b/QgisModelBaker/images/QgisModelBaker-generate-icon.svg deleted file mode 100644 index b81dcd63d..000000000 --- a/QgisModelBaker/images/QgisModelBaker-generate-icon.svg +++ /dev/null @@ -1,366 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/QgisModelBaker/images/QgisModelBaker-icon.png b/QgisModelBaker/images/QgisModelBaker-icon.png deleted file mode 100644 index bec58a69115bad3def6a4b74f9df42bea293d5ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14939 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 diff --git a/QgisModelBaker/images/QgisModelBaker-xtf-export-icon.svg b/QgisModelBaker/images/QgisModelBaker-xtf-export-icon.svg deleted file mode 100644 index 63ebb5fa6..000000000 --- a/QgisModelBaker/images/QgisModelBaker-xtf-export-icon.svg +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/QgisModelBaker/images/QgisModelBaker-xtf-import-icon.svg b/QgisModelBaker/images/QgisModelBaker-xtf-import-icon.svg deleted file mode 100644 index 52f13be50..000000000 --- a/QgisModelBaker/images/QgisModelBaker-xtf-import-icon.svg +++ /dev/null @@ -1,367 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - -