Option authentification pour table avec droits particuliers.

CenRa_AUTOMAP/CenRa_AutoMap.py

@@ -4,7 +4,8 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import Qt, QUrl
+from qgis.PyQt.QtCore import QUrl
+# from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
 from qgis.PyQt.QtWidgets import QAction
 from qgis.utils import iface
@@ -34,8 +35,11 @@ from .tools.resources import (
 )
 pyperclip()
 
+try:
     from .canvas_editor import AutoMap_Editor
-from .style_invoke import AutoMap_Style
+#    from .style_invoke import AutoMap_Style
+except NameError:
+    print('404')
 
 
 class PgAutoMap:
@@ -82,11 +86,11 @@ class PgAutoMap:
             self.toolBar.addAction(self.automap_action)
             self.automap_action.triggered.connect(self.open_editor)
 
-        if not self.style_dock:
-            self.style_dock = AutoMap_Style()
+        # if not self.style_dock:
+        #    self.style_dock = AutoMap_Style()
 
-        if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
-            iface.addDockWidget(Qt.DockWidgetArea(0x1), self.style_dock)
+        # if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
+        #    iface.addDockWidget(Qt.DockWidgetArea(0x1), self.style_dock)
 
     def open_about_dialog(self):
         """

CenRa_AUTOMAP/canvas_editor.py

@@ -14,6 +14,7 @@ from qgis.core import (
     QgsLayoutItemLabel,
     QgsLayoutItemPicture,
     QgsLayoutItemLegend,
+    QgsLayoutItem,
     QgsLegendStyle,
     QgsLayoutItemScaleBar,
     QgsLayerTreeGroup,
@@ -116,15 +117,19 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             'Carte_size': None,
             'Carte_locals': None,
             'Carte_rotate': None,
+            'Carte_frame': None,
             'Carte_2_size': None,
             'Carte_2_locals': None,
             'Carte_2_rotate': None,
             'Legande_size': None,
             'Legande_locals': None,
             'Legande_rotate': None,
+            'Legande_frame': None,
             'Arrow_size': None,
             'Arrow_locals': None,
             'Arrow_rotate': None,
+            'Arrow_background': None,
+            'Arrow_path': None,
             'Echelle_size': None,
             'Echelle_locals': None,
             'Echelle_rotate': None,
@@ -140,9 +145,11 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             'Credit_size': None,
             'Credit_locals': None,
             'Credit_rotate': None,
+            'Credit_alignment': None,
             'Source_size': None,
             'Source_locals': None,
             'Source_rotate': None,
+            'Source_alignment': None,
             'Logo_2_size': None,
             'Logo_2_locals': None,
             'Logo_2_rotate': None,
@@ -459,7 +466,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     self.map_modele_test.setExtent(iface.mapCanvas().extent())
                     # Position de la carte dans le composeur
 
-                    self.map_modele_test.setItemRotation(self.template_parameters['Carte_rotate'])
+                    self.map_modele_test.setMapRotation(self.template_parameters['Carte_rotate'])
                     self.map_modele_test.attemptResize(self.template_parameters['Carte_size'])
                     self.map_modele_test.attemptMove(self.template_parameters['Carte_locals'])
                     # on dimensionne le rendu de la carte (pour référence la page totale est une page A4 donc 297*210)
@@ -473,7 +480,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                         if self.radioButton_12.isChecked() == 1:
                             self.position_map = QgsLayoutItemMap(self.layout)
                             self.position_map.setRect(20, 20, 20, 20)
-                            self.position_map.setExtent(QgsRectangle(641552, 6647386, 995856, 6331104))
+                            self.position_map.setExtent(QgsRectangle(618704, 6329245, 1018704, 6649245))
+                            # self.position_map.setExtent(QgsRectangle(641552, 6647386, 995856, 6331104))
                             self.position_map.setFollowVisibilityPreset(True)
                             self.position_map.setFollowVisibilityPresetName(self.comboBox_6.currentText())
                             self.position_map.setItemRotation(self.template_parameters['Carte_2_rotate'])
@@ -487,13 +495,14 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                             # overviewitem.addOverview(map_overview)
 
                             self.position_map.refresh()
-                            self.map_modele_test.setFrameEnabled(True)
+                            self.map_modele_test.setFrameEnabled(self.template_parameters['Carte_frame'])
+                            self.position_map.setFrameEnabled(self.template_parameters['Carte_2_frame'])
                             self.layout.addLayoutItem(self.position_map)
                             self.position_map.setId("Carte_locals")
                     self.map_modele_test.refresh()
 
                     self.map_modele_test.setBackgroundColor(QColor(255, 255, 255, 255))
-                    self.map_modele_test.setFrameEnabled(True)
+                    self.map_modele_test.setFrameEnabled(self.template_parameters['Carte_frame'])
                     if self.radioButton_9.isChecked() == 1:
                         self.map_modele_test.setAtlasDriven(True)
                     self.layout.addLayoutItem(self.map_modele_test)
@@ -504,7 +513,9 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     self.layout.addLayoutItem(title)
                     titre = titre_layout_name
                     title.setText(titre)
-                    title.setFont(QFont("Calibri", 15, False))
+                    Font = QFont("Calibri", 15, False)
+                    Font.setBold(True)
+                    title.setFont(Font)
                     title.setItemRotation(self.template_parameters['Titre_rotate'])
                     title.attemptResize(self.template_parameters['Titre_size'])
                     title.attemptMove(self.template_parameters['Titre_locals'])
@@ -537,6 +548,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     # Ajout du logo CEN NA en haut à gauche de la page
                     logo = QgsLayoutItemPicture(self.layout)
                     logo.setResizeMode(QgsLayoutItemPicture.Zoom)
+                    logo.setPictureAnchor(QgsLayoutItem.ReferencePoint(4))
                     logo.setMode(QgsLayoutItemPicture.FormatRaster)
                     logo.setItemRotation(self.template_parameters['Logo_rotate'])
                     logo.setFixedSize(self.template_parameters['Logo_size'])
@@ -551,7 +563,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     legend.setId('legende_model1')
                     # legend.setTitle('Legende')
                     legend.adjustBoxSize()
-                    legend.setFrameEnabled(False)
+                    legend.setFrameEnabled(self.template_parameters['Legande_frame'])
                     legend.setAutoUpdateModel(False)
 
                     legend.setLinkedMap(self.map_modele_test)
@@ -608,6 +620,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 legend.rstyle(QgsLegendStyle.Group).setMargin(QgsLegendStyle.Top, 3)
                 legend.rstyle(QgsLegendStyle.Subgroup).setMargin(QgsLegendStyle.Top, 3)
                 legend.setColumnCount(self.spinBox.value())
+                legend.setItemRotation(self.template_parameters['Legande_rotate'])
 
                 legend.adjustBoxSize()
                 legend.setBackgroundEnabled(True)
@@ -628,9 +641,9 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebarnumeric_qpt.setNumberOfSegmentsLeft(0)
 
                 self.scalebarnumeric_qpt.setFont(QFont("Calibri", 12))
+                self.scalebarnumeric_qpt.setItemRotation(self.template_parameters['Echelle_rotate'])
                 self.scalebarnumeric_qpt.attemptMove(self.template_parameters['Echelle_locals'])
                 self.scalebarnumeric_qpt.attemptResize(self.template_parameters['Echelle_size'])
-                self.scalebarnumeric_qpt.setItemRotation(self.template_parameters['Echelle_rotate'])
                 self.scalebarnumeric_qpt.setAlignment(QgsScaleBarSettings.Alignment(1))
                 self.scalebarnumeric_qpt.setBackgroundEnabled(True)
                 self.scalebarnumeric_qpt.setBackgroundColor(QColor(255, 255, 255, 130))
@@ -641,6 +654,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebar_qpt = QgsLayoutItemScaleBar(self.layout)
                 self.scalebar_qpt.setStyle('Single Box')
                 self.scalebar_qpt.setLinkedMap(self.map_modele_test)
+                self.scalebar_qpt.setFillColor(QColor(144, 144, 144, 255))
                 self.scalebar_qpt.applyDefaultSize()
                 self.scalebar_qpt.applyDefaultSettings()
 
@@ -648,9 +662,9 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebar_qpt.setNumberOfSegmentsLeft(0)
 
                 self.scalebar_qpt.setFont(QFont("Calibri", 12))
+                self.scalebar_qpt.setItemRotation(self.template_parameters['Echelle_2_rotate'])
                 self.scalebar_qpt.attemptMove(self.template_parameters['Echelle_2_locals'])
                 self.scalebar_qpt.attemptResize(self.template_parameters['Echelle_2_size'])
-                self.scalebar_qpt.setItemRotation(self.template_parameters['Echelle_2_rotate'])
                 self.scalebar_qpt.setAlignment(QgsScaleBarSettings.Alignment(1))
                 self.scalebar_qpt.setBackgroundEnabled(True)
                 self.scalebar_qpt.setBackgroundColor(QColor(255, 255, 255, 130))
@@ -660,12 +674,16 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
                 # ajout de la fleche du Nord
                 north = QgsLayoutItemPicture(self.layout)
-                north.setPicturePath(resources_path("mises_en_pages", "NorthArrow_02.svg"))
+                north.setPicturePath(resources_path("mises_en_pages", self.template_parameters['Arrow_path']))
+                north.setLinkedMap(self.map_modele_test)
                 self.layout.addLayoutItem(north)
+                north.setPictureAnchor(QgsLayoutItem.ReferencePoint(4))
+                north.setItemRotation(self.template_parameters['Arrow_rotate'])
                 north.attemptMove(self.template_parameters['Arrow_locals'])
                 north.attemptResize(self.template_parameters['Arrow_size'])
-                north.setItemRotation(self.template_parameters['Arrow_rotate'])
-                north.setBackgroundEnabled(True)
+                north.setSvgStrokeColor(QColor(255, 255, 255, 255))
+                north.setSvgFillColor(QColor(76, 76, 76, 255))
+                north.setBackgroundEnabled(self.template_parameters['Arrow_background'])
                 north.setBackgroundColor(QColor(255, 255, 255, 130))
 
                 if self.radioButton_10.isChecked() == 1:
@@ -686,15 +704,17 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 credit_text = QgsLayoutItemLabel(self.layout)
                 credit_text.setText(info[0])
                 credit_text.setFont(QFont("Calibri", 9))
-                credit_text.setHAlign(Qt.AlignmentFlag(0x0002))
+                credit_text.setHAlign(Qt.AlignmentFlag(self.template_parameters['Credit_alignment']))
                 credit_text.setVAlign(Qt.AlignmentFlag(0x0080))
+                credit_text.setMarginX(2)
                 credit_text.setBackgroundEnabled(True)
                 credit_text.setBackgroundColor(QColor(255, 255, 255, 130))
                 credit_text2 = QgsLayoutItemLabel(self.layout)
                 credit_text2.setText(info_text)
                 credit_text2.setFont(QFont("Calibri", 9))
-                credit_text2.setHAlign(Qt.AlignmentFlag(0x0002))
+                credit_text2.setHAlign(Qt.AlignmentFlag(self.template_parameters['Source_alignment']))
                 credit_text2.setVAlign(Qt.AlignmentFlag(0x0080))
+                credit_text2.setMarginX(2)
                 credit_text.setItemRotation(self.template_parameters['Credit_rotate'])
                 credit_text.attemptResize(self.template_parameters['Credit_size'])
                 credit_text.attemptMove(self.template_parameters['Credit_locals'])
@@ -711,11 +731,11 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 for logo_run in self.mComboBox_4.checkedItems():
                     logo_credit = QgsLayoutItemPicture(self.layout)
                     logo_credit.setResizeMode(QgsLayoutItemPicture.Zoom)
+                    logo_credit.setPictureAnchor(QgsLayoutItem.ReferencePoint(4))
                     logo_credit.setMode(QgsLayoutItemPicture.FormatRaster)
                     cur_x = self.template_parameters['Logo_2_locals'].x()
+                    logo_credit.setItemRotation(self.template_parameters['Logo_2_rotate'])
                     logo_credit.attemptMove(self.template_parameters['Logo_2_locals'])
-                    print(logo_credit.pictureAnchor())
-                    # logo_credit.setPictureAnchor(4)
                     self.template_parameters['Logo_2_locals'].setX(cur_x + (logo_div / len_item))
                     logo_credit.setFixedSize(self.template_parameters['Logo_2_size'])
                     if logo_run[0] == ' ':
@@ -781,6 +801,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             del self.QMBquestion
         except ValueError:
             TryMessage = True
+        except AttributeError:
+            TryMessage = True
 
         if TryMessage is True:
             iface.openLayoutDesigner(layout_modifie)

CenRa_AUTOMAP/metadata.txt

@@ -5,9 +5,10 @@
 [general]
 name=CenRa_AutoMap
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
 supportsQt6=True
 description=CenRa_AutoMap
-version=2.0
+version=2.11
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -22,7 +23,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
 
 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_AUTOMAP:</h2></br><p><h3>19/05/2025 - Version 2.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>11/04/2025 - Version 1.7: </h3> - Correctif d'orthographe.</p></br><p><h3>09/04/2025 - Version 1.6: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 1.5: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.4: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 1.3: </h3> - Fenêtre redimensionnable avec déplaçable avec la mollette sourit.</p></br><p><h3>25/02/2025 - Version 1.2: </h3> - DockWidget pour ouverture de couche avec theme.</p></br><p><h3>28/01/2025 - Version 1.1: </h3> - Multi-Composeur pris en charge.</p></br><p><h3>27/01/2025 - Version 1.0: </h3> - Version releases.</br> - Ajoute un message d'avertissement au moment d'écraser la mise en page.</br> - Ajoute prénom et nom dans la réalisation.</br> - Utilisation de Calibri.</p></br><p><h3>13/01/2025 - Version 0.1.10: </h3> - Correctif.</p></br><p><h3>07/01/2025 - Version 0.1.9: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>19/12/2024 - Version 0.1.8: </h3> - Nouvelle mise en page.</br> - Incrémentation automatique de nouveau modele de mise en page. </br> - Correctif de bug.</p></br><p><h3>21/10/2024 - Version 0.1.7: </h3> - Epurations du code.</p></br><p><h3>07/10/2024 - Version 0.1.6: </h3> - Option de bibliotheque de logo custome.</p></br><p><h3>03/10/2024 - Version 0.1.5: </h3> - Remonte la fênetre dans la pille.</br> - Gestion du nombre de colonne dans la légend.</br></p></br><p><h3>02/10/2024 - Version 0.1.4: </h3> - Mise en page plein écrant.</br></p></br><p><h3>01/10/2024 - Version 0.1.3: </h3> - Récupération du titre et sous-titre pour mise en page existente.</br> - Integration de bibliotheque de logo.</br> - Integration de gestionaire pour les source de donnée.</br> - Mise en place d'une bar d'echelle adaptative. </br></p></br><p><h3>30/09/2024 - Version 0.1.2: </h3> - Activation du thème. </br> - Ajouter une carte de suivie. </br><p></br><h3>27/09/2024 - Version 0.1.1: </h3> - Ajout d'une liste déroulante pour les sources de données. </br>- Bouton pour ajouter des fonts de carte customisés. </br>- Fonctionnalité de génération d'atlas. </p></br><p><h3>26/09/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_AutoMap avec une seul mise en page. </p></br>
+changelog=<h2>CenRa_AUTOMAP:</h2></br><p><h3>21/05/2026 - Version 2.11: </h3> - Optimisation des performances hors connexion.</br></p></br><p><h3>04/05/2026 - Version 2.10: </h3> - Suppression ancien logo n2000.</p></br><p><h3>12/03/2026 - Version 2.9: </h3> - qgisMaximumVersion est 4.0.</p></br><p><h3>09/01/2026 - Version 2.8: </h3> - deplacement de l'echelle.</p></br><p><h3>18/12/2025 - Version 2.7: </h3> - fix de bug gitea.</p></br><p><h3>18/12/2025 - Version 2.6: </h3> - ajoue du logo n2000 et region.</p></br><p><h3>17/12/2025 - Version 2.5: </h3> - Carte n2000 mise a jour landscape et portrait.</p></br><p><h3>15/12/2025 - Version 2.4: </h3> - Landescape pour n2000.</p></br><p><h3>15/12/2025 - Version 2.3: </h3> - nouvelle mise en page n2000.</p></br><p><h3>12/12/2025 - Version 2.2: </h3> - nouvelle mise en page pour n2000.</p></br><p><h3>30/07/2025 - Version 2.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 2.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>11/04/2025 - Version 1.7: </h3> - Correctif d'orthographe.</p></br><p><h3>09/04/2025 - Version 1.6: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 1.5: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.4: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 1.3: </h3> - Fenêtre redimensionnable avec déplaçable avec la mollette sourit.</p></br><p><h3>25/02/2025 - Version 1.2: </h3> - DockWidget pour ouverture de couche avec theme.</p></br><p><h3>28/01/2025 - Version 1.1: </h3> - Multi-Composeur pris en charge.</p></br><p><h3>27/01/2025 - Version 1.0: </h3> - Version releases.</br> - Ajoute un message d'avertissement au moment d'écraser la mise en page.</br> - Ajoute prénom et nom dans la réalisation.</br> - Utilisation de Calibri.</p></br><p><h3>13/01/2025 - Version 0.1.10: </h3> - Correctif.</p></br><p><h3>07/01/2025 - Version 0.1.9: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>19/12/2024 - Version 0.1.8: </h3> - Nouvelle mise en page.</br> - Incrémentation automatique de nouveau modele de mise en page. </br> - Correctif de bug.</p></br><p><h3>21/10/2024 - Version 0.1.7: </h3> - Epurations du code.</p></br><p><h3>07/10/2024 - Version 0.1.6: </h3> - Option de bibliotheque de logo custome.</p></br><p><h3>03/10/2024 - Version 0.1.5: </h3> - Remonte la fênetre dans la pille.</br> - Gestion du nombre de colonne dans la légend.</br></p></br><p><h3>02/10/2024 - Version 0.1.4: </h3> - Mise en page plein écrant.</br></p></br><p><h3>01/10/2024 - Version 0.1.3: </h3> - Récupération du titre et sous-titre pour mise en page existente.</br> - Integration de bibliotheque de logo.</br> - Integration de gestionaire pour les source de donnée.</br> - Mise en place d'une bar d'echelle adaptative. </br></p></br><p><h3>30/09/2024 - Version 0.1.2: </h3> - Activation du thème. </br> - Ajouter une carte de suivie. </br><p></br><h3>27/09/2024 - Version 0.1.1: </h3> - Ajout d'une liste déroulante pour les sources de données. </br>- Bouton pour ajouter des fonts de carte customisés. </br>- Fonctionnalité de génération d'atlas. </p></br><p><h3>26/09/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_AutoMap avec une seul mise en page. </p></br>
 
 # Tags are comma separated with spaces allowed
 tags=python

CenRa_AUTOMAP/style_invoke.py

@@ -1,95 +1,41 @@
 import logging
-import os
-from collections import namedtuple
-from enum import Enum
-from functools import partial
-from pathlib import Path
-from xml.dom.minidom import parseString
-from qgis.gui import *
-import qgis
-from importlib import import_module
+# from qgis.gui import *
+
 from qgis.core import (
-    NULL,
-    QgsApplication,
-    QgsScaleBarSettings,	
     QgsDataSourceUri,
     QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
-    QgsRasterLayer,
     QgsSettings,
     QgsVectorLayer,
-    QgsGeometry,
-    QgsPrintLayout,
-    QgsReadWriteContext,
-    QgsLayoutItemMap,
-    QgsLayoutItemPage,
-    QgsLayoutSize,
-    QgsUnitTypes,
-    QgsLayoutPoint,
-    QgsLayoutItemLabel,
-    QgsLayoutItemPicture,
-    QgsLayoutItemLegend,
-    QgsLegendStyle,
-    QgsLayoutItemScaleBar,
-    QgsLayerTreeGroup,
-    QgsCoordinateReferenceSystem,
-    QgsCoordinateTransform,
-    QgsLayerTree,
-    QgsLayoutTableColumn,
-    QgsRectangle,
-    QgsLayoutItemMapOverviewStack,
     QgsMapThemeCollection,
 )
-from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime, Qt
-from qgis.PyQt.QtGui import QDesktopServices, QIcon, QColor, QFont, QMovie
-from qgis.PyQt.QtPrintSupport import QPrinter
+from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import (
     QDockWidget,
-    QAction,
-    QMessageBox,
-    QPushButton,
-    QDockWidget,
-    QFileDialog,
     QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
-    QTableWidgetItem,
-    QVBoxLayout,
 )
-import psycopg2
-try:
-    from PyQt5.QtCore import QSettings
-    from PyQt5 import QtGui
-    from PyQt5 import QtWidgets
-except:
-    from PyQt6.QtCore import QSettings
-    from PyQt6 import QtGui
-    from PyQt6 import QtWidgets
-from qgis.PyQt.QtXml import QDomDocument
-from qgis.utils import iface
-import glob
-try:
 
+from qgis.PyQt.QtXml import QDomDocument
+
+try:
     Enabled = True
-    from .tools.StyleLayer import *
-except:
+    from .tools.StyleLayer import host, port, dbname, os_user
+except ValueError:
     Enabled = False
 from .tools.resources import (
     load_ui,
     resources_path,
-    send_issues,
+    # send_issues,
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues
 
-from datetime import date
+# from datetime import date
 
 EDITOR_CLASS = load_ui('CenRa_AutoMapStyle_base.ui')
 LOGGER = logging.getLogger('CenRa_AutoMapStyle')
 
-class AutoMap_Style(QDockWidget, EDITOR_CLASS):
 
+class AutoMap_Style(QDockWidget, EDITOR_CLASS):
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -97,7 +43,7 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
         self.settings = QgsSettings()
         self.s = QSettings()
 
-        self.toolButton.setIcon(QtGui.QIcon(resources_path('icons','loader.png')))
+        self.toolButton.setIcon(QIcon(resources_path('icons', 'loader.png')))
 
         self.loadComboBox()
         self.toolButton.clicked.connect(self.loadStyle)
@@ -140,13 +86,13 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
                 uri.setDataSource(schema, table, "geom")
                 uri.setKeyColumn(key)
                 layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                if layer.isValid() == True:
+                if layer.isValid() is True:
                     layerName = layer.name()
                     listStyle = layer.listStylesInDatabase()
                     try:
                         StyleExist = True
                         indexStyle = (listStyle[2].index(layerName))
-                    except:
+                    except ValueError:
                         StyleExist = False
                     if StyleExist:
                         StyleId = (listStyle[1][indexStyle])
@@ -181,13 +127,13 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
                 uri.setDataSource(schema, table, "geom")
                 uri.setKeyColumn('gid')
                 layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                if layer.isValid() == True:
+                if layer.isValid() is True:
                     layerName = layer.name()
                     listStyle = layer.listStylesInDatabase()
                     try:
                         StyleExist = True
                         indexStyle = (listStyle[2].index(layerName))
-                    except:
+                    except ValueError:
                         StyleExist = False
                     if StyleExist:
                         StyleId = (listStyle[1][indexStyle])

CenRa_AUTOMAP/tools/mises_en_pages/carto_standard.py

@@ -3,6 +3,8 @@ from qgis.core import (
     QgsUnitTypes,
     QgsLayoutPoint,
 )
+
+
 def fletch_canvas(self):
     if self.radioButton_6.isChecked():
         values_page = 'A4'
@@ -18,15 +20,20 @@ def fletch_canvas(self):
             self.template_parameters['Carte_size'] = QgsLayoutSize(198.85714285714286, 175, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_locals'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_rotate'] = 0.0
+            self.template_parameters['Carte_frame'] = True
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(50.0, 50, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_rotate'] = 0.0
+            self.template_parameters['Carte_2_frame'] = False
             self.template_parameters['Legande_size'] = QgsLayoutSize(198.85714285714286, 90, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_locals'] = QgsLayoutPoint(5, 205, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_rotate'] = 0.0
+            self.template_parameters['Legande_frame'] = False
             self.template_parameters['Arrow_size'] = QgsLayoutSize(12.0, 12, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_locals'] = QgsLayoutPoint(191, 6, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_rotate'] = 0.0
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
             self.template_parameters['Echelle_size'] = QgsLayoutSize(54.857142857142854, 5, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Echelle_locals'] = QgsLayoutPoint(145, 229, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Echelle_rotate'] = 0.0
@@ -39,9 +46,11 @@ def fletch_canvas(self):
             self.template_parameters['Credit_size'] = QgsLayoutSize(100.0, 4, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Credit_locals'] = QgsLayoutPoint(205, 158.0, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Credit_rotate'] = 270.0
+            self.template_parameters['Credit_alignment'] = 0x0002
             self.template_parameters['Source_size'] = QgsLayoutSize(100.0, 4, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Source_locals'] = QgsLayoutPoint(104, 200, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Source_rotate'] = 0.0
+            self.template_parameters['Source_alignment'] = 0x0002
             self.template_parameters['Sous_titre_size'] = QgsLayoutSize(198.85714285714286, 8, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Sous_titre_rotate'] = 0.0
@@ -55,15 +64,20 @@ def fletch_canvas(self):
             self.template_parameters['Carte_size'] = QgsLayoutSize(280, 247, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_locals'] = QgsLayoutPoint(7, 35, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_rotate'] = 0.0
+            self.template_parameters['Carte_frame'] = True
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(70, 70, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(7, 35, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_rotate'] = 0.0
+            self.template_parameters['Carte_2_frame'] = False
             self.template_parameters['Legande_size'] = QgsLayoutSize(280, 127, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_locals'] = QgsLayoutPoint(7, 289, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_rotate'] = 0.0
+            self.template_parameters['Legande_frame'] = False
             self.template_parameters['Arrow_size'] = QgsLayoutSize(17, 17, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_locals'] = QgsLayoutPoint(269, 8, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_rotate'] = 0.0
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
             self.template_parameters['Echelle_size'] = QgsLayoutSize(77, 7, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Echelle_locals'] = QgsLayoutPoint(205, 323, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Echelle_rotate'] = 0.0
@@ -76,9 +90,11 @@ def fletch_canvas(self):
             self.template_parameters['Credit_size'] = QgsLayoutSize(141, 6, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Credit_locals'] = QgsLayoutPoint(289, 223, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Credit_rotate'] = 270.0
+            self.template_parameters['Credit_alignment'] = 0x0002
             self.template_parameters['Source_size'] = QgsLayoutSize(141, 6, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Source_locals'] = QgsLayoutPoint(147, 282, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Source_rotate'] = 0.0
+            self.template_parameters['Source_alignment'] = 0x0002
             self.template_parameters['Sous_titre_size'] = QgsLayoutSize(280, 11, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(7, 17, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Sous_titre_rotate'] = 0.0
@@ -94,15 +110,20 @@ def fletch_canvas(self):
             self.template_parameters['Carte_size'] = QgsLayoutSize(285.14285714285717, 145, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_rotate'] = 0.0
+            self.template_parameters['Carte_frame'] = True
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(100.0, 100, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_rotate'] = 0.0
+            self.template_parameters['Carte_2_frame'] = False
             self.template_parameters['Legande_size'] = QgsLayoutSize(285.14285714285717, 41, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 168, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_rotate'] = 0.0
+            self.template_parameters['Legande_frame'] = False
             self.template_parameters['Arrow_size'] = QgsLayoutSize(13.142857142857142, 12, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_locals'] = QgsLayoutPoint(277, 6, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_rotate'] = 0.0
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
             self.template_parameters['Echelle_size'] = QgsLayoutSize(54.857142857142854, 15, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Echelle_locals'] = QgsLayoutPoint(232, 193, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Echelle_rotate'] = 0.0
@@ -115,9 +136,11 @@ def fletch_canvas(self):
             self.template_parameters['Credit_size'] = QgsLayoutSize(100.0, 4, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Credit_locals'] = QgsLayoutPoint(291, 127.0, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Credit_rotate'] = 270.0
+            self.template_parameters['Credit_alignment'] = 0x0002
             self.template_parameters['Source_size'] = QgsLayoutSize(100.0, 4, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Source_locals'] = QgsLayoutPoint(189, 169, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Source_rotate'] = 0.0
+            self.template_parameters['Source_alignment'] = 0x0002
             self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286.0, 8, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Sous_titre_rotate'] = 0.0
@@ -131,15 +154,20 @@ def fletch_canvas(self):
             self.template_parameters['Carte_size'] = QgsLayoutSize(402, 205, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 32, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_rotate'] = 0.0
+            self.template_parameters['Carte_frame'] = True
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(141, 141, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(8, 32, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_rotate'] = 0.0
+            self.template_parameters['Carte_2_frame'] = False
             self.template_parameters['Legande_size'] = QgsLayoutSize(402, 58, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 237, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_rotate'] = 0.0
+            self.template_parameters['Legande_frame'] = False
             self.template_parameters['Arrow_size'] = QgsLayoutSize(19, 17, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_locals'] = QgsLayoutPoint(391, 8, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_rotate'] = 0.0
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
             self.template_parameters['Echelle_size'] = QgsLayoutSize(77, 21, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Echelle_locals'] = QgsLayoutPoint(327, 272, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Echelle_rotate'] = 0.0
@@ -152,9 +180,11 @@ def fletch_canvas(self):
             self.template_parameters['Credit_size'] = QgsLayoutSize(141, 6, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Credit_locals'] = QgsLayoutPoint(410, 179, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Credit_rotate'] = 270.0
+            self.template_parameters['Credit_alignment'] = 0x0002
             self.template_parameters['Source_size'] = QgsLayoutSize(141, 6, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Source_locals'] = QgsLayoutPoint(267, 238, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Source_rotate'] = 0.0
+            self.template_parameters['Source_alignment'] = 0x0002
             self.template_parameters['Sous_titre_size'] = QgsLayoutSize(403, 11, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(7, 17, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Sous_titre_rotate'] = 0.0

CenRa_AUTOMAP/tools/mises_en_pages/full_page.py

@@ -4,6 +4,8 @@ from qgis.core import (
     QgsUnitTypes,
     QgsLayoutPoint,
 )
+
+
 def fletch_canvas(self):
     if self.radioButton_6.isChecked():
         values_page = 'A4'
@@ -52,6 +54,13 @@ def fletch_canvas(self):
             self.template_parameters['Sous_titre_rotate'] = 0
             self.template_parameters['Echelle_2_rotate'] = 0
             self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_frame'] = False
+            self.template_parameters['Legande_frame'] = False
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
+            self.template_parameters['Credit_alignment'] = 0x0002
+            self.template_parameters['Source_alignment'] = 0x0002
         if values_page == 'A3':
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
@@ -89,6 +98,14 @@ def fletch_canvas(self):
             self.template_parameters['Sous_titre_rotate'] = 0
             self.template_parameters['Echelle_2_rotate'] = 0
             self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_frame'] = False
+            self.template_parameters['Legande_frame'] = False
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
+            self.template_parameters['Credit_alignment'] = 0x0002
+            self.template_parameters['Source_alignment'] = 0x0002
 
     if page_rotate == 'Landscape':
         if values_page == 'A3':
@@ -128,6 +145,14 @@ def fletch_canvas(self):
             self.template_parameters['Sous_titre_rotate'] = 0
             self.template_parameters['Echelle_2_rotate'] = 0
             self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_frame'] = False
+            self.template_parameters['Legande_frame'] = False
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
+            self.template_parameters['Credit_alignment'] = 0x0002
+            self.template_parameters['Source_alignment'] = 0x0002
         if values_page == 'A4':
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
@@ -165,6 +190,14 @@ def fletch_canvas(self):
             self.template_parameters['Sous_titre_rotate'] = 0
             self.template_parameters['Echelle_2_rotate'] = 0
             self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_frame'] = False
+            self.template_parameters['Legande_frame'] = False
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
+            self.template_parameters['Credit_alignment'] = 0x0002
+            self.template_parameters['Source_alignment'] = 0x0002
 
     # Retour des info #
     return self.template_parameters

CenRa_AUTOMAP/tools/mises_en_pages/left_corner.py

@@ -4,6 +4,8 @@ from qgis.core import (
     QgsUnitTypes,
     QgsLayoutPoint,
 )
+
+
 def fletch_canvas(self):
     if self.radioButton_6.isChecked():
         values_page = 'A4'
@@ -52,6 +54,14 @@ def fletch_canvas(self):
             self.template_parameters['Logo_2_size'] = QgsLayoutSize(30.0, 30, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(41, 233, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_frame'] = False
+            self.template_parameters['Legande_frame'] = False
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
+            self.template_parameters['Credit_alignment'] = 0x0002
+            self.template_parameters['Source_alignment'] = 0x0002
         if values_page == 'A3':
             self.template_parameters['Carte_size'] = QgsLayoutSize(237, 369, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_locals'] = QgsLayoutPoint(58, 2, QgsUnitTypes.LayoutMillimeters)
@@ -89,6 +99,15 @@ def fletch_canvas(self):
             self.template_parameters['Logo_2_size'] = QgsLayoutSize(42, 42, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(58, 329, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_frame'] = False
+            self.template_parameters['Legande_frame'] = False
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
+            self.template_parameters['Credit_alignment'] = 0x0002
+            self.template_parameters['Source_alignment'] = 0x0002
+
     if page_rotate == 'Landscape':
         if values_page == 'A4':
             self.template_parameters['Carte_size'] = QgsLayoutSize(254.85714285714286, 175, QgsUnitTypes.LayoutMillimeters)
@@ -127,6 +146,14 @@ def fletch_canvas(self):
             self.template_parameters['Logo_2_size'] = QgsLayoutSize(30.0, 30, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(41, 146, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_frame'] = False
+            self.template_parameters['Legande_frame'] = False
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
+            self.template_parameters['Credit_alignment'] = 0x0002
+            self.template_parameters['Source_alignment'] = 0x0002
         if values_page == 'A3':
             self.template_parameters['Carte_size'] = QgsLayoutSize(359, 247, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_locals'] = QgsLayoutPoint(58, 2, QgsUnitTypes.LayoutMillimeters)
@@ -164,4 +191,13 @@ def fletch_canvas(self):
             self.template_parameters['Logo_2_size'] = QgsLayoutSize(42, 42, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(58, 206, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Logo_2_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_frame'] = False
+            self.template_parameters['Legande_frame'] = False
+            self.template_parameters['Arrow_background'] = True
+            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
+            self.template_parameters['Credit_alignment'] = 0x0002
+            self.template_parameters['Source_alignment'] = 0x0002
+
     return self.template_parameters

CenRa_AUTOMAP/tools/mises_en_pages/n2000.py

@@ -0,0 +1,197 @@
+
+from qgis.core import (
+    QgsLayoutSize,
+    QgsUnitTypes,
+    QgsLayoutPoint,
+)
+
+
+def fletch_canvas(self):
+    if self.radioButton_6.isChecked():
+        values_page = 'A4'
+    else:
+        values_page = 'A3'
+    if self.radioButton_7.isChecked():
+        page_rotate = 'Portrait'
+    else:
+        page_rotate = 'Landscape'
+
+    if page_rotate == 'Portrait':
+        if values_page == 'A4':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(206.0, 200, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(2, 29, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(58.857142857142854, 40, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(146, 218, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_rotate'] = 0
+            self.template_parameters['Carte_2_frame'] = True
+            self.template_parameters['Legande_size'] = QgsLayoutSize(198.85714285714286, 36, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 260, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_rotate'] = 0
+            self.template_parameters['Legande_frame'] = True
+            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(191, 32, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Arrow_background'] = False
+            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(50.0, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(90, 244, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(6, 234, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(206.0, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 3, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(198.0, 5, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(3, 228.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 270
+            self.template_parameters['Credit_alignment'] = 0x0001
+            self.template_parameters['Source_size'] = QgsLayoutSize(198.0, 5, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(8, 228.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 270
+            self.template_parameters['Source_alignment'] = 0x0001
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(202.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(4, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50.0, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(90, 233, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(48, 234, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+        if values_page == 'A3':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(290, 282, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(3, 41, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(83, 56, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(206, 307, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_rotate'] = 0
+            self.template_parameters['Carte_2_frame'] = True
+            self.template_parameters['Legande_size'] = QgsLayoutSize(280, 51, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 367, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_rotate'] = 0
+            self.template_parameters['Legande_frame'] = True
+            self.template_parameters['Arrow_size'] = QgsLayoutSize(20, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(269, 45, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Arrow_background'] = False
+            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(70, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(125, 350, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(56, 28, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(8, 330, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(290, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 4, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(280, 7, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(4, 322, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 270
+            self.template_parameters['Credit_alignment'] = 0x0001
+            self.template_parameters['Source_size'] = QgsLayoutSize(280, 7, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(11, 322, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 270
+            self.template_parameters['Source_alignment'] = 0x0001
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(285, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(6, 19, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(70, 19, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(125, 330, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(56, 28, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(68, 330, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+    if page_rotate == 'Landscape':
+        if values_page == 'A4':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(189.0, 189, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(9, 18.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50.0, 40, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(194, 20.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_rotate'] = 0
+            self.template_parameters['Carte_2_frame'] = True
+            self.template_parameters['Legande_size'] = QgsLayoutSize(203.0, 62, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(199, 63.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_rotate'] = 0
+            self.template_parameters['Legande_frame'] = True
+            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(177, 20.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Arrow_background'] = False
+            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(247, 43, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(209, 174.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(289.0, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(191, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(8, 201, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 0
+            self.template_parameters['Credit_alignment'] = 0x0001
+            self.template_parameters['Source_size'] = QgsLayoutSize(191, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(8, 195, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 0
+            self.template_parameters['Source_alignment'] = 0x0001
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(289.0, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 12.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(249, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(252, 174, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+        if values_page == 'A3':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(305.0, 273, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(9, 18.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50.0, 40, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(311, 20.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_rotate'] = 0
+            self.template_parameters['Carte_2_frame'] = True
+            self.template_parameters['Legande_size'] = QgsLayoutSize(203.0, 62, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(317, 63.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_rotate'] = 0
+            self.template_parameters['Legande_frame'] = True
+            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(296, 20.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Arrow_background'] = False
+            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(364, 43, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(320, 264.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(413.0, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(306, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(8, 285, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 0
+            self.template_parameters['Credit_alignment'] = 0x0001
+            self.template_parameters['Source_size'] = QgsLayoutSize(306, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(8, 279, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 0
+            self.template_parameters['Source_alignment'] = 0x0001
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(413.0, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 12.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(366, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(369, 264, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+    return self.template_parameters

CenRa_AUTOMAP/tools/mises_en_pages/n2000_comparaison.py

@@ -0,0 +1,197 @@
+
+from qgis.core import (
+    QgsLayoutSize,
+    QgsUnitTypes,
+    QgsLayoutPoint,
+)
+
+
+def fletch_canvas(self):
+    if self.radioButton_6.isChecked():
+        values_page = 'A4'
+    else:
+        values_page = 'A3'
+    if self.radioButton_7.isChecked():
+        page_rotate = 'Portrait'
+    else:
+        page_rotate = 'Landscape'
+
+    if page_rotate == 'Portrait':
+        if values_page == 'A4':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(145.0, 135, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(4, 18, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50, 40, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(146, 21, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_rotate'] = 0
+            self.template_parameters['Carte_2_frame'] = True
+            self.template_parameters['Legande_size'] = QgsLayoutSize(198.85714285714286, 36, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(153, 64, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_rotate'] = 0
+            self.template_parameters['Legande_frame'] = True
+            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(6, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Arrow_background'] = False
+            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(50.0, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(154, 220, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(160, 264, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(205.0, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 1, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(145.0, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(4, 147.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 0
+            self.template_parameters['Credit_alignment'] = 0x0001
+            self.template_parameters['Source_size'] = QgsLayoutSize(145.0, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(4, 141.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 0
+            self.template_parameters['Source_alignment'] = 0x0001
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(205, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(2, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50.0, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(162, 208, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(160, 234, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+        if values_page == 'A3':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(233.0, 192, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(4, 18, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50, 40, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(234, 21, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_rotate'] = 0
+            self.template_parameters['Carte_2_frame'] = True
+            self.template_parameters['Legande_size'] = QgsLayoutSize(190, 36, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(242, 64, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_rotate'] = 0
+            self.template_parameters['Legande_frame'] = True
+            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(6, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Arrow_background'] = False
+            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(50.0, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(154, 220, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(248, 386, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(293.0, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 1, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(233.0, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(4, 204.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 0
+            self.template_parameters['Credit_alignment'] = 0x0001
+            self.template_parameters['Source_size'] = QgsLayoutSize(233.0, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(4, 198.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 0
+            self.template_parameters['Source_alignment'] = 0x0001
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(293, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(2, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50.0, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(252, 330, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(160, 234, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+    if page_rotate == 'Landscape':
+        if values_page == 'A4':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(145.0, 140, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(150, 27.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(253, 144.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_rotate'] = 0
+            self.template_parameters['Carte_2_frame'] = True
+            self.template_parameters['Legande_size'] = QgsLayoutSize(110.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(183, 175.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_rotate'] = 0
+            self.template_parameters['Legande_frame'] = True
+            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(278, 29.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Arrow_background'] = False
+            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(110, 191, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 175.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(288.0, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(140, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(150, 167, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 270
+            self.template_parameters['Credit_alignment'] = 0x0001
+            self.template_parameters['Source_size'] = QgsLayoutSize(140, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(156, 167, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 270
+            self.template_parameters['Source_alignment'] = 0x0001
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(288.0, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 11.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(110, 180, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(52, 175, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+        if values_page == 'A3':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(200.0, 230, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(216, 27.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            self.template_parameters['Carte_frame'] = True
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(373, 234.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_rotate'] = 0
+            self.template_parameters['Carte_2_frame'] = True
+            self.template_parameters['Legande_size'] = QgsLayoutSize(110.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(253, 264.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_rotate'] = 0
+            self.template_parameters['Legande_frame'] = True
+            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(401, 29.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Arrow_background'] = False
+            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(150, 281, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 265.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(413.0, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(230, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(216, 257, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 270
+            self.template_parameters['Credit_alignment'] = 0x0001
+            self.template_parameters['Source_size'] = QgsLayoutSize(230, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(222, 257, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 270
+            self.template_parameters['Source_alignment'] = 0x0001
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(413.0, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 11.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(150, 270, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(72, 265, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+    return self.template_parameters

CenRa_COPIE/CenRa_Copie.py

@@ -21,7 +21,11 @@ from .tools.resources import (
     maj_verif,
 )
 pyperclip()
+
+try:
     from .copie_editor import Copie_Editor
+except NameError:
+    print('404')
 
 
 class PgCopie:

CenRa_COPIE/copie_editor.py

@@ -9,7 +9,7 @@ from builtins import str
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 from qgis.PyQt import QtGui
-from qgis.core import QgsDataSourceUri, QgsSettings, QgsWkbTypes
+from qgis.core import QgsDataSourceUri, QgsSettings, QgsWkbTypes, Qgis
 
 try:
     from .tools.PythonSQL import login_base
@@ -50,7 +50,7 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
 
         if layer is None:
             # self.iface.messageBar().pushMessage(u"Vous devez sélectionner une table !", level=QgsMessageBar.WARNING, duration=5)
-            self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner une table !", level=1, duration=5)
+            self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner une table !", level=Qgis.Warning, duration=5)
 
         else:
             # Récupération des sources de la couche active
@@ -67,7 +67,7 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
 
             if source_db != sigdb:
                 # self.iface.messageBar().pushMessage(u"Un référentiel ne peut être copié, utilisez les filtres !", level=QgsMessageBar.CRITICAL, duration=10)
-                self.iface.messageBar().pushMessage("Ooops", u"Vous ne pouvez copier des couches que dans sigXX", level=2, duration=5)
+                self.iface.messageBar().pushMessage("Ooops", u"Vous ne pouvez copier des couches que dans sigXX", level=Qgis.Critical, duration=5)
             else:
                 user = account[0]
                 mdp = account[1]
@@ -208,5 +208,5 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
                     con.close()
 
                     # self.iface.messageBar().pushMessage("Table \"" + source_schema + "." + source_tablename + u"\" copiée dans \"" + schema + "." + tablename + "\"." , level=QgsMessageBar.INFO, duration=10)
-                    self.iface.messageBar().pushMessage("Bravo!", "Table \"" + source_schema + "." + source_tablename + u"\" copiée dans \"" + schema + "." + tablename + "\".", level=3, duration=5)
+                    self.iface.messageBar().pushMessage("Bravo!", "Table \"" + source_schema + "." + source_tablename + u"\" copiée dans \"" + schema + "." + tablename + "\".", level=Qgis.Info, duration=5)
                     pass

CenRa_COPIE/metadata.txt

@@ -9,9 +9,10 @@
 [general]
 name=CenRA_COPIE
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
 supportsQt6=True
 description=Permet la copie d'une table dans une base PostGis
-version=3.0
+version=3.2
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -20,7 +21,7 @@ email=si_besoin@cen-rhonealpes.fr
 # Recommended items:
 
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_COPIE:</h2></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>11/04/2025 - Version 2.5: </h3> - Correctif de bug.</p></br><p><h3>09/04/2025 - Version 2.4: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.3: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.2: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>22/10/2024 - Version 2:</h3>- Refonte du code.</p></br><p><h3>13/09/2024 - Version 1.5:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
+changelog=<h2>CenRa_COPIE:</h2></br><p><h3>12/03/2026 - Version 3.2: </h3> - qgisMaximumVersion est 4.0.</p></br><p><h3>30/07/2025 - Version 3.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>11/04/2025 - Version 2.5: </h3> - Correctif de bug.</p></br><p><h3>09/04/2025 - Version 2.4: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.3: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.2: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>22/10/2024 - Version 2:</h3>- Refonte du code.</p></br><p><h3>13/09/2024 - Version 1.5:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
 
 # Tags are comma separated with spaces allowed
 tags=cenra, database, table

CenRa_COPIE/tools/ui/CenRa_about_form.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CenRa_Metabase_editorwidget_base</class>
- <widget class="QDialog" name="CenRa_Metabase_editorwidget_base">
+ <widget class="QDialog" name="CenRa_about_base">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Journal des modifications</string>
   </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>../../CenRa_Metabase/tools/ui/icon.svg</normaloff>../../CenRa_Metabase/tools/ui/icon.svg</iconset>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QScrollArea" name="scrollArea">
@@ -38,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>453</width>
-        <height>570</height>
+        <height>547</height>
        </rect>
       </property>
       <widget class="QGroupBox" name="groupBox">
@@ -70,7 +66,7 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::NoButton</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

CenRa_FLUX/CenRa_Flux.py

@@ -20,7 +20,10 @@ from .tools.resources import (
 )
 pyperclip()
 
+try:
     from .flux_editor import Flux_Editor
+except NameError:
+    print('404')
 
 
 class PgFlux:

CenRa_FLUX/flux_editor.py

@@ -1,30 +1,34 @@
 # -*- coding: utf-8 -*-
+"""
+Module Flux Editor pour le plugin CenRA_FLUX
+Permet de gérer et charger des couches depuis les bases de données PostGIS (SIG et REF)
+"""
 
 from __future__ import absolute_import
-# Import the PyQt and QGIS libraries
-# from builtins import next
+# Import des bibliothèques PyQt et QGIS
 from builtins import str
-# from builtins import object
 
 from qgis.PyQt import QtCore, QtGui
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt import QtWidgets
-# from qgis.PyQt.QtWidgets import  QDialog
 from qgis.PyQt.QtGui import QIcon
+import os
 
-# from qgis.PyQt.QtCore import *
-
-# from qgis.core import QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsProject, QgsSettings
-from qgis.core import QgsDataSourceUri, QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsProject, QgsSettings, QgsApplication, QgsVectorLayer, QgsRasterLayer, QgsWkbTypes
+from qgis.core import (
+    QgsDataSourceUri,
+    QgsCoordinateReferenceSystem,
+    QgsCoordinateTransform,
+    QgsProject,
+    QgsSettings,
+    QgsApplication,
+    QgsVectorLayer,
+    QgsRasterLayer,
+    QgsWkbTypes
+)
 from qgis.PyQt.QtWidgets import (
     QDialog,
-    # QAction,
-    # QDockWidget,
-    # QFileDialog,
-    # QInputDialog,
-    # QMenu,
-    # QToolButton,
-    # QTableWidget,
+    QPushButton,
+    QInputDialog,
     QTableWidgetItem,
     QMessageBox,
     QVBoxLayout,
@@ -33,28 +37,22 @@ from .tools.SQLRequet import schemaname_list, schemaname_list_ref, schemaname_di
 from .tools.resources import (
     load_ui,
     resources_path,
-    # send_issues,
 )
 try:
+    if os.path.exists('N:'):
         from .tools.PythonSQL import login_base
 except NameError:
     print('Pas de fichier PythonSQL')
 
-
-# from .issues import CenRa_Issues
-
-# from ast import literal_eval
 from qgis.utils import iface
-# import os.path
-# import os
-# import webbrowser
 import psycopg2
 import psycopg2.extras
-# import base64
 
+# Variable globale pour le mode debug
 global DeBUG
 DeBUG = 0
 
+# Création des icônes pour les couches raster et vecteur
 itemIconRaster = QTableWidgetItem()
 icon = QIcon()
 icon.addPixmap(QtGui.QPixmap(resources_path('icons', 'mIconRaster.svg')), QIcon.Mode(0), QIcon.State(1))
@@ -65,28 +63,40 @@ icon = QIcon()
 icon.addPixmap(QtGui.QPixmap(resources_path('icons', 'mIconVecteur.svg')), QIcon.Mode(0), QIcon.State(1))
 itemIconVecteur.setIcon(icon)
 
+# Récupération des informations de connexion à la base de données
 try:
     account = login_base('account')
-    user = account[0]
-    mdp = account[1]
-    host = account[2]
-    port = account[3]
-    dbname = account[4]
-    sigdb = account[5]
-    refdb = account[6]
+    user = account[0]       # Nom d'utilisateur
+    user_save = account[0]  # Nom d'utilisateur sauvegarde
+    mdp = account[1]        # Mot de passe
+    mdp_save = account[1]   # Mot de passe sauvegard
+    host = account[2]       # Hôte de la base de données
+    port = account[3]       # Port de connexion
+    dbname = account[4]     # Nom de la base de données
+    sigdb = account[5]      # Base de données SIG
+    refdb = account[6]      # Base de données REF
+
 
 except NameError:
     print('Fails to login DB for account')
 
+# Chargement de l'interface utilisateur depuis le fichier .ui
 EDITOR_CLASS = load_ui('CenRa_Flux_base.ui')
 
-targetCrs = QgsCoordinateReferenceSystem('EPSG:4326')
-layerCrs = QgsCoordinateReferenceSystem('EPSG:2154')
+# Configuration des systèmes de coordonnées de référence (CRS)
+targetCrs = QgsCoordinateReferenceSystem('EPSG:4326')  # WGS84 (coordonnées géographiques)
+layerCrs = QgsCoordinateReferenceSystem('EPSG:2154')   # Lambert 93 (projection française)
 TranformCRS = QgsCoordinateTransform(layerCrs, targetCrs, QgsProject.instance())
 
 
 class Flux_Editor(QDialog, EDITOR_CLASS):
+    """
+    Classe principale de l'éditeur de flux
+    Gère l'interface de sélection et de chargement des couches depuis les bases de données
+    """
+
     def __init__(self, parent=None):
+        """Initialisation de l'interface et des composants"""
         _ = parent
         super().__init__()
         self.setupUi(self)
@@ -95,81 +105,109 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
         self.first_start = None
         self.iface = iface
+        # Configuration des éléments visuels de l'interface
         self.label_3.setPixmap(QtGui.QPixmap(resources_path('ui', 'logo.png')))
         self.commandLinkButton.setIcon(QtGui.QIcon(resources_path('ui', 'arrow-bottom.png')))
         self.commandLinkButton_2.setIcon(QtGui.QIcon(resources_path('ui', 'arrow-up.png')))
 
+        # Configuration du tableau des couches disponibles
         self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger(0))
         self.toolButton.setIcon(QtGui.QIcon(resources_path('ui', 'find.png')))
+        self.toolButton_2.setIcon(QtGui.QIcon(resources_path('ui', 'star.png')))
+        # Ajout des options de base de données (SIG ou REF)
         self.comboBox_2.addItem("SIG")
         self.comboBox_2.addItem('REF')
-        self.comboBox.currentIndexChanged.connect(self.initialisation_flux)
-        self.commandLinkButton.clicked.connect(self.selection_flux)
-        self.tableWidget.itemDoubleClicked.connect(self.selection_flux)
-        self.pushButton_2.clicked.connect(self.limite_flux)
-        self.commandLinkButton_2.clicked.connect(self.suppression_flux)
-        self.tableWidget_2.itemDoubleClicked.connect(self.suppression_flux)
-        self.comboBox_2.currentIndexChanged.connect(self.bd_source)
+
+        # Connexion des signaux aux slots (événements de l'interface)
+        self.commandLinkButton.clicked.connect(self.selection_flux)           # Bouton de sélection de flux
+        self.tableWidget.itemDoubleClicked.connect(self.selection_flux)       # Double-clic sur une couche
+        self.pushButton_2.clicked.connect(self.limite_flux)                   # Bouton de chargement
+        self.commandLinkButton_2.clicked.connect(self.suppression_flux)       # Bouton de suppression
+        self.tableWidget_2.itemDoubleClicked.connect(self.suppression_flux)   # Double-clic pour supprimer
+        self.comboBox_2.currentIndexChanged.connect(self.bd_source)           # Changement de base de données
         self.checkBox.hide()
-        # self.checkBox.stateChanged.connect(self.modeCarte)
-        self.toolButton.clicked.connect(self.getCanevas)
+        self.toolButton.clicked.connect(self.getCanevas)                      # Filtrer par emprise du canevas
+        self.toolButton.setToolTip('Filtrer uniquement les couche Contour/Habitat/Travaux \nqui ce trouve dans le canvas de la carte.')
+        self.toolButton_2.clicked.connect(self.filtre_favorit)                # Filtrer par favoris
+        self.toolButton_2.setToolTip('Afficher uniquement les favoris.')
         layout = QVBoxLayout()
-        self.lineEdit.textChanged.connect(self.filtre_dynamique)
-        # self.viewer.textChanged.connect(self.NewTitle)
+        self.lineEdit.textChanged.connect(self.filtre_dynamique)              # Recherche dynamique
         layout.addWidget(self.lineEdit)
         self.viewer.hide()
+        # Configuration du menu de debug (caché par défaut)
         self.DeBUG.addItem('')
+        self.DeBUG.addItem('Dev')
         self.DeBUG.addItem('01')
         self.DeBUG.addItem('0726')
         self.DeBUG.addItem('4269')
+        self.comboBox.currentIndexChanged.connect(self.initialisation_flux)
 
-        self.DeBUG.hide()
+        self.DeBUG.currentIndexChanged.connect(self.SwitchDEBUG)
+        self.DeBUG.hide()  # Menu debug caché par défaut
 
     def raise_(self):
         """Run method that performs all the real work"""
         self.bd_source()
 
+    def SwitchDEBUG(self):
+        """Change les paramètres de connexion selon le mode debug sélectionné"""
+        try:
+            global user, mdp, host, port, dbname, sigdb, refdb
+            account = login_base(self.DeBUG.currentText())
+            user = account[0]
+            mdp = account[1]
+            host = account[2]
+            port = account[3]
+            dbname = account[4]
+            sigdb = account[5]
+            refdb = account[6]
+            self.bd_source()
+
+        except NameError:
+            print('Fails to switch DB for account')
+
     def ModeDeBUG(self):
         self.DeBUG.show()
 
     def mousePressEvent(self, event):
+        """Détecte les clics sur le logo pour activer le mode debug (3 clics consécutifs)"""
         global DeBUG
+        # Zone du logo (coordonnées x: 330-560, y: 5-75)
         if 330 <= event.pos().x() <= 560 and 5 <= event.pos().y() <= 75:
             DeBUG = DeBUG + 1
-            if DeBUG == 3:
+            if DeBUG == 3:  # Activation après 3 clics
                 DeBUG = 0
                 self.ModeDeBUG()
         else:
             DeBUG = 0
             self.DeBUG.hide()
 
-    """
-    def NewTitle(self):
-        if self.viewer.title() != '':
-            Tsplit = ((self.viewer.title()).split('.'))
-            print(Tsplit[0], Tsplit[1])
-            self.openPostGIS(Tsplit[0], Tsplit[1])
-    """
-
     def bd_source(self):
+        global user, mdp
+        if user != user_save or mdp != mdp_save:
+            user = user_save
+            mdp = mdp_save
+        """Sélectionne la base de données source (SIG ou REF)"""
         self.activateWindow()
         bd_origine = self.comboBox_2.currentText()
         if bd_origine == 'REF':
-            self.run_ref()
+            self.run_ref()  # Connexion à la base REF
         if bd_origine == 'SIG':
-            self.run_sig()
+            self.run_sig()  # Connexion à la base SIG
 
     def run_ref(self):
-        """Run method that performs all the real work"""
+        """Initialise la connexion à la base de données REF"""
+        # Vider le tableau des flux sélectionnés
         while self.tableWidget_2.rowCount() > 0:
             self.tableWidget_2.removeRow(self.tableWidget_2.rowCount() - 1)
-#            print(self.tableWidget_2.rowCount())
+
         global cur, con, dbtype
         dbtype = refdb
+        # Connexion à la base de données REF
         con = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + dbtype + " user=" + user + " password=" + mdp)
         cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        self.initialisation_flux()
         self.combobox_custom()
+        self.initialisation_flux()
         # Create the dialog with elements (after translation) and keep reference
         # Only create GUI ONCE in callback, so that it will only load when the plugin is started
         if self.first_start is True:
@@ -178,64 +216,110 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         self.show()
         # Run the dialog event loop
         result = self.exec()
-        # See if OK was pressed
         if result:
-            # Do something useful here - delete the line containing pass and
-            # substitute with your code.
             pass
 
     def run_sig(self):
-        """Run method that performs all the real work"""
+        """Initialise la connexion à la base de données SIG"""
+        # Vider le tableau des flux sélectionnés
         while self.tableWidget_2.rowCount() > 0:
             self.tableWidget_2.removeRow(self.tableWidget_2.rowCount() - 1)
         global cur, con, dbtype
         dbtype = sigdb
+        # Connexion à la base de données SIG
         con = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + dbtype + " user=" + user + " password=" + mdp)
         cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        self.initialisation_flux()
         self.combobox_custom()
-        # Create the dialog with elements (after translation) and keep reference
-        # Only create GUI ONCE in callback, so that it will only load when the plugin is started
+        self.initialisation_flux()
+
         if self.first_start is True:
             self.first_start = False
-        # show the dialog
-        self.show()
-        # Run the dialog event loop
-        result = self.exec()
-        # See if OK was pressed
-        if result:
-            # Do something useful here - delete the line containing pass and
-            # substitute with your code.
-            pass
 
     def suppression_flux(self):
         self.tableWidget_2.removeRow(self.tableWidget_2.currentRow())
 
-    def initialisation_flux(self):
+    def AddOrDelToUserFav(self):
+        """Ajoute ou supprime une couche des favoris de l'utilisateur"""
+        selected_items = self.tableWidget.selectedItems()
+        favorit_statut = selected_items[4].text()  # 0 = non favori, 1 = favori
+
+        selected_items[4].tableWidget().removeCellWidget(selected_items[4].row(), 4)
+
+        schema_name = selected_items[2].text()
+        table_name = selected_items[3].text()
+
+        # Ajout aux favoris
+        if favorit_statut == "0":
+            FAV = "mStarIconDel.png"  # Icône étoile pleine
+            selected_items[4].setText("1")
+            # Requête SQL pour ajouter aux favoris
+            SQLAddFav = """INSERT INTO admin_sig.favtable (utilisateur, schema_name, table_name) VALUES ('""" + user + "','" + schema_name + "','" + table_name + """');"""
+            if dbtype == sigdb:
+                cur.execute(SQLAddFav)
+                con.commit()
+            else:
+                conSIG = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + sigdb + " user=" + user + " password=" + mdp)
+                curSIG = conSIG.cursor(cursor_factory=psycopg2.extras.DictCursor)
+                curSIG.execute(SQLAddFav)
+                conSIG.commit()
+                conSIG.close()
+
+        # Suppression des favoris
+        else:
+            FAV = "mStarIconAdd.png"  # Icône étoile vide
+            selected_items[4].setText("0")
+            # Requête SQL pour supprimer des favoris
+            SQLDelFav = """DELETE FROM admin_sig.favtable WHERE utilisateur LIKE '""" + user + """' AND schema_name LIKE '""" + schema_name + """' AND table_name LIKE '""" + table_name + """';"""
+            if dbtype == sigdb:
+                cur.execute(SQLDelFav)
+                con.commit()
+            else:
+                conSIG = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + sigdb + " user=" + user + " password=" + mdp)
+                curSIG = conSIG.cursor(cursor_factory=psycopg2.extras.DictCursor)
+                curSIG.execute(SQLDelFav)
+                conSIG.commit()
+                conSIG.close()
+
+        iconFav = QIcon()
+        iconFav.addPixmap(QtGui.QPixmap(resources_path('icons', FAV)), QIcon.Mode(0), QIcon.State(1))
+        self.FavButton = QPushButton(iconFav, "")
+        selected_items[4].tableWidget().setCellWidget(selected_items[4].row(), 4, self.FavButton)
+        self.FavButton.clicked.connect(self.AddOrDelToUserFav)
+
+    def initialisation_flux(self):
+        """Initialise et remplit le tableau des couches disponibles"""
+        if self.toolButton_2.text() == "1":
+            self.filtre_favorit(None)
+        self.tableWidget.clear()
+        if NoSignals == 0:  # Éviter les boucles infinies lors des mises à jour
             if dbtype == sigdb:
-            # self.toolButton.setEnabled(1)
                 if self.comboBox.currentText() == 'toutes les catégories':
                     custom_list = schemaname_list
                 elif self.comboBox.currentText() == 'travaux':
-                custom_list = """(SELECT schemaname,tablename from pg_catalog.pg_tables
-        where schemaname like '""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) order by schemaname,tablename;"""
+                    custom_list = schemaname_list[:-2] + """
+                    WHERE schemaname LIKE '""" + str(self.comboBox.currentText()) + """%';
+                    """
                 else:
-                custom_list = """(SELECT schemaname,tablename from pg_catalog.pg_tables
-        where schemaname like '\\_""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '\\_""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) order by schemaname,tablename;"""
+                    custom_list = schemaname_list[:-2] + """
+                    WHERE schemaname LIKE '_""" + str(self.comboBox.currentText()) + """%';
+                    """
             else:
                 if self.comboBox.currentText() == 'toutes les catégories':
                     custom_list = schemaname_list_ref
                 else:
-                custom_list = """SELECT schemaname,tablename from pg_catalog.pg_tables
-        where schemaname like '""" + str(self.comboBox.currentText()) + """' order by schemaname,tablename;"""
+                    custom_list = schemaname_list_ref[:-2] + """
+                    WHERE schemaname LIKE '""" + str(self.comboBox.currentText()) + """%' AND tablename NOT LIKE 'qgis_projects';
+                    """
             cur.execute(custom_list)
             list_schema = cur.fetchall()
 
+            # Vérification de la présence de couches raster dans la base
             SQLcountRaster = """SELECT schemaname,viewname FROM pg_catalog.pg_views
             WHERE schemaname LIKE 'public' AND viewname LIKE 'raster_columns';"""
             cur.execute(SQLcountRaster)
             RasterIF = len(cur.fetchall())
 
+            # Récupération de la liste des couches raster si disponibles
             if RasterIF == 1:
                 SQLloadRaster = """SELECT concat(r_table_schema,'.',r_table_name) from public.raster_columns; """
                 cur.execute(SQLloadRaster)
@@ -246,10 +330,76 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             else:
                 RasterList = []
 
+            # Récupération des projets QGIS stockés dans la base de données
+            SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects'"""
+            cur.execute(SQLprojects)
+            list_projects = cur.fetchall()
+            list_projects_qgis = []
+            if len(list_projects) <= 1:
+                for ProjectName in list_projects:
+                    SQLProjectsQgis = """SELECT name, metadata, content FROM """ + '"' + ProjectName[0] + '"."' + ProjectName[1] + '"'
+                    cur.execute(SQLProjectsQgis)
+                    list_projects_qgis.append(cur.fetchall())
+
+            # Récupération des droits d'accès de l'utilisateur sur les tables
+            SQLGrands = """
+                WITH t as (SELECT
+                    n.nspname AS table_schema,
+                    c.relname AS table_name,
+                    r.rolname AS grantee,
+                    CASE
+                        WHEN acl_text LIKE '%r%' THEN 'SELECT'
+                        WHEN acl_text LIKE '%w%' THEN 'UPDATE'
+                        WHEN acl_text LIKE '%a%' THEN 'INSERT'
+                        WHEN acl_text LIKE '%d%' THEN 'DELETE'
+                        WHEN acl_text LIKE '%x%' THEN 'REFERENCES'
+                        ELSE 'OTHER'
+                    END AS privilege_type
+                FROM pg_class c
+                JOIN pg_namespace n ON n.oid = c.relnamespace
+                LEFT JOIN LATERAL unnest(c.relacl) AS acl_item(acl) ON TRUE
+                LEFT JOIN LATERAL (
+                    SELECT acl::text AS acl_text,
+                        split_part(acl::text, '=', 1) AS grantee_name
+                ) priv ON TRUE
+                LEFT JOIN pg_roles r ON r.rolname = priv.grantee_name
+                WHERE c.relkind IN ('r', 'v','m'))
+                """
+            if self.comboBox.currentText() == 'toutes les catégories':
+                SQLGrands = SQLGrands + """SELECT concat(table_schema,'.',table_name) FROM t WHERE grantee in(SELECT rolname FROM pg_catalog.pg_roles WHERE oid in(SELECT roleid FROM pg_auth_members WHERE member = (SELECT usesysid FROM pg_catalog.pg_user WHERE usename = '""" + user + """'))) and privilege_type = 'SELECT';"""
+            else:
+                if dbtype == sigdb:
+                    SQLGrands = SQLGrands + """SELECT concat(table_schema,'.',table_name) FROM t WHERE grantee in(SELECT rolname FROM pg_catalog.pg_roles WHERE oid in(SELECT roleid FROM pg_auth_members WHERE member = (SELECT usesysid FROM pg_catalog.pg_user WHERE usename = '""" + user + """'))) and privilege_type = 'SELECT' AND table_schema LIKE '_""" + str(self.comboBox.currentText()) + """_%';"""
+                elif dbtype == refdb:
+                    SQLGrands = SQLGrands + """SELECT concat(table_schema,'.',table_name) FROM t WHERE grantee in(SELECT rolname FROM pg_catalog.pg_roles WHERE oid in(SELECT roleid FROM pg_auth_members WHERE member = (SELECT usesysid FROM pg_catalog.pg_user WHERE usename = '""" + user + """'))) and privilege_type = 'SELECT' AND table_schema LIKE '""" + str(self.comboBox.currentText()) + """%';"""
+            cur.execute(SQLGrands)
+            list_grands = cur.fetchall()
+            GrandUser = []
+            for grandsFind in list_grands:
+                GrandUser.append(grandsFind[0])
+
+            # Récupération de la liste des favoris de l'utilisateur
+            SQLFavTable = "SELECT concat(schema_name, '.', table_name) FROM admin_sig.favtable WHERE utilisateur LIKE '" + user + "';"
+            if dbtype == refdb:
+                conSIG = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + sigdb + " user=" + user + " password=" + mdp)
+                curSIG = conSIG.cursor(cursor_factory=psycopg2.extras.DictCursor)
+                curSIG.execute(SQLFavTable)
+                list_fav = curSIG.fetchall()
+                conSIG.close()
+                print('SIG')
+            else:
+                cur.execute(SQLFavTable)
+                list_fav = cur.fetchall()
+            FavList = []
+            for favFind in list_fav:
+                FavList.append(favFind[0])
+
+            # Remplissage du tableau avec les couches disponibles
             self.tableWidget.setRowCount(len(list_schema))
-        self.tableWidget.setColumnCount(4)
+            self.tableWidget.setColumnCount(5)
             i = 0
             for value in list_schema:
+                MetadataXML = value[2]
                 if dbtype == sigdb:
                     type_val = str(value[0])[1:3]
                     schema_name = str(value[0])[4:]
@@ -258,6 +408,8 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                         table_name = str(value[1][len(value[0]) + 1:])
                     else:
                         table_name = str(value[1])
+                    if type_val == "00":
+                        table_name = value[1]
                 else:
                     type_val = ''
                     schema_name = str(value[0])
@@ -278,6 +430,18 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                     schema_name = str(value[0])
                     table_name = str(value[1])
 
+                FavStatut = 0
+                if (schema_name + '.' + table_name) not in FavList:
+                    FAV = "mStarIconAdd.png"
+                    FavStatut = 0
+                else:
+                    FAV = "mStarIconDel.png"
+                    FavStatut = 1
+                iconFav = QIcon()
+                iconFav.addPixmap(QtGui.QPixmap(resources_path('icons', FAV)), QIcon.Mode(0), QIcon.State(1))
+                self.FavButton = QPushButton(iconFav, "")
+                self.FavButton.clicked.connect(self.AddOrDelToUserFav)
+
                 if (str(value[0]) + '.' + str(value[1])) in RasterList:
                     SVG = 'mIconRaster.svg'
                 else:
@@ -295,19 +459,87 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                 self.tableWidget.setItem(i, 2, item)
                 item = QTableWidgetItem(table_name)
                 self.tableWidget.setItem(i, 3, item)
+                item = QTableWidgetItem(str(FavStatut))
+                self.tableWidget.setItem(i, 4, item)
+                self.tableWidget.setCellWidget(i, 4, self.FavButton)
+
+                # Coloration des lignes selon les droits d'accès
+                if (str(value[0]) + '.' + str(value[1])) in GrandUser:  # L'utilisateur a les droits
+                    for j in range(self.tableWidget.columnCount()):
+                        self.tableWidget.item(i, j).setToolTip(MetadataXML)
+                else:
+                    # Coloration en violet si droits insuffisants
+                    for j in range(self.tableWidget.columnCount()):
+                        self.tableWidget.item(i, j).setBackground(QtGui.QColor(187, 134, 192, 50))
+                        self.tableWidget.item(i, j).setToolTip('Droit insuffisant pour ouvrire la couche !')
+
                 i = i + 1
+
+            if self.comboBox.currentText() == 'toutes les catégories':
+                SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects'"""
+            else:
+                SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects' AND schemaname LIKE '""" + str(self.comboBox.currentText()) + """';"""
+            cur.execute(SQLprojects)
+            list_projects = cur.fetchall()
+
+            list_projects_qgis = []
+            if len(list_projects) >= 1:
+                for ProjectName in list_projects:
+                    SQLProjectsQgis = """SELECT name, metadata, content FROM """ + '"' + ProjectName[0] + '"."' + ProjectName[1] + '"'
+                    cur.execute(SQLProjectsQgis)
+                    list_projects_qgis = cur.fetchall()
+                    for Project in list_projects_qgis:
+                        FavStatut = 0
+                        if (ProjectName[0] + '.' + Project[0]) not in FavList:
+                            FAV = "mStarIconAdd.png"
+                            FavStatut = 0
+                        else:
+                            FAV = "mStarIconDel.png"
+                            FavStatut = 1
+                        iconFav = QIcon()
+                        iconFav.addPixmap(QtGui.QPixmap(resources_path('icons', FAV)), QIcon.Mode(0), QIcon.State(1))
+                        self.FavButton = QPushButton(iconFav, "")
+                        self.FavButton.clicked.connect(self.AddOrDelToUserFav)
+                        if dbtype == refdb:
+                            self.FavButton.setEnabled(False)
+
+                        self.tableWidget.setRowCount(i + 1)
+                        itemIcon = QTableWidgetItem()
+                        icon = QIcon()
+                        icon.addPixmap(QtGui.QPixmap(resources_path('icons', 'mIconQgis.svg')), QIcon.Mode(0), QIcon.State(1))
+                        itemIcon.setIcon(icon)
+                        self.tableWidget.setItem(i, 0, itemIcon)
+
+                        item = QTableWidgetItem('qgis')
+                        self.tableWidget.setItem(i, 1, item)
+
+                        item = QTableWidgetItem(ProjectName[0])
+                        self.tableWidget.setItem(i, 2, item)
+
+                        item = QTableWidgetItem(Project[0])
+                        self.tableWidget.setItem(i, 3, item)
+
+                        item = QTableWidgetItem(str(FavStatut))
+                        self.tableWidget.setItem(i, 4, item)
+                        self.tableWidget.setCellWidget(i, 4, self.FavButton)
+
+                        i = i + 1
+
             self.tableWidget.setColumnWidth(0, 20)
             self.tableWidget.setColumnWidth(1, 70)
             self.tableWidget.setColumnWidth(2, 300)
             self.tableWidget.setColumnWidth(3, 300)
-        self.tableWidget.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table"])
+            self.tableWidget.setColumnWidth(4, 20)
+            self.tableWidget.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table", "Favorit"])
+
+            if self.lineEdit.text() != 'Recherche par mots-clés':
+                self.filtre_dynamique(self.lineEdit.text())
 
     def selection_flux(self):
+        """Ajoute une couche sélectionnée à la liste des flux à charger"""
         selected_row = 0
         selected_items = self.tableWidget.selectedItems()
 
-        # Assuming you want to compare items in the first column for uniqueness
-        # svgTake = (selected_items[2].tableWidget().cellWidget(0,0))
         new_item_text = selected_items[3].text()
 
         if not self.item_already_exists(new_item_text):
@@ -315,14 +547,16 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
 
             for column in range(self.tableWidget.columnCount()):
                 cloned_item = selected_items[column].clone()
-                self.tableWidget_2.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table"])
-                self.tableWidget_2.setColumnCount(4)
+                self.tableWidget_2.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table", "Favorit"])
+                self.tableWidget_2.setColumnCount(5)
                 self.tableWidget_2.setItem(selected_row, column, cloned_item)
 
             self.tableWidget_2.setColumnWidth(0, 20)
             self.tableWidget_2.setColumnWidth(1, 70)
             self.tableWidget_2.setColumnWidth(2, 300)
             self.tableWidget_2.setColumnWidth(3, 300)
+            self.tableWidget_2.setColumnWidth(4, 20)
+            self.tableWidget_2.setColumnHidden(4, True)
 
     def item_already_exists(self, new_item_text):
         # Assuming you want to compare items in the first column for uniqueness
@@ -331,7 +565,8 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         return len(existing_items) > 0
 
     def limite_flux(self):
-
+        """Vérifie le nombre de flux à charger et affiche un avertissement si > 5"""
+        # Avertissement si plus de 5 couches sélectionnées (risque de performance)
         if self.tableWidget_2.rowCount() > 5:
             self.QMBquestion = QMessageBox.question(iface.mainWindow(), u"Attention !",
                                                     "Le nombre de flux à charger en une seule fois est limité à 5 pour des questions de performances. Souhaitez vous tout de même charger les " + str(
@@ -346,26 +581,9 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         if self.tableWidget_2.rowCount() <= 5:
             self.chargement_flux()
 
-    """
-    def openPostGIS(self, schema, table):
-        uri = QgsDataSourceUri()
-        uri.setConnection(host, port, sigdb, user, mdp)
-
-        if (schema + '.' + table) in LRasterList:
-            uri.setDataSource(schema, table, "rast")
-            uri.setKeyColumn('rid')
-            uri.setSrid('2154')
-            layer = QgsRasterLayer(uri.uri(), table, "postgresraster")
-        else:
-            uri.setDataSource(schema, table, "geom")
-            uri.setKeyColumn('gid')
-            uri.setSrid('2154')
-            layer = QgsVectorLayer(uri.uri(), table, "postgres")
-        # Ajout de la couche au canevas QGIS
-        QgsProject.instance().addMapLayer(layer)
-    """
-
     def chargement_flux(self):
+        global cur, con, dbtype
+        """Charge les couches sélectionnées dans QGIS"""
         managerAU = QgsApplication.authManager()
         managerAU.availableAuthMethodConfigs().keys()
 
@@ -379,19 +597,57 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             }
             return switcher.get(type, "nothing")
 
-        # def displayOnWindows(type, uri, name):
-        #    p = []
-
+        # Vérification de la présence de l'extension PostGIS Raster
         SQLloadRaster = """SELECT concat(r_table_schema,'.',r_table_name) from public.raster_columns; """
+        SQLextension = """SELECT count(extname) FROM pg_catalog.pg_extension WHERE extname LIKE 'postgis_raster';"""
+
+        cur.execute(SQLextension)
+        count_extension = cur.fetchall()[0][0]
+
+        if count_extension == 1:
             cur.execute(SQLloadRaster)
             list_raster = cur.fetchall()
+        else:
+            list_raster = []
+
         RasterList = []
         for rasterFind in list_raster:
             RasterList.append(rasterFind[0])
 
+        # Chargement de chaque couche sélectionnée
         for row in range(0, self.tableWidget_2.rowCount()):
-            color_rgba = 855030089
-            if self.tableWidget_2.item(row, 1).background().color().rgba() != color_rgba:
+            color_rgba_db = 855030089      # Code couleur pour couche dans autre BD
+            color_rgba_droit = 851150528   # Code couleur pour droits insuffisants
+            self.QMBquestionNoLogin = QMessageBox()
+            if self.tableWidget_2.item(row, 1).background().color().rgba() == color_rgba_droit:
+                self.QMBquestionNoLogin.setWindowTitle(u"Attention !")
+                self.QMBquestionNoLogin.setIcon(QMessageBox.Icon.Warning)
+                self.QMBquestionNoLogin.setText("Vous ne disposez pas des droit pour la couche «" + str(self.tableWidget_2.item(row, 1).text()) + ' ' + str(self.tableWidget_2.item(row, 2).text()) + "» !")
+                self.QMBquestionNoLogin.setStandardButtons(QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00080000))
+                self.QMBquestionNoLogin = self.QMBquestionNoLogin.exec()
+                # self.QMBquestionNoLogin = QMessageBox.question(iface.mainWindow(), u"Attention !", "Vous ne disposez pas des droit pour la couche «" + str(self.tableWidget_2.item(row, 1).text()) + ' ' + str(self.tableWidget_2.item(row, 2).text()) + "» !", QMessageBox.StandardButton(0x00004000), QMessageBox.StandardButton(0x00080000))
+                if self.QMBquestionNoLogin != QMessageBox.StandardButton(0x00004000):
+                    self.InputDialog = QInputDialog()
+                    user_bypass = (self.InputDialog.getText(None, 'Foncier', 'Identifiant:'))[0]
+                    mdp_bypass = (self.InputDialog.getText(None, 'Foncier', 'Mot de pass:'))[0]
+
+                    global user, mdp
+                    user = user_bypass
+                    mdp = mdp_bypass
+                    try:
+                        con = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + dbtype + " user=" + user + " password=" + mdp)
+                        cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
+                    except psycopg2.OperationalError:
+                        print('password authentication failed')
+                        user = user_save
+                        mdp = mdp_save
+
+            else:
+                if user != user_save or mdp != mdp_save:
+                    user = user_save
+                    mdp = mdp_save
+
+            if (self.tableWidget_2.item(row, 1).background().color().rgba() != color_rgba_db) and (self.QMBquestionNoLogin != QMessageBox.StandardButton(0x00004000)):
                 # supression de la partie de l'url après le point d'interrogation
                 if dbtype == sigdb:
                     code = self.tableWidget_2.item(row, 1).text()
@@ -399,30 +655,41 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                     if code == 'travaux' or code == 'agregation':
                         schema = self.tableWidget_2.item(row, 2).text()
                         table = self.tableWidget_2.item(row, 3).text()
+                    elif code == '00':
+                        table = self.tableWidget_2.item(row, 3).text()
                     else:
                         table = self.tableWidget_2.item(row, 3).text()
                         table = schema + '_' + table
                 elif dbtype == refdb:
-                    # code = self.tableWidget_2.item(row,1).text()
+                    code = self.tableWidget_2.item(row, 1).text()
                     schema = self.tableWidget_2.item(row, 2).text()
                     table = self.tableWidget_2.item(row, 3).text()
-                    # .split("?", 1)[0]
+                # Configuration de l'URI de connexion PostGIS
                 uri = QgsDataSourceUri()
                 uri.setConnection(host, port, dbtype, user, mdp)
 
-                # nom du schéma à remplacer: "hydrographie" à supprimer et mettre "couches_collaboratives" lorsqu'on aura regroupé les couches à modifier dans un même schéma
+                # Chargement selon le type de couche (raster, vecteur ou projet QGIS)
                 if (schema + '.' + table) in RasterList:
+                    # Chargement d'une couche raster
                     uri.setDataSource(schema, table, "rast")
-                    uri.setKeyColumn('rid')
-                    uri.setSrid('2154')
+                    uri.setKeyColumn('rid')  # Clé primaire pour les rasters
+                    uri.setSrid('2154')      # Lambert 93
                     layer = QgsRasterLayer(uri.uri(), table, "postgresraster")
                     QgsProject.instance().addMapLayer(layer)
+                elif code == 'qgis':
+                    # Chargement d'un projet QGIS stocké dans la base de données
+                    schema = self.tableWidget_2.item(row, 2).text()
+                    table = self.tableWidget_2.item(row, 3).text()
+                    uri_project = 'postgresql://' + user + ':' + mdp + '@' + host + ':' + port + '?sslmode=disable&dbname=' + dbtype + "&schema=" + schema + '&project=' + table
+                    QgsProject.instance().read(uri_project)
                 else:
-                    uri.setDataSource(schema, table, "geom")
-                    uri.setKeyColumn('gid')
+                    # Chargement d'une couche vecteur
+                    uri.setDataSource(schema, table, "geom")  # Colonne géométrie
+                    uri.setKeyColumn('gid')  # Clé primaire
 
-                    # Chargement de la couche PostGIS
+                    # Détection du type de géométrie
                     geom_type = 'SELECT right(st_geometrytype(geom),-3) as a FROM ' + schema + '.' + table + ' GROUP BY a'
+                    try:
                         cur.execute(geom_type)
                         list_typegeom = cur.fetchall()
                         if len(list_typegeom) > 1:
@@ -448,10 +715,21 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                             layer = QgsVectorLayer(uri.uri(), table, "postgres")
                             # Ajout de la couche au canevas QGIS
                             QgsProject.instance().addMapLayer(layer)
+                    except psycopg2.errors.UndefinedTable:
+                        print('Table not exist... RollBack !')
+                        con.rollback()
+                    except psycopg2.errors.InsufficientPrivilege:
+                        print('Insufficient Privilege... RollBack !')
+                        con.rollback()
+
             else:
+                if self.QMBquestionNoLogin != QMessageBox.StandardButton(0x00004000):
                     self.QMBquestion = QMessageBox.question(iface.mainWindow(), u"Attention !", "La couche «" + str(self.tableWidget_2.item(row, 1).text()) + ' ' + str(self.tableWidget_2.item(row, 2).text()) + "» ne ce trouve pas dans cette BD !", QMessageBox.StandardButton(0x00004000))
 
     def combobox_custom(self):
+        """Remplit la liste déroulante des catégories selon la base de données sélectionnée"""
+        global NoSignals
+        NoSignals = 1  # Désactive temporairement les signaux pour éviter les boucles
         if dbtype == sigdb:
             self.toolButton.setEnabled(1)
             self.comboBox.clear()
@@ -464,6 +742,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             self.comboBox.addItem('69')
             self.comboBox.addItem('agregation')
             self.comboBox.addItem('travaux')
+            self.comboBox.addItem('qgis')
             self.comboBox.addItem('form')
         if dbtype == refdb:
             self.toolButton.setEnabled(0)
@@ -474,19 +753,65 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             self.comboBox.addItem("toutes les catégories")
             for baxval in list_schema:
                 self.comboBox.addItem(baxval[0])
+        NoSignals = 0
+
+    def filtre_favorit(self, filter_fav):
+        """Active ou désactive le filtre des favoris"""
+        if self.toolButton_2.text() == "0":  # Activation du filtre
+            self.toolButton_2.setText("1")
+            self.toolButton_2.setDown(True)
+            if self.lineEdit.text() != 'Recherche par mots-clés':
+                self.filtre_dynamique(self.lineEdit.text())
+            else:
+                for i in range(self.tableWidget.rowCount()):
+                    item = self.tableWidget.item(i, 4)
+                    match = self.toolButton_2.text() not in item.text().lower()
+                    self.tableWidget.setRowHidden(i, match)
+        elif self.toolButton_2.text() == "1":
+            self.toolButton_2.setText("0")
+            self.toolButton_2.setDown(False)
+            if self.lineEdit.text() != 'Recherche par mots-clés':
+                self.filtre_dynamique(self.lineEdit.text())
+            else:
+                for i in range(self.tableWidget.rowCount()):
+                    self.tableWidget.setRowHidden(i, False)
 
     def filtre_dynamique(self, filter_text):
+        """Filtre dynamique des couches selon le texte saisi"""
+        # Remplacement des espaces par des underscores pour la recherche
         if filter_text.find(' ') >= 0:
             filter_text = filter_text.replace(" ", "_")
         for i in range(self.tableWidget.rowCount()):
             for j in range(self.tableWidget.columnCount()):
                 item = self.tableWidget.item(i, j)
                 match = filter_text.lower() not in item.text().lower()
+                if match is False:
+                    if self.toolButton_2.text() == "1":
+                        item = self.tableWidget.item(i, 4)
+                        match = self.toolButton_2.text() not in item.text().lower()
                 self.tableWidget.setRowHidden(i, match)
                 if not match:
                     break
 
     def getCanevas(self):
+        """Filtre les couches selon l'emprise du canevas QGIS actuel"""
+
+        # Récupération de la liste des favoris de l'utilisateur
+        SQLFavTable = "SELECT concat(schema_name, '.', table_name) FROM admin_sig.favtable WHERE utilisateur LIKE '" + user + "';"
+        if dbtype == refdb:
+            conSIG = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + sigdb + " user=" + user + " password=" + mdp)
+            curSIG = conSIG.cursor(cursor_factory=psycopg2.extras.DictCursor)
+            curSIG.execute(SQLFavTable)
+            list_fav = curSIG.fetchall()
+            conSIG.close()
+        else:
+            cur.execute(SQLFavTable)
+            list_fav = cur.fetchall()
+        FavList = []
+        for favFind in list_fav:
+            FavList.append(favFind[0])
+
+        # Récupération de l'emprise du canevas
         poly = iface.mapCanvas().extent()
         geom = (str(poly.xMinimum()) + ',' + str(poly.yMinimum()) + ',' + str(poly.xMaximum()) + ',' + str(poly.yMaximum()))
 
@@ -518,12 +843,28 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             TableSomme = cur.fetchall()[0][0]
 
             if e[0][1:3] != 'fo':
+                schema_name = e[0][4:]
                 DepName = QTableWidgetItem(e[0][1:3])
-                SchemaName = QTableWidgetItem(e[0][4:])
+                SchemaName = QTableWidgetItem(schema_name)
             else:
+                schema_name = e[0][6:]
                 DepName = QTableWidgetItem('form')
-                SchemaName = QTableWidgetItem(e[0][6:])
-            TableName = QTableWidgetItem(e[1][len(e[0]) + 1:])
+                SchemaName = QTableWidgetItem(schema_name)
+            table_name = e[1][len(e[0]) + 1:]
+            TableName = QTableWidgetItem(table_name)
+
+            FavStatut = 0
+            if (schema_name + '.' + table_name) not in FavList:
+                FAV = "mStarIconAdd.png"
+                FavStatut = 0
+            else:
+                FAV = "mStarIconDel.png"
+                FavStatut = 1
+            iconFav = QIcon()
+            iconFav.addPixmap(QtGui.QPixmap(resources_path('icons', FAV)), QIcon.Mode(0), QIcon.State(1))
+            self.FavButton = QPushButton(iconFav, "")
+            self.FavButton.clicked.connect(self.AddOrDelToUserFav)
+
             self.tableWidget.insertRow(row_count)
 
             itemIcon = QTableWidgetItem()
@@ -535,6 +876,9 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             self.tableWidget.setItem(row_count, 1, DepName)
             self.tableWidget.setItem(row_count, 2, SchemaName)
             self.tableWidget.setItem(row_count, 3, TableName)
+            item = QTableWidgetItem(str(FavStatut))
+            self.tableWidget.setItem(row_count, 4, item)
+            self.tableWidget.setCellWidget(row_count, 4, self.FavButton)
             if TableSomme == 0:
                 for j in range(self.tableWidget.columnCount()):
                     self.tableWidget.item(row_count, j).setBackground(QtGui.QColor(246, 185, 73, 50))
@@ -550,7 +894,3 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             new_object = new_object + '[' + str(obj_X[1]) + ',' + str(obj_X[0]) + '],'
         new_object = new_object[:-1] + ']'
         return (new_object)
-
-    # def popup(self):
-        # self.dialog = Popup()  # +++ - self
-        # self.dialog.text_edit.show()

CenRa_FLUX/metadata.txt

@@ -5,9 +5,10 @@
 [general]
 name=CenRa_FLUX
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
 supportsQt6=True
 description=Permet d'ouvrire une table dans la base PostGis
-version=3.5
+version=3.23
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -32,7 +33,7 @@ icon=icon.png
 # experimental flag
 experimental=False
 
-changelog=<h2>CenRa_FLUX:</h2></br><p><h3>29/07/2025 - Version 3.5: </h3> - Bug fix sur les donnee raster.</p></br><p><h3>23/07/2025 - Version 3.4: </h3> - Ouverture raster dans la base SIG.</p></br><p><h3>23/07/2025 - Version 3.3: </h3> - Optimisation des chargement.</p></br><p><h3>22/07/2025 - Version 3.2: </h3> - Visualisation des format raster et vecteur dans REF.</p></br><p><h3>21/07/2025 - Version 3.1: </h3> - Bug fix pour l'ouverture de plus de 5 couches.</p></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6.</p></br><p><h3>09/04/2025 - Version 2.9: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>07/04/2025 - Version 2.7: </h3> - mode debug.</p></br><p><h3>03/04/2025 - Version 2.6: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 2.5: </h3> - Visualisation distincte des couches ne se trouvant pas dans l'antenne.</p></br><p><h3>13/02/2025 - Version 2.4: </h3> - Ajoute redimensionnement et déplacement mollette.</p></br><p><h3>05/02/2025 - Version 2.3: </h3> - Bouton de visualisation des couches se trouvent uniquement dans le canva de la carte.</p></br><p><h3>07/01/2025 - Version 2.2: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.1:</h3> - Correctif de bug.</br> - Evolution de la limit de 3 à 5. </br></p></br><p><h3>22/10/2024 - Version 2.0:</h3> - Reformatage du code.</br></p></br><p><h3>03/10/2024 - Version 1.14:</h3> - Remonte la fênetre dans la pille.</br></p><p><h3>13/09/2024 - Version 1.13:</h3>- MAJ sur le lien du changelog</br>- Bug-fix: Ouvre MultiPolygone et Polygon séparément.</p></br><p><h3>10/09/2024 - Version 1.11:</h3>- Ouverture de table contenant plusieurs géométries.</p></br><p><h3>26/08/2024 - Version 1.10:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
+changelog=<h2>CenRa_FLUX:</h2></br><p><h3>21/05/2026 - Version 3.23: </h3> - Optimisation des performances hors connexion.</p></br><p><h3>23/03/2026 - Version 3.22: </h3> - Pache mineur.</p></br><p><h3>12/03/2026 - Version 3.21: </h3> - qgisMaximumVersion est 4.0.</p></br><p><h3>05/03/2026 - Version 3.20: </h3> - Visualisation des metadonnees avec un tooltip au survol de la couche.</p></br><p><h3>26/02/2026 - Version 3.19: </h3> - Visualisation des droits pour les vues materialisees.</p></br><p><h3>25/02/2026 - Version 3.18: </h3> - Filtre par secteur geographique compatible avec les favoris.</p></br><p><h3>12/02/2026 - Version 3.17: </h3> - Favorit dans la BD Ref.</p></br><p><h3>11/02/2026 - Version 3.16: </h3> - Creation de favori et visualisation.</p></br><p><h3>10/02/2026 - Version 3.15: </h3> - Sauvegarde la recherche.</p></br><p><h3>08/12/2025 - Version 3.14: </h3> - message d'erreur pour les drois de couche sur la DB.</p></br><p><h3>08/12/2025 - Version 3.13: </h3> - Detection des droit utilisateur.</p></br><p><h3>25/09/2025 - Version 3.12: </h3> - version +1.</p></br><p><h3>25/09/2025 - Version 3.11: </h3> - Correctife sur les code 00.</p></br><p><h3>24/09/2025 - Version 3.10: </h3> - Erreur sur l ouverture des couche raster. </p></br><p><h3>24/09/2025 - Version 3.9: </h3> - bugfix lier aux extention pgsql.</p></br><p><h3>09/09/2025 - Version 3.8: </h3> -  Bug REF fix.</p></br><p><h3>05/09/2025 - Version 3.7: </h3> - Ouverture de projet QGIS contenue dans la base de donnees.</p></br><p><h3>30/07/2025 - Version 3.6: </h3> - Correctife de bug.</p></br><p><h3>29/07/2025 - Version 3.5: </h3> - Bug fix sur les donnee raster.</p></br><p><h3>23/07/2025 - Version 3.4: </h3> - Ouverture raster dans la base SIG.</p></br><p><h3>23/07/2025 - Version 3.3: </h3> - Optimisation des chargement.</p></br><p><h3>22/07/2025 - Version 3.2: </h3> - Visualisation des format raster et vecteur dans REF.</p></br><p><h3>21/07/2025 - Version 3.1: </h3> - Bug fix pour l'ouverture de plus de 5 couches.</p></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6.</p></br><p><h3>09/04/2025 - Version 2.9: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>07/04/2025 - Version 2.7: </h3> - mode debug.</p></br><p><h3>03/04/2025 - Version 2.6: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 2.5: </h3> - Visualisation distincte des couches ne se trouvant pas dans l'antenne.</p></br><p><h3>13/02/2025 - Version 2.4: </h3> - Ajoute redimensionnement et déplacement mollette.</p></br><p><h3>05/02/2025 - Version 2.3: </h3> - Bouton de visualisation des couches se trouvent uniquement dans le canva de la carte.</p></br><p><h3>07/01/2025 - Version 2.2: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.1:</h3> - Correctif de bug.</br> - Evolution de la limit de 3 à 5. </br></p></br><p><h3>22/10/2024 - Version 2.0:</h3> - Reformatage du code.</br></p></br><p><h3>03/10/2024 - Version 1.14:</h3> - Remonte la fênetre dans la pille.</br></p><p><h3>13/09/2024 - Version 1.13:</h3>- MAJ sur le lien du changelog</br>- Bug-fix: Ouvre MultiPolygone et Polygon séparément.</p></br><p><h3>10/09/2024 - Version 1.11:</h3>- Ouverture de table contenant plusieurs géométries.</p></br><p><h3>26/08/2024 - Version 1.10:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
 
 # deprecated flag (applies to the whole plugin, not just a single version)
 deprecated=False

CenRa_FLUX/tools/SQLRequet.py

@@ -2,13 +2,57 @@
 schemaname_distinct = """SELECT DISTINCT schemaname from pg_catalog.pg_tables
                             WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
                             order by schemaname;"""
-schemaname_list_ref = """SELECT schemaname,tablename from pg_catalog.pg_tables
-        WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
-        order by schemaname,tablename;"""
-schemaname_list = """(SELECT schemaname,tablename from pg_catalog.pg_tables
-        where schemaname like 'trav%' or schemaname like '\\_ag%' or schemaname like '\\_00%' or schemaname like '\\_01%' or schemaname like '\\_07%' or  schemaname like '\\_26%' or schemaname like '\\_form%' or schemaname like '\\_42%' or schemaname like '\\_69%' order by schemaname,tablename)
-        UNION
-        (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews order by schemaname,tablename) order by schemaname,tablename;"""
+
+schemaname_list_ref = """
+WITH TableList AS (SELECT
+                       schemaname,
+                       tablename
+                   FROM pg_catalog.pg_tables
+                   WHERE
+                       schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
+                   ORDER BY schemaname,tablename),
+    TableDescription AS (SELECT
+                             schemaname,
+                             tablename,
+                             description
+                         FROM TableList
+                            LEFT JOIN pg_description ON objoid = (quote_ident(schemaname)||'.'||quote_ident(tablename))::regclass
+                         ORDER BY schemaname, tablename)
+SELECT * FROM TableDescription;
+"""
+
+schemaname_list = """
+WITH
+TableList as (SELECT
+                  schemaname,
+                  tablename
+              FROM pg_catalog.pg_tables
+              WHERE schemaname LIKE 'trav%' OR schemaname LIKE '_ag%' OR schemaname LIKE '_00%' OR schemaname LIKE '_01%' OR schemaname LIKE '_07%' OR  schemaname LIKE '_26%' OR schemaname LIKE '_form%' OR schemaname LIKE '_42%' OR schemaname LIKE '_69%'
+              ORDER BY schemaname,tablename),
+
+ViewList as (SELECT
+                 schemaname,
+                 matviewname AS tablename
+             FROM pg_catalog.pg_matviews
+             ORDER BY schemaname,tablename),
+
+TableAndView as (SELECT
+                     schemaname,
+                     tablename
+                 FROM TableList
+                 UNION SELECT schemaname,tablename FROM ViewList),
+
+TableViewDescription as (SELECT
+                             schemaname,
+                             tablename,
+                             description
+                         FROM TableAndView
+                             LEFT JOIN pg_description ON objoid = (quote_ident(schemaname)||'.'||quote_ident(tablename))::regclass
+                         ORDER BY schemaname,tablename)
+
+SELECT * FROM TableViewDescription;
+"""
+
 geom = "geom"
 champ_travaux_prevus_multipolygon = """(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, surface_m2 double precision, surface_ha double precision,  date_creation date, date_maj date, geom geometry(MultiPolygon,2154))"""
 champ_travaux_prevus_multilinestring = """(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, longueur_m double precision, longueur_km double precision,  date_creation date, date_maj date, geom geometry(MultiLineString,2154))"""

CenRa_FLUX/tools/icons/mIconQgis.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<polygon fill="#EE7913" points="68.613,69.625 86.891,69.625 71.697,54.625 52.613,54.625 52.613,72.746 68.613,88.548 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="402.5244" y1="-220.8706" x2="400.6479" y2="-97.5023" gradientTransform="matrix(1 0 0 -1 -300.5195 -92.5547)">
+	<stop  offset="0" style="stop-color:#589632"/>
+	<stop  offset="1" style="stop-color:#93B023"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="126.613,109.057 94.488,77.625 76.613,77.625 76.613,96.033 107.143,126.625 
+	126.613,126.625 "/>
+<polygon fill="#F0E64A" points="76.613,77.625 94.488,77.625 86.891,69.625 68.613,69.625 68.613,88.548 76.613,96.033 "/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="365.4619" y1="-221.1455" x2="363.5923" y2="-98.227" gradientTransform="matrix(1 0 0 -1 -300.5195 -92.5547)">
+	<stop  offset="0" style="stop-color:#589632"/>
+	<stop  offset="1" style="stop-color:#93B023"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M68.923,101.552c-1.165,0.242-1.769,0.157-4.685,0.157c-20.866,0-38.612-17.158-38.612-39.406
+	c0-22.248,17.551-39.027,38.612-39.027s37.833,16.78,37.833,39.027c0,3.619-0.451,7.099-1.284,10.398L120.1,92.012
+	c4.979-8.726,7.765-18.869,7.765-29.857c0-34.289-27.363-59.963-64.016-59.963C27.363,2.191,0,27.696,0,62.154
+	c0,34.625,27.363,60.638,63.848,60.638c9.417,0,16.069-1.469,23.042-3.761L68.923,101.552z"/>
+<polygon opacity="0.15" fill="#FFFFFF" enable-background="new    " points="53.083,54.625 71.697,54.625 126.613,109.057 
+	126.613,126.625 "/>
+</svg>

CenRa_FLUX/tools/resources.py

@@ -155,7 +155,7 @@ def maj_verif(NAME):
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except NameError:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:

CenRa_FLUX/tools/ui/CenRa_Flux_base - Copie.ui

@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="enabled">
-   <bool>true</bool>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>910</width>
-    <height>800</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>910</width>
-    <height>800</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>910</width>
-    <height>800</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>SIG CEN-RA</string>
-  </property>
-  <widget class="QComboBox" name="comboBox">
-   <property name="geometry">
-    <rect>
-     <x>260</x>
-     <y>130</y>
-     <width>171</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="editable">
-    <bool>false</bool>
-   </property>
-   <property name="currentText">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="comboBox_2">
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>80</y>
-     <width>171</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="editable">
-    <bool>false</bool>
-   </property>
-   <property name="currentText">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_3">
-   <property name="geometry">
-    <rect>
-     <x>345</x>
-     <y>10</y>
-     <width>221</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="pixmap">
-    <pixmap>:/plugins/CenRa_FLUX/logo.jpg</pixmap>
-   </property>
-   <property name="scaledContents">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButton_2">
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>750</y>
-     <width>171</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Charger les couches</string>
-   </property>
-  </widget>
-  <widget class="QTableWidget" name="tableWidget">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>170</y>
-     <width>850</width>
-     <height>281</height>
-    </rect>
-   </property>
-   <property name="selectionMode">
-    <enum>QAbstractItemView::SingleSelection</enum>
-   </property>
-   <property name="sortingEnabled">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QTableWidget" name="tableWidget_2">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>550</y>
-     <width>850</width>
-     <height>181</height>
-    </rect>
-   </property>
-   <property name="selectionMode">
-    <enum>QAbstractItemView::SingleSelection</enum>
-   </property>
-  </widget>
-  <widget class="QCommandLinkButton" name="commandLinkButton">
-   <property name="geometry">
-    <rect>
-     <x>400</x>
-     <y>470</y>
-     <width>61</width>
-     <height>61</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</iconset>
-   </property>
-   <property name="iconSize">
-    <size>
-     <width>50</width>
-     <height>40</height>
-    </size>
-   </property>
-  </widget>
-  <widget class="QCommandLinkButton" name="commandLinkButton_2">
-   <property name="geometry">
-    <rect>
-     <x>460</x>
-     <y>470</y>
-     <width>61</width>
-     <height>61</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>:/plugins/CenRa_FLUX/arrow-up.png</normaloff>:/plugins/CenRa_FLUX/arrow-up.png</iconset>
-   </property>
-   <property name="iconSize">
-    <size>
-     <width>50</width>
-     <height>40</height>
-    </size>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lineEdit">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>480</x>
-     <y>130</y>
-     <width>171</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Recherche par mots-clés</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-   <property name="readOnly">
-    <bool>false</bool>
-   </property>
-   <property name="clearButtonEnabled">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>40</x>
-     <y>150</y>
-     <width>161</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Calibri</family>
-     <pointsize>10</pointsize>
-     <italic>false</italic>
-    </font>
-   </property>
-   <property name="text">
-    <string>Liste des flux disponibles :</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>530</y>
-     <width>171</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Calibri</family>
-     <pointsize>10</pointsize>
-     <italic>false</italic>
-    </font>
-   </property>
-   <property name="text">
-    <string>Flux sélectionné(s) à charger :</string>
-   </property>
-  </widget>
-  <zorder>label_3</zorder>
-  <zorder>comboBox</zorder>
-  <zorder>comboBox_2</zorder>
-  <zorder>pushButton_2</zorder>
-  <zorder>tableWidget</zorder>
-  <zorder>tableWidget_2</zorder>
-  <zorder>commandLinkButton</zorder>
-  <zorder>commandLinkButton_2</zorder>
-  <zorder>lineEdit</zorder>
-  <zorder>label</zorder>
-  <zorder>label_2</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>

CenRa_FLUX/tools/ui/CenRa_Flux_base.ui

@@ -386,6 +386,35 @@
         <string notr="true">background-color: rgba(255, 255, 255,0.50);</string>
        </property>
       </widget>
+      <widget class="QToolButton" name="toolButton_2">
+       <property name="geometry">
+        <rect>
+         <x>700</x>
+         <y>130</y>
+         <width>21</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>0</string>
+       </property>
+      </widget>
+      <zorder>commandLinkButton_2</zorder>
+      <zorder>pushButton_2</zorder>
+      <zorder>label</zorder>
+      <zorder>tableWidget_2</zorder>
+      <zorder>comboBox</zorder>
+      <zorder>lineEdit</zorder>
+      <zorder>toolButton</zorder>
+      <zorder>tableWidget</zorder>
+      <zorder>label_2</zorder>
+      <zorder>label_3</zorder>
+      <zorder>comboBox_2</zorder>
+      <zorder>commandLinkButton</zorder>
+      <zorder>checkBox</zorder>
+      <zorder>DeBUG</zorder>
+      <zorder>toolButton_2</zorder>
+      <zorder>viewer</zorder>
      </widget>
     </widget>
    </item>

CenRa_FLUX/tools/ui/CenRa_about_form.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CenRa_Metabase_editorwidget_base</class>
- <widget class="QDialog" name="CenRa_Metabase_editorwidget_base">
+ <widget class="QDialog" name="CenRa_about_base">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Journal des modifications</string>
   </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>../../CenRa_Metabase/tools/ui/icon.svg</normaloff>../../CenRa_Metabase/tools/ui/icon.svg</iconset>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QScrollArea" name="scrollArea">
@@ -38,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>453</width>
-        <height>570</height>
+        <height>547</height>
        </rect>
       </property>
       <widget class="QGroupBox" name="groupBox">
@@ -70,7 +66,7 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::NoButton</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

CenRa_METABASE/CenRa_Metabase.py

@@ -31,8 +31,12 @@ from .tools.resources import (
     maj_verif,
 )
 pyperclip()
+
+try:
     from .dock import CenRa_Metabase
     from .editor import Metabase_Editor
+except NameError:
+    print('404')
 
 # from CenRa_Metabase.issues import CenRa_Issues
 

CenRa_METABASE/editor.py

@@ -12,6 +12,7 @@ from qgis.core import (
     QgsSettings,
     QgsGeometry,
     QgsWkbTypes,
+    Qgis,
 )
 from qgis.PyQt import QtGui, QtCore
 from qgis.PyQt.QtGui import QIcon
@@ -238,7 +239,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
                 self.new_data(layer)
         else:
             self.close()
-            iface.messageBar().pushMessage("Information:", "Cette couche n'est pas stockée dans PostgreSQL", level=1, duration=30)
+            iface.messageBar().pushMessage("Information:", "Cette couche n'est pas stockée dans PostgreSQL", level=Qgis.Warning, duration=30)
 
     def is_in_psql(self, layer):
         try:

CenRa_METABASE/metadata.txt

@@ -5,9 +5,10 @@
 [general]
 name=CenRa_Metabase
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
 supportsQt6=True
 description=CenRa_METABASE
-version=0.3.0
+version=0.3.2
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -22,7 +23,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
 
 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_METABASE:</h2></br><p><h3>19/05/2025 - Version 0.3.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>09/04/2025 - Version 0.2.3: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 0.2.2: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 0.2.1: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.2.0: </h3> - Deployment sur serveur SIG.</p></br><p><h3>07/01/2025 - Version 0.1.6: </h3> - ByPass du certif ssl ci erreur</p></br><p><h3>19/12/2024 - Version 0.1.5: </h3> - Fix les problem de lenteur qu'en la base est down.</p></br><p><h3>12/12/2024 - Version 0.1.4: </h3> - Crash Fix .</p></br><p><h3>08/10/2024 - Version 0.1.3: </h3> - Lecture de métadonnée des flux WMS/WFS.</p></br><p><h3>07/10/2024 - Version 0.1.2: </h3> - Correctif de bug.</p></br><p><h3>03/10/2024 - Version 0.1.1: </h3> - Remonte la fênetre dans la pille.</p></br><p><h3>26/08/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_Metabase </p>
+changelog=<h2>CenRa_METABASE:</h2></br><p><h3>12/03/2026 - Version 0.3.2: </h3> - qgisMaximumVersion est 4.0.</p></br><p><h3>30/07/2025 - Version 0.3.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 0.3.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>09/04/2025 - Version 0.2.3: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 0.2.2: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 0.2.1: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.2.0: </h3> - Deployment sur serveur SIG.</p></br><p><h3>07/01/2025 - Version 0.1.6: </h3> - ByPass du certif ssl ci erreur</p></br><p><h3>19/12/2024 - Version 0.1.5: </h3> - Fix les problem de lenteur qu'en la base est down.</p></br><p><h3>12/12/2024 - Version 0.1.4: </h3> - Crash Fix .</p></br><p><h3>08/10/2024 - Version 0.1.3: </h3> - Lecture de métadonnée des flux WMS/WFS.</p></br><p><h3>07/10/2024 - Version 0.1.2: </h3> - Correctif de bug.</p></br><p><h3>03/10/2024 - Version 0.1.1: </h3> - Remonte la fênetre dans la pille.</p></br><p><h3>26/08/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_Metabase </p>
 
 # Tags are comma separated with spaces allowed
 tags=python

CenRa_METABASE/tools/ui/CenRa_about_form.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CenRa_Metabase_editorwidget_base</class>
- <widget class="QDialog" name="CenRa_Metabase_editorwidget_base">
+ <widget class="QDialog" name="CenRa_about_base">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Journal des modifications</string>
   </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>../../CenRa_Metabase/tools/ui/icon.svg</normaloff>../../CenRa_Metabase/tools/ui/icon.svg</iconset>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QScrollArea" name="scrollArea">
@@ -38,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>453</width>
-        <height>570</height>
+        <height>547</height>
        </rect>
       </property>
       <widget class="QGroupBox" name="groupBox">
@@ -70,7 +66,7 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::NoButton</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

CenRa_PAGERENDER/canvas_editor.py

@@ -68,6 +68,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
             'Source': 0,
             'Echelle_2': 0,
             'Logo_2': 0}
+        self.varObject = {}
 
         path = ''
         ix = 0
@@ -83,6 +84,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
         self.horizontalSlider.valueChanged.connect(self.horizontal)
         self.verticalSlider.valueChanged.connect(self.vertical)
         self.tableWidget.itemSelectionChanged.connect(self.setSlider)
+        self.tableWidget_2.cellChanged.connect(self.setObject)
         self.radioButton.toggled.connect(self.setSlider)
         self.pushButton.clicked.connect(self.export)
         self.spinBox.editingFinished.connect(self.valueSlider)
@@ -181,8 +183,8 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
             QApplication.restoreOverrideCursor()
 
     def select_file(self):
-        options = QFileDialog.Options()
-        options |= QFileDialog.ShowDirsOnly
+        # options = QFileDialog.Options()
+        # options |= QFileDialog.getExistingDirectory()
         folder = QFileDialog.getOpenFileName(self, "Sélection du fichier ", '', 'Python(*.py)')
         if folder[0] != '':
             return folder[0]
@@ -197,7 +199,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
             sourcefile = open(logopath, 'r')
             splitsource = sourcefile.read().splitlines()
             all_children = self.frame.children()
-            all_element = ['_locals', '_size', '_rotate']
+            all_element = ['_locals', '_size', '_rotate', '_frame', '_background', '_path']
             for children in all_children:
                 flen = 0
                 for element in all_element:
@@ -207,7 +209,17 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
                         if find_it.find(recherche_element) != -1:
                             flen = flen + 1
                             if flen == 1:
-                                if element != '_rotate':
+                                if element == '_frame' or element == '_background' or element == '_path':
+                                    value_find = (find_it.split('=')[1]).replace('"', '')
+                                    if children.objectName() in self.varObject:
+                                        if element[1:] in self.varObject[children.objectName()]:
+                                            self.varObject[children.objectName()][element[1:]] = value_find
+                                        else:
+                                            self.varObject[children.objectName()].update({element[1:]: value_find})
+                                    else:
+                                        self.varObject.update({children.objectName(): {element[1:]: value_find}})
+                                    # print(self.varObject)
+                                elif element != '_rotate':
                                     value_find = (find_it[find_it[:].find('(') + 1:-33]).split(',')
                                     if element == '_size':
                                         Psize_h = float(value_find[0]) * 3.5
@@ -276,6 +288,8 @@ from qgis.core import (
     QgsUnitTypes,
     QgsLayoutPoint,
 )
+
+
 def fletch_canvas(self):
     if self.radioButton_6.isChecked():
         values_page = 'A4'
@@ -297,6 +311,16 @@ def fletch_canvas(self):
         if values_page == '""" + page_size + """':"""
                 for children in all_children:
                     selection = children
+                    if selection.objectName() in self.varObject:
+                        for parametre_object in self.varObject[selection.objectName()]:
+                            if str(selection.objectName()) != "Arrow" and str(parametre_object) != "path":
+                                export_str = export_str + """
+            self.template_parameters['""" + str(selection.objectName()) + '_' + str(parametre_object) + """'] = """ + str(self.varObject[selection.objectName()][parametre_object])
+                            elif str(selection.objectName()) == "Arrow" and str(parametre_object) == "path":
+                                if str(self.varObject[selection.objectName()][parametre_object]) == "":
+                                    self.varObject[selection.objectName()][parametre_object] = "NorthArrow_02.svg"
+                                export_str = export_str + """
+            self.template_parameters['""" + str(selection.objectName()) + '_' + str(parametre_object) + """'] = '""" + str(self.varObject[selection.objectName()][parametre_object]) + "'"
                     if page_type == 'Portrait':
                         item_rotate_object = self.varPortrait[selection.objectName() + '_rotate'][0]
                         if item_rotate_object == 0 or item_rotate_object == 180:
@@ -406,9 +430,29 @@ def fletch_canvas(self):
         frame_y = self.frame.y()
         self.frame.move(frame_x, frame_y)
 
+    def setParameter(self, selection_name):
+        if selection_name in self.varObject:
+            for table2Range in range(0, self.tableWidget_2.rowCount()):
+                rowName = self.tableWidget_2.item(table2Range, 0).text()
+                if rowName in self.varObject[selection_name]:
+                    self.tableWidget_2.setItem(table2Range, 1, QTableWidgetItem(str(self.varObject[selection_name][rowName])))
+                else:
+                    self.varObject[selection_name].update({rowName: ""})
+                    self.tableWidget_2.setItem(table2Range, 1, QTableWidgetItem(''))
+        else:
+            self.varObject.update({selection_name: {"frame": "", "background": "", "path": ""}})
+            self.tableWidget_2.setItem(1, 1, QTableWidgetItem(''))
+            self.tableWidget_2.setItem(2, 1, QTableWidgetItem(''))
+            self.tableWidget_2.setItem(3, 1, QTableWidgetItem(''))
+
+    def setObject(self, event):
+        selection_name = (self.tableWidget.currentItem()).text()
+        rowName = self.tableWidget_2.item(event, 0).text()
+        rowValue = self.tableWidget_2.item(event, 1).text()
+        self.varObject[selection_name][rowName] = rowValue
+
     def setSlider(self):
         if self.tableWidget.currentItem() is not None:
-            print(self.tableWidget.tabKeyNavigation())
             selection_name = (self.tableWidget.currentItem()).text()
             all_children = self.frame.children()
             selection = 0
@@ -431,6 +475,7 @@ def fletch_canvas(self):
                 self.verticalSlider.setValue(yy)
                 self.spinBox.setValue(xx)
                 self.spinBox_2.setValue(yy)
+            self.setParameter(selection_name)
 
     def rotate_color(self, selection, last_children):
         global last_select
@@ -439,16 +484,16 @@ def fletch_canvas(self):
         else:
             ColorCode = "249, 238, 148, 50"
         if self.rotate_object[selection.objectName()] == 0:
-            selection.setStyleSheet("border: 2px solid;border-color:red;border-bottom-color: blue;background-color: rgb(" + ColorCode + ")")
+            selection.setStyleSheet("border: 2px solid;border-color:red;border-bottom-color: blue;background-color: rgba(" + ColorCode + ")")
         elif self.rotate_object[selection.objectName()] == 90:
-            selection.setStyleSheet("border: 2px solid;border-color:red;border-left-color: blue;background-color: rgb(" + ColorCode + ")")
+            selection.setStyleSheet("border: 2px solid;border-color:red;border-left-color: blue;background-color: rgba(" + ColorCode + ")")
         elif self.rotate_object[selection.objectName()] == 180:
-            selection.setStyleSheet("border: 2px solid;border-color:red;border-top-color: blue;background-color: rgb(" + ColorCode + ")")
+            selection.setStyleSheet("border: 2px solid;border-color:red;border-top-color: blue;background-color: rgba(" + ColorCode + ")")
         elif self.rotate_object[selection.objectName()] == 270:
-            selection.setStyleSheet("border: 2px solid;border-color:red;border-right-color: blue;background-color: rgb(" + ColorCode + ")")
+            selection.setStyleSheet("border: 2px solid;border-color:red;border-right-color: blue;background-color: rgba(" + ColorCode + ")")
         if last_children != 0:
             if last_select != selection.objectName():
-                last_children.setStyleSheet("background-color: rgb(10, 10, 10, 50)")
+                last_children.setStyleSheet("background-color: rgba(10, 10, 10, 50)")
 
         last_select = selection.objectName()
 

CenRa_PAGERENDER/demoV2.py

@@ -4,6 +4,8 @@ from qgis.core import (
     QgsUnitTypes,
     QgsLayoutPoint,
 )
+
+
 def fletch_canvas(self):
     if self.radioButton_6.isChecked():
         values_page = 'A4'
@@ -22,8 +24,8 @@ def fletch_canvas(self):
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(85.71428571428571, 69, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(209, 3, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_size'] = QgsLayoutSize(140.0,147, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(41, 110, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(85.71428571428571, 131, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(209, 74, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_rotate'] = 0
             self.template_parameters['Arrow_size'] = QgsLayoutSize(14.285714285714286, 14, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_locals'] = QgsLayoutPoint(189, 20, QgsUnitTypes.LayoutMillimeters)
@@ -59,8 +61,8 @@ def fletch_canvas(self):
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(121, 97, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(294, 4, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_size'] = QgsLayoutSize(197,207, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(58, 156, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(121, 185, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(294, 105, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_rotate'] = 0
             self.template_parameters['Arrow_size'] = QgsLayoutSize(20, 20, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_locals'] = QgsLayoutPoint(266, 28, QgsUnitTypes.LayoutMillimeters)
@@ -97,8 +99,8 @@ def fletch_canvas(self):
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(85.71428571428571, 69, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(209, 3, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_size'] = QgsLayoutSize(140.0,147, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(49, 15, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(85.71428571428571, 131, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(209, 74, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_rotate'] = 0
             self.template_parameters['Arrow_size'] = QgsLayoutSize(14.285714285714286, 14, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_locals'] = QgsLayoutPoint(189, 20, QgsUnitTypes.LayoutMillimeters)
@@ -134,8 +136,8 @@ def fletch_canvas(self):
             self.template_parameters['Carte_2_size'] = QgsLayoutSize(121, 97, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(294, 4, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_size'] = QgsLayoutSize(197,207, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(69, 21, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(121, 185, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(294, 105, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Legande_rotate'] = 0
             self.template_parameters['Arrow_size'] = QgsLayoutSize(20, 20, QgsUnitTypes.LayoutMillimeters)
             self.template_parameters['Arrow_locals'] = QgsLayoutPoint(266, 28, QgsUnitTypes.LayoutMillimeters)

CenRa_PAGERENDER/metadata.txt

@@ -5,9 +5,10 @@
 [general]
 name=CenRa_PageRender
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
 supportsQt6=True
 description=CenRa_PageRender
-version=0.2.0
+version=0.2.5
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -22,7 +23,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
 
 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_PAGERENDER:</h2></br><p><h3>19/05/2025 - Version 0.2.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>03/04/2025 - Version 0.1.6: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.1.5: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>14/11/2024 - Version 0.1.4: </h3> - Implementation de la mollet. </br> - Implementation du dragging pour déplacer et modification de la taille </br></p></br><p><h3>08/11/2024 - Version 0.1.3: </h3> - Correctif de bug. </br><p><h3>21/10/2024 - Version 0.1.1: </h3> - Les match en if. </br> - Bouton de scroll et adaptation portrait.</p></br><p><h3>09/10/2024 - Version 0.1.0: </h3> - Création.</p>
+changelog=<h2>CenRa_PAGERENDER:</h2></br><p><h3>23/03/2026 - Version 0.2.5: </h3> - Pache mineur.</p></br><p><h3>12/03/2026 - Version 0.2.4: </h3> - qgisMaximumVersion est 4.0.</p></br><p><h3>15/12/2025 - Version 0.2.3: </h3> - nouveau systeme de parametrage.</p></br><p><h3>12/12/2025 - Version 0.2.2: </h3> - bug sur le background.</p></br><p><h3>30/07/2025 - Version 0.2.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 0.2.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>03/04/2025 - Version 0.1.6: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.1.5: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>14/11/2024 - Version 0.1.4: </h3> - Implementation de la mollet. </br> - Implementation du dragging pour déplacer et modification de la taille </br></p></br><p><h3>08/11/2024 - Version 0.1.3: </h3> - Correctif de bug. </br><p><h3>21/10/2024 - Version 0.1.1: </h3> - Les match en if. </br> - Bouton de scroll et adaptation portrait.</p></br><p><h3>09/10/2024 - Version 0.1.0: </h3> - Création.</p>
 
 # Tags are comma separated with spaces allowed
 tags=python

CenRa_PAGERENDER/tools/resources.py

@@ -147,7 +147,7 @@ def maj_verif(NAME):
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except urllib.requests.URLError:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:

CenRa_PAGERENDER/tools/ui/CenRa_PageRender_base.ui

@@ -118,12 +118,6 @@
      <property name="styleSheet">
       <string notr="true">QFrame#frame{background-color: rgb(255, 255, 255, 170);}</string>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
      <widget class="QLabel" name="Carte">
       <property name="geometry">
        <rect>
@@ -133,27 +127,15 @@
         <height>700</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Plain</enum>
-      </property>
-      <property name="lineWidth">
-       <number>5</number>
-      </property>
-      <property name="midLineWidth">
-       <number>2</number>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
       <property name="margin">
        <number>5</number>
       </property>
@@ -167,11 +149,11 @@
         <height>240</height>
        </rect>
       </property>
-      <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+      <property name="autoFillBackground">
+       <bool>false</bool>
       </property>
-      <property name="frameShadow">
-       <enum>QFrame::Plain</enum>
+      <property name="styleSheet">
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -186,8 +168,11 @@
         <height>460</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -202,8 +187,11 @@
         <height>50</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -218,8 +206,11 @@
         <height>25</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -234,8 +225,11 @@
         <height>40</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -257,19 +251,7 @@
        <bool>false</bool>
       </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
-      </property>
-      <property name="lineWidth">
-       <number>-1</number>
-      </property>
-      <property name="midLineWidth">
-       <number>0</number>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -277,9 +259,6 @@
       <property name="scaledContents">
        <bool>false</bool>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-      </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
@@ -299,8 +278,11 @@
         <height>20</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -315,8 +297,11 @@
         <height>20</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -338,19 +323,7 @@
        <bool>false</bool>
       </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
-      </property>
-      <property name="lineWidth">
-       <number>-1</number>
-      </property>
-      <property name="midLineWidth">
-       <number>0</number>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -358,9 +331,6 @@
       <property name="scaledContents">
        <bool>false</bool>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-      </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
@@ -380,8 +350,11 @@
         <height>45</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -396,8 +369,11 @@
         <height>100</height>
        </rect>
       </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="styleSheet">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
       <property name="text">
        <string/>
@@ -416,29 +392,23 @@
      <property name="styleSheet">
       <string notr="true">QFrame#frame_2{background-color: rgb(255, 255, 255, 170);}</string>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
      <widget class="QTableWidget" name="tableWidget">
       <property name="geometry">
        <rect>
         <x>10</x>
         <y>10</y>
         <width>161</width>
-        <height>641</height>
+        <height>381</height>
        </rect>
       </property>
       <property name="midLineWidth">
        <number>1</number>
       </property>
       <property name="horizontalScrollBarPolicy">
-       <enum>Qt::ScrollBarAlwaysOff</enum>
+       <enum>Qt::ScrollBarAsNeeded</enum>
       </property>
       <property name="sizeAdjustPolicy">
-       <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+       <enum>QAbstractScrollArea::AdjustIgnored</enum>
       </property>
       <property name="editTriggers">
        <set>QAbstractItemView::NoEditTriggers</set>
@@ -462,10 +432,10 @@
        <bool>true</bool>
       </property>
       <property name="selectionMode">
-       <enum>QAbstractItemView::SingleSelection</enum>
+       <enum>QAbstractItemView::NoSelection</enum>
       </property>
       <property name="selectionBehavior">
-       <enum>QAbstractItemView::SelectRows</enum>
+       <enum>QAbstractItemView::SelectItems</enum>
       </property>
       <property name="iconSize">
        <size>
@@ -474,7 +444,7 @@
        </size>
       </property>
       <property name="textElideMode">
-       <enum>Qt::ElideMiddle</enum>
+       <enum>Qt::ElideLeft</enum>
       </property>
       <property name="showGrid">
        <bool>true</bool>
@@ -535,7 +505,7 @@
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>650</y>
+        <y>660</y>
         <width>161</width>
         <height>21</height>
        </rect>
@@ -544,6 +514,117 @@
        <string>Load</string>
       </property>
      </widget>
+     <widget class="QTableWidget" name="tableWidget_2">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>400</y>
+        <width>161</width>
+        <height>241</height>
+       </rect>
+      </property>
+      <property name="lineWidth">
+       <number>2</number>
+      </property>
+      <property name="midLineWidth">
+       <number>1</number>
+      </property>
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAsNeeded</enum>
+      </property>
+      <property name="sizeAdjustPolicy">
+       <enum>QAbstractScrollArea::AdjustIgnored</enum>
+      </property>
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="tabKeyNavigation">
+       <bool>false</bool>
+      </property>
+      <property name="dragEnabled">
+       <bool>false</bool>
+      </property>
+      <property name="dragDropOverwriteMode">
+       <bool>false</bool>
+      </property>
+      <property name="dragDropMode">
+       <enum>QAbstractItemView::NoDragDrop</enum>
+      </property>
+      <property name="defaultDropAction">
+       <enum>Qt::IgnoreAction</enum>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::NoSelection</enum>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectItems</enum>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>5</width>
+        <height>5</height>
+       </size>
+      </property>
+      <property name="textElideMode">
+       <enum>Qt::ElideLeft</enum>
+      </property>
+      <property name="showGrid">
+       <bool>true</bool>
+      </property>
+      <property name="cornerButtonEnabled">
+       <bool>true</bool>
+      </property>
+      <property name="rowCount">
+       <number>3</number>
+      </property>
+      <property name="columnCount">
+       <number>2</number>
+      </property>
+      <attribute name="horizontalHeaderVisible">
+       <bool>false</bool>
+      </attribute>
+      <attribute name="horizontalHeaderMinimumSectionSize">
+       <number>50</number>
+      </attribute>
+      <attribute name="horizontalHeaderDefaultSectionSize">
+       <number>78</number>
+      </attribute>
+      <attribute name="horizontalHeaderHighlightSections">
+       <bool>true</bool>
+      </attribute>
+      <attribute name="verticalHeaderVisible">
+       <bool>false</bool>
+      </attribute>
+      <attribute name="verticalHeaderMinimumSectionSize">
+       <number>20</number>
+      </attribute>
+      <attribute name="verticalHeaderDefaultSectionSize">
+       <number>30</number>
+      </attribute>
+      <row/>
+      <row/>
+      <row/>
+      <column/>
+      <column/>
+      <item row="0" column="0">
+       <property name="text">
+        <string>frame</string>
+       </property>
+      </item>
+      <item row="1" column="0">
+       <property name="text">
+        <string>background</string>
+       </property>
+      </item>
+      <item row="2" column="0">
+       <property name="text">
+        <string>path</string>
+       </property>
+      </item>
+     </widget>
     </widget>
     <widget class="QRadioButton" name="radioButton">
      <property name="geometry">
@@ -595,12 +676,12 @@
       <rect>
        <x>240</x>
        <y>10</y>
-       <width>61</width>
+       <width>88</width>
        <height>22</height>
       </rect>
      </property>
      <property name="buttonSymbols">
-      <enum>QAbstractSpinBox::NoButtons</enum>
+      <enum>QAbstractSpinBox::UpDownArrows</enum>
      </property>
      <property name="suffix">
       <string/>
@@ -617,12 +698,12 @@
       <rect>
        <x>310</x>
        <y>10</y>
-       <width>61</width>
+       <width>88</width>
        <height>22</height>
       </rect>
      </property>
      <property name="buttonSymbols">
-      <enum>QAbstractSpinBox::NoButtons</enum>
+      <enum>QAbstractSpinBox::UpDownArrows</enum>
      </property>
      <property name="suffix">
       <string/>
@@ -671,9 +752,6 @@
      <property name="value">
       <number>40</number>
      </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
      <property name="invertedAppearance">
       <bool>true</bool>
      </property>

CenRa_PAGERENDER/tools/ui/CenRa_about_form.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CenRa_Metabase_editorwidget_base</class>
- <widget class="QDialog" name="CenRa_Metabase_editorwidget_base">
+ <widget class="QDialog" name="CenRa_about_base">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Journal des modifications</string>
   </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>../../CenRa_Metabase/tools/ui/icon.svg</normaloff>../../CenRa_Metabase/tools/ui/icon.svg</iconset>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QScrollArea" name="scrollArea">
@@ -38,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>453</width>
-        <height>570</height>
+        <height>547</height>
        </rect>
       </property>
       <widget class="QGroupBox" name="groupBox">
@@ -70,7 +66,7 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::NoButton</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

CenRa_POSTGIS/CenRa_Postgis.py

@@ -25,10 +25,12 @@ from .tools.resources import (
 )
 pyperclip()
 
+try:
     from .postgis_editor import Postgis_Editor
     from .postgis_creator import Postgis_Creator
     from .postgis_rename import Postgis_Rename
-
+except NameError:
+    print('Module introuvable...')
 
 IPAddr = socket.gethostbyname(socket.gethostname())
 
@@ -101,19 +103,13 @@ class PgPostgis:
             self.postgis_rename = QAction(icon3, 'dossier_rename', None)
             self.toolBar.addAction(self.postgis_rename)
             self.postgis_rename.triggered.connect(self.open_rename)
-
-            if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
-                self.action_rename.setEnabled(True)
-                self.postgis_rename.setEnabled(True)
-                self.postgis_rename.setVisible(1)
-            else:
-                self.action_rename.setEnabled(False)
             self.postgis_rename.setEnabled(False)
             self.postgis_rename.setVisible(0)
 
-            self.postgis_rename.setEnabled(False)
+            if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
                 if os.access('N:/', os.R_OK):
                     self.postgis_rename.setEnabled(True)
+                self.postgis_rename.setVisible(1)
 
     def open_about_dialog(self):
         """

CenRa_POSTGIS/metadata.txt

@@ -11,9 +11,10 @@
 [general]
 name=CenRa_POSTGIS
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
 supportsQt6=True
 description=Permet de crée un dossier dans la base PostGis
-version=3.0
+version=3.4
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -22,7 +23,7 @@ email=si_besoin@cen-rhonealpes.fr
 # Optional items:
 
 # Uncomment the following line and add your changelog entries:
-changelog=<h2>CenRa_POSTGIS:</h2></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>09/04/2025 - Version 2.9: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.7: </h3> - Mise a jour de securite.</p></br><p><h3>12/02/2025 - Version 2.6: </h3> - InDev:renomé les schema et table.</p></br><p><h3>04/02/2025 - Version 2.5: </h3> - Correctif bug création de couche.</p></br><p><h3>23/01/2025 - Version 2.4: </h3> - Correctif sur les pkey.</p></br><p><h3>22/01/2025 - Version 2.3: </h3> - Correctif sur la creation de projet.</p></br><p><h3>21/01/2025 - Version 2.2: </h3> - Correctif sur la longeur des nom.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.0:</h3>- Refont du code.</p>
+changelog=<h2>CenRa_POSTGIS:</h2></br><p><h3>21/05/2026 - Version 3.4: </h3> - Optimisation des performances hors connexion.</p></br><p><h3>23/03/2026 - Version 3.3: </h3> - Optimisation pour QGIS.</p></br><p><h3>12/03/2026 - Version 3.2: </h3> - qgisMaximumVersion est 4.0.</p></br><p><h3>30/07/2025 - Version 3.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>09/04/2025 - Version 2.9: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.7: </h3> - Mise a jour de securite.</p></br><p><h3>12/02/2025 - Version 2.6: </h3> - InDev:renomé les schema et table.</p></br><p><h3>04/02/2025 - Version 2.5: </h3> - Correctif bug création de couche.</p></br><p><h3>23/01/2025 - Version 2.4: </h3> - Correctif sur les pkey.</p></br><p><h3>22/01/2025 - Version 2.3: </h3> - Correctif sur la creation de projet.</p></br><p><h3>21/01/2025 - Version 2.2: </h3> - Correctif sur la longeur des nom.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.0:</h3>- Refont du code.</p>
 
 # tags are comma separated with spaces allowed
 tags=cenra, postgis, database

CenRa_POSTGIS/postgis_creator.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import
 # from builtins import next
 # from builtins import str
 # from builtins import object
-# import qgis
+import os
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 # from qgis.PyQt.QtGui import QIcon
@@ -15,9 +15,10 @@ from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 from qgis.PyQt import QtGui
 
 # from qgis.core import *
-from qgis.core import QgsSettings
+from qgis.core import QgsSettings, Qgis
 
 try:
+    if os.path.exists('N:'):
         from .tools.PythonSQL import login_base
 except ValueError:
     print('Pas de fichier PythonSQL')
@@ -98,7 +99,7 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
                 cur.execute(SQL_schema)
                 cur.execute(SQL_GRANT_SCHEMA)
             else:
-                iface.messageBar().pushMessage("POSTGRESQL :", "Pas de couche sélectionnée, création refusée.", level=1, duration=30)
+                iface.messageBar().pushMessage("POSTGRESQL :", "Pas de couche sélectionnée, création refusée.", level=Qgis.Warning, duration=30)
 
             create_contour(self, schema, cur, con, host, port, dbname, user, mdp)
             create_habita(self, schema, cur, con, host, port, dbname, user, mdp)

CenRa_POSTGIS/postgis_editor.py

@@ -4,8 +4,8 @@ from __future__ import absolute_import
 # Import the PyQt and QGIS libraries
 from builtins import next
 from builtins import str
-# from builtins import object
-# import qgis
+import os
+
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 # from qgis.PyQt.QtGui import QIcon
@@ -16,6 +16,7 @@ from qgis.PyQt import QtGui
 from qgis.core import QgsSettings
 
 try:
+    if os.path.exists('N:'):
         from .tools.PythonSQL import login_base
 except ValueError:
     print('Pas de fichier PythonSQL')

CenRa_POSTGIS/postgis_rename.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import
 # from builtins import next
 from builtins import str
 # from builtins import object
-# import qgis
+import os
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox, QDialogButtonBox
 # from qgis.PyQt.QtGui import QIcon
@@ -18,6 +18,7 @@ from qgis.PyQt import QtGui
 from qgis.core import QgsSettings, QgsDataSourceUri, QgsProject
 
 try:
+    if os.path.exists('N:'):
         from .tools.PythonSQL import login_base
 except ValueError:
     print('Pas de fichier PythonSQL')
@@ -48,8 +49,8 @@ try:
     dbname = account[4]
     cur = account[7]
     con = account[8]
-except ValueError:
-    print('')
+except NameError:
+    print('Fails to login DB for account')
 
 
 class Postgis_Rename(QDialog, EDITOR_CLASS):

CenRa_POSTGIS/tools/resources.py

@@ -172,7 +172,7 @@ def maj_verif(NAME):
             version_plugin = version_web[valeur_version_web: valeur_version_web + len_version]
             if version_plugin != version:
                 iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30)
-        except urllib.error.URLError:
+        except NameError:
             print("error gitea version ssl")
     else:
         iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)

CenRa_POSTGIS/tools/ui/CenRa_about_form.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CenRa_Metabase_editorwidget_base</class>
- <widget class="QDialog" name="CenRa_Metabase_editorwidget_base">
+ <widget class="QDialog" name="CenRa_about_base">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Journal des modifications</string>
   </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>../../CenRa_Metabase/tools/ui/icon.svg</normaloff>../../CenRa_Metabase/tools/ui/icon.svg</iconset>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QScrollArea" name="scrollArea">
@@ -38,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>453</width>
-        <height>570</height>
+        <height>547</height>
        </rect>
       </property>
       <widget class="QGroupBox" name="groupBox">
@@ -70,7 +66,7 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::NoButton</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

CenRa_SICEN/metadata.txt

@@ -11,9 +11,10 @@
 [general]
 name=CenRa SICEN
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
 supportsQt6=True
 description=Filtre des données saisies dans SICEN et export d'une liste d'espèces.
-version=2.0
+version=2.2
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -22,7 +23,7 @@ email=si_besoin@cen-rhonealpes.fr
 # Optional items:
 
 # Uncomment the following line and add your changelog entries:
-changelog=<h2>CenRa_SICEN:</h2></br><p><h3>19/05/2025 - Version 2.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>09/04/2025 - Version 1.11: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 1.10: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.9: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 1.8: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>13/09/2024 - Version 1.7:</h3> - Il est maintenant possible de sélectionné plusieurs entité pour le filtre par Emprise.</br>- Ajoute d'un changelog.</br>- Ajoute une vérification de mise à jour.</p>
+changelog=<h2>CenRa_SICEN:</h2></br><p><h3>12/03/2026 - Version 2.2: </h3> - qgisMaximumVersion est 4.0.</p></br><p><h3>30/07/2025 - Version 2.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 2.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>09/04/2025 - Version 1.11: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 1.10: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.9: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 1.8: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>13/09/2024 - Version 1.7:</h3> - Il est maintenant possible de sélectionné plusieurs entité pour le filtre par Emprise.</br>- Ajoute d'un changelog.</br>- Ajoute une vérification de mise à jour.</p>
 
 # tags are comma separated with spaces allowed
 tags=cenra, postgis, sicen

CenRa_SICEN/sicen.py

@@ -5,13 +5,13 @@ from builtins import object
 import os
 
 # from qgis.PyQt import uic
-from qgis.core import QgsDataSourceUri, QgsLayerTreeLayer, QgsProject, QgsVectorLayer
+from qgis.core import QgsDataSourceUri, QgsLayerTreeLayer, QgsProject, QgsVectorLayer, Qgis
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QMenu, QAction, QFileDialog
 from qgis.PyQt.QtCore import QSettings, QTranslator, QCoreApplication, qVersion
 
 # Initialize Qt resources from file resources.py
-from . import resources_rc
+# from . import resources_rc
 # Import the code for the dialog
 from .sicendialog import SICENDialog
 
@@ -22,21 +22,16 @@ import csv
 
 from .forms.about_form import AboutDialog
 
-# import psycopg2
-# import psycopg2.extras
-# import base64
 import socket
 import os
 
-from .tools.resources import maj_verif, pyperclip
+from .tools.resources import maj_verif, pyperclip, resources_path
 pyperclip()
 try:
     from .tools.PythonSQL import login_base
 except ValueError:
     print('Pas de fichier PythonSQL')
 
-# import sys
-
 
 class SICEN(object):
 
@@ -73,43 +68,43 @@ class SICEN(object):
         self.toolBar.setObjectName("SICEN")
 
         # Create action that will start plugin configuration
-        self.action = QAction(
-            QIcon(":/plugins/sicen/sicen.png"),
+        self.action_open = QAction(
+            QIcon(resources_path("icon", "sicen.png")),
             u"Ouverture des données SICEN", self.iface.mainWindow())
-        self.action.setEnabled(False)
+        self.action_open.setEnabled(False)
         if os.access('N:/', os.R_OK):
-            self.action.setEnabled(True)
+            self.action_open.setEnabled(True)
         # connect the action to the run method
-        self.action.triggered.connect(self.ouverture)
+        self.action_open.triggered.connect(self.ouverture)
 
         # Add toolbar button and menu item
-        self.toolBar.addAction(self.action)
-        self.iface.addPluginToMenu(u"SICEN", self.action)
+        self.toolBar.addAction(self.action_open)
+        self.iface.addPluginToMenu(u"SICEN", self.action_open)
 
         # Create action that will start plugin configuration
-        self.action = QAction(
-            QIcon(":/plugins/sicen/sicen_export.png"),
+        self.action_export = QAction(
+            QIcon(resources_path("icon", "sicen_export.png")),
             u"Export liste d'espèces", self.iface.mainWindow())
-        self.action.setEnabled(False)
+        self.action_export.setEnabled(False)
         IPAddr = socket.gethostbyname(socket.gethostname())
         if IPAddr[0:11] == "100.100.100":
-            self.action.setEnabled(True)
+            self.action_export.setEnabled(True)
         elif IPAddr[0:9] == "192.168.0":
-            self.action.setEnabled(True)
+            self.action_export.setEnabled(True)
         elif IPAddr[0:9] == "192.168.1":
-            self.action.setEnabled(True)
+            self.action_export.setEnabled(True)
         # connect the action to the run method
-        self.action.triggered.connect(self.export)
+        self.action_export.triggered.connect(self.export)
 
         # Add toolbar button and menu item
-        self.toolBar.addAction(self.action)
-        self.iface.addPluginToMenu(u"SICEN", self.action)
+        self.toolBar.addAction(self.action_export)
+        self.iface.addPluginToMenu(u"SICEN", self.action_export)
 
         self.menu = QMenu()
         self.menu.setTitle(QCoreApplication.translate("SICEN", "&SICEN"))
 
-        self.sicen_ouverture = QAction(QIcon(":/plugins/SICEN/sicen.png"), QCoreApplication.translate("SICEN", u"Ouverture des données SICEN"), self.iface.mainWindow())
-        self.sicen_export = QAction(QIcon(":/plugins/SICEN/sicen_export.png"), QCoreApplication.translate("SICEN", u"Export liste d'espèces"), self.iface.mainWindow())
+        self.sicen_ouverture = QAction(QIcon(resources_path("icon", "sicen.png")), QCoreApplication.translate("SICEN", u"Ouverture des données SICEN"), self.iface.mainWindow())
+        self.sicen_export = QAction(QIcon(resources_path("icon", "sicen_export.png")), QCoreApplication.translate("SICEN", u"Export liste d'espèces"), self.iface.mainWindow())
 
         self.menu.addActions([self.sicen_ouverture, self.sicen_export])
 
@@ -127,8 +122,10 @@ class SICEN(object):
 
     def unload(self):
         # Remove the plugin menu item and icon
-        self.iface.removePluginMenu(u"&SICEN", self.action)
-        self.iface.removeToolBarIcon(self.action)
+        self.iface.removePluginMenu(u"&SICEN", self.action_open)
+        self.iface.removeToolBarIcon(self.action_open)
+        self.iface.removePluginMenu(u"&SICEN", self.action_export)
+        self.iface.removeToolBarIcon(self.action_export)
 
     # run method that performs all the real work
     def ouverture(self):
@@ -553,7 +550,7 @@ class SICEN(object):
                 layer = self.iface.activeLayer()
                 if layer is None:
                     # self.iface.messageBar().pushMessage(u"Vous devez sélectionner une table !", level=QgsMessageBar.WARNING, duration=5)
-                    self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner une table !", level=1, duration=5)
+                    self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner une table !", level=Qgis.Warning, duration=5)
 
                 else:
                     selection = layer.selectedFeatures()
@@ -688,16 +685,16 @@ class SICEN(object):
                             # legende.setGroupExpanded (index, True)
 
                         # self.iface.messageBar().pushMessage(u"Extraction réussie : ", u" Pensez à renommer vos couches pour plus de lisibilité.", level=QgsMessageBar.INFO, duration=10)
-                        self.iface.messageBar().pushMessage("Info", u"Extraction réussie : ", u" Pensez à renommer vos couches pour plus de lisibilité.", level=0, duration=4)
+                        self.iface.messageBar().pushMessage("Info", u"Extraction réussie : ", u" Pensez à renommer vos couches pour plus de lisibilité.", level=Qgis.Info, duration=4)
 
                     elif layer.selectedFeatureCount() == 0:
                         # self.iface.messageBar().pushMessage(u"Vous devez sélectionner au moins un polygone !", level=QgsMessageBar.WARNING, duration=5)
-                        self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner au moins un polygone !", level=1, duration=5)
+                        self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner au moins un polygone !", level=Qgis.Warning, duration=5)
                         reqwhere_geom = ''
 
                     else:
                         # self.iface.messageBar().pushMessage(u"Vous devez sélectionner qu'un seul polygone !", level=QgsMessageBar.WARNING, duration=5)
-                        self.iface.messageBar().pushMessage("Ooops", u"Vous ne devez sélectionner qu'un seul polygone !", level=1, duration=5)
+                        self.iface.messageBar().pushMessage("Ooops", u"Vous ne devez sélectionner qu'un seul polygone !", level=Qgis.Warning, duration=5)
                         reqwhere_geom = ''
             else:
                 # Requete finale
@@ -819,7 +816,7 @@ class SICEN(object):
                     # legende.setGroupExpanded (index, True)
 
                 # self.iface.messageBar().pushMessage(u"Extraction réussie : ", u" Pensez à renommer vos couches pour plus de lisibilité.", level=QgsMessageBar.INFO, duration=10)
-                self.iface.messageBar().pushMessage("Info", u"Extraction réussie : ", u" Pensez à renommer vos couches pour plus de lisibilité.", level=0, duration=10)
+                self.iface.messageBar().pushMessage("Info", u"Extraction réussie : ", u" Pensez à renommer vos couches pour plus de lisibilité.", level=Qgis.Info, duration=10)
 
             pass
 
@@ -829,7 +826,7 @@ class SICEN(object):
 
         if layer is None:
             # self.iface.messageBar().pushMessage(u"Vous devez sélectionner une table !", level=QgsMessageBar.WARNING, duration=5)
-            self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner une table !", level=1, duration=5)
+            self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner une table !", level=Qgis.Warning, duration=5)
 
         else:
             selection = layer.selectedFeatures()
@@ -912,12 +909,12 @@ class SICEN(object):
 
                 file.close()
                 # self.iface.messageBar().pushMessage(u"Export réussi dans " + chemin_fichier , level=QgsMessageBar.INFO, duration=5)
-                self.iface.messageBar().pushMessage("Ooops", u"Export réussi dans " + chemin_fichier, level=0, duration=5)
+                self.iface.messageBar().pushMessage("Ooops", u"Export réussi dans " + chemin_fichier, level=Qgis.Info, duration=5)
 
             elif (layer.selectedFeatureCount() == 0):
                 # self.iface.messageBar().pushMessage(u"Vous devez sélectionner au moins un polygone !", level=QgsMessageBar.WARNING, duration=5)
-                self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner au moins un polygone !", level=1, duration=5)
+                self.iface.messageBar().pushMessage("Ooops", u"Vous devez sélectionner au moins un polygone !", level=Qgis.Warning, duration=5)
 
             else:
                 # self.iface.messageBar().pushMessage(u"Vous devez sélectionner qu'un seul polygone !", level=QgsMessageBar.WARNING, duration=5)
-                self.iface.messageBar().pushMessage("Ooops", u"Vous ne devez sélectionner qu'un seul polygone !", level=1, duration=5)
+                self.iface.messageBar().pushMessage("Ooops", u"Vous ne devez sélectionner qu'un seul polygone !", level=Qgis.Warning, duration=5)

CenRa_SICEN/tools/resources.py

@@ -90,7 +90,7 @@ def resources_path(*args):
     :return: Absolute path to the resources folder.
     :rtype: str
     """
-    path = abspath(abspath(join(plugin_path(), "CenRa_COPIE\\tools")))
+    path = abspath(abspath(join(plugin_path(), "CenRa_SICEN\\tools")))
     for item in args:
         path = abspath(join(path, item))
     return path

plugins.xml

@@ -1,25 +1,27 @@
 <plugins>
-    <pyqgis_plugin name="CenRa_POSTGIS" version="3.0">
+    <pyqgis_plugin name="CenRa_POSTGIS" version="3.4">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>3.0</version>
+        <version>3.4</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_POSTGIS.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>
         <author_name>CEN-Rhone-Alpes</author_name>
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_POSTGIS.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
-        <create_date>2024-02-06</create_date>
-        <update_date>2025-05-19</update_date>
+        <create_date>2026-05-21</create_date>
+        <update_date>2026-03-12</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,postgis</tags>
     </pyqgis_plugin>
 
-    <pyqgis_plugin name="CenRa_COPIE" version="3.0">
+    <pyqgis_plugin name="CenRa_COPIE" version="3.2">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>3.0</version>
+        <version>3.2</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_COPIE.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>
@@ -27,16 +29,17 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_COPIE.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-02-06</create_date>
-        <update_date>2025-05-19</update_date>
+        <update_date>2026-03-12</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,copie</tags>
     </pyqgis_plugin>
 
-    <pyqgis_plugin name="CenRa_SICEN" version="2.0">
+    <pyqgis_plugin name="CenRa_SICEN" version="2.2">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.0</version>
+        <version>2.2</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_SICEN.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>
@@ -44,33 +47,35 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_SICEN.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-02-06</create_date>
-        <update_date>2025-05-19</update_date>
+        <update_date>2026-03-12</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,sicen</tags>
     </pyqgis_plugin>
 
-    <pyqgis_plugin name="CenRa_FLUX" version="3.5">
+    <pyqgis_plugin name="CenRa_FLUX" version="3.23">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>3.5</version>
+        <version>3.23</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_FLUX.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>
         <author_name>CEN-Rhone-Alpes</author_name>
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_FLUX.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
-        <create_date>2024-02-06</create_date>
-        <update_date>2025-07-29</update_date>
+        <create_date>2026-05-21</create_date>
+        <update_date>2026-03-12</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,flux</tags>
     </pyqgis_plugin>
     
-    <pyqgis_plugin name="CenRa_METABASE" version="0.3.0">
+    <pyqgis_plugin name="CenRa_METABASE" version="0.3.2">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.3.0</version>
+        <version>0.3.2</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_METABASE.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>
@@ -78,41 +83,43 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_METABASE.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-09-12</create_date>
-        <update_date>2025-05-19</update_date>
+        <update_date>2026-03-12</update_date>
         <experimental>True</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,metabase</tags>
     </pyqgis_plugin>
     
-    <pyqgis_plugin name="CenRa_AUTOMAP" version="2.0">
+    <pyqgis_plugin name="CenRa_AUTOMAP" version="2.11">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.0</version>
+        <version>2.11</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_AUTOMAP.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>
         <author_name>CEN-Rhone-Alpes</author_name>
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_AUTOMAP.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
-        <create_date>2024-09-25</create_date>
-        <update_date>2025-05-19</update_date>
+        <create_date>2026-05-21</create_date>
+        <update_date>2026-03-12</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,mise en page,atlas</tags>
     </pyqgis_plugin>
     
-    <pyqgis_plugin name="CenRa_PAGERENDER" version="0.2.0">
+    <pyqgis_plugin name="CenRa_PAGERENDER" version="0.2.5">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.2.0</version>
+        <version>0.2.5</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_PAGERENDER.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>
         <author_name>CEN-Rhone-Alpes</author_name>
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_PAGERENDER.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
-        <create_date>2024-10-09</create_date>
-        <update_date>2025-05-19</update_date>
+        <create_date>2026-03-23</create_date>
+        <update_date>2026-03-12</update_date>
         <experimental>True</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,mise en page,atlas</tags>
@@ -122,6 +129,7 @@
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
         <version>0.1.0</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_gn2qgis.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>
@@ -139,6 +147,7 @@
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
         <version>0.1.0</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
+        <qgis_maximum_version>4.99</qgis_maximum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>BiodivAURA.zip</file_name>
         <icon>CEN-Rhone-Alpes.png</icon>