Fix de bug et optimisation d'exécution.

CenRa_AUTOMAP/canvas_editor.py

@@ -14,6 +14,7 @@ from qgis.core import (
     QgsLayoutItemLabel,
     QgsLayoutItemPicture,
     QgsLayoutItemLegend,
+    QgsLayoutItem,
     QgsLegendStyle,
     QgsLayoutItemScaleBar,
     QgsLayerTreeGroup,
@@ -547,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'])
@@ -675,6 +677,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 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'])
@@ -728,6 +731,7 @@ 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'])

CenRa_AUTOMAP/metadata.txt

@@ -7,7 +7,7 @@ name=CenRa_AutoMap
 qgisMinimumVersion=3.0
 supportsQt6=True
 description=CenRa_AutoMap
-version=2.4
+version=2.8
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -22,7 +22,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>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>
+changelog=<h2>CenRa_AUTOMAP:</h2></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/tools/mises_en_pages/n2000.py

@@ -36,7 +36,7 @@ def fletch_canvas(self):
             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(85, 244, 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)
@@ -56,7 +56,7 @@ def fletch_canvas(self):
             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(85, 233, 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)
@@ -107,91 +107,91 @@ def fletch_canvas(self):
             self.template_parameters['Logo_2_rotate'] = 0
     if page_rotate == 'Landscape':
         if values_page == 'A4':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(206.0, 200, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_size'] = QgsLayoutSize(189.0, 189, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(29, 8.0, 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(210, 54.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(194, 20.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 270
+            self.template_parameters['Carte_2_rotate'] = 0
             self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(206.0, 36, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(203.0, 62, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(258, 208.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(199, 63.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 270
+            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(30, 23.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(177, 20.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 270
+            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(241, 112, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(247, 43, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 270
+            self.template_parameters['Echelle_rotate'] = 0
             self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(237, 206.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(209, 174.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 270
+            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(206.0, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_size'] = QgsLayoutSize(289.0, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 208.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 270
+            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(207, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_size'] = QgsLayoutSize(191, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(28, 202, 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(207, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_size'] = QgsLayoutSize(191, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(28, 196, 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(202.0, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(289.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(13, 206.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 12.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 270
+            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(233, 112, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(249, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 270
+            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(237, 162, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(252, 174, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 270
+            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_size'] = QgsLayoutSize(305.0, 273, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(39, 8, 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(70, 55, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50.0, 40, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(320, 80, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(311, 20.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 270
+            self.template_parameters['Carte_2_rotate'] = 0
             self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(290, 5., QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(203.0, 62, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(365, 295, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(317, 63.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 270
+            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_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(41, 31, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(296, 20.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 270
+            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(72, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(360, 160, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(364, 43, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 270
+            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(40, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(340, 290, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(320, 264.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 270
+            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(290, 15, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_size'] = QgsLayoutSize(413.0, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 293, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 270
+            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(290, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_size'] = QgsLayoutSize(306, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(39, 282, 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(290, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_size'] = QgsLayoutSize(306, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(39, 274, 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(285, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(413.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(19, 291, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 12.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 270
+            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(70, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(330, 159, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(366, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 270
+            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40, 30, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(340, 230, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(369, 264, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 270
+            self.template_parameters['Logo_2_rotate'] = 0
     return self.template_parameters

CenRa_AUTOMAP/tools/mises_en_pages/n2000_comparaison.py

@@ -18,93 +18,93 @@ def fletch_canvas(self):
 
     if page_rotate == 'Portrait':
         if values_page == 'A4':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(145.0, 140, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_size'] = QgsLayoutSize(145.0, 135, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(28, 3, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(4, 18, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 270
+            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(165, 55, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(146, 21, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 270
+            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(185, 145, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(153, 64, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 270
+            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(29, 4, 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(196, 210, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(154, 220, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 270
+            self.template_parameters['Echelle_rotate'] = 0
             self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(185, 290, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(160, 264, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 270
+            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(290.0, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_size'] = QgsLayoutSize(205.0, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 295, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 1, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 270
+            self.template_parameters['Titre_rotate'] = 0
             self.template_parameters['Credit_size'] = QgsLayoutSize(145.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(173, 143.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(4, 147.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 180
+            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(173, 137.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(4, 141.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 180
+            self.template_parameters['Source_rotate'] = 0
             self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(290, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(205, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(12, 295, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(2, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 270
+            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(185, 210, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(162, 208, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 270
+            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(185, 248, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(160, 234, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 270
+            self.template_parameters['Logo_2_rotate'] = 0
         if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(225.0, 200, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_size'] = QgsLayoutSize(233.0, 192, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(28, 3, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(4, 18, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 270
+            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(250, 55, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(234, 21, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 270
+            self.template_parameters['Carte_2_rotate'] = 0
             self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(200, 36, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(190, 36, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(260, 235, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(242, 64, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 270
+            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(29, 4, 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(276, 325, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(154, 220, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 270
+            self.template_parameters['Echelle_rotate'] = 0
             self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(265, 410, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(248, 386, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 270
+            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(405.0, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_size'] = QgsLayoutSize(293.0, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 410, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 1, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 270
+            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(225.0, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_size'] = QgsLayoutSize(233.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(253, 203.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(4, 204.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 180
+            self.template_parameters['Credit_rotate'] = 0
             self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(225.0, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_size'] = QgsLayoutSize(233.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(253, 197.0, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(4, 198.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 180
+            self.template_parameters['Source_rotate'] = 0
             self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(405, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(293, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(12, 410, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(2, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 270
+            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(265, 325, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(252, 330, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 270
+            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(265, 365, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(160, 234, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 270
+            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)

CenRa_FLUX/flux_editor.py

@@ -188,7 +188,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         con = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + dbtype + " user=" + user + " password=" + mdp)
         cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
         self.combobox_custom()
-        # self.initialisation_flux()
+        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:
@@ -212,7 +212,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         con = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + dbtype + " user=" + user + " password=" + mdp)
         cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
         self.combobox_custom()
-        # self.initialisation_flux()
+        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:
@@ -231,111 +231,114 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         self.tableWidget_2.removeRow(self.tableWidget_2.currentRow())
 
     def initialisation_flux(self):
-        print('run')
+        if NoSignals == 0:
-        if dbtype == sigdb:
+            # print('Initiaisation de la connection a la DB: ' + dbtype)
-            # 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;"""
-            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;"""
-        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()) + """' AND tablename NOT LIKE 'qgis_projects' order by schemaname, tablename;"""
-        cur.execute(custom_list)
-        list_schema = cur.fetchall()
-
-        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())
-
-        if RasterIF == 1:
-            SQLloadRaster = """SELECT concat(r_table_schema,'.',r_table_name) from public.raster_columns; """
-            cur.execute(SQLloadRaster)
-            list_raster = cur.fetchall()
-            RasterList = []
-            for rasterFind in list_raster:
-                RasterList.append(rasterFind[0])
-        else:
-            RasterList = []
-
-        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())
-
-        if self.comboBox.currentText() == 'toutes les catégories':
-            SQLGrands = """SELECT concat(table_schema,'.',table_name) FROM information_schema.role_table_grants 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:
-            SQLGrands = """SELECT concat(table_schema,'.',table_name) FROM information_schema.role_table_grants 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])
-
-        self.tableWidget.setRowCount(len(list_schema))
-        self.tableWidget.setColumnCount(4)
-        i = 0
-        for value in list_schema:
             if dbtype == sigdb:
-                type_val = str(value[0])[1:3]
+                # self.toolButton.setEnabled(1)
-                schema_name = str(value[0])[4:]
+                if self.comboBox.currentText() == 'toutes les catégories':
-                table_name = str(value[1][len(value[0]) + 1:])
+                    custom_list = schemaname_list
-                if value[0] == value[1][:len(value[0])]:
+                elif self.comboBox.currentText() == 'travaux':
-                    table_name = str(value[1][len(value[0]) + 1:])
+                    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;"""
                 else:
-                    table_name = str(value[1])
+                    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;"""
             else:
-                type_val = ''
+                if self.comboBox.currentText() == 'toutes les catégories':
-                schema_name = str(value[0])
+                    custom_list = schemaname_list_ref
-                table_name = str(value[1])
-            if type_val == 'fo':
-                type_val = str(value[0])[1:5]
-                schema_name = str(value[0])[6:]
-                if value[0] == value[1][:len(value[0])]:
-                    table_name = str(value[1][len(value[0]) + 1:])
                 else:
-                    table_name = str(value[1])
+                    custom_list = """SELECT schemaname, tablename from pg_catalog.pg_tables WHERE schemaname LIKE '""" + str(self.comboBox.currentText()) + """' AND tablename NOT LIKE 'qgis_projects' order by schemaname, tablename;"""
-            elif type_val == 'ra':
+            cur.execute(custom_list)
-                type_val = 'travaux'
+            list_schema = cur.fetchall()
-                schema_name = str(value[0])
-                table_name = str(value[1])
-            elif type_val != '00' and type_val != '01' and type_val != '07' and type_val != '26' and type_val != '42' and type_val != '69' and type_val != 'ra':
-                type_val = 'agregation'
-                schema_name = str(value[0])
-                table_name = str(value[1])
 
-            if (str(value[0]) + '.' + str(value[1])) in RasterList:
+            SQLcountRaster = """SELECT schemaname,viewname FROM pg_catalog.pg_views
-                SVG = 'mIconRaster.svg'
+            WHERE schemaname LIKE 'public' AND viewname LIKE 'raster_columns';"""
+            cur.execute(SQLcountRaster)
+            RasterIF = len(cur.fetchall())
+
+            if RasterIF == 1:
+                SQLloadRaster = """SELECT concat(r_table_schema,'.',r_table_name) from public.raster_columns; """
+                cur.execute(SQLloadRaster)
+                list_raster = cur.fetchall()
+                RasterList = []
+                for rasterFind in list_raster:
+                    RasterList.append(rasterFind[0])
             else:
-                SVG = 'mIconVecteur.svg'
+                RasterList = []
 
-            itemIcon = QTableWidgetItem()
+            SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects'"""
-            icon = QIcon()
+            cur.execute(SQLprojects)
-            icon.addPixmap(QtGui.QPixmap(resources_path('icons', SVG)), QIcon.Mode(0), QIcon.State(1))
+            list_projects = cur.fetchall()
-            itemIcon.setIcon(icon)
+            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())
 
-            self.tableWidget.setItem(i, 0, itemIcon)
+            if self.comboBox.currentText() == 'toutes les catégories':
-            item = QTableWidgetItem(type_val)
+                SQLGrands = """SELECT concat(table_schema,'.',table_name) FROM information_schema.role_table_grants 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';"""
-            self.tableWidget.setItem(i, 1, item)
+            else:
-            item = QTableWidgetItem(schema_name)
+                if dbtype == sigdb:
-            self.tableWidget.setItem(i, 2, item)
+                    SQLGrands = """SELECT concat(table_schema,'.',table_name) FROM information_schema.role_table_grants 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()) + """_%';"""
-            item = QTableWidgetItem(table_name)
+                elif dbtype == refdb:
-            self.tableWidget.setItem(i, 3, item)
+                    SQLGrands = """SELECT concat(table_schema,'.',table_name) FROM information_schema.role_table_grants 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])
+            self.tableWidget.setRowCount(len(list_schema))
+            self.tableWidget.setColumnCount(4)
+            i = 0
+            for value in list_schema:
+                if dbtype == sigdb:
+                    type_val = str(value[0])[1:3]
+                    schema_name = str(value[0])[4:]
+                    table_name = str(value[1][len(value[0]) + 1:])
+                    if value[0] == value[1][:len(value[0])]:
+                        table_name = str(value[1][len(value[0]) + 1:])
+                    else:
+                        table_name = str(value[1])
+                else:
+                    type_val = ''
+                    schema_name = str(value[0])
+                    table_name = str(value[1])
+                if type_val == 'fo':
+                    type_val = str(value[0])[1:5]
+                    schema_name = str(value[0])[6:]
+                    if value[0] == value[1][:len(value[0])]:
+                        table_name = str(value[1][len(value[0]) + 1:])
+                    else:
+                        table_name = str(value[1])
+                elif type_val == 'ra':
+                    type_val = 'travaux'
+                    schema_name = str(value[0])
+                    table_name = str(value[1])
+                elif type_val != '00' and type_val != '01' and type_val != '07' and type_val != '26' and type_val != '42' and type_val != '69' and type_val != 'ra':
+                    type_val = 'agregation'
+                    schema_name = str(value[0])
+                    table_name = str(value[1])
 
-            if True:
+                if (str(value[0]) + '.' + str(value[1])) in RasterList:
+                    SVG = 'mIconRaster.svg'
+                else:
+                    SVG = 'mIconVecteur.svg'
+
+                itemIcon = QTableWidgetItem()
+                icon = QIcon()
+                icon.addPixmap(QtGui.QPixmap(resources_path('icons', SVG)), QIcon.Mode(0), QIcon.State(1))
+                itemIcon.setIcon(icon)
+
+                self.tableWidget.setItem(i, 0, itemIcon)
+                item = QTableWidgetItem(type_val)
+                self.tableWidget.setItem(i, 1, item)
+                item = QTableWidgetItem(schema_name)
+                self.tableWidget.setItem(i, 2, item)
+                item = QTableWidgetItem(table_name)
+                self.tableWidget.setItem(i, 3, item)
+
+                # if dbtype == sigdb:
                 if (str(value[0]) + '.' + str(value[1])) in GrandUser:
                     pass
                 else:
@@ -344,45 +347,48 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                         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
+                i = i + 1
 
-        if self.comboBox.currentText() == 'toutes les catégories':
+            if self.comboBox.currentText() == 'toutes les catégories':
-            SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects'"""
+                SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects'"""
-        else:
+            else:
-            SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects' AND schemaname LIKE '""" + str(self.comboBox.currentText()) + """';"""
+                SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects' AND schemaname LIKE '""" + str(self.comboBox.currentText()) + """';"""
-        cur.execute(SQLprojects)
+            cur.execute(SQLprojects)
-        list_projects = cur.fetchall()
+            list_projects = cur.fetchall()
 
-        list_projects_qgis = []
+            list_projects_qgis = []
-        if len(list_projects) >= 1:
+            if len(list_projects) >= 1:
-            for ProjectName in list_projects:
+                for ProjectName in list_projects:
-                SQLProjectsQgis = """SELECT name, metadata, content FROM """ + '"' + ProjectName[0] + '"."' + ProjectName[1] + '"'
+                    SQLProjectsQgis = """SELECT name, metadata, content FROM """ + '"' + ProjectName[0] + '"."' + ProjectName[1] + '"'
-                cur.execute(SQLProjectsQgis)
+                    cur.execute(SQLProjectsQgis)
-                list_projects_qgis = cur.fetchall()
+                    list_projects_qgis = cur.fetchall()
-                for Project in list_projects_qgis:
+                    for Project in list_projects_qgis:
-                    self.tableWidget.setRowCount(i + 1)
+                        self.tableWidget.setRowCount(i + 1)
-                    itemIcon = QTableWidgetItem()
+                        itemIcon = QTableWidgetItem()
-                    icon = QIcon()
+                        icon = QIcon()
-                    icon.addPixmap(QtGui.QPixmap(resources_path('icons', 'mIconQgis.svg')), QIcon.Mode(0), QIcon.State(1))
+                        icon.addPixmap(QtGui.QPixmap(resources_path('icons', 'mIconQgis.svg')), QIcon.Mode(0), QIcon.State(1))
-                    itemIcon.setIcon(icon)
+                        itemIcon.setIcon(icon)
-                    self.tableWidget.setItem(i, 0, itemIcon)
+                        self.tableWidget.setItem(i, 0, itemIcon)
 
-                    item = QTableWidgetItem('qgis')
+                        item = QTableWidgetItem('qgis')
-                    self.tableWidget.setItem(i, 1, item)
+                        self.tableWidget.setItem(i, 1, item)
 
-                    item = QTableWidgetItem(ProjectName[0])
+                        item = QTableWidgetItem(ProjectName[0])
-                    self.tableWidget.setItem(i, 2, item)
+                        self.tableWidget.setItem(i, 2, item)
 
-                    item = QTableWidgetItem(Project[0])
+                        item = QTableWidgetItem(Project[0])
-                    self.tableWidget.setItem(i, 3, item)
+                        self.tableWidget.setItem(i, 3, item)
 
-                    i = i + 1
+                        i = i + 1
 
-        self.tableWidget.setColumnWidth(0, 20)
+            self.tableWidget.setColumnWidth(0, 20)
-        self.tableWidget.setColumnWidth(1, 70)
+            self.tableWidget.setColumnWidth(1, 70)
-        self.tableWidget.setColumnWidth(2, 300)
+            self.tableWidget.setColumnWidth(2, 300)
-        self.tableWidget.setColumnWidth(3, 300)
+            self.tableWidget.setColumnWidth(3, 300)
-        self.tableWidget.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table"])
+            self.tableWidget.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table"])
+
+            if self.lineEdit.text() != 'Recherche par mots-clés':
+                self.filtre_dynamique(self.lineEdit.text())
 
     def selection_flux(self):
         selected_row = 0
@@ -483,7 +489,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         for row in range(0, self.tableWidget_2.rowCount()):
             color_rgba_db = 855030089
             color_rgba_droit = 851150528
-            # print(self.tableWidget_2.item(row, 1).background().color().rgba())
+            print(self.tableWidget_2.item(row, 1).background().color().rgba())
             if self.tableWidget_2.item(row, 1).background().color().rgba() == color_rgba_droit:
                 self.QMBquestion = 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))
             elif self.tableWidget_2.item(row, 1).background().color().rgba() != color_rgba_db:
@@ -525,14 +531,8 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
 
                     # Chargement de la couche PostGIS
                     geom_type = 'SELECT right(st_geometrytype(geom),-3) as a FROM ' + schema + '.' + table + ' GROUP BY a'
-                    try:
+                    cur.execute(geom_type)
-                        cur.execute(geom_type)
+                    list_typegeom = cur.fetchall()
-                        list_typegeom = cur.fetchall()
-                        UndefinedTable = True
-                    except psycopg2.errors.UndefinedTable:
-                        print("Error table name")
-                        list_typegeom = ''
-                        UndefinedTable = False
                     if len(list_typegeom) > 1:
                         for typegeom in list_typegeom:
                             if typegeom[0] == 'MultiPolygon':
@@ -553,16 +553,16 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                                 # Ajout de la couche au canevas QGIS
                                 QgsProject.instance().addMapLayer(layer)
                     else:
-                        if UndefinedTable:
+                        layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                            layer = QgsVectorLayer(uri.uri(), table, "postgres")
+                        # Ajout de la couche au canevas QGIS
-                            # Ajout de la couche au canevas QGIS
+                        QgsProject.instance().addMapLayer(layer)
-                            QgsProject.instance().addMapLayer(layer)
-                        else:
-                            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()) + "» semble ne pas avoir le même nom dans la BD, merci de contacter votre administrateur pour régler le problème !", QMessageBox.StandardButton(0x00004000))
             else:
                 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):
+        # print('Chargement de la list pour la BD: ' + dbtype)
+        global NoSignals
+        NoSignals = 1
         if dbtype == sigdb:
             self.toolButton.setEnabled(1)
             self.comboBox.clear()
@@ -586,6 +586,7 @@ 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_dynamique(self, filter_text):
         if filter_text.find(' ') >= 0:

CenRa_PAGERENDER/tools/ui/CenRa_PageRender_base.ui

@@ -78,7 +78,7 @@
       <number>296</number>
      </property>
      <property name="orientation">
-      <enum>Qt::Orientation::Horizontal</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
     </widget>
     <widget class="QSlider" name="verticalSlider">
@@ -100,7 +100,7 @@
       <number>0</number>
      </property>
      <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
+      <enum>Qt::Vertical</enum>
      </property>
      <property name="invertedAppearance">
       <bool>true</bool>
@@ -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::Shape::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Shadow::Raised</enum>
-     </property>
      <widget class="QLabel" name="Carte">
       <property name="geometry">
        <rect>
@@ -139,24 +133,9 @@
       <property name="styleSheet">
        <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
-      <property name="frameShape">
-       <enum>QFrame::Shape::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Shadow::Plain</enum>
-      </property>
-      <property name="lineWidth">
-       <number>5</number>
-      </property>
-      <property name="midLineWidth">
-       <number>2</number>
-      </property>
       <property name="text">
        <string/>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignmentFlag::AlignCenter</set>
-      </property>
       <property name="margin">
        <number>5</number>
       </property>
@@ -176,9 +155,6 @@
       <property name="styleSheet">
        <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
-      <property name="frameShadow">
-       <enum>QFrame::Shadow::Plain</enum>
-      </property>
       <property name="text">
        <string/>
       </property>
@@ -277,27 +253,12 @@
       <property name="styleSheet">
        <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
-      <property name="frameShape">
-       <enum>QFrame::Shape::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Shadow::Raised</enum>
-      </property>
-      <property name="lineWidth">
-       <number>-1</number>
-      </property>
-      <property name="midLineWidth">
-       <number>0</number>
-      </property>
       <property name="text">
        <string/>
       </property>
       <property name="scaledContents">
        <bool>false</bool>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTop|Qt::AlignmentFlag::AlignTrailing</set>
-      </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
@@ -364,27 +325,12 @@
       <property name="styleSheet">
        <string notr="true">background-color: rgba(10, 10, 10, 50)</string>
       </property>
-      <property name="frameShape">
-       <enum>QFrame::Shape::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Shadow::Raised</enum>
-      </property>
-      <property name="lineWidth">
-       <number>-1</number>
-      </property>
-      <property name="midLineWidth">
-       <number>0</number>
-      </property>
       <property name="text">
        <string/>
       </property>
       <property name="scaledContents">
        <bool>false</bool>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTop|Qt::AlignmentFlag::AlignTrailing</set>
-      </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
@@ -446,12 +392,6 @@
      <property name="styleSheet">
       <string notr="true">QFrame#frame_2{background-color: rgb(255, 255, 255, 170);}</string>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::Shape::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Shadow::Raised</enum>
-     </property>
      <widget class="QTableWidget" name="tableWidget">
       <property name="geometry">
        <rect>
@@ -465,13 +405,13 @@
        <number>1</number>
       </property>
       <property name="horizontalScrollBarPolicy">
-       <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
+       <enum>Qt::ScrollBarAsNeeded</enum>
       </property>
       <property name="sizeAdjustPolicy">
-       <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContentsOnFirstShow</enum>
+       <enum>QAbstractScrollArea::AdjustIgnored</enum>
       </property>
       <property name="editTriggers">
-       <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
+       <set>QAbstractItemView::NoEditTriggers</set>
       </property>
       <property name="tabKeyNavigation">
        <bool>false</bool>
@@ -483,19 +423,19 @@
        <bool>false</bool>
       </property>
       <property name="dragDropMode">
-       <enum>QAbstractItemView::DragDropMode::NoDragDrop</enum>
+       <enum>QAbstractItemView::NoDragDrop</enum>
       </property>
       <property name="defaultDropAction">
-       <enum>Qt::DropAction::IgnoreAction</enum>
+       <enum>Qt::IgnoreAction</enum>
       </property>
       <property name="alternatingRowColors">
        <bool>true</bool>
       </property>
       <property name="selectionMode">
-       <enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
+       <enum>QAbstractItemView::NoSelection</enum>
       </property>
       <property name="selectionBehavior">
-       <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
+       <enum>QAbstractItemView::SelectItems</enum>
       </property>
       <property name="iconSize">
        <size>
@@ -504,7 +444,7 @@
        </size>
       </property>
       <property name="textElideMode">
-       <enum>Qt::TextElideMode::ElideMiddle</enum>
+       <enum>Qt::ElideLeft</enum>
       </property>
       <property name="showGrid">
        <bool>true</bool>
@@ -590,13 +530,13 @@
        <number>1</number>
       </property>
       <property name="horizontalScrollBarPolicy">
-       <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
+       <enum>Qt::ScrollBarAsNeeded</enum>
       </property>
       <property name="sizeAdjustPolicy">
-       <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContentsOnFirstShow</enum>
+       <enum>QAbstractScrollArea::AdjustIgnored</enum>
       </property>
       <property name="editTriggers">
-       <set>QAbstractItemView::EditTrigger::DoubleClicked</set>
+       <set>QAbstractItemView::NoEditTriggers</set>
       </property>
       <property name="tabKeyNavigation">
        <bool>false</bool>
@@ -608,19 +548,19 @@
        <bool>false</bool>
       </property>
       <property name="dragDropMode">
-       <enum>QAbstractItemView::DragDropMode::NoDragDrop</enum>
+       <enum>QAbstractItemView::NoDragDrop</enum>
       </property>
       <property name="defaultDropAction">
-       <enum>Qt::DropAction::IgnoreAction</enum>
+       <enum>Qt::IgnoreAction</enum>
       </property>
       <property name="alternatingRowColors">
        <bool>true</bool>
       </property>
       <property name="selectionMode">
-       <enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
+       <enum>QAbstractItemView::NoSelection</enum>
       </property>
       <property name="selectionBehavior">
-       <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
+       <enum>QAbstractItemView::SelectItems</enum>
       </property>
       <property name="iconSize">
        <size>
@@ -629,7 +569,7 @@
        </size>
       </property>
       <property name="textElideMode">
-       <enum>Qt::TextElideMode::ElideMiddle</enum>
+       <enum>Qt::ElideLeft</enum>
       </property>
       <property name="showGrid">
        <bool>true</bool>
@@ -707,16 +647,16 @@
       </font>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::FocusPolicy::NoFocus</enum>
+      <enum>Qt::NoFocus</enum>
      </property>
      <property name="layoutDirection">
-      <enum>Qt::LayoutDirection::LeftToRight</enum>
+      <enum>Qt::LeftToRight</enum>
      </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
      <property name="inputMethodHints">
-      <set>Qt::InputMethodHint::ImhNone</set>
+      <set>Qt::ImhNone</set>
      </property>
      <property name="text">
       <string/>
@@ -741,7 +681,7 @@
       </rect>
      </property>
      <property name="buttonSymbols">
-      <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+      <enum>QAbstractSpinBox::UpDownArrows</enum>
      </property>
      <property name="suffix">
       <string/>
@@ -763,7 +703,7 @@
       </rect>
      </property>
      <property name="buttonSymbols">
-      <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+      <enum>QAbstractSpinBox::UpDownArrows</enum>
      </property>
      <property name="suffix">
       <string/>
@@ -812,9 +752,6 @@
      <property name="value">
       <number>40</number>
      </property>
-     <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
-     </property>
      <property name="invertedAppearance">
       <bool>true</bool>
      </property>

plugins.xml

@@ -61,7 +61,7 @@
         <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-12-08</update_date>
+        <update_date>2025-12-15</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,flux</tags>
@@ -84,9 +84,9 @@
         <tags>cenra,metabase</tags>
     </pyqgis_plugin>
     
-    <pyqgis_plugin name="CenRa_AUTOMAP" version="2.4">
+    <pyqgis_plugin name="CenRa_AUTOMAP" version="2.8">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.4</version>
+        <version>2.8</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_AUTOMAP.zip</file_name>
@@ -95,7 +95,7 @@
         <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-12-15</update_date>
+        <update_date>2026-01-09</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,mise en page,atlas</tags>