V1.9.0 (#36)

fpennica · web-flow · commit 9dbb5cf99555 · 2023-10-27T13:23:14.000+02:00
* prepare for v1.9.0
diff --git a/.env b/.env
@@ -11,4 +11,4 @@
 # dnf repoquery -l python3-qgis
 # PYTHONPATH=/usr/share/qgis/python:/usr/lib64/python3.9/site-packages:${env:PYTHONPATH}
 
-PYTHONPATH=/usr/share/qgis/python:/usr/lib/python3/dist-packages:/usr/lib64/python3.9/site-packages:/usr/lib/python3.10/site-packages:${env:PYTHONPATH}
+PYTHONPATH=/usr/share/qgis/python:/usr/lib/python3/dist-packages:/usr/lib64/python3.9/site-packages:/usr/lib/python3.10/site-packages:/usr/lib/python3.11/site-packages:${env:PYTHONPATH}
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -1,5 +1,15 @@
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+  apt_packages:
+    - texlive-latex-recommended
+    - texlive-latex-extra
+    - texlive-fonts-recommended
+    - texlive-lang-italian
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: help/source/conf.py
@@ -8,9 +18,6 @@ sphinx:
 formats:
   - pdf
 
-build:
-  apt_packages:
-    - texlive-latex-recommended
-    - texlive-latex-extra
-    - texlive-fonts-recommended
-    - texlive-lang-italian
+python:
+  install:
+    - requirements: help/requirements.txt
diff --git a/README.md b/README.md
@@ -10,6 +10,11 @@ Documentation: [https://mzs-tools.readthedocs.io](https://mzs-tools.readthedocs.
 
 ## Changelog
 
+### v1.9.0
+
+- Updated styles and print layouts
+- Improved compatibility with MS standard v4.2
+
 ### v1.8.3
 
 - Updated styles and expressions in QGIS project
diff --git a/data/progetto_MS.zip b/data/progetto_MS.zip
diff --git a/help/requirements.txt b/help/requirements.txt
@@ -0,0 +1 @@
+sphinx-rtd-theme
diff --git a/help/source/conf.py b/help/source/conf.py
@@ -53,9 +53,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.8.3'
+version = '1.9.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.8.3'
+release = '1.9.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/help/source/intro.rst b/help/source/intro.rst
@@ -94,6 +94,10 @@ Riferimenti
 Changelog
 ---------
 
+v1.9.0
+    - Updated styles and print layouts
+    - Improved compatibility with MS standard v4.2
+
 v1.8.3
     - Updated styles and expressions in QGIS project
     - Updated and improved print layouts
diff --git a/metadata.txt b/metadata.txt
@@ -8,101 +8,104 @@ qgisMinimumVersion=3.16
 
 description=Plugin for Italian seismic microzonation.
 
-version=1.8.3
+version=1.9.0
 author=IGAG-CNR
 email=labgis@igag.cnr.it
 
 
 about=The plugin allows the creation of the database and the cartographic representation of the Italian seismic microzonation studies for levels 1, 2 and 3 according to the standards of representation and computer archiving version 4.2 (Technical commission for seismic microzonation - art. 5 paragraph 7, OPCM 13 nov. 2010, n. 3907). The software provider does not provide any warranty for the program (as described in the GPLv3 license).
 
     Il plugin consente la creazione della banca dati e la rappresentazione cartografica degli studi di microzonazione sismica italiana per i livelli 1, 2 e 3 secondo gli Standard di rappresentazione ed archiviazione informatica versione 4.2 (Commissione tecnica per la microzonazione sismica - art. 5, comma 7 dell’OPCM 13 nov. 2010, n. 3907). Il fornitore del software non fornisce alcun tipo di garanzia per il programma (come descritto all'interno della licenza GPLv3).
-	
+    
 changelog=
 
-		<b>v1.8.3:</b>
+        <b>v1.9.0:</b>
+                - Updated styles and print layouts
+                - Improved compatibility with MS standard v4.2
+        <b>v1.8.3:</b>
                 - Updated styles and expressions in QGIS project
-				- Updated and improved print layouts
-				- Added available regional CTR WMS services
-				- Fix potential problems in import process
-		<b>v1.8.2:</b>
+                - Updated and improved print layouts
+                - Added available regional CTR WMS services
+                - Fix potential problems in import process
+        <b>v1.8.2:</b>
                 - Experimental fixes for slow data import and export processes
-				- Updated styles and expressions in QGIS project
-				- Updated and improved print layouts
-		<b>v1.8.1:</b>
+                - Updated styles and expressions in QGIS project
+                - Updated and improved print layouts
+        <b>v1.8.1:</b>
                 - Fix problem with version strings in project update
-		<b>v1.8:</b>
+        <b>v1.8:</b>
                 -  QGIS project template improvements
-		<b>v1.7:</b>
+        <b>v1.7:</b>
                 -  Update ISTAT administrative boundaries and codes to the latest 2022 version
-				-  Update styles for editing layers
-				-  Add QGIS action for punctual and linear surveys layers to directly search for available survey documents in the project folder
-		<b>v1.6:</b>
+                -  Update styles for editing layers
+                -  Add QGIS action for punctual and linear surveys layers to directly search for available survey documents in the project folder
+        <b>v1.6:</b>
                 -  Fix Python error in geotec editing
-				-  Update project template (snapping options, symbols)
+                -  Update project template (snapping options, symbols)
         <b>v1.5:</b>
                 -  Ported to QGIS 3
-		<b>v1.4:</b>
-				-  Updated to new MS 4.2 standards;
-				-  update project (fixed labels, update .py files, added new style);
-				-  updated italian manual.
-		<b>v1.3:</b>
-				-  updated layout "CDI - Carta delle Indagini" (added legend);
-				-  updated export shapefiles and "Export geodatabase to project folder" tool (to meet the standards);
-				-  removed "Validate project" tool;
-				-  fixed bug in log files;
-				-  update project (fixed labels, update .py files);
-				-  updated italian manual.
-		<b>v1.2:</b>
-				-  updated layouts ("Carta di Microzonazione Sismica (FA 0.1-0.5 s)", "Carta di Microzonazione Sismica (FA 0.4-0.8 s)", "Carta di Microzonazione Sismica (FA 0.7-1.1 s)");
-				-  added "pkey" field in "Indagini" and "Parametri" tables;
-				-  removed english manual.
-		<b>v1.1:</b>
-				-  modified the layout layer "CDI - Indagini puntuali";
-				-  modified the layout layer "MOPS - HVSR";
-				-  updated export database ("CdI_Tabelle.sqlite").
-		<b>v1.0:</b>
-				-  stable version;
-				-  added a new video-guide ("Indagine stazione singola (HVSR)");
-				-  update project (fixed labels and styles errors, update .py files);
-				-  updated italian manual.
-		<b>v0.9:</b>
-				-  update table "Indagine stazione singola (HVSR)", "freq.ui" mask and added a new layout ("Carta delle frequenze naturali dei terreni fr");
-				-  update constraint "quota_slm_top_verify" and "quota_slm_bot_verify" in "indagini_puntuali", "parametri_puntuali" and "parametri_lineari" tables;
-				-  moved export process to a separate thread;
-				-  export progress shown in qgis interface;
-				-  fixed bug in "siti_ind_param.py";
-				-  update "New project" tool;
-				-  added a new table ("metadati");
-				-  update project (in particular .ui, .py files);
-				-  updated italian manual.
-		<b>v0.8:</b>
-				-  fixed bug in "siti_ind_param.py";
-				-  update "siti_puntuali" and "siti_lineari" triggers;
-				-  added a new table ("Indagine stazione singola (HVSR)") and a new layout ("Carta delle frequenze naturali dei terreni");
-				-  update project (in particular .ui, .py files);
-				-  changed update project process and removed "Update project" tool;
-				-  updated italian manual.
-		<b>v0.7:</b>
-				-  moved import process to a separate thread;
-				-  import progress shown in qgis interface;
-				-  fixed bug with empty numeric values in csv files during import;
-				-  reimplemented import log file;
-				-  added "Update project" tool;
-				-  update project (in particular .ui, .py files);
-				-  updated italian manual.
-		<b>v0.6:</b>
-				-  video-guide additions;
-				-  update project (in particular .ui, .py files);
-				-  resolved bugs;
-				-  updated italian manual.
-		<b>v0.5:</b>
-				-  improved "Add feature or record" tool;
-				-  removed useless tool;
-				-  update project (in particular .ui, .py files);
-				-  resolved bugs;
-				-  updated italian manual.
-		<b>v0.4:</b>
-				-  initial relase.
+        <b>v1.4:</b>
+                -  Updated to new MS 4.2 standards;
+                -  update project (fixed labels, update .py files, added new style);
+                -  updated italian manual.
+        <b>v1.3:</b>
+                -  updated layout "CDI - Carta delle Indagini" (added legend);
+                -  updated export shapefiles and "Export geodatabase to project folder" tool (to meet the standards);
+                -  removed "Validate project" tool;
+                -  fixed bug in log files;
+                -  update project (fixed labels, update .py files);
+                -  updated italian manual.
+        <b>v1.2:</b>
+                -  updated layouts ("Carta di Microzonazione Sismica (FA 0.1-0.5 s)", "Carta di Microzonazione Sismica (FA 0.4-0.8 s)", "Carta di Microzonazione Sismica (FA 0.7-1.1 s)");
+                -  added "pkey" field in "Indagini" and "Parametri" tables;
+                -  removed english manual.
+        <b>v1.1:</b>
+                -  modified the layout layer "CDI - Indagini puntuali";
+                -  modified the layout layer "MOPS - HVSR";
+                -  updated export database ("CdI_Tabelle.sqlite").
+        <b>v1.0:</b>
+                -  stable version;
+                -  added a new video-guide ("Indagine stazione singola (HVSR)");
+                -  update project (fixed labels and styles errors, update .py files);
+                -  updated italian manual.
+        <b>v0.9:</b>
+                -  update table "Indagine stazione singola (HVSR)", "freq.ui" mask and added a new layout ("Carta delle frequenze naturali dei terreni fr");
+                -  update constraint "quota_slm_top_verify" and "quota_slm_bot_verify" in "indagini_puntuali", "parametri_puntuali" and "parametri_lineari" tables;
+                -  moved export process to a separate thread;
+                -  export progress shown in qgis interface;
+                -  fixed bug in "siti_ind_param.py";
+                -  update "New project" tool;
+                -  added a new table ("metadati");
+                -  update project (in particular .ui, .py files);
+                -  updated italian manual.
+        <b>v0.8:</b>
+                -  fixed bug in "siti_ind_param.py";
+                -  update "siti_puntuali" and "siti_lineari" triggers;
+                -  added a new table ("Indagine stazione singola (HVSR)") and a new layout ("Carta delle frequenze naturali dei terreni");
+                -  update project (in particular .ui, .py files);
+                -  changed update project process and removed "Update project" tool;
+                -  updated italian manual.
+        <b>v0.7:</b>
+                -  moved import process to a separate thread;
+                -  import progress shown in qgis interface;
+                -  fixed bug with empty numeric values in csv files during import;
+                -  reimplemented import log file;
+                -  added "Update project" tool;
+                -  update project (in particular .ui, .py files);
+                -  updated italian manual.
+        <b>v0.6:</b>
+                -  video-guide additions;
+                -  update project (in particular .ui, .py files);
+                -  resolved bugs;
+                -  updated italian manual.
+        <b>v0.5:</b>
+                -  improved "Add feature or record" tool;
+                -  removed useless tool;
+                -  update project (in particular .ui, .py files);
+                -  resolved bugs;
+                -  updated italian manual.
+        <b>v0.4:</b>
+                -  initial relase.
 
 tracker=https://github.com/CNR-IGAG/mzs-tools/issues
 
diff --git a/pb_tool.cfg b/pb_tool.cfg
@@ -60,7 +60,7 @@ compiled_ui_files:
 resource_files: 
 
 # Other files required for the plugin
-extras: comuni.csv LICENSE.md metadata.txt icon.png query_v08.sql query_v09.sql query_v10_12.sql README.md tb_aggiorna_progetto.ui tb_copia_ms.ui tb_edit_win.ui tb_esporta_shp.ui tb_importa_shp.ui tb_info.ui tb_nuovo_progetto.ui versione.txt
+extras: comuni.csv LICENSE.md metadata.txt icon.png query_v08.sql query_v09.sql query_v10_12.sql query_v19.sql README.md tb_aggiorna_progetto.ui tb_copia_ms.ui tb_edit_win.ui tb_esporta_shp.ui tb_importa_shp.ui tb_info.ui tb_nuovo_progetto.ui versione.txt
 
 # Other directories to be deployed with the plugin.
 # These must be subdirectories under the plugin directory
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mzs-tools"
-version = "1.8.3"
+version = "1.9.0"
 description = "QGIS plugin for italian seismic microzonation"
 authors = ["CNR IGAG LabGIS <labgis@igag.cnr.it>"]
 license = "GPL-3.0-or-later"
diff --git a/query_v19.sql b/query_v19.sql
@@ -0,0 +1,4 @@
+CREATE TABLE 'tavole' ( "ogc_fid" INTEGER PRIMARY KEY AUTOINCREMENT, 'nome' VARCHAR(255), 'numero' INTEGER, "GEOMETRY" POLYGON);;
+
+CREATE TABLE 'nome_sezione' ( "ogc_fid" INTEGER PRIMARY KEY AUTOINCREMENT, 'nome' VARCHAR(50), "GEOMETRY" POINT);;
+
diff --git a/tb_aggiorna_progetto.py b/tb_aggiorna_progetto.py
@@ -1,10 +1,3 @@
-# -*- coding: utf-8 -*-
-# -------------------------------------------------------------------------------
-# Name:		tb_aggiorna_progetto.py
-# Author:	  Tarquini E.
-# Created:	 24-09-2018
-# -------------------------------------------------------------------------------
-
 import datetime
 import os
 import shutil
@@ -19,9 +12,7 @@
 
 from .utils import save_map_image
 
-FORM_CLASS, _ = uic.loadUiType(
-    os.path.join(os.path.dirname(__file__), "tb_aggiorna_progetto.ui")
-)
+FORM_CLASS, _ = uic.loadUiType(os.path.join(os.path.dirname(__file__), "tb_aggiorna_progetto.ui"))
 
 
 class aggiorna_progetto(QDialog, FORM_CLASS):
@@ -39,33 +30,25 @@ def aggiorna(self, proj_path, dir_output, nome, proj_vers, new_proj_vers):
 
             pacchetto = os.path.join(self.plugin_dir, "data", "progetto_MS.zip")
 
-            name_output = (
-                nome
-                + "_backup_v"
-                + proj_vers
-                + "_"
-                + datetime.datetime.now().strftime("%Y_%m_%d_%H_%M")
-            )
-
-            if proj_vers < "0.8" and new_proj_vers >= "1.3":
-                sql_scripts = ["query_v08.sql", "query_v09.sql", "query_v10_12.sql"]
-            elif proj_vers == "0.8" and new_proj_vers >= "1.3":
-                sql_scripts = ["query_v09.sql", "query_v10_12.sql"]
-            elif proj_vers >= "0.9" and proj_vers < "1.2" and new_proj_vers >= "1.3":
-                sql_scripts = ["query_v10_12.sql"]
-            else:
-                sql_scripts = []
+            name_output = nome + "_backup_v" + proj_vers + "_" + datetime.datetime.now().strftime("%Y_%m_%d_%H_%M")
 
-            try:
+            sql_scripts = []
+            if proj_vers < "0.8":
+                sql_scripts.append("query_v08.sql")
+            if proj_vers < "0.9":
+                sql_scripts.append("query_v09.sql")
+            if proj_vers < "1.2":
+                sql_scripts.append("query_v10_12.sql")
+            if proj_vers < "1.9":
+                sql_scripts.append("query_v19.sql")
 
+            try:
                 shutil.copytree(proj_path, os.path.join(dir_output, name_output))
 
                 path_db = os.path.join(proj_path, "db", "indagini.sqlite")
 
                 for upgrade_script in sql_scripts:
-                    QgsMessageLog.logMessage(
-                        f"Executing: {upgrade_script}", "MzSTools", level=Qgis.Info
-                    )
+                    QgsMessageLog.logMessage(f"Executing: {upgrade_script}", "MzSTools", level=Qgis.Info)
                     self.exec_db_upgrade_sql(path_db, upgrade_script)
 
                 QgsMessageLog.logMessage("Sql upgrades ok", "MzSTools", level=Qgis.Info)
@@ -105,10 +88,7 @@ def aggiorna(self, proj_path, dir_output, nome, proj_vers, new_proj_vers):
                 QMessageBox.information(
                     None,
                     self.tr("INFORMATION!"),
-                    self.tr(
-                        "The project structure has been updated!\nThe backup copy has been saved in the following directory: "
-                    )
-                    + name_output,
+                    self.tr("The project structure has been updated!\nThe backup copy has been saved in the following directory: ") + name_output,
                 )
 
                 # QgsProject.instance().read(QgsProject.instance().fileName())
@@ -161,25 +141,17 @@ def load_new_qgs_file(self, proj_path):
         layouts = layout_manager.printLayouts()
 
         # replace region logo
-        logo_regio_in = os.path.join(
-            self.plugin_dir, "img", "logo_regio", codice_regio + ".png"
-        ).replace("\\", "/")
-        logo_regio_out = os.path.join(
-            proj_path, "progetto", "loghi", "logo_regio.png"
-        ).replace("\\", "/")
+        logo_regio_in = os.path.join(self.plugin_dir, "img", "logo_regio", codice_regio + ".png").replace("\\", "/")
+        logo_regio_out = os.path.join(proj_path, "progetto", "loghi", "logo_regio.png").replace("\\", "/")
         shutil.copyfile(logo_regio_in, logo_regio_out)
 
         # replace region map
         layer_tree_root = QgsProject.instance().layerTreeRoot()
         project_layers = layer_tree_root.layerOrder()
         for layer in project_layers:
             layer_tree_root.findLayer(layer.id()).setItemVisibilityChecked(False)
-        layer_limiti_comunali = QgsProject.instance().mapLayersByName(
-            "Limiti comunali"
-        )[0]
-        layer_tree_root.findLayer(layer_limiti_comunali.id()).setItemVisibilityChecked(
-            True
-        )
+        layer_limiti_comunali = QgsProject.instance().mapLayersByName("Limiti comunali")[0]
+        layer_tree_root.findLayer(layer_limiti_comunali.id()).setItemVisibilityChecked(True)
         layer_tree_root.findLayer(comune_layer.id()).setItemVisibilityChecked(True)
         imageFilename = os.path.join(proj_path, "progetto", "loghi", "mappa_reg.png")
         save_map_image(imageFilename, layer_limiti_comunali, canvas)
diff --git a/template_code/progetto/versione.txt b/template_code/progetto/versione.txt
@@ -1 +1 @@
-1.8.3
+1.9.0
diff --git a/template_code/progetto_MS.qgs b/template_code/progetto_MS.qgs
diff --git a/versione.txt b/versione.txt
