diff --git a/QgisModelBaker/gui/workflow_wizard/execution_page.py b/QgisModelBaker/gui/workflow_wizard/execution_page.py index 453920db..9c813130 100644 --- a/QgisModelBaker/gui/workflow_wizard/execution_page.py +++ b/QgisModelBaker/gui/workflow_wizard/execution_page.py @@ -188,7 +188,7 @@ def _on_process_finished(self, exit_code, result): level = LogLevel.SUCCESS if self.db_action_type == DbActionType.GENERATE: message = self.tr( - "Interlis model(s) successfully imported into the database!" + "INTERLIS model(s) successfully imported into the database!" ) elif self.db_action_type == DbActionType.IMPORT_DATA: message = self.tr( diff --git a/QgisModelBaker/gui/workflow_wizard/export_data_configuration_page.py b/QgisModelBaker/gui/workflow_wizard/export_data_configuration_page.py index d3aa3337..bf396391 100644 --- a/QgisModelBaker/gui/workflow_wizard/export_data_configuration_page.py +++ b/QgisModelBaker/gui/workflow_wizard/export_data_configuration_page.py @@ -52,7 +52,7 @@ def __init__(self, parent, title): 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)" + "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], diff --git a/QgisModelBaker/gui/workflow_wizard/import_source_selection_page.py b/QgisModelBaker/gui/workflow_wizard/import_source_selection_page.py index 9457143d..dd1bb180 100644 --- a/QgisModelBaker/gui/workflow_wizard/import_source_selection_page.py +++ b/QgisModelBaker/gui/workflow_wizard/import_source_selection_page.py @@ -59,9 +59,9 @@ def __init__(self, parent, title): self.file_browse_button.clicked.connect( make_file_selector( self.input_line_edit, - title=self.tr("Open Interlis Model, Transfer or Catalogue File"), + title=self.tr("Open INTERLIS Model, Transfer or Catalogue File"), file_filter=self.tr( - "Interlis Model / Transfer / Catalogue File (*.ili *.xtf *.itf *.XTF *.ITF *.xml *.XML *.xls *.XLS *.xlsx *.XLSX)" + "INTERLIS Model / Transfer / Catalogue File (*.ili *.xtf *.itf *.XTF *.ITF *.xml *.XML *.xls *.XLS *.xlsx *.XLSX)" ), ) ) diff --git a/QgisModelBaker/gui/workflow_wizard/project_creation_page.py b/QgisModelBaker/gui/workflow_wizard/project_creation_page.py index d4f350c6..2b077e02 100644 --- a/QgisModelBaker/gui/workflow_wizard/project_creation_page.py +++ b/QgisModelBaker/gui/workflow_wizard/project_creation_page.py @@ -445,6 +445,8 @@ def _create_project(self): ) legend = generator.legend(available_layers) + self.progress_bar.setValue(50) + custom_layer_order_structure = list() custom_project_properties = {} mapthemes = {} @@ -530,8 +532,9 @@ def _create_project(self): LogLevel.TOPPING, ) - self.progress_bar.setValue(55) + self.progress_bar.setValue(55) + self.workflow_wizard.log_panel.print_info(self.tr("Set transaction mode…")) # override transaction mode if give n by topic transaction_mode = custom_project_properties.get("transaction_mode", None) @@ -561,6 +564,12 @@ def _create_project(self): transaction_mode = Qgis.TransactionMode.Disabled.name # otherwise it's already a string and could be everything + self.progress_bar.setValue(60) + + self.workflow_wizard.log_panel.print_info( + self.tr("Optimize according the strategy...") + ) + # override optimize strategy if give n by topic optimize_strategy = custom_project_properties.get("ili_optimize_strategy", None) @@ -592,11 +601,17 @@ def _create_project(self): ) project.post_generate() + self.progress_bar.setValue(70) + qgis_project = QgsProject.instance() self.workflow_wizard.log_panel.print_info(self.tr("Generate QGIS project…")) project.create(None, qgis_project) + self.progress_bar.setValue(75) + + self.workflow_wizard.log_panel.print_info(self.tr("Set map canvas extent...")) + # Set the extent of the mapCanvas from the first layer extent found for layer in project.layers: if layer.extent is not None: @@ -604,7 +619,7 @@ def _create_project(self): self.workflow_wizard.iface.mapCanvas().refresh() break - self.progress_bar.setValue(60) + self.progress_bar.setValue(80) # QML Toppings in the metadata: collect, download and apply # This configuration is legacy (should be in project topping instead), but it's still supported diff --git a/QgisModelBaker/metadata.txt b/QgisModelBaker/metadata.txt index 8bfd06ec..786ddb20 100644 --- a/QgisModelBaker/metadata.txt +++ b/QgisModelBaker/metadata.txt @@ -7,7 +7,7 @@ qgisMinimumVersion=3.16 qgisMaximumVersion=3.99 author=OPENGIS.ch GmbH in collaboration with SwissTierras Colombia email=info@opengis.ch -about=Model Baker (previously QgsProjectGenerator) creates QGIS projects from Interlis models, PostGIS database schemas or GeoPackages. It preconfigures layers, widgets, relations and much more based on meta information available from models. +about=Model Baker (previously QgsProjectGenerator) creates QGIS projects from INTERLIS models, PostGIS database schemas or GeoPackages. It preconfigures layers, widgets, relations and much more based on meta information available from models. tags=model,schema,postgres,postgis,geopackage,gpkg,interlis,ili,xtf,projectgenerator,project,modelbaker,QgisModelBaker tracker=https://github.com/opengisch/QgisModelBaker/issues repository=https://github.com/opengisch/QgisModelBaker diff --git a/QgisModelBaker/ui/options.ui b/QgisModelBaker/ui/options.ui index 406be760..e30fe825 100644 --- a/QgisModelBaker/ui/options.ui +++ b/QgisModelBaker/ui/options.ui @@ -91,7 +91,7 @@ - Interlis + INTERLIS @@ -115,7 +115,7 @@ <html><head/><body> -<p>Directories which contain Interlis Models (ili files). Several paths can be separated with a semicolon `;`. It is also possible to specify URL's of model repositories.</p> +<p>Directories which contain INTERLIS Models (ili files). Several paths can be separated with a semicolon `;`. It is also possible to specify URL's of model repositories.</p> <dl> <dt>%ILI_FROM_DB</dt><dd>is a placeholder for the models in the database (in the table <code>t_ili2db_model</code>). </dt> diff --git a/QgisModelBaker/ui/topping_wizard/referencedata.ui b/QgisModelBaker/ui/topping_wizard/referencedata.ui index 05dbaf38..bd84eb49 100644 --- a/QgisModelBaker/ui/topping_wizard/referencedata.ui +++ b/QgisModelBaker/ui/topping_wizard/referencedata.ui @@ -64,7 +64,7 @@ - Browse Interlis files + Browse INTERLIS files … diff --git a/QgisModelBaker/ui/workflow_wizard/database_selection.ui b/QgisModelBaker/ui/workflow_wizard/database_selection.ui index 7477ba3d..8ca9f6c9 100644 --- a/QgisModelBaker/ui/workflow_wizard/database_selection.ui +++ b/QgisModelBaker/ui/workflow_wizard/database_selection.ui @@ -77,12 +77,12 @@ - Interlis (PostGIS) + INTERLIS (PostGIS) - Interlis (GeoPackage) + INTERLIS (GeoPackage) diff --git a/QgisModelBaker/ui/workflow_wizard/import_source_selection.ui b/QgisModelBaker/ui/workflow_wizard/import_source_selection.ui index 04df97cb..dbd4f130 100644 --- a/QgisModelBaker/ui/workflow_wizard/import_source_selection.ui +++ b/QgisModelBaker/ui/workflow_wizard/import_source_selection.ui @@ -95,7 +95,7 @@ - Browse Interlis files + Browse INTERLIS files … diff --git a/QgisModelBaker/ui/workflow_wizard/project_creation.ui b/QgisModelBaker/ui/workflow_wizard/project_creation.ui index 7b1213eb..1485e6c9 100644 --- a/QgisModelBaker/ui/workflow_wizard/project_creation.ui +++ b/QgisModelBaker/ui/workflow_wizard/project_creation.ui @@ -87,7 +87,7 @@ - Browse Interlis files + Browse INTERLIS files … diff --git a/QgisModelBaker/utils/globals.py b/QgisModelBaker/utils/globals.py index edf4ad1a..30a50a13 100644 --- a/QgisModelBaker/utils/globals.py +++ b/QgisModelBaker/utils/globals.py @@ -33,15 +33,15 @@ DbIliMode.pg: QCoreApplication.translate("QgisModelBaker", "PostGIS"), DbIliMode.gpkg: QCoreApplication.translate("QgisModelBaker", "GeoPackage"), DbIliMode.mssql: QCoreApplication.translate("QgisModelBaker", "SQL Server"), - DbIliMode.ili: QCoreApplication.translate("QgisModelBaker", "Interlis"), + DbIliMode.ili: QCoreApplication.translate("QgisModelBaker", "INTERLIS"), DbIliMode.ili2pg: QCoreApplication.translate( - "QgisModelBaker", "Interlis (use PostGIS)" + "QgisModelBaker", "INTERLIS (use PostGIS)" ), DbIliMode.ili2gpkg: QCoreApplication.translate( - "QgisModelBaker", "Interlis (use GeoPackage)" + "QgisModelBaker", "INTERLIS (use GeoPackage)" ), DbIliMode.ili2mssql: QCoreApplication.translate( - "QgisModelBaker", "Interlis (use SQL Server)" + "QgisModelBaker", "INTERLIS (use SQL Server)" ), } diff --git a/README.md b/README.md index 562f4a75..39cd0ff6 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ Configuring QGIS layers and forms manually is a tedious and error prone process. This plugin loads database schemas with various meta information to preconfigure the layer tree, widget configuration, relations and more. -[Interlis](https://en.wikipedia.org/wiki/Interlis) models contain more information than a plain database schema. This -plugin uses [ili2pg](https://github.com/claeis/ili2db#ili2db---importsexports-interlis-transfer-files-to-a-sql-db) to import an Interlis model into a PostGIS database and uses +[INTERLIS](https://en.wikipedia.org/wiki/INTERLIS) models contain more information than a plain database schema. This +plugin uses [ili2pg](https://github.com/claeis/ili2db#ili2db---importsexports-interlis-transfer-files-to-a-sql-db) to import an INTERLIS model into a PostGIS database and uses the additional meta information to configure the user interface even better. [Read the documentation](https://opengisch.github.io/QgisModelBaker/) for more information.