Ajout de guillemets doubles pour prendre en compte les noms de colonne ambigus, à la création d'atlas avec des labels dynamiques.

?

.gitignore

@@ -17,3 +17,5 @@
 #ReIgnore
 **/__pycache__
 **/test/
+PythonSQL.py
+StyleLayer.py

CenRa_AUTOMAP/CenRa_AutoMap.py

@@ -4,9 +4,10 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, 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, QMessageBox
+from qgis.PyQt.QtWidgets import QAction
 from qgis.utils import iface
 import qgis
 
@@ -24,20 +25,28 @@ from pg_metadata.processing.provider import PgMetadataProvider
 from pg_metadata.qgis_plugin_tools.tools.custom_logging import setup_logger
 '''
 import os
+from qgis.PyQt.QtCore import QSettings
+from .about_form import AboutDialog
 from .tools.resources import (
-    plugin_path,
+    # plugin_path,
     resources_path,
+    pyperclip,
     maj_verif,
 )
-from .canvas_editor import AutoMap_Editor
+pyperclip()
-from .about_form import AboutDialog
+
+try:
+    from .canvas_editor import AutoMap_Editor
+#    from .style_invoke import AutoMap_Style
+except NameError:
+    print('404')
 
-from PyQt5.QtCore import *
 
 class PgAutoMap:
     def __init__(self):
         """ Constructor. """
         self.canvas_editor = None
+        self.style_dock = None
 #        self.issues = None
         self.provider = None
         self.locator_filter = None
@@ -73,49 +82,23 @@ class PgAutoMap:
         if not self.canvas_editor:
             self.canvas_editor = AutoMap_Editor()
 
-
             self.automap_action = QAction(icon, 'CenRa_AutoMap', None)
             self.toolBar.addAction(self.automap_action)
             self.automap_action.triggered.connect(self.open_editor)
-    '''
-        if not self.locator_filter:
-            self.locator_filter = LocatorFilter(iface)
-            iface.registerLocatorFilter(self.locator_filter)
 
-    @staticmethod
+        # if not self.style_dock:
-    def check_invalid_connection_names():
+        #    self.style_dock = AutoMap_Style()
-        """ Check for invalid connection names in the QgsSettings. """
-        valid, invalid = validate_connections_names()
-        n_invalid = len(invalid)
 
-        if n_invalid == 0:
+        # if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
-            return
+        #    iface.addDockWidget(Qt.DockWidgetArea(0x1), self.style_dock)
 
-        invalid_text = ', '.join(invalid)
-        msg = QMessageBox()
-        msg.setIcon(QMessageBox.Warning)
-        msg.setWindowTitle(tr('PgMetadata: Database connection(s) not available'))
-        msg.setText(tr(
-            f'{n_invalid} connection(s) listed in PgMetadata’s settings are invalid or '
-            f'no longer available: {invalid_text}'))
-        msg.setInformativeText(tr(
-            'Do you want to remove these connection(s) from the PgMetadata settings? '
-            '(You can also do this later with the “Set Connections” tool.)'))
-        msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
-        clicked = msg.exec()
-
-        if clicked == QMessageBox.Yes:
-            iface.messageBar().pushSuccess('PgMetadata', tr(f'{n_invalid} invalid connection(s) removed.'))
-            store_connections(valid)
-        if clicked == QMessageBox.No:
-            iface.messageBar().pushInfo('PgMetadata', tr(f'Keeping {n_invalid} invalid connections.'))
-    '''
     def open_about_dialog(self):
         """
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))

CenRa_AUTOMAP/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog

CenRa_AUTOMAP/canvas_editor.py

@@ -1,74 +1,42 @@
 import logging
 import os
-from PyQt5.QtCore import QSettings
-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.core import (
-    NULL,
-    QgsApplication,
     QgsScaleBarSettings,
-    QgsDataSourceUri,
     QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
     QgsRasterLayer,
     QgsSettings,
     QgsVectorLayer,
-    QgsGeometry,
     QgsPrintLayout,
     QgsReadWriteContext,
     QgsLayoutItemMap,
     QgsLayoutItemPage,
-    QgsLayoutSize,
     QgsUnitTypes,
-    QgsLayoutPoint,
     QgsLayoutItemLabel,
     QgsLayoutItemPicture,
     QgsLayoutItemLegend,
+    QgsLayoutItem,
     QgsLegendStyle,
     QgsLayoutItemScaleBar,
     QgsLayerTreeGroup,
-    QgsCoordinateReferenceSystem,
-    QgsCoordinateTransform,
-    QgsLayerTree,
-    QgsLayoutTableColumn,
     QgsRectangle,
-    QgsLayoutItemMapOverviewStack,
 )
-from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime, Qt
+from qgis.PyQt.QtCore import Qt
-from qgis.PyQt.QtGui import QDesktopServices, QIcon, QColor, QFont, QMovie
+from qgis.PyQt.QtGui import QColor, QFont
-from qgis.PyQt.QtPrintSupport import QPrinter
-from qgis.PyQt.QtWebKitWidgets import QWebPage
 from qgis.PyQt.QtWidgets import (
     QDialog,
-    QAction,
+    QMessageBox,
-    QDockWidget,
+    QPushButton,
     QFileDialog,
-    QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
-    QTableWidgetItem,
-    QVBoxLayout,
 )
-from PyQt5 import QtGui
+from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt import QtGui
 from qgis.PyQt.QtXml import QDomDocument
 from qgis.utils import iface
 import glob
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
-    send_issues,
 )
-from .issues import CenRa_Issues
-
 from datetime import date
 
 EDITOR_CLASS = load_ui('CenRa_AutoMap_base.ui')
@@ -103,8 +71,8 @@ data_source = [
 A4_size = {'Portrait': {'RIGHT': 210, 'LEFT': 0, 'TOP': 0, 'BOTTOM': 297}, 'Landscape': {'RIGHT': 297, 'LEFT': 0, 'TOP': 0, 'BOTTOM': 210}}
 A3_size = {'Portrait': {'RIGHT': 298, 'LEFT': 0, 'TOP': 0, 'BOTTOM': 420}, 'Landscape': {'RIGHT': 420, 'LEFT': 0, 'TOP': 0, 'BOTTOM': 298}}
 
-class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
+class AutoMap_Editor(QDialog, EDITOR_CLASS):
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -119,8 +87,9 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         for i in plugin_dir[1:]:
             ix = ix + 1
             path = path + '/' + i
-        self.tabWidget.setStyleSheet('background-image: url('+path+'/tools/bg/Capture.png);')
+        # self.tabWidget.setStyleSheet('background-image: url('+path+'/tools/bg/Capture.png);')
 
+        self.verticalScrollBar.hide()
         self.commandLinkButton.clicked.connect(self.chargement_qpt)
         self.radioButton_9.clicked.connect(self.statu_atlas)
         self.radioButton_10.clicked.connect(self.statu_source)
@@ -131,14 +100,14 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.commandLinkButton_2.clicked.connect(self.load_ortho)
         self.commandLinkButton_3.clicked.connect(self.load_osm)
         self.CustomeLogo.clicked.connect(self.deflogoteck)
+        self.verticalScrollBar.valueChanged.connect(self.moveFrame)
 
-        ## On ajoute le nom des templates à la liste déroulante de l'onglet "mises en page" :
+        # On ajoute le nom des templates à la liste déroulante de l'onglet "mises en page" :
         mises_en_page = []
 
         for filename in glob.glob(resources_path("mises_en_pages", "*.py")):
             mises_en_page.append(filename)
 
-
         for i, filename in enumerate(mises_en_page):
             nom_fichier = os.path.basename(filename)
             self.comboBox.addItem(nom_fichier)
@@ -148,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,
@@ -172,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,
@@ -190,15 +165,25 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.hide_source()
         self.hide_atlas()
 
+    def wheelEvent(self, event):
+        if (event.angleDelta().y() >= 1):
+            vsb = self.verticalScrollBar.value() + 20
+        else:
+            vsb = self.verticalScrollBar.value() - 20
+        self.verticalScrollBar.setValue(vsb)
+
+    def moveFrame(self):
+        self.frame.move(self.frame.x(), self.verticalScrollBar.value())
+
     def update_logo_library(self):
         self.mComboBox_4.clear()
         logo_library = []
         custome_bibliotech = glob.glob(self.s.value("automap/logoteck", 1, type=str) + '*.*')
-        for l,logo_x in enumerate(custome_bibliotech):
+        for number, logo_x in enumerate(custome_bibliotech):
             logo_library.append(' ' + os.path.basename(logo_x))
 
         bibliotech = glob.glob(resources_path("logo_library", "*.png"))
-        for l,logo_x in enumerate(bibliotech):
+        for number, logo_x in enumerate(bibliotech):
             logo_library.append(os.path.basename(logo_x))
         self.mComboBox_4.addItems(sorted(logo_library))
 
@@ -221,16 +206,20 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 try:
                     layout_subtitle = project_subtitle.layoutManager().layoutByName(self.comboBox_7.currentText())
                     self.lineEdit_3.setText(layout_subtitle.itemById("SubTitle").text())
-                except:
+                except NameError:
                     print("")
 
     def load_ortho(self):
         global myGroup, last_group
         runing = False
-        try: myGroup
+        try:
-        except NameError: runing = True
+            myGroup
-        try: last_group
+        except NameError:
-        except NameError: last_group = ''
+            runing = True
+        try:
+            last_group
+        except NameError:
+            last_group = ''
         if runing or (last_group != '' and last_group != 'ortho'):
             layername = False
             layerAll = QgsProject.instance().layerTreeRoot().children()
@@ -271,10 +260,14 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
     def load_osm(self):
         global myGroup, last_group
         runing = False
-        try: myGroup
+        try:
-        except NameError: runing = True
+            myGroup
-        try: last_group
+        except NameError:
-        except NameError: last_group = ''
+            runing = True
+        try:
+            last_group
+        except NameError:
+            last_group = ''
         if runing or (last_group != '' and last_group != 'osm'):
             layername = False
             layerAll = QgsProject.instance().layerTreeRoot().children()
@@ -321,6 +314,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.comboBox_6.clear()
         self.comboBox_7.clear()
 
+        if (self.s.value("automap/prenom_nom", "1", type=str) != "1"):
+            self.lineEdit_5.setText(self.s.value("automap/prenom_nom", 1, type=str))
         couches = []
         couche_vecteur = ['']
         mapThemes = ['']
@@ -347,6 +342,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             self.show_map()
         else:
             self.hide_map()
+
     def show_map(self):
         self.groupBox_3.setEnabled(True)
         self.groupBox_3.show()
@@ -360,6 +356,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             self.show_titre()
         else:
             self.hide_titre()
+
     def show_titre(self):
         self.lineEdit_2.setEnabled(False)
         self.lineEdit_2.hide()
@@ -377,6 +374,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             self.show_source()
         else:
             self.hide_source()
+
     def show_source(self):
         self.lineEdit_4.setEnabled(False)
         self.lineEdit_4.hide()
@@ -423,18 +421,29 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             layout_name = self.comboBox_7.currentText()
         else:
             layout_name = self.lineEdit_2.text()
-        layouts_list = self.manager.printLayouts()
+        # layouts_list = self.manager.printLayouts()
 
         for filename in glob.glob(resources_path("mises_en_pages", "*.qpt")):
             with open(os.path.join(os.getcwd(), filename), 'r') as f:
                 self.layout = QgsPrintLayout(project)
                 self.layout.initializeDefaults()
-                myAtlas=self.layout.atlas()
+                # myAtlas = self.layout.atlas()
                 template_content = f.read()
                 doc = QDomDocument()
                 doc.setContent(template_content)
                 self.layout.loadFromTemplate(doc, QgsReadWriteContext(), True)
+
+                try:
+                    cutLayout = layout_name.index("¶")
+                except ValueError:
+                    cutLayout = 0
+
+                if cutLayout >= 1:
                     self.layout.setName(layout_name)
+                    titre_layout_name = layout_name[:cutLayout]
+                else:
+                    self.layout.setName(layout_name)
+                    titre_layout_name = layout_name
 
                 if self.radioButton_6.isChecked() and self.radioButton_7.isChecked():
                     logo_div = A4_size['Portrait']['RIGHT']
@@ -444,11 +453,12 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     logo_div = A3_size['Portrait']['RIGHT']
                 if self.radioButton_5.isChecked() and self.radioButton_8.isChecked():
                     logo_div = A3_size['Portrait']['BOTTOM']
-                if True:#os.path.basename(filename) == "1. Modèle carto standard (consolidé).qpt":
+                # os.path.basename(filename) == "1. Modèle carto standard (consolidé).qpt":
+                if True:
 
                     self.actualisation_mise_en_page()
 
-                    ## Add map to layout
+                    # Add map to layout
                     self.map_modele_test = QgsLayoutItemMap(self.layout)
                     # Charger une carte vide
                     self.map_modele_test.setRect(20, 20, 20, 20)
@@ -456,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)
@@ -470,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'])
@@ -484,24 +495,27 @@ 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)
                     self.map_modele_test.setId("carte_principale")
 
-                    ## Ajout d'un titre à la mise en page
+                    # Ajout d'un titre à la mise en page
                     title = QgsLayoutItemLabel(self.layout)
                     self.layout.addLayoutItem(title)
-                    titre = layout_name
+                    titre = titre_layout_name
                     title.setText(titre)
-                    title.setFont(QFont("Calibri", 15, QFont.Bold))
+                    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'])
@@ -510,18 +524,17 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     title.setBackgroundColor(QColor(255, 255, 255, 130))
                     self.layout.addItem(title)
                     # title.adjustSizeToText() on n'utilise plutot setFixedSize pour pouvoir centrer le titre de manière plus optimale ici
-                    title.setHAlign(Qt.AlignHCenter)
+                    title.setHAlign(Qt.AlignmentFlag(0x0004))
-                    title.setVAlign(Qt.AlignVCenter)
+                    title.setVAlign(Qt.AlignmentFlag(0x0080))
 
-
+                    # Ajout d'un sous titre à la mise en page
-                    ## Ajout d'un sous titre à la mise en page
                     subtitle = QgsLayoutItemLabel(self.layout)
                     self.layout.addLayoutItem(subtitle)
                     titre = self.lineEdit_3.text()
                     if self.radioButton_9.isChecked() == 1:
-                        titre = titre + ' [%' + self.comboBox_4.currentText() + '%]'
+                        titre = titre + ' [%"' + self.comboBox_4.currentText() + '"%]'
                     subtitle.setText(titre)
-                    subtitle.setFont(QFont("MS Shell Dlg 2", 10))
+                    subtitle.setFont(QFont("Calibri", 10))
                     subtitle.setItemRotation(self.template_parameters['Sous_titre_rotate'])
                     subtitle.attemptResize(self.template_parameters['Sous_titre_size'])
                     subtitle.attemptMove(self.template_parameters['Sous_titre_locals'])
@@ -529,13 +542,13 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     subtitle.setBackgroundEnabled(True)
                     subtitle.setBackgroundColor(QColor(255, 255, 255, 130))
                     self.layout.addItem(subtitle)
-                    subtitle.setHAlign(Qt.AlignHCenter)
+                    subtitle.setHAlign(Qt.AlignmentFlag(0x0004))
-                    subtitle.setVAlign(Qt.AlignVCenter)
+                    subtitle.setVAlign(Qt.AlignmentFlag(0x0080))
 
-
+                    # Ajout du logo CEN NA en haut à gauche de la page
-                    ## 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'])
@@ -544,14 +557,13 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     logo.setId('logo')
                     self.layout.addLayoutItem(logo)
 
-
+                    # Ajout de la legende :
-                    ## Ajout de la legende :
                     legend = QgsLayoutItemLegend(self.layout)
 
                     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)
@@ -590,7 +602,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                         layertreelayer = root.findLayer(layer.id())
 
                         # get the parent of the layer tree layer (layer tree root, or group)
-                        if layertreelayer != None:
+                        if layertreelayer is not None:
                             parent = layertreelayer.parent()
 
                         # if the parent is a group and has a name, find it and remove the layer
@@ -601,7 +613,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                         else:
                             root_group.removeLayer(layer)
 
-
                 legend.setEqualColumnWidth(True)
                 legend.setSplitLayer(True)
                 legend.setColumnSpace(5)
@@ -609,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)
@@ -618,7 +630,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 legend.updateLegend()
                 legend.attemptMove(self.template_parameters['Legande_locals'])
 
-                ## Ajout de l'échelle numeric à la mise en page
+                # Ajout de l'échelle numeric à la mise en page
                 self.scalebarnumeric_qpt = QgsLayoutItemScaleBar(self.layout)
                 self.scalebarnumeric_qpt.setStyle('Numeric')
                 self.scalebarnumeric_qpt.setLinkedMap(self.map_modele_test)
@@ -628,28 +640,31 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebarnumeric_qpt.setNumberOfSegments(2)
                 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))
 
                 self.layout.addLayoutItem(self.scalebarnumeric_qpt)
 
-                ## Ajout de l'échelle à la mise en page
+                # Ajout de l'échelle à la mise en page
                 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()
 
                 self.scalebar_qpt.setNumberOfSegments(2)
                 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))
@@ -659,11 +674,17 @@ 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.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:
                     text_source = ' '
@@ -674,36 +695,47 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 else:
                     info_text = ["Source : " + self.lineEdit_4.text()][0]
                 # ajout note info:
-                info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime(
+                if self.radioButton_14.isChecked() == 1:
-                    "%d/%m/%Y") + ")"]
+                    self.s.setValue("automap/prenom_nom", self.lineEdit_5.text())
+                    prenom_nom = self.s.value("automap/prenom_nom", 1, type=str)
+                    info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ") par " + prenom_nom]
+                else:
+                    info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ")"]
                 credit_text = QgsLayoutItemLabel(self.layout)
                 credit_text.setText(info[0])
                 credit_text.setFont(QFont("Calibri", 9))
-                credit_text.setHAlign(Qt.AlignRight)
+                credit_text.setHAlign(Qt.AlignmentFlag(self.template_parameters['Credit_alignment']))
-                credit_text.setVAlign(Qt.AlignVCenter)
+                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.AlignRight)
+                credit_text2.setHAlign(Qt.AlignmentFlag(self.template_parameters['Source_alignment']))
-                credit_text2.setVAlign(Qt.AlignVCenter)
+                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'])
                 credit_text2.setItemRotation(self.template_parameters['Source_rotate'])
                 credit_text2.attemptResize(self.template_parameters['Source_size'])
                 credit_text2.attemptMove(self.template_parameters['Source_locals'])
+                credit_text2.setBackgroundEnabled(True)
+                credit_text2.setBackgroundColor(QColor(255, 255, 255, 130))
                 self.layout.addLayoutItem(credit_text)
                 self.layout.addLayoutItem(credit_text2)
 
-                ## Ajout du logo credit en bas à droit de la page
+                # Ajout du logo credit en bas à droit de la page
                 len_item = (len(self.mComboBox_4.checkedItems()))
                 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'])
-                    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] == ' ':
@@ -721,12 +753,34 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
                 existing_layout = project.layoutManager().layoutByName(self.layout.name())
             if existing_layout:
+                self.QMBquestion = QMessageBox()
+                self.QMBquestion.setWindowTitle(u"Attention !")
+                self.QMBquestion.setIcon(QMessageBox.Icon.Warning)
+                self.QMBquestion.setText("Mise en page existante, la mise en page va être écrasée !")
+                self.QMBquestion.setStandardButtons(QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
+                self.QMBquestion.addButton(QPushButton('Autre mise en page'), QMessageBox.ButtonRole(0))
+                self.QMBquestion = self.QMBquestion.exec()
+
                 # if self.radioButton_12.isChecked() != 1:
+                if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
                     project.layoutManager().removeLayout(existing_layout)
+                    # result = project.layoutManager().addLayout(self.layout)
+                elif self.QMBquestion != QMessageBox.StandardButton(0x00010000):
+                    LayoutCOUNT = 0
+                    arrayManager = []
+                    for AddArrayManager in project.layoutManager().layouts():
+                        arrayManager.append(AddArrayManager.name())
+                    arrayManager.sort()
+                    for LayoutNAME in arrayManager:
+                        if LayoutNAME == layout_name:
+                            LayoutCOUNT = LayoutCOUNT + 1
+                        if LayoutNAME == layout_name + "¶" + str(LayoutCOUNT):
+                            LayoutCOUNT = LayoutCOUNT + 1
+                    layout_name = (layout_name + "¶" + str(LayoutCOUNT))
+                    self.layout.setName(layout_name)
 
-                result = project.layoutManager().addLayout(self.layout)
+            else:
-
+                existing_layout = True
-
 
         self.manager.addLayout(self.layout)
         if self.radioButton_9.isChecked() == 1:
@@ -737,8 +791,24 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
         fichier_mise_en_page = layout_name
         layout_modifie = QgsProject.instance().layoutManager().layoutByName(fichier_mise_en_page)
+        try:
+            if (self.QMBquestion == QMessageBox.AcceptRole):
+                TryMessage = (self.QMBquestion == QMessageBox.AcceptRole)
+            elif (self.QMBquestion == QMessageBox.Yes):
+                TryMessage = (self.QMBquestion == QMessageBox.Yes)
+            else:
+                TryMessage = False
+            del self.QMBquestion
+        except ValueError:
+            TryMessage = True
+        except AttributeError:
+            TryMessage = True
+
+        if TryMessage is True:
             iface.openLayoutDesigner(layout_modifie)
             self.close()
+        else:
+            self.activateWindow()
 
     def actualisation_mise_en_page(self):
         values_page = self.comboBox.currentText()
@@ -764,13 +834,11 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         eval("exec('self.template_parameters = '+ values_page_import + '.fletch_canvas(self)')")
 
     def bar_echelle_auto(self, echelle, bar_echelle):
-       
         if True:
             if echelle.scale() >= 40000:
                 bar_echelle.setUnits(QgsUnitTypes.DistanceKilometers)
                 bar_echelle.setUnitLabel("km")
                 bar_echelle.setUnitsPerSegment(round((echelle.scale() * 0.04) / 1000))
-
             else:
                 bar_echelle.setUnits(QgsUnitTypes.DistanceMeters)
                 bar_echelle.setUnitLabel("m")

CenRa_AUTOMAP/issues.py

@@ -1,10 +1,4 @@
 import os
-plugin_dir = os.path.dirname(__file__)
-end_find = plugin_dir.rfind('\\')+1
-
-NAME = plugin_dir[end_find:]
-#print(NAME)
-
 from qgis.gui import *
 
 from qgis.core import (
@@ -35,14 +29,20 @@ from qgis.utils import iface
 
 from .tools.resources import (
     load_ui,
-    resources_path,
+    # resources_path,
     send_issues,
 )
 
+plugin_dir = os.path.dirname(__file__)
+end_find = plugin_dir.rfind('\\') + 1
+
+NAME = plugin_dir[end_find:]
+# print(NAME)
+
 EDITOR_CLASS = load_ui('CenRa_IssuesSend.ui')
 
-class CenRa_Issues(QDialog, EDITOR_CLASS):
 
+class CenRa_Issues(QDialog, EDITOR_CLASS):
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -63,11 +63,16 @@ class CenRa_Issues(QDialog, EDITOR_CLASS):
         statu_autre = self.check_autre.isChecked()
 
         statu = []
-        if statu_bug == True : statu = statu + [1]
+        if statu_bug is True:
-        if statu_aide == True : statu = statu + [3]
+            statu = statu + [1]
-        if statu_question == True : statu = statu + [5]
+        if statu_aide is True:
-        if statu_amelioration == True : statu = statu + [2]
+            statu = statu + [3]
-        if statu_autre == True : statu = statu + [6]
+        if statu_question is True:
+            statu = statu + [5]
+        if statu_amelioration is True:
+            statu = statu + [2]
+        if statu_autre is True:
+            statu = statu + [6]
 
         if len(statu) >= 1:
             import qgis

CenRa_AUTOMAP/metadata.txt

@@ -5,8 +5,10 @@
 [general]
 name=CenRa_AutoMap
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
+supportsQt6=True
 description=CenRa_AutoMap
-version=0.1.10
+version=2.12
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,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>13/01/2025 - Version 0.1.10: </h3> - Correctif.</br></p></br><p><h3>07/01/2025 - Version 0.1.9: </h3> - ByPass du certif ssl ci erreur.</br></p><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>30/06/2026 - Version 2.12: </h3> - Mise en page N2000 Logo redimensionner.</p></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

@@ -0,0 +1,151 @@
+import logging
+# from qgis.gui import *
+
+from qgis.core import (
+    QgsDataSourceUri,
+    QgsProject,
+    QgsSettings,
+    QgsVectorLayer,
+    QgsMapThemeCollection,
+)
+from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtWidgets import (
+    QDockWidget,
+    QInputDialog,
+)
+
+from qgis.PyQt.QtXml import QDomDocument
+
+try:
+    Enabled = True
+    from .tools.StyleLayer import host, port, dbname, os_user
+except ValueError:
+    Enabled = False
+from .tools.resources import (
+    load_ui,
+    resources_path,
+    # send_issues,
+)
+# from .issues import CenRa_Issues
+
+# from datetime import date
+
+EDITOR_CLASS = load_ui('CenRa_AutoMapStyle_base.ui')
+LOGGER = logging.getLogger('CenRa_AutoMapStyle')
+
+
+class AutoMap_Style(QDockWidget, EDITOR_CLASS):
+    def __init__(self, parent=None):
+        _ = parent
+        super().__init__()
+        self.setupUi(self)
+        self.settings = QgsSettings()
+        self.s = QSettings()
+
+        self.toolButton.setIcon(QIcon(resources_path('icons', 'loader.png')))
+
+        self.loadComboBox()
+        self.toolButton.clicked.connect(self.loadStyle)
+
+    def loadComboBox(self):
+        style = self.comboBox
+        style.clear()
+        style.addItem('')
+        style.addItem('Foncier')
+        style.addItem('Administratif')
+
+    def loadStyle(self):
+        style = self.comboBox.currentText()
+        if style == 'Foncier':
+            self.loadFoncier()
+        if style == 'Administratif':
+            self.loadAdministratif()
+
+    def loginfo(self):
+        InputDialog = QInputDialog()
+        mdp = InputDialog.getText(None, 'Foncier', 'Mot de pass base foncier:')
+        return mdp
+
+    def loadAdministratif(self):
+        mtc = QgsProject.instance().mapThemeCollection()
+        theme_name = 'Administratif'
+        theme_state = mtc.mapThemeState(theme_name)
+
+        mdp = self.loginfo()[0]
+        if mdp != '':
+            # couche = [['_form_power_rename','_form_power_rename_contour_2025'],['_42_bois_du_roy','_42_bois_du_roy_habitat_2021']]
+            couche = [['administratif', 'departements2024', 'gid'], ['administratif', 'v_communes', 'id']]
+            for schema_table in couche:
+                schema = schema_table[0]
+                table = schema_table[1]
+                key = schema_table[2]
+                uri = QgsDataSourceUri()
+                uri.setConnection(host, port, dbname, os_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
+                uri.setDataSource(schema, table, "geom")
+                uri.setKeyColumn(key)
+                layer = QgsVectorLayer(uri.uri(), table, "postgres")
+                if layer.isValid() is True:
+                    layerName = layer.name()
+                    listStyle = layer.listStylesInDatabase()
+                    try:
+                        StyleExist = True
+                        indexStyle = (listStyle[2].index(layerName))
+                    except ValueError:
+                        StyleExist = False
+                    if StyleExist:
+                        StyleId = (listStyle[1][indexStyle])
+                        styleTuple = layer.getStyleFromDatabase(StyleId)
+                        styleqml = styleTuple[0]
+                        styledoc = QDomDocument()
+                        styledoc.setContent(styleqml)
+                        layer.importNamedStyle(styledoc)
+
+                    # Ajout de la couche au canevas QGIS
+                    QgsProject.instance().addMapLayer(layer)
+
+                    layer_record = QgsMapThemeCollection.MapThemeLayerRecord(layer)
+                    theme_state.addLayerRecord(layer_record)
+                    mtc.insert(theme_name, theme_state)
+
+    def loadFoncier(self):
+        mtc = QgsProject.instance().mapThemeCollection()
+        theme_name = 'Foncier'
+        theme_state = mtc.mapThemeState(theme_name)
+
+        mdp = self.loginfo()[0]
+        if mdp != '':
+            # couche = [['_form_power_rename','_form_power_rename_contour_2025'],['_42_bois_du_roy','_42_bois_du_roy_habitat_2021']]
+            couche = [['sites', 'v_sites_parcelles'], ['sites', 'v_sites'], ['inventaires', 'suivi_zh'], ['inventaires', 'suivi_ps']]
+            for schema_table in couche:
+                schema = schema_table[0]
+                table = schema_table[1]
+                uri = QgsDataSourceUri()
+                uri.setConnection(host, port, dbname, os_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
+                uri.setDataSource(schema, table, "geom")
+                uri.setKeyColumn('gid')
+                layer = QgsVectorLayer(uri.uri(), table, "postgres")
+                if layer.isValid() is True:
+                    layerName = layer.name()
+                    listStyle = layer.listStylesInDatabase()
+                    try:
+                        StyleExist = True
+                        indexStyle = (listStyle[2].index(layerName))
+                    except ValueError:
+                        StyleExist = False
+                    if StyleExist:
+                        StyleId = (listStyle[1][indexStyle])
+                        styleTuple = layer.getStyleFromDatabase(StyleId)
+                        styleqml = styleTuple[0]
+                        styledoc = QDomDocument()
+                        styledoc.setContent(styleqml)
+                        layer.importNamedStyle(styledoc)
+
+                    # Ajout de la couche au canevas QGIS
+                    QgsProject.instance().addMapLayer(layer)
+
+                    layer_record = QgsMapThemeCollection.MapThemeLayerRecord(layer)
+                    theme_state.addLayerRecord(layer_record)
+                    mtc.insert(theme_name, theme_state)

CenRa_AUTOMAP/tools/PythonSQL.py

@@ -1,34 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-#print(IPAddr)
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.81"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user='stage'

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(140, 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, 241, 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(130, 233, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(80.0, 35, 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(228, 149.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(80.0, 35, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(208, 172, 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(148, 267, 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(80.0, 35, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(128, 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(138, 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(138, 180, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(80.0, 35, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(52, 172, 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_AUTOMAP/tools/resources.py

@@ -4,6 +4,7 @@ import configparser
 import shutil
 import tempfile
 import base64
+import os
 import psycopg2
 import psycopg2.extras
 from os.path import abspath, join, pardir, dirname
@@ -107,25 +108,15 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
+def pyperclip():
-    from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user
+    dst = dirname(dirname(__file__))+"\\tools\\"
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+    if os.access('N:/',os.R_OK):
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/StyleLayer.py'
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+    try:
-    res_ident = first_cur.fetchone()
+        shutil.copy(src, dst)
+    except:
+        print('404')
 
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
-
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-    
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url,titre,body,labels):
     import requests
     import json
@@ -158,7 +149,7 @@ def maj_verif(NAME):
 
     url = qgis.utils.pluginMetadata(NAME,'repository')
     #URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)

CenRa_AUTOMAP/tools/ui/CenRa_AutoMapStyle_base.ui

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CenRa_AutoMapStyle</class>
+ <widget class="QDockWidget" name="CenRa_AutoMapStyle">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>48</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="floating">
+   <bool>false</bool>
+  </property>
+  <property name="features">
+   <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable</set>
+  </property>
+  <property name="windowTitle">
+   <string>CenRa_AutoMap</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="leftMargin">
+     <number>5</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>5</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <property name="horizontalSpacing">
+     <number>5</number>
+    </property>
+    <item row="0" column="1">
+     <widget class="QComboBox" name="comboBox">
+      <property name="autoFillBackground">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QLabel" name="label">
+      <property name="maximumSize">
+       <size>
+        <width>40</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>12</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Style:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <widget class="QToolButton" name="toolButton">
+      <property name="autoFillBackground">
+       <bool>true</bool>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>20</width>
+        <height>20</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_base.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1150</width>
+    <width>1144</width>
-    <height>778</height>
+    <height>765</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -51,26 +51,76 @@
     <attribute name="title">
      <string>Liste de templates existants</string>
     </attribute>
-    <widget class="QGroupBox" name="groupBox_6">
+    <widget class="QLabel" name="label_5">
      <property name="geometry">
       <rect>
-       <x>680</x>
+       <x>920</x>
-       <y>350</y>
+       <y>10</y>
-       <width>141</width>
+       <width>211</width>
-       <height>41</height>
+       <height>71</height>
       </rect>
      </property>
-     <property name="styleSheet">
+     <property name="text">
-      <string notr="true">QGroupBox#groupBox_6{background-color: rgb(255, 255, 255, 170);}</string>
-     </property>
-     <property name="title">
       <string/>
      </property>
-     <widget class="QCommandLinkButton" name="commandLinkButton">
+     <property name="scaledContents">
+      <bool>true</bool>
+     </property>
+    </widget>
+    <widget class="QScrollBar" name="verticalScrollBar">
+     <property name="geometry">
+      <rect>
+       <x>1120</x>
+       <y>9</y>
+       <width>20</width>
+       <height>741</height>
+      </rect>
+     </property>
+     <property name="minimum">
+      <number>-500</number>
+     </property>
+     <property name="maximum">
+      <number>0</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="invertedAppearance">
+      <bool>true</bool>
+     </property>
+    </widget>
+    <widget class="QGroupBox" name="frame">
      <property name="geometry">
       <rect>
        <x>0</x>
        <y>0</y>
+       <width>1141</width>
+       <height>761</height>
+      </rect>
+     </property>
+     <property name="title">
+      <string/>
+     </property>
+     <widget class="QGroupBox" name="groupBox_2">
+      <property name="geometry">
+       <rect>
+        <x>950</x>
+        <y>10</y>
+        <width>161</width>
+        <height>111</height>
+       </rect>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">QGroupBox#groupBox_2{background-color: rgb(255, 255, 255, 170);}</string>
+      </property>
+      <property name="title">
+       <string/>
+      </property>
+      <widget class="QCommandLinkButton" name="commandLinkButton_3">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>60</y>
          <width>141</width>
          <height>41</height>
         </rect>
@@ -85,7 +135,32 @@
         <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
        </property>
        <property name="text">
-       <string> Mise en page</string>
+        <string>OpenStreetMap</string>
+       </property>
+      </widget>
+      <widget class="QCommandLinkButton" name="commandLinkButton_2">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>141</width>
+         <height>41</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <family>Segoe UI</family>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="autoFillBackground">
+        <bool>false</bool>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
+       </property>
+       <property name="text">
+        <string> Ortho</string>
        </property>
       </widget>
      </widget>
@@ -93,9 +168,9 @@
       <property name="geometry">
        <rect>
         <x>20</x>
-       <y>70</y>
+        <y>50</y>
         <width>391</width>
-       <height>611</height>
+        <height>631</height>
        </rect>
       </property>
       <property name="font">
@@ -305,7 +380,7 @@
        <property name="geometry">
         <rect>
          <x>40</x>
-        <y>470</y>
+         <y>490</y>
          <width>290</width>
          <height>20</height>
         </rect>
@@ -342,7 +417,7 @@
        <property name="geometry">
         <rect>
          <x>30</x>
-        <y>450</y>
+         <y>470</y>
          <width>161</width>
          <height>21</height>
         </rect>
@@ -485,7 +560,7 @@
        <property name="geometry">
         <rect>
          <x>270</x>
-        <y>570</y>
+         <y>590</y>
          <width>82</width>
          <height>15</height>
         </rect>
@@ -621,7 +696,7 @@
        <property name="geometry">
         <rect>
          <x>40</x>
-        <y>530</y>
+         <y>550</y>
          <width>310</width>
          <height>20</height>
         </rect>
@@ -658,7 +733,7 @@
        <property name="geometry">
         <rect>
          <x>30</x>
-        <y>510</y>
+         <y>530</y>
          <width>111</width>
          <height>21</height>
         </rect>
@@ -681,7 +756,7 @@
        <property name="geometry">
         <rect>
          <x>340</x>
-        <y>470</y>
+         <y>490</y>
          <width>42</width>
          <height>21</height>
         </rect>
@@ -697,7 +772,7 @@
        <property name="geometry">
         <rect>
          <x>30</x>
-        <y>560</y>
+         <y>580</y>
          <width>111</width>
          <height>23</height>
         </rect>
@@ -706,6 +781,52 @@
         <string>Custom Bibliotheque</string>
        </property>
       </widget>
+      <widget class="QRadioButton" name="radioButton_14">
+       <property name="geometry">
+        <rect>
+         <x>50</x>
+         <y>440</y>
+         <width>121</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>7</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>Prénom Nom</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+      <widget class="QLineEdit" name="lineEdit_5">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="geometry">
+        <rect>
+         <x>140</x>
+         <y>440</y>
+         <width>201</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="text">
+        <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>
       <zorder>label_14</zorder>
       <zorder>label_8</zorder>
       <zorder>label_7</zorder>
@@ -728,22 +849,8 @@
       <zorder>lineEdit_3</zorder>
       <zorder>lineEdit_4</zorder>
       <zorder>lineEdit_2</zorder>
-    </widget>
+      <zorder>radioButton_14</zorder>
-    <widget class="QLabel" name="label_5">
+      <zorder>lineEdit_5</zorder>
-     <property name="geometry">
-      <rect>
-       <x>920</x>
-       <y>10</y>
-       <width>211</width>
-       <height>71</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="scaledContents">
-      <bool>true</bool>
-     </property>
      </widget>
      <widget class="QGroupBox" name="groupBox">
       <property name="geometry">
@@ -902,69 +1009,6 @@
        </property>
       </widget>
      </widget>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="geometry">
-      <rect>
-       <x>970</x>
-       <y>10</y>
-       <width>161</width>
-       <height>111</height>
-      </rect>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">QGroupBox#groupBox_2{background-color: rgb(255, 255, 255, 170);}</string>
-     </property>
-     <property name="title">
-      <string/>
-     </property>
-     <widget class="QCommandLinkButton" name="commandLinkButton_3">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>60</y>
-        <width>141</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <property name="font">
-       <font>
-        <family>Segoe UI</family>
-        <pointsize>10</pointsize>
-       </font>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
-      </property>
-      <property name="text">
-       <string>OpenStreetMap</string>
-      </property>
-     </widget>
-     <widget class="QCommandLinkButton" name="commandLinkButton_2">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>10</y>
-        <width>141</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <property name="font">
-       <font>
-        <family>Segoe UI</family>
-        <pointsize>10</pointsize>
-       </font>
-      </property>
-      <property name="autoFillBackground">
-       <bool>false</bool>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
-      </property>
-      <property name="text">
-       <string> Ortho</string>
-      </property>
-     </widget>
-    </widget>
      <widget class="QGroupBox" name="groupBox_3">
       <property name="geometry">
        <rect>
@@ -1093,12 +1137,48 @@
        </item>
       </widget>
      </widget>
-    <zorder>groupBox</zorder>
+     <widget class="QGroupBox" name="groupBox_6">
-    <zorder>groupBox_6</zorder>
+      <property name="geometry">
-    <zorder>groupBox_7</zorder>
+       <rect>
+        <x>680</x>
+        <y>350</y>
+        <width>141</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">QGroupBox#groupBox_6{background-color: rgb(255, 255, 255, 170);}</string>
+      </property>
+      <property name="title">
+       <string/>
+      </property>
+      <widget class="QCommandLinkButton" name="commandLinkButton">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>141</width>
+         <height>41</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <family>Segoe UI</family>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
+       </property>
+       <property name="text">
+        <string> Mise en page</string>
+       </property>
+      </widget>
+     </widget>
+    </widget>
+    <zorder>frame</zorder>
     <zorder>label_5</zorder>
-    <zorder>groupBox_2</zorder>
+    <zorder>verticalScrollBar</zorder>
-    <zorder>groupBox_3</zorder>
    </widget>
   </widget>
  </widget>

CenRa_AUTOMAP/tools/ui/CenRa_about_form.ui

@@ -29,9 +29,6 @@
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
@@ -41,7 +38,7 @@
         <x>0</x>
         <y>0</y>
         <width>453</width>
-        <height>547</height>
+        <height>570</height>
        </rect>
       </property>
       <widget class="QGroupBox" name="groupBox">
@@ -56,7 +53,7 @@
        <property name="title">
         <string>DevLog</string>
        </property>
-       <widget class="QWebView" name="viewer" native="true">
+       <widget class="QTextBrowser" name="viewer">
         <property name="geometry">
          <rect>
           <x>10</x>
@@ -65,11 +62,6 @@
           <height>511</height>
          </rect>
         </property>
-        <property name="url" stdset="0">
-         <url>
-          <string>about:blank</string>
-         </url>
-        </property>
        </widget>
       </widget>
      </widget>
@@ -78,19 +70,12 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::NoButton</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_COPIE/CenRa_Copie.py

@@ -4,25 +4,29 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
+from qgis.PyQt.QtCore import QSettings, QUrl
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction, QMessageBox
+from qgis.PyQt.QtWidgets import QAction
 from qgis.utils import iface
 import qgis
 
 
 # include <QSettings>
-
 import os
+from .about_form import AboutDialog
 from .tools.resources import (
-    plugin_path,
+    # plugin_path,
+    pyperclip,
     resources_path,
     maj_verif,
 )
-from .copie_editor import Copie_Editor
+pyperclip()
-from .about_form import AboutDialog
+
+try:
+    from .copie_editor import Copie_Editor
+except NameError:
+    print('404')
 
-from PyQt5.QtCore import *
 
 class PgCopie:
     def __init__(self):
@@ -66,13 +70,18 @@ class PgCopie:
             self.copie_editor = QAction(icon, 'Copie', None)
             self.toolBar.addAction(self.copie_editor)
             self.copie_editor.triggered.connect(self.open_editor)
+            self.copie_editor.setEnabled(False)
+            # IPAddr = socket.gethostbyname(socket.gethostname())
+            if os.access('N:/', os.R_OK):
+                self.copie_editor.setEnabled(True)
 
     def open_about_dialog(self):
         """
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -86,7 +95,6 @@ class PgCopie:
         if self.action_editor:
             iface.removePluginMenu('CenRa_Copie', self.copie_editor)
 
-
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)
             del self.provider

CenRa_COPIE/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog

CenRa_COPIE/copie_editor.py

@@ -4,37 +4,37 @@ from __future__ import absolute_import
 # Import the PyQt and QGIS libraries
 from builtins import next
 from builtins import str
-from builtins import object
+# from builtins import object
-import qgis
+# import qgis
 from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog
+from qgis.PyQt.QtWidgets import QDialog, QMessageBox
-from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt import QtGui
-from PyQt5.QtCore import *
+from qgis.core import QgsDataSourceUri, QgsSettings, QgsWkbTypes, Qgis
-from PyQt5.QtGui import *
+
-from PyQt5 import QtGui
+try:
-from qgis.core import *
+    from .tools.PythonSQL import login_base
-from qgis.core import QgsDataSourceUri
+except ValueError:
+    print('Pas de fichier PythonSQL')
 
-from .tools.PythonSQL import *
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
+    # send_issues,
-    send_issues,
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues
 
 from qgis.utils import iface
-import os.path
+# import os
-import webbrowser, os
+# import os.path
-import psycopg2
+# import webbrowser
-import psycopg2.extras
+# import psycopg2
-import base64
+# import psycopg2.extras
+# import base64
 
 EDITOR_CLASS = load_ui('CenRa_Copie_base.ui')
 
-class Copie_Editor(QDialog, EDITOR_CLASS):
 
+class Copie_Editor(QDialog, EDITOR_CLASS):
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -48,7 +48,7 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
         """Run method that performs all the real work"""
         layer = self.iface.activeLayer()
 
-        if layer == None :
+        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=Qgis.Warning, duration=5)
 
@@ -62,21 +62,20 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
             # tablename
             source_tablename = [s for s in list_sources if "table" in s][0].split('"')[3]
 
+            account = login_base("account")
+            sigdb = account[5]
+
             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=Qgis.Critical, duration=5)
-
             else:
-
+                user = account[0]
-                first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                mdp = account[1]
-                first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                host = account[2]
-                first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                port = account[3]
-                res_ident = first_cur.fetchone()
+                dbname = account[4]
-                mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                cur = account[7]
-                user = res_ident[1]
+                con = account[8]
-                con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-                cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-                first_conn.close()
 
                 # Creation de la liste des schemas de la base de donnees
                 SQL = """WITH list_schema AS (
@@ -102,28 +101,27 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
 
                 self.schema.clear()
                 self.schema.addItems(listItems)
-                self.schema.setCurrentIndex(-1) # Pour ne pas commencer la liste au premier schema
+                # Pour ne pas commencer la liste au premier schema
+                self.schema.setCurrentIndex(-1)
 
-
+                # Affiche le nom de la table source
-                self.table_source.setText(source_schema + "." + source_tablename) # Affiche le nom de la table source
+                self.table_source.setText(source_schema + "." + source_tablename)
                 # show the dialog
                 self.show()
                 # Run the dialog event loop
-                result = self.exec_()
+                result = self.exec()
                 # See if OK was pressed
                 if result:
                     # ******************************debut script*********************************
+                    account = login_base("account")
+                    user = account[0]
+                    mdp = account[1]
+                    host = account[2]
+                    port = account[3]
+                    dbname = account[4]
+                    cur = account[7]
+                    con = account[8]
 
-
-                    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-                    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-                    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-                    res_ident = first_cur.fetchone()
-                    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-                    user = res_ident[1]
-                    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-                    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-                    first_conn.close()
                     # Récupération de la couche active
                     layer = self.iface.activeLayer()
 
@@ -158,7 +156,6 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
                     else:
                         SQL_table = "CREATE TABLE " + schema + "." + tablename + " AS SELECT * FROM " + source_schema + "." + source_tablename
 
-
                     SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename + "_pkey" + " PRIMARY KEY (gid)"
                     SQL_sequence_01 = "CREATE SEQUENCE " + schema + "." + tablename + "_gid_seq" + " INCREMENT 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1;"
                     SQL_sequence_02 = "ALTER TABLE " + schema + "." + tablename + " ALTER COLUMN gid SET DEFAULT nextval(\'" + schema + "." + tablename + "_gid_seq\'::regclass);"
@@ -178,6 +175,13 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
                     cur.execute(SQL_sequence_03)
                     cur.execute(SQL_sequence_04)
 
+                    RETURNE = "SELECT pg_get_serial_sequence('" + schema + "." + tablename + "','gid')"
+                    cur.execute(RETURNE)
+                    sequence_name = cur.fetchone()[0]
+                    print(sequence_name)
+                    SQL_GRANT_TABLE = "GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON " + schema + "." + tablename + " TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON " + schema + "." + tablename + " TO grp_sig;GRANT ALL ON SEQUENCE " + sequence_name + " TO grp_qgis;"
+                    cur.execute(SQL_GRANT_TABLE)
+
                     if layer.wkbType() == QgsWkbTypes.PointGeometry:
                         cur.execute(SQL_trigger_coordonnees)
 
@@ -191,12 +195,12 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
 
                     con.commit()
 
-                    ### Affichage de la table
+                    # Affichage de la table
                     uri = QgsDataSourceUri()
                     # set host name, port, database name, username and password
                     uri.setConnection(host, port, dbname, user, mdp)
                     # set database schema, table name, geometry column and optionaly subset (WHERE clause)
-                    uri.setDataSource(schema, tablename, geom)
+                    uri.setDataSource(schema, tablename, "geom")
 
                     layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
 
@@ -204,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=Qgis.Success, 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,8 +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=2.1
+version=3.2
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -19,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>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/PythonSQL.py

@@ -1,174 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.11"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user = 'stage'
-
-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))"""
-champ_travaux_prevus_point = """(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, x_wgs84 double precision, y_wgs84 double precision,  date_creation date, date_maj date, geom geometry(Point,2154))"""
-
-champ_viergePolygone = """(gid serial NOT NULL, commentaire text, surface_m2 double precision, surface_ha double precision, geom geometry(MultiPolygon,2154))"""
-champ_viergeLigne = """(gid serial NOT NULL, commentaire text, longueur_m double precision, longueur_km double precision, geom geometry(MultiLineString,2154))"""
-champ_viergePoint = """(gid serial NOT NULL, commentaire text, x_wgs84 double precision, y_wgs84 double precision, geom geometry(Point,2154))"""
-
-champ_habitat = """(gid serial NOT NULL, cd_cb_01 text, lb_cb97_fr_01 text, occupation_01 integer, cd_cb_02 text, lb_cb97_fr_02 text, occupation_02 integer, cd_cb_03 text, lb_cb97_fr_03 text, occupation_03 integer, milieu_code text, milieu_libelle text, surface_m2 double precision, surface_ha double precision, commentaire text, date_creation date, date_maj date, geom geometry(MultiPolygon,2154))"""
-
-champ_contour="""(gid serial NOT NULL, date_creation date, date_maj date, utilisateur character varying, dept character(2), nom character varying, surface_m2 double precision, surface_ha double precision, type_site character varying, type_milieu character varying, date_premier_pg integer, date_debut_pg integer, date_fin_pg integer, referent character varying, gestion_deleguee character varying, terrain_militaire character(3), ens character(3), zh character(3), adapt_pmr character(3), inform character(3), guide character(3), ouverture_public character(3), obs character(3), anim character(3), n2000_anim character(3), contrat_n2000_conseil character(3), n2000_op character(3), contrat_n2000_benef character(3), contrat_agri character(3), bc_habitat integer, bc_amphibien integer, bc_coleoptere integer, bc_crustace integer, bc_mammifere integer, bc_chiroptere integer, bc_mollusque integer, bc_odonate integer, bc_oiseau integer, bc_orthoptere integer, bc_poisson integer, bc_reptile integer, bc_rhopalocere integer, bc_heterocere integer, bc_autre_invertebre integer, bc_flore integer, bc_bryophyte integer, bc_champignon integer, suiv_analyse_sol character(3), suiv_piezo character(3), suiv_climat character(3), suiv_topo character(3), suiv_habitat character(3), suiv_amphibien character(3), suiv_coleoptere character(3), suiv_crustace character(3), suiv_mammifere character(3), suiv_chiroptere character(3), suiv_mollusque character(3), suiv_odonate character(3), suiv_oiseau character(3), suiv_orthoptere character(3), suiv_poisson character(3), suiv_reptile character(3), suiv_rhopalocere character(3), suiv_heterocere character(3), suiv_autre_invertebre character(3), suiv_flore character(3), suiv_bryophyte character(3), suiv_champignon character(3), suiv_analyse_eau character(3), suiv_phenologie character(3), suiv_frequentation character(3), suiv_paysager character(3), suiv_autre character(3), commentaire text, geom geometry(MultiPolygon,2154))
-"""
-
-champ_vegethab_point = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(Point,2154)
-)
-"""
-champ_vegethab_multilinestring = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(MultiLineString,2154)
-)
-"""
-champ_vegethab_multipolygon = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(MultiPolygon,2154)
-)
-"""

CenRa_COPIE/tools/resources.py

@@ -3,9 +3,10 @@
 import configparser
 import shutil
 import tempfile
-import base64
+# import base64
-import psycopg2
+# import psycopg2
-import psycopg2.extras
+# import psycopg2.extras
+import os
 from os.path import abspath, join, pardir, dirname
 
 from qgis.PyQt import uic
@@ -89,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_COPIE\\tools")))
     for item in args:
         path = abspath(join(path, item))
     return path
@@ -107,64 +108,60 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-    from CenRa_Metabase.resources.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
 
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+def pyperclip():
+    dst = dirname(dirname(__file__)) + "\\tools\\"
+    if os.access('N:/', os.R_OK):
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
+    try:
+        shutil.copy(src, dst)
+    except FileNotFoundError:
+        print('404')
+    except UnboundLocalError:
+        print('404')
 
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
 
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url, titre, body, labels):
     import requests
+    import urllib.request
     import json
-    import os
+    # import os
-    import qgis
+    # import qgis
 
-    usr = os.environ['USERNAME']
+    # usr = os.environ['USERNAME']
     token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
     url = url + '?token=' + token
 
     headers = {'Authorization': 'token ' + token, 'accept': 'application/json', 'Content-Type': 'application/json'}
 
-
     payload = {'title': titre, 'body': body, 'labels': labels}
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except ValueError:
         binar = False
         r = ''
     if binar:
         r = requests.post(url, data=json.dumps(payload), headers=headers)
     return r
 
+
 def maj_verif(NAME):
     import qgis
     import urllib.request
     iface = qgis.utils.iface
     from qgis.core import Qgis
 
-    url = qgis.utils.pluginMetadata(NAME,'repository')
+    # url = qgis.utils.pluginMetadata(NAME, 'repository')
     # URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
     # print(URL)
     version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
@@ -174,11 +171,12 @@ 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:
+        except urllib.error.URLError:
             print("error gitea version ssl")
     else:
         iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)
 
+
 def devlog(NAME):
     import qgis
     devmaj = '<head><style>* {margin:0; padding:0; }</style></head>'

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">
@@ -29,9 +25,6 @@
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
@@ -56,7 +49,7 @@
        <property name="title">
         <string>DevLog</string>
        </property>
-       <widget class="QWebView" name="viewer" native="true">
+       <widget class="QTextBrowser" name="viewer">
         <property name="geometry">
          <rect>
           <x>10</x>
@@ -65,11 +58,6 @@
           <height>511</height>
          </rect>
         </property>
-        <property name="url" stdset="0">
-         <url>
-          <string>about:blank</string>
-         </url>
-        </property>
        </widget>
       </widget>
      </widget>
@@ -78,19 +66,12 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_FLUX/CenRa_Flux.py

@@ -4,25 +4,27 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
+from qgis.PyQt.QtCore import QUrl, QSettings
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction, QMessageBox
+from qgis.PyQt.QtWidgets import QAction
 from qgis.utils import iface
 import qgis
 
-
 # include <QSettings>
-
+from .about_form import AboutDialog
 import os
 from .tools.resources import (
-    plugin_path,
+    pyperclip,
     resources_path,
     maj_verif,
 )
-from .flux_editor import Flux_Editor
+pyperclip()
-from .about_form import AboutDialog
+
+try:
+    from .flux_editor import Flux_Editor
+except NameError:
+    print('404')
 
-from PyQt5.QtCore import *
 
 class PgFlux:
     def __init__(self):
@@ -62,17 +64,20 @@ class PgFlux:
         self.help_action.triggered.connect(self.open_help)
         if not self.action_editor:
             self.action_editor = Flux_Editor()
-
             self.flux_editor = QAction(icon, 'SigCEN', None)
             self.toolBar.addAction(self.flux_editor)
             self.flux_editor.triggered.connect(self.open_editor)
+            self.flux_editor.setEnabled(False)
+            if os.access('N:/', os.R_OK):
+                self.flux_editor.setEnabled(True)
 
     def open_about_dialog(self):
         """
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -86,7 +91,6 @@ class PgFlux:
         if self.action_editor:
             iface.removePluginMenu('CenRa_Flux', self.flux_editor)
 
-
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)
             del self.provider

CenRa_FLUX/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog

CenRa_FLUX/flux_editor.py

@@ -1,63 +1,102 @@
 # -*- 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
+# Import des bibliothèques PyQt et QGIS
-from builtins import next
 from builtins import str
-from builtins import object
+
-import qgis
+from qgis.PyQt import QtCore, QtGui
-from qgis.PyQt import QtCore
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt import QtWidgets
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog
 from qgis.PyQt.QtGui import QIcon
-from PyQt5.QtCore import *
+import os
-from PyQt5.QtGui import *
+
-from PyQt5 import QtGui
+from qgis.core import (
-from qgis.core import *
+    QgsDataSourceUri,
-from qgis.core import QgsDataSourceUri
+    QgsCoordinateReferenceSystem,
+    QgsCoordinateTransform,
+    QgsProject,
+    QgsSettings,
+    QgsApplication,
+    QgsVectorLayer,
+    QgsRasterLayer,
+    QgsWkbTypes
+)
 from qgis.PyQt.QtWidgets import (
     QDialog,
-    QAction,
+    QPushButton,
-    QDockWidget,
-    QFileDialog,
     QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
     QTableWidgetItem,
     QMessageBox,
     QVBoxLayout,
 )
-from .tools.PythonSQL import *
+from .tools.SQLRequet import schemaname_list, schemaname_list_ref, schemaname_distinct
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
-    send_issues,
 )
-from .issues import CenRa_Issues
+try:
+    if os.path.exists('N:'):
+        from .tools.PythonSQL import login_base
+except NameError:
+    print('Pas de fichier PythonSQL')
 
 from qgis.utils import iface
-import os.path
-import webbrowser, os
 import psycopg2
 import psycopg2.extras
-import base64
 
-first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+# Variable globale pour le mode debug
-first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+global DeBUG
-first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+DeBUG = 0
-res_ident = first_cur.fetchone()
-mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-user = res_ident[1]
-first_conn.close()
 
+# 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))
+itemIconRaster.setIcon(icon)
+
+itemIconVecteur = QTableWidgetItem()
+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]       # 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')
 
+# 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)
@@ -66,123 +105,311 @@ 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')))
 
-        self.tableWidget.setSelectionBehavior(QTableWidget.SelectRows)
+        # Configuration du tableau des couches disponibles
-        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        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)
-        layout = QVBoxLayout()
-        self.lineEdit.textChanged.connect(self.filtre_dynamique)
-        layout.addWidget(self.lineEdit)
-        #self.lineEdit.mousePressEvent = self._mousePressEvent
 
-        #metadonnees_plugin = open(self.plugin_path + '/metadata.txt')
+        # Connexion des signaux aux slots (événements de l'interface)
-        #infos_metadonnees = metadonnees_plugin.readlines()
+        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.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)              # 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.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:  # Activation après 3 clics
+                DeBUG = 0
+                self.ModeDeBUG()
+        else:
+            DeBUG = 0
+            self.DeBUG.hide()
+
     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 == True:
+        if self.first_start is True:
             self.first_start = False
         # show the dialog
         self.show()
         # Run the dialog event loop
-        result = self.exec_()
+        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
+        self.initialisation_flux()
-        # Only create GUI ONCE in callback, so that it will only load when the plugin is started
+
-        if self.first_start == True:
+        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 open_url(self, item):
+    def AddOrDelToUserFav(self):
-        url = item.data(Qt.UserRole)
+        """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:
                 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
+                    custom_list = schemaname_list[:-2] + """
-         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;"""
+                    WHERE schemaname LIKE '""" + str(self.comboBox.currentText()) + """%';
+                    """
                 else:
-                custom_list="""(SELECT schemaname,tablename from pg_catalog.pg_tables
+                    custom_list = schemaname_list[:-2] + """
-         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;"""
+                    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
+                    custom_list = schemaname_list_ref[:-2] + """
-         where schemaname like '"""+ str(self.comboBox.currentText()) +"""' order by schemaname,tablename;"""
+                    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)
+                list_raster = cur.fetchall()
+                RasterList = []
+                for rasterFind in list_raster:
+                    RasterList.append(rasterFind[0])
+            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(3)
+            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:]
+                    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])
+                    if type_val == "00":
+                        table_name = value[1]
                 else:
                     type_val = ''
                     schema_name = str(value[0])
@@ -190,6 +417,9 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                 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'
@@ -200,67 +430,162 @@ 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:
+                    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,0,item)
-            item = QTableWidgetItem(schema_name)
                 self.tableWidget.setItem(i, 1, item)
-            item = QTableWidgetItem(table_name)
+                item = QTableWidgetItem(schema_name)
                 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, 300)
+            self.tableWidget.setColumnWidth(1, 70)
             self.tableWidget.setColumnWidth(2, 300)
-        self.tableWidget.setHorizontalHeaderLabels(["Code","Schema","Table"])
+            self.tableWidget.setColumnWidth(3, 300)
+            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
+        new_item_text = selected_items[3].text()
-        new_item_text = selected_items[2].text()
 
         if not self.item_already_exists(new_item_text):
             self.tableWidget_2.insertRow(selected_row)
 
             for column in range(self.tableWidget.columnCount()):
                 cloned_item = selected_items[column].clone()
-                self.tableWidget_2.setHorizontalHeaderLabels(["Code","Schema", "Table"])
+                self.tableWidget_2.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table", "Favorit"])
-                self.tableWidget_2.setColumnCount(3)
+                self.tableWidget_2.setColumnCount(5)
                 self.tableWidget_2.setItem(selected_row, column, cloned_item)
 
-            self.tableWidget_2.setColumnWidth(0, 50)
+            self.tableWidget_2.setColumnWidth(0, 20)
-            self.tableWidget_2.setColumnWidth(1, 300)
+            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
-        existing_items = self.tableWidget_2.findItems(new_item_text, QtCore.Qt.MatchExactly)
+        existing_items = self.tableWidget_2.findItems(new_item_text, QtCore.Qt.MatchFlag(0))
-
         # Check if there are any existing items with the same text in the first column
         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(
                                                         self.tableWidget_2.rowCount()) + " flux sélectionnés ? (risque de plantage de QGIS)",
-                                                    QMessageBox.Yes | QMessageBox.No)
+                                                    QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
-            if self.QMBquestion == QMessageBox.Yes:
+            if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
                 self.chargement_flux()
 
-            if self.QMBquestion == QMessageBox.No:
+            if self.QMBquestion == QMessageBox.StandardButton(0x00001000):
                 print("Annulation du chargement des couches")
 
         if self.tableWidget_2.rowCount() <= 5:
             self.chargement_flux()
 
     def chargement_flux(self):
-
+        global cur, con, dbtype
+        """Charge les couches sélectionnées dans QGIS"""
         managerAU = QgsApplication.authManager()
-        k = managerAU.availableAuthMethodConfigs().keys()
+        managerAU.availableAuthMethodConfigs().keys()
 
         def REQUEST(type):
             switcher = {
@@ -272,35 +597,101 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             }
             return switcher.get(type, "nothing")
 
+        # 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';"""
 
-        def displayOnWindows(type, uri, name):
+        cur.execute(SQLextension)
-            p = []
+        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()):
-                ## supression de la partie de l'url après le point d'interrogation
+            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,0).text()
+                    code = self.tableWidget_2.item(row, 1).text()
-                    schema = '_'+code+'_'+self.tableWidget_2.item(row,1).text()
+                    schema = '_' + code + '_' + self.tableWidget_2.item(row, 2).text()
                     if code == 'travaux' or code == 'agregation':
-                        schema = self.tableWidget_2.item(row,1).text()
+                        schema = self.tableWidget_2.item(row, 2).text()
-                    table = self.tableWidget_2.item(row,2).text()#.split("?", 1)[0]
+                        table = self.tableWidget_2.item(row, 3).text()
-                if dbtype == refdb:
+                    elif code == '00':
-#                    code = self.tableWidget_2.item(row,0).text()
+                        table = self.tableWidget_2.item(row, 3).text()
-                    schema = self.tableWidget_2.item(row,1).text()
+                    else:
-                    table = self.tableWidget_2.item(row,2).text()#.split("?", 1)[0]
+                        table = self.tableWidget_2.item(row, 3).text()
+                        table = schema + '_' + table
+                elif dbtype == refdb:
+                    code = self.tableWidget_2.item(row, 1).text()
+                    schema = self.tableWidget_2.item(row, 2).text()
+                    table = self.tableWidget_2.item(row, 3).text()
+                # 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')  # 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:
+                    # Chargement d'une couche vecteur
+                    uri.setDataSource(schema, table, "geom")  # Colonne géométrie
+                    uri.setKeyColumn('gid')  # Clé primaire
 
-                uri.setDataSource(schema, table, "geom")
+                    # Détection du type de géométrie
-                uri.setKeyColumn('gid')
-
-                # 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)
                         list_typegeom = cur.fetchall()
-                print(len(list_typegeom))
                         if len(list_typegeom) > 1:
                             for typegeom in list_typegeom:
                                 if typegeom[0] == 'MultiPolygon':
@@ -315,7 +706,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                                     uri.setWkbType(QgsWkbTypes.LineString)
                                 elif typegeom[0] == 'MultiPoint':
                                     uri.setWkbType(QgsWkbTypes.MultiPoint)
-                        if (typegeom[0] != None and typegeom[0] != 'Polygon'):
+                                if (typegeom[0] is not None and typegeom[0] != 'Polygon'):
                                     uri.setSrid('2154')
                                     layer = QgsVectorLayer(uri.uri(), table, "postgres")
                                     # Ajout de la couche au canevas QGIS
@@ -324,9 +715,26 @@ 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()
+                    except psycopg2.errors.UndefinedColumn:
+                        print('Column "geom" does not exist... 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()
             self.comboBox.addItem("toutes les catégories")
             self.comboBox.addItem('00')
@@ -337,8 +745,10 @@ 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)
             custom_list = schemaname_distinct
             cur.execute(custom_list)
             list_schema = cur.fetchall()
@@ -346,17 +756,144 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             self.comboBox.addItem("toutes les catégories")
             for baxval in list_schema:
                 self.comboBox.addItem(baxval[0])
-    def filtre_dynamique(self, filter_text):
+        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 popup(self):
+    def getCanevas(self):
+        """Filtre les couches selon l'emprise du canevas QGIS actuel"""
 
-        self.dialog = Popup()  # +++ - self
+        # Récupération de la liste des favoris de l'utilisateur
-        self.dialog.text_edit.show()
+        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()))
+
+        SQL_GEOM_CONTOUR = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_contour" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_habitat" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_EU_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_eu_habitat" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_LIGNE = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_ligne" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_POINT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_point" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_POLY = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_poly" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+
+        cur.execute(SQL_GEOM_CONTOUR)
+        TableContour = cur.fetchall()
+        cur.execute(SQL_GEOM_HABITAT)
+        TableHabitat = cur.fetchall()
+        cur.execute(SQL_GEOM_EU_HABITAT)
+        TableEuHabitat = cur.fetchall()
+        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_LIGNE)
+        TableTravauxLigne = cur.fetchall()
+        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_POINT)
+        TableTravauxPoint = cur.fetchall()
+        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_POLY)
+        TableTravauxPoly = cur.fetchall()
+
+        TableHaveGeom = sorted(TableContour + TableHabitat + TableEuHabitat + TableTravauxLigne + TableTravauxPoint + TableTravauxPoly)
+        row_count = 0
+        self.tableWidget.setRowCount(0)
+        for e in TableHaveGeom:
+            cur.execute("""SELECT DISTINCT count(*) FROM pg_catalog.pg_tables WHERE schemaname LIKE '""" + e[0] + """' AND tablename LIKE '""" + e[1] + """';""")
+            TableSomme = cur.fetchall()[0][0]
+
+            if e[0][1:3] != 'fo':
+                schema_name = e[0][4:]
+                DepName = QTableWidgetItem(e[0][1:3])
+                SchemaName = QTableWidgetItem(schema_name)
+            else:
+                schema_name = e[0][6:]
+                DepName = QTableWidgetItem('form')
+                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()
+            icon = QIcon()
+            icon.addPixmap(QtGui.QPixmap(resources_path('icons', 'mIconVecteur.svg')), QIcon.Mode(0), QIcon.State(1))
+            itemIcon.setIcon(icon)
+
+            self.tableWidget.setItem(row_count, 0, itemIcon)
+            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))
+                    self.tableWidget.item(row_count, j).setToolTip('Couche dans une autre BD !')
+            row_count = row_count + 1
+        if self.lineEdit.text() != 'Recherche par mots-clés':
+            self.filtre_dynamique(self.lineEdit.text())
+
+    def SwitchGeom(self, vargeom):
+        new_object = '['
+        obj = vargeom['coordinates'][0][0]
+        for obj_X in obj:
+            new_object = new_object + '[' + str(obj_X[1]) + ',' + str(obj_X[0]) + '],'
+        new_object = new_object[:-1] + ']'
+        return (new_object)

CenRa_FLUX/issues.py

@@ -1,47 +1,24 @@
 import os
-plugin_dir = os.path.dirname(__file__)
+# from qgis.gui import *
-end_find = plugin_dir.rfind('\\')+1
 
-NAME = plugin_dir[end_find:]
+from qgis.core import QgsSettings
-
+from qgis.PyQt.QtWidgets import QDialog
-from qgis.gui import *
-
-from qgis.core import (
-    NULL,
-    QgsApplication,
-    QgsDataSourceUri,
-    QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
-    QgsRasterLayer,
-    QgsSettings,
-    QgsVectorLayer,
-    QgsGeometry,
-)
-from qgis.PyQt.QtWidgets import (
-    QDialog,
-    QAction,
-    QDockWidget,
-    QFileDialog,
-    QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
-    QTableWidgetItem,
-)
 from qgis.utils import iface
 
 
 from .tools.resources import (
     load_ui,
-    resources_path,
     send_issues,
 )
+plugin_dir = os.path.dirname(__file__)
+end_find = plugin_dir.rfind('\\') + 1
+
+NAME = plugin_dir[end_find:]
 
 EDITOR_CLASS = load_ui('CenRa_IssuesSend.ui')
 
-class CenRa_Issues(QDialog, EDITOR_CLASS):
 
+class CenRa_Issues(QDialog, EDITOR_CLASS):
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -62,11 +39,16 @@ class CenRa_Issues(QDialog, EDITOR_CLASS):
         statu_autre = self.check_autre.isChecked()
 
         statu = []
-        if statu_bug == True : statu = statu + [1]
+        if statu_bug is True:
-        if statu_aide == True : statu = statu + [3]
+            statu = statu + [1]
-        if statu_question == True : statu = statu + [5]
+        if statu_aide is True:
-        if statu_amelioration == True : statu = statu + [2]
+            statu = statu + [3]
-        if statu_autre == True : statu = statu + [6]
+        if statu_question is True:
+            statu = statu + [5]
+        if statu_amelioration is True:
+            statu = statu + [2]
+        if statu_autre is True:
+            statu = statu + [6]
 
         if len(statu) >= 1:
             import qgis
@@ -78,11 +60,11 @@ class CenRa_Issues(QDialog, EDITOR_CLASS):
         else:
             code = 423
         if code == 201:
-            iface.messageBar().pushMessage("Envoyer :", "Votre messages à bien été envoyer.", level=Qgis.Success, duration=20)
+            iface.messageBar().pushMessage("Envoyer :", "Votre messages à bien été envoyer.", level=0, duration=20)
             self.close()
         elif code == 422:
-            iface.messageBar().pushMessage("Erreur :", "Erreur dans le contenu du messages.", level=Qgis.Critical, duration=20)
+            iface.messageBar().pushMessage("Erreur :", "Erreur dans le contenu du messages.", level=2, duration=20)
         elif code == 423:
-            iface.messageBar().pushMessage("Erreur :", "Pas de sujet sélectionné.", level=Qgis.Critical, duration=20)
+            iface.messageBar().pushMessage("Erreur :", "Pas de sujet sélectionné.", level=2, duration=20)
         elif code == 404:
-            iface.messageBar().pushMessage("Missing :", "Le serveur de messagerie est injoignable.", level=Qgis.Warning, duration=20)
+            iface.messageBar().pushMessage("Missing :", "Le serveur de messagerie est injoignable.", level=1, duration=20)

CenRa_FLUX/metadata.txt

@@ -5,8 +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=2.2
+version=3.24
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -18,7 +20,6 @@ email=si_besoin@cen-rhonealpes.fr
 
 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-# changelog= correctif de sécurité: envoi du certificat d'authentification seulement pour les couches fonciercen et drone / intégration des styles RPG geoportail / modification des noms de couches pour plus de clarté
 
 # Tags are comma separated with spaces allowed
 tags=cenra, postgis, database
@@ -32,7 +33,7 @@ icon=icon.png
 # experimental flag
 experimental=False
 
-changelog=<h1>CenRA_FLUX:</h1></br><p><h3>07/01/2025 - Version 2.2: </h3> - ByPass du certif ssl ci erreur.</br></p><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>22/05/2026 - Version 3.24: </h3> - Option authentification pour table avec droits particuliers.</p></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
@@ -45,4 +46,3 @@ deprecated=False
 
 # If the plugin can run on QGIS Server.
 server=False
-

CenRa_FLUX/tools/HubToTea.py

@@ -1,5 +1,6 @@
 from qgis.core import QgsApplication
 
+
 def gitea():
     file_url = QgsApplication.qgisSettingsDirPath() + 'QGIS/QGIS3.ini'
     recherche_1 = 'plugin_repositories\\github\\url=https://github.com/CEN-Rhone-Alpes/Plugin_QGIS/releases/latest/download/plugins.xml'

CenRa_FLUX/tools/SQLRequet.py

@@ -1,48 +1,58 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-print(IPAddr)
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.11"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user = 'stage'
 
 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'
+schemaname_list_ref = """
-          order by schemaname,tablename;"""
+WITH TableList AS (SELECT
-schemaname_list="""(SELECT schemaname,tablename from pg_catalog.pg_tables
+                       schemaname,
-         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)
+                       tablename
-         UNION
+                   FROM pg_catalog.pg_tables
-         (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews order by schemaname,tablename) order by schemaname,tablename;"""
+                   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/icons/mIconRaster.svg

@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg5692"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="mActionAddRasterLayer.svg"
+   inkscape:export-filename="/home/denis/Desktop/oracle.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <title
+     id="title2829">GIS icon theme 0.2</title>
+  <defs
+     id="defs5694">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective3486" />
+    <inkscape:perspective
+       id="perspective3496"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3600"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective7871"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective8710"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective9811"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4762"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.539029"
+     inkscape:cx="0.66325675"
+     inkscape:cy="15.235866"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     borderlayer="false"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-grids="true"
+     inkscape:object-paths="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5700"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       dotted="true"
+       originx="2.5px"
+       originy="2.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5697">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>GIS icon theme 0.2</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Robert Szczepanek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Robert Szczepanek</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>GIS icons</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:coverage>GIS icons</dc:coverage>
+        <dc:description>http://robert.szczepanek.pl/</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer"
+     style="display:inline"
+     transform="translate(0,-8)">
+    <rect
+       style="fill:#6e97c4;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="rect6419"
+       width="7.999999"
+       height="7.999999"
+       x="7.9999986"
+       y="7.9999995" />
+    <rect
+       style="fill:#2b3b4d;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
+       id="rect6419-6"
+       width="7.999999"
+       height="7.999999"
+       x="16.000002"
+       y="7.9999995" />
+    <rect
+       style="fill:#2b3b4d;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
+       id="rect6419-6-9"
+       width="7.999999"
+       height="7.999999"
+       x="7.9999986"
+       y="16"
+       inkscape:transform-center-x="-3.9999992"
+       inkscape:transform-center-y="-5.3333316" />
+    <rect
+       style="fill:#6d97c4;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
+       id="rect6419-0"
+       width="7.999999"
+       height="7.999999"
+       x="16.000002"
+       y="16" />
+    <rect
+       style="fill:#2d3e4d;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
+       id="rect6419-6-7"
+       width="7.999999"
+       height="7.999999"
+       x="-4.7683716e-07"
+       y="7.9999995" />
+    <rect
+       style="fill:#6d97c4;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
+       id="rect6419-3"
+       width="7.999999"
+       height="7.999999"
+       x="-4.7683716e-07"
+       y="16" />
+    <rect
+       style="fill:#6d97c4;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
+       id="rect6419-5"
+       width="7.999999"
+       height="7.999999"
+       x="7.9999986"
+       y="24.000002" />
+    <rect
+       style="fill:#2b3b4d;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
+       id="rect6419-6-6"
+       width="7.999999"
+       height="7.999999"
+       x="-4.7683716e-07"
+       y="24.000002" />
+    <rect
+       style="fill:none;stroke:none"
+       id="rect6554"
+       width="23.999998"
+       height="23.999998"
+       x="-4.7683716e-07"
+       y="7.9999995" />
+  </g>
+</svg>

CenRa_FLUX/tools/icons/mIconVecteur.svg

@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg5692"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="mActionAddWfsLayer.svg"
+   inkscape:export-filename="/media/home1/robert/svn/graphics/trunk/toolbar-icons/32x32/layer-vector.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <title
+     id="title2829">GIS icon theme 0.2</title>
+  <defs
+     id="defs5694">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective3486" />
+    <inkscape:perspective
+       id="perspective3496"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3600"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective7871"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective8710"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective9811"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4762"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective4762-4" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective9811-2" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective8710-0" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective7871-7" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3600-9" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3496-4" />
+    <inkscape:perspective
+       id="perspective3486-0"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3952"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-0.094554179"
+     inkscape:cy="17.125349"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     borderlayer="false"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-grids="false"
+     inkscape:object-paths="false"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5700"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       dotted="true"
+       originx="2.5px"
+       originy="2.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5697">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>GIS icon theme 0.2</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Robert Szczepanek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Robert Szczepanek</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>GIS icons</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:coverage>GIS icons</dc:coverage>
+        <dc:description>http://robert.szczepanek.pl/</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer"
+     style="display:inline"
+     transform="translate(0,-8)">
+    <g
+       id="g3028"
+       transform="matrix(0.75161647,0,0,0.75161647,-0.02586348,9.4769448)">
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3775"
+         d="m 16.000001,1.0775438 c 9.467477,4.6992805 8.114981,22.3215822 0,25.8460432"
+         style="fill:none;stroke:#749fcf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3773"
+         d="m 1.1225356,14.000566 29.7549294,0"
+         style="fill:none;stroke:#749fcf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3773-1"
+         d="m 2.9484075,6.9340877 c 7.5739815,1.0094969 18.3939565,1.0094969 25.9679385,0"
+         style="fill:none;stroke:#749fcf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3773-4"
+         d="m 2.9484075,21.067042 c 7.5739815,-1.009496 18.3939565,-1.009496 25.9679385,0"
+         style="fill:none;stroke:#749fcf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3777"
+         d="m 16.000001,1.0775438 c -8.1149812,3.5244605 -9.467478,21.1467632 0,25.8460432"
+         style="fill:none;stroke:#749fcf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.2562074,0,0,1.0871977,22.465232,-1.0129089)"
+         d="m 6.9656949,13.809332 c 0,6.713955 -5.4228716,12.15669 -12.1123228,12.15669 -6.6894511,0 -12.1123231,-5.442735 -12.1123231,-12.15669 0,-6.7139549 5.422872,-12.1566907 12.1123231,-12.1566907 6.6894512,0 12.1123228,5.4427358 12.1123228,12.1566907 z"
+         sodipodi:ry="12.156691"
+         sodipodi:rx="12.112323"
+         sodipodi:cy="13.809332"
+         sodipodi:cx="-5.1466279"
+         id="path3003"
+         style="fill:none;stroke:#5488c4;stroke-width:1.28353083;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path2960"
+         d="M 7.3400991,7.2779254 13.185401,22.026434 19.613856,7.4154701 24.89957,7.3945152"
+         style="color:#000000;fill:none;stroke:#172739;stroke-width:1.29794168;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(1.5475161,0,0,1.6212881,1.923793,-12.988176)"
+         d="m 4.5,12.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="12.5"
+         sodipodi:cx="3.5"
+         id="path2958"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#172739;stroke-width:0.94698602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.5839392,0,0,1.6212881,7.641614,1.7603321)"
+         d="m 4.5,12.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="12.5"
+         sodipodi:cx="3.5"
+         id="path2958-0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#172739;stroke-width:0.93603462;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.5475161,0,0,1.6212881,14.034218,-12.884972)"
+         d="m 4.5,12.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="12.5"
+         sodipodi:cx="3.5"
+         id="path2958-9"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#172739;stroke-width:0.94698602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.5475161,0,0,1.6212881,19.483264,-12.871586)"
+         d="m 4.5,12.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="12.5"
+         sodipodi:cx="3.5"
+         id="path2958-6"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#172739;stroke-width:0.94698602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>

CenRa_FLUX/tools/resources.py

@@ -2,10 +2,8 @@
 
 import configparser
 import shutil
+import os
 import tempfile
-import base64
-import psycopg2
-import psycopg2.extras
 from os.path import abspath, join, pardir, dirname
 
 from qgis.PyQt import uic
@@ -80,6 +78,16 @@ def plugin_test_data_path(*args, copy=False):
         return path
 
 
+def pyperclip():
+    dst = dirname(dirname(__file__)) + "\\tools\\"
+    if os.access('N:/', os.R_OK):
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
+    try:
+        shutil.copy(src, dst)
+    except NameError:
+        print('404')
+
+
 def resources_path(*args):
     """Get the path to our resources folder.
 
@@ -107,64 +115,47 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-    from .tools.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
 
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url, titre, body, labels):
     import requests
     import json
-    import os
+    # import os
-    import qgis
+    # import qgis
 
-    usr = os.environ['USERNAME']
+    # usr = os.environ['USERNAME']
     token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
     url = url + '?token=' + token
 
     headers = {'Authorization': 'token ' + token, 'accept': 'application/json', 'Content-Type': 'application/json'}
 
-
     payload = {'title': titre, 'body': body, 'labels': labels}
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except NameError:
         binar = False
         r = ''
     if binar:
         r = requests.post(url, data=json.dumps(payload), headers=headers)
     return r
 
+
 def maj_verif(NAME):
     import qgis
     import urllib.request
     iface = qgis.utils.iface
     from qgis.core import Qgis
 
-    url = qgis.utils.pluginMetadata(NAME,'repository')
+    # url = qgis.utils.pluginMetadata(NAME, 'repository')
     # URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
     # print(URL)
     version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
@@ -174,11 +165,12 @@ 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:
+        except NameError:
             print("error gitea version ssl")
     else:
         iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)
 
+
 def devlog(NAME):
     import qgis
     devmaj = '<head><style>* {margin:0; padding:0; }</style></head>'

CenRa_FLUX/tools/ui/CenRa_Flux_base - Copie.ui

@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <resources>
- </resources>
- <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>350</x>
-     <y>20</y>
-     <width>221</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="pixmap">
-    <pixmap resource="resources.qrc">:/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 resource="resources.qrc">
-     <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 resource="resources.qrc">
-     <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>
- </widget>
- <connections/>
-</ui>

CenRa_FLUX/tools/ui/CenRa_Flux_base.ui

@@ -9,148 +9,95 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>910</width>
+    <width>890</width>
-    <height>800</height>
+    <height>810</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>910</width>
+    <width>600</width>
-    <height>800</height>
+    <height>400</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>910</width>
+    <width>890</width>
-    <height>800</height>
+    <height>810</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>SIG CEN-RA</string>
   </property>
-  <widget class="QComboBox" name="comboBox">
+  <property name="sizeGripEnabled">
-   <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">
+  <layout class="QGridLayout" name="gridLayout">
-    <string notr="true"/>
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMaximumSize</enum>
    </property>
-  </widget>
+   <property name="leftMargin">
-  <widget class="QComboBox" name="comboBox_2">
+    <number>0</number>
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>80</y>
-     <width>171</width>
-     <height>22</height>
-    </rect>
    </property>
-   <property name="editable">
+   <property name="topMargin">
-    <bool>false</bool>
+    <number>0</number>
    </property>
-   <property name="currentText">
+   <property name="rightMargin">
-    <string notr="true"/>
+    <number>0</number>
    </property>
-  </widget>
+   <property name="bottomMargin">
-  <widget class="QLabel" name="label_3">
+    <number>0</number>
-   <property name="geometry">
-    <rect>
-     <x>345</x>
-     <y>10</y>
-     <width>221</width>
-     <height>71</height>
-    </rect>
    </property>
-   <property name="text">
+   <property name="spacing">
-    <string/>
+    <number>0</number>
    </property>
-   <property name="pixmap">
+   <item row="0" column="0">
-    <pixmap>:/plugins/CenRa_FLUX/logo.jpg</pixmap>
+    <widget class="QScrollArea" name="scrollArea">
-   </property>
+     <property name="maximumSize">
-   <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>
+       <width>890</width>
-     <height>40</height>
+       <height>810</height>
+      </size>
+     </property>
+     <property name="inputMethodHints">
+      <set>Qt::ImhNoEditMenu|Qt::ImhNoTextHandles</set>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
+     </property>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
+     <property name="midLineWidth">
+      <number>0</number>
+     </property>
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents_2">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>890</width>
+        <height>810</height>
+       </rect>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>890</width>
+        <height>810</height>
        </size>
       </property>
-  </widget>
       <widget class="QCommandLinkButton" name="commandLinkButton_2">
        <property name="geometry">
         <rect>
-     <x>460</x>
+         <x>450</x>
          <y>470</y>
          <width>61</width>
          <height>61</height>
@@ -170,13 +117,81 @@
         </size>
        </property>
       </widget>
+      <widget class="QPushButton" name="pushButton_2">
+       <property name="geometry">
+        <rect>
+         <x>360</x>
+         <y>750</y>
+         <width>171</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Charger les couches</string>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label">
+       <property name="geometry">
+        <rect>
+         <x>30</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="QTableWidget" name="tableWidget_2">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>550</y>
+         <width>851</width>
+         <height>181</height>
+        </rect>
+       </property>
+       <property name="inputMethodHints">
+        <set>Qt::ImhNoEditMenu|Qt::ImhNoTextHandles</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::SingleSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
+      </widget>
+      <widget class="QComboBox" name="comboBox">
+       <property name="geometry">
+        <rect>
+         <x>250</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="QLineEdit" name="lineEdit">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="geometry">
         <rect>
-     <x>480</x>
+         <x>470</x>
          <y>130</y>
          <width>171</width>
          <height>21</height>
@@ -195,30 +210,54 @@
         <bool>true</bool>
        </property>
       </widget>
-  <widget class="QLabel" name="label">
+      <widget class="QToolButton" name="toolButton">
        <property name="geometry">
         <rect>
-     <x>40</x>
+         <x>660</x>
-     <y>150</y>
+         <y>130</y>
-     <width>161</width>
+         <width>21</width>
-     <height>16</height>
+         <height>21</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>
+        <string/>
+       </property>
+      </widget>
+      <widget class="QTableWidget" name="tableWidget">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>170</y>
+         <width>850</width>
+         <height>281</height>
+        </rect>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editTriggers">
+        <set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::SingleSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
        </property>
       </widget>
       <widget class="QLabel" name="label_2">
        <property name="geometry">
         <rect>
-     <x>30</x>
+         <x>20</x>
          <y>530</y>
          <width>171</width>
          <height>16</height>
@@ -235,17 +274,151 @@
         <string>Flux sélectionné(s) à charger :</string>
        </property>
       </widget>
-  <zorder>label_3</zorder>
+      <widget class="QLabel" name="label_3">
-  <zorder>comboBox</zorder>
+       <property name="geometry">
-  <zorder>comboBox_2</zorder>
+        <rect>
-  <zorder>pushButton_2</zorder>
+         <x>335</x>
-  <zorder>tableWidget</zorder>
+         <y>10</y>
-  <zorder>tableWidget_2</zorder>
+         <width>221</width>
-  <zorder>commandLinkButton</zorder>
+         <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="QComboBox" name="comboBox_2">
+       <property name="geometry">
+        <rect>
+         <x>360</x>
+         <y>80</y>
+         <width>171</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="currentText">
+        <string notr="true"/>
+       </property>
+      </widget>
+      <widget class="QCommandLinkButton" name="commandLinkButton">
+       <property name="geometry">
+        <rect>
+         <x>390</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="QCheckBox" name="checkBox">
+       <property name="geometry">
+        <rect>
+         <x>830</x>
+         <y>20</y>
+         <width>70</width>
+         <height>17</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <widget class="QComboBox" name="DeBUG">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>20</y>
+         <width>71</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="currentText">
+        <string notr="true"/>
+       </property>
+      </widget>
+      <widget class="QTextBrowser" name="viewer">
+       <property name="geometry">
+        <rect>
+         <x>90</x>
+         <y>10</y>
+         <width>731</width>
+         <height>731</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <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>lineEdit</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>
+  </layout>
  </widget>
  <resources/>
  <connections/>

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">
@@ -29,9 +25,6 @@
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
@@ -56,7 +49,7 @@
        <property name="title">
         <string>DevLog</string>
        </property>
-       <widget class="QWebView" name="viewer" native="true">
+       <widget class="QTextBrowser" name="viewer">
         <property name="geometry">
          <rect>
           <x>10</x>
@@ -65,11 +58,6 @@
           <height>511</height>
          </rect>
         </property>
-        <property name="url" stdset="0">
-         <url>
-          <string>about:blank</string>
-         </url>
-        </property>
        </widget>
       </widget>
      </widget>
@@ -78,19 +66,12 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_METABASE/CenRa_Metabase.py

@@ -4,13 +4,12 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
+from qgis.PyQt.QtCore import Qt, QUrl, QSettings
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction, QMessageBox
+from qgis.PyQt.QtWidgets import QAction
 from qgis.utils import iface
 import qgis
 
-
 # include <QSettings>
 '''
 from pg_metadata.connection_manager import (
@@ -24,17 +23,23 @@ from pg_metadata.processing.provider import PgMetadataProvider
 from pg_metadata.qgis_plugin_tools.tools.custom_logging import setup_logger
 '''
 import os
+from .about_form import MetabaseAboutDialog
 from .tools.resources import (
-    plugin_path,
+    # plugin_path,
+    pyperclip,
     resources_path,
     maj_verif,
 )
+pyperclip()
+
+try:
     from .dock import CenRa_Metabase
     from .editor import Metabase_Editor
-from .about_form import MetabaseAboutDialog
+except NameError:
+    print('404')
+
 # from CenRa_Metabase.issues import CenRa_Issues
 
-from PyQt5.QtCore import *
 
 class PgMetadata:
     def __init__(self):
@@ -97,14 +102,13 @@ class PgMetadata:
         if not self.editor:
             self.editor = Metabase_Editor()
 
-
             self.editor_action = QAction(icon2, 'CenRa_Metabase', None)
             self.toolBar.addAction(self.editor_action)
             self.editor_action.triggered.connect(self.open_editor)
 
         if not self.dock:
             self.dock = CenRa_Metabase()
-            iface.addDockWidget(Qt.RightDockWidgetArea, self.dock)
+            iface.addDockWidget(Qt.DockWidgetArea(0x2), self.dock)
 
             # Open/close the dock from plugin menu
             self.dock_action = QAction(icon, 'CenRa_Metabase', iface.mainWindow())
@@ -155,7 +159,8 @@ class PgMetadata:
         About dialog
         """
         dialog = MetabaseAboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -199,7 +204,6 @@ class PgMetadata:
             iface.pluginMenu().removeAction(self.dock_action)
             del self.dock_action
 
-
     @staticmethod
     def run_tests(pattern='test_*.py', package=None):
         """Run the test inside QGIS."""

CenRa_METABASE/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog
@@ -12,10 +12,11 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType(
     os.path.join(
         str(Path(__file__).resolve().parent),
         'tools/ui',
-        'CenRa_Metabase_about_form.ui'
+        'CenRa_about_form.ui'
     )
 )
 
+
 class MetabaseAboutDialog(QDialog, ABOUT_FORM_CLASS):
 
     """ About - Let the user display the about dialog. """

CenRa_METABASE/dock.py

@@ -14,45 +14,31 @@ from pathlib import Path
 from xml.dom.minidom import parseString
 
 from qgis.core import (
-    NULL,
     QgsApplication,
-    QgsDataSourceUri,
-    QgsProject,
-    QgsProviderConnectionException,
     QgsProviderRegistry,
-    QgsRasterLayer,
     QgsSettings,
-    QgsVectorLayer,
 )
 from qgis.PyQt.QtCore import QLocale, QUrl
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
 from qgis.PyQt.QtPrintSupport import QPrinter
-from qgis.PyQt.QtWebKitWidgets import QWebPage
+# from qgis.PyQt.QtWebKitWidgets import QWebPage
 from qgis.PyQt.QtWidgets import (
-    QDialog,
     QAction,
     QDockWidget,
     QFileDialog,
-    QInputDialog,
     QMenu,
     QToolButton,
 )
-from qgis.gui import *
 from qgis.utils import iface
 import qgis
-'''
-from pg_metadata.connection_manager import (
-    check_pgmetadata_is_installed,
-    connections_list,
-    settings_connections_names,
-)
-'''
-
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
 )
+try:
+    from .tools.PythonSQL import login_base
+except ValueError:
+    print('Pas de fichier PythonSQL')
 
 DOCK_CLASS = load_ui('CenRa_Metabase_dockwidget_base.ui')
 LOGGER = logging.getLogger('CenRa_Metabase')
@@ -81,8 +67,8 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
         self.current_datasource_uri = None
         self.current_connection = None
 
-        self.viewer.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
+        # self.viewer.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
-        self.viewer.page().linkClicked.connect(self.open_link)
+        # self.viewer.page().linkClicked.connect(self.open_link)
 
         # Help button
         self.external_help.setText('')
@@ -98,7 +84,7 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
         # Settings menu
         self.config.setAutoRaise(True)
         # self.config.setToolTip(tr("Settings"))
-        self.config.setPopupMode(QToolButton.InstantPopup)
+        self.config.setPopupMode(QToolButton.ToolButtonPopupMode(2))
         self.config.setIcon(QgsApplication.getThemeIcon("/mActionOptions.svg"))
 
         self.auto_open_dock_action = QAction(
@@ -116,7 +102,7 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
         # Setting PDF/HTML menu
         self.save_button.setAutoRaise(True)
         # self.save_button.setToolTip(tr("Save metadata"))
-        self.save_button.setPopupMode(QToolButton.InstantPopup)
+        self.save_button.setPopupMode(QToolButton.ToolButtonPopupMode(2))
         self.save_button.setIcon(QIcon(QgsApplication.iconPath('mActionFileSave.svg')))
 
         self.save_as_pdf = QAction(
@@ -147,11 +133,11 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
         # self.default_html_content_not_installed()
         # else:
         self.default_html_content_not_pg_layer()
-
+        iface.layerTreeView().currentLayerChanged.connect(self.layer_changed)
         try:
             login_base()
             iface.layerTreeView().currentLayerChanged.connect(self.layer_changed)
-        except:
+        except ValueError:
             # qgis.utils.plugins['CenRa_METABASE'].initGui()
             qgis.utils.plugins['CenRa_METABASE'].unload()
             # self.default_html_content_not_pg_layer()
@@ -188,8 +174,8 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
 
         if output_format == OutputFormats.PDF:
             printer = QPrinter()
-            printer.setOutputFormat(QPrinter.PdfFormat)
+            printer.setOutputFormat(QPrinter.OutputFormat(1))
-            printer.setPageMargins(20, 20, 20, 20, QPrinter.Millimeter)
+            # printer.setPageMargins(20,20,20,20,QPrinter.Unit(0))
             printer.setOutputFileName(output_file_path)
             self.viewer.print(printer)
             iface.messageBar().pushSuccess(
@@ -228,43 +214,15 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
     def save_auto_open_dock(self):
         """ Save settings about the dock. """
         self.settings.setValue("pgmetadata/auto_open_dock", self.auto_open_dock_action.isChecked())
+
     def sql_to_xml(self, dataall):
         distribution = ''
         for y in dataall[1]:
-            distribution = distribution + (
+            distribution = distribution + ('<dcat:distribution>' + '<dcat:Distribution>' + '<dct:title>{data}</dct:title>'.format(data=y[0]) + '<dcat:downloadURL>{data}</dcat:downloadURL>'.format(data=y[1]) + '<dcat:mediaType>{data}</dcat:mediaType>'.format(data=y[2]) + '<dct:format>{data}</dct:format>'.format(data=y[3]) + '<dct:bytesize>{data}</dct:bytesize>'.format(data=y[4]) + '</dcat:Distribution>' + '</dcat:distribution>')
-            '<dcat:distribution>'+
-            '<dcat:Distribution>'+
-            '<dct:title>{data}</dct:title>'.format(data=y[0])+
-            '<dcat:downloadURL>{data}</dcat:downloadURL>'.format(data=y[1])+
-            '<dcat:mediaType>{data}</dcat:mediaType>'.format(data=y[2])+
-            '<dct:format>{data}</dct:format>'.format(data=y[3])+
-            '<dct:bytesize>{data}</dct:bytesize>'.format(data=y[4])+
-            '</dcat:Distribution>'+
-            '</dcat:distribution>')
         publisher = ''
         for z in dataall[2]:
-            publisher = publisher + (
+            publisher = publisher + ('<dct:publisher>' + '<foaf:Organization>' + '<foaf:name>{data}</foaf:name>'.format(data=z[1]) + '<foaf:mbox>{data}</foaf:mbox>'.format(data=z[3]) + '</foaf:Organization>' + '</dct:publisher>')
-            '<dct:publisher>'+
+        data_str = [[dataall[0][26], '<dct:identifier>{data}</dct:identifier>'.format(data=dataall[0][1]) + '<dct:title>{data}</dct:title>'.format(data=dataall[0][4]) + '<dct:description>{data}</dct:description>'.format(data=dataall[0][5]) + '<dct:language>{data}</dct:language>'.format(data=dataall[0][26]) + '<dct:spatial>{data}</dct:spatial>'.format(data=dataall[0][28]) + '<dct:created rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">{data}</dct:created>'.format(data=dataall[0][20]) + '<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">{data}</dct:issued>'.format(data=dataall[0][11]) + '<dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">{data}</dct:modified>'.format(data=dataall[0][21]) + '<dct:license>{data}</dct:license>'.format(data=dataall[0][13]) + distribution + publisher + '<dcat:theme>{data}</dcat:theme>'.format(data=", ".join(str(x) for x in dataall[0][24])) + '<dcat:keyword>{data}</dcat:keyword>'.format(data=", ".join(str(x) for x in dataall[0][6])) + '<dct:accrualPeriodicity>{data}</dct:accrualPeriodicity>'.format(data=dataall[0][12])]]
-            '<foaf:Organization>'+
-            '<foaf:name>{data}</foaf:name>'.format(data=z[1])+
-            '<foaf:mbox>{data}</foaf:mbox>'.format(data=z[3])+
-            '</foaf:Organization>'+
-            '</dct:publisher>')
-        data_str = [[dataall[0][26],
-'<dct:identifier>{data}</dct:identifier>'.format(data=dataall[0][1])+
-'<dct:title>{data}</dct:title>'.format(data=dataall[0][4])+
-'<dct:description>{data}</dct:description>'.format(data=dataall[0][5])+
-'<dct:language>{data}</dct:language>'.format(data=dataall[0][26])+
-'<dct:spatial>{data}</dct:spatial>'.format(data=dataall[0][28])+
-'<dct:created rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">{data}</dct:created>'.format(data=dataall[0][20])+
-'<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">{data}</dct:issued>'.format(data=dataall[0][11])+
-'<dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">{data}</dct:modified>'.format(data=dataall[0][21])+
-'<dct:license>{data}</dct:license>'.format(data=dataall[0][13])+
-distribution+
-publisher+
-'<dcat:theme>{data}</dcat:theme>'.format(data=", ".join(str(x) for x in dataall[0][24]))+
-'<dcat:keyword>{data}</dcat:keyword>'.format(data=", ".join(str(x) for x in dataall[0][6]))+
-'<dct:accrualPeriodicity>{data}</dct:accrualPeriodicity>'.format(data=dataall[0][12])]]
 
         return data_str
 
@@ -289,7 +247,6 @@ publisher+
         self.current_connection = None
         self.ce_trouve_dans_psql(layer)
 
-
     def add_flatten_dataset_table(self):
         """ Add a flatten dataset table with all links and contacts. """
         '''
@@ -334,7 +291,7 @@ publisher+
 
     def set_html_content(self, title=None, body=None):
         """ Set the content in the dock. """
-        #link_logo=resources_path('icons', 'CEN_RA.png')
+        # ink_logo=resources_path('icons', 'CEN_RA.png')
         css_file = resources_path('css', 'dock.css')
         with open(css_file, 'r', encoding='utf8') as f:
             css = f.read()
@@ -353,13 +310,13 @@ publisher+
         html += '</body></html>'
 
         # It must be a file, even if it does not exist on the file system.
-        base_url = QUrl.fromLocalFile(resources_path('images', 'must_be_a_file.png'))
+        # base_url = QUrl.fromLocalFile(resources_path('images', 'must_be_a_file.png'))
-        self.viewer.setHtml(html, base_url)
+        self.viewer.setHtml(html)
 
     def ce_trouve_dans_psql(self, layer):
         try:
             uri = layer.dataProvider().uri()
-        except:
+        except AttributeError:
             self.default_html_content_not_pg_layer()
             self.save_button.setEnabled(False)
             uri = ''
@@ -389,7 +346,7 @@ publisher+
         data_url = dataall[1]
         data_contact = dataall[2]
         # print(len(data_url))
-        data_collonne=[field.name() for field in layer.dataProvider().fields()]
+        # data_collonne = [field.name() for field in layer.dataProvider().fields()]
 
         body += '<div><h3>Identification</h3><table class="table table-condensed">'
         body += '<tr><th>Titre</th><td>{data[4]}</td></tr>'.format(data=data)
@@ -454,10 +411,12 @@ publisher+
     def set_html_to_wms(self, layer):
         self.set_html_content(
             'CenRa Metadata', (layer.htmlMetadata()))
+
     def default_html_content_not_pg_layer(self):
         """ When it's not a PostgreSQL layer. """
         self.set_html_content(
             'CenRa Metadata', ('Vous devez cliquer sur une couche dans la légende qui est stockée dans PostgreSQL.'))
+
     def default_html_content_not_metadata(self):
         self.set_html_content(
             'CenRa Metadata', ('La couche ne contien pas de métadonnée.'))
@@ -492,4 +451,3 @@ publisher+
         data_contact = cur.fetchall()
         cur.close()
         return data_general[0], data_url, data_contact
-

CenRa_METABASE/editor.py

@@ -1,56 +1,48 @@
 import logging
 import os
 
-from collections import namedtuple
+# from collections import namedtuple
-from enum import Enum
+# from enum import Enum
-from functools import partial
+# from functools import partial
-from pathlib import Path
+# from pathlib import Path
-from xml.dom.minidom import parseString
+# from xml.dom.minidom import parseString
-from qgis.gui import *
+# from qgis.gui import *
 from qgis.core import (
-    NULL,
     QgsApplication,
-    QgsDataSourceUri,
-    QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
-    QgsRasterLayer,
     QgsSettings,
-    QgsVectorLayer,
     QgsGeometry,
     QgsWkbTypes,
+    Qgis,
 )
-from PyQt5 import QtGui
+from qgis.PyQt import QtGui, QtCore
-from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime
+from qgis.PyQt.QtGui import QIcon
-from qgis.PyQt.QtGui import QDesktopServices, QIcon
+# from qgis.PyQt.QtPrintSupport import QPrinter
-from qgis.PyQt.QtPrintSupport import QPrinter
+# from qgis.PyQt.QtWebKitWidgets import QWebPage
-from qgis.PyQt.QtWebKitWidgets import QWebPage
+import psycopg2
 from qgis.PyQt.QtWidgets import (
     QDialog,
-    QAction,
-    QDockWidget,
     QFileDialog,
-    QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
     QTableWidgetItem,
 )
 from qgis.utils import iface
 
+try:
+    from .tools.PythonSQL import login_base
+except ValueError:
+    print('Pas de fichier PythonSQL')
+
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
+    # send_issues,
-    send_issues,
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues
 
 EDITOR_CLASS = load_ui('CenRa_Metabase_editorwidget_base.ui')
-LOGGER = logging.getLogger('CenRa_Metabase')
+LOGGEr = logging.getLogger('CenRa_Metabase')
+
 
 class Metabase_Editor(QDialog, EDITOR_CLASS):
-
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -70,7 +62,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
             self.auto_adding.show()
 
         self.auto_adding.clicked.connect(self.auto_run)
-        self.issues_app.clicked.connect(self.issues_open)
+        # self.issues_app.clicked.connect(self.issues_open)
         self.categories_select_view.itemDoubleClicked.connect(self.add_categories_view)
         self.categories_view.itemDoubleClicked.connect(self.deleter_categories_view)
         self.themes_select_view.itemDoubleClicked.connect(self.add_themes_view)
@@ -98,6 +90,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         self.format_box.setCurrentIndex(0)
         self.taille_line.setText('45')
         self.add_lien()
+
     def add_metadata(self):
         table_name = layer.dataProvider().uri().table()
         schema_name = layer.dataProvider().uri().schema()
@@ -251,7 +244,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
     def is_in_psql(self, layer):
         try:
             uri = layer.dataProvider().uri()
-        except:
+        except AttributeError:
             uri = ''
             return False
         if uri != '':
@@ -320,7 +313,6 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         role_list = all_list[10]
         organisation_list = all_list[11]
 
-
         # langue_box
         self.langue_box.clear()
         self.langue_box.addItem('')
@@ -388,7 +380,6 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         crs_code = str(layer.crs().authid())
         self.crscode_plaintext.setPlainText(crs_code)
 
-
         self.frequence_box.addItem('')
         self.restriction_box.addItem('')
         self.licence_box.addItem('')
@@ -457,7 +448,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
                 try:
                     in_index = sql_dataload[6].index(categorie_select_data[0])
                     in_index = False
-                except:
+                except ValueError:
                     in_index = True
                 if in_index:
                     self.categories_select_view.setItem(i, 0, QTableWidgetItem(categorie_select_data[0]))
@@ -467,7 +458,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
                 try:
                     in_index = sql_dataload[24].index(themes_select_data[0])
                     in_index = False
-                except:
+                except ValueError:
                     in_index = True
                 if in_index:
                     self.themes_select_view.setItem(i, 0, QTableWidgetItem(themes_select_data[0]))
@@ -582,6 +573,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         self.categories_select_view.removeRow(self.categories_select_view.currentRow())
         self.categories_view.insertRow(0)
         self.categories_view.setItem(0, 0, QTableWidgetItem(values_add_categories))
+
     def deleter_categories_view(self):
         values_deleter_categories = self.categories_view.selectedItems()[0].text()
         self.categories_view.removeRow(self.categories_view.currentRow())
@@ -593,6 +585,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         self.themes_select_view.removeRow(self.themes_select_view.currentRow())
         self.themes_view.insertRow(0)
         self.themes_view.setItem(0, 0, QTableWidgetItem(values_add_themes))
+
     def deleter_themes_view(self):
         values_deleter_themes = self.themes_view.selectedItems()[0].text()
         self.themes_view.removeRow(self.themes_view.currentRow())
@@ -613,10 +606,10 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
                 cur.execute(sql_sizefile)
                 boolean = True
 
-            except:
+            except psycopg2.errors.UndefinedTable:
                 boolean = False
 
-            if boolean == True:
+            if boolean is True:
                 size_file = (cur.fetchall())[0][0]
             else:
                 size_file = ''
@@ -654,9 +647,12 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         array_contact += "('" + table + "', '" + schema + "', '" + self.role_box.currentText() + "', '" + self.nom_line.text() + "', '" + self.organisation_box.currentText() + "', '" + self.email_line.text() + "', '" + self.telephone_line.text() + "'),"
 
     def delete_lien(self):
-
+        fin = ''
         global uid_delete_list_link, array_link
+        try:
             lien_uid = self.table_lien.item(self.table_lien.currentRow(), 0).text()
+        except AttributeError:
+            lien_uid = True
         self.table_lien.removeRow(self.table_lien.currentRow())
         if lien_uid == 'new_value':
             position = self.table_lien.currentRow()
@@ -680,12 +676,18 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
                 fin += 1
             array_link = array_link[:debut - 1] + array_link[fin + 1:]
             # print('a:', array_link)
+        elif lien_uid is True:
+            print('Pas de ligne "Lien"')
         else:
             uid_delete_list_link += "'" + lien_uid + "',"
 
     def delete_contact(self):
+        fin = ''
         global uid_delete_list_contact, array_contact
+        try:
             contact_uid = self.table_contact.item(self.table_contact.currentRow(), 0).text()
+        except AttributeError:
+            contact_uid = True
         self.table_contact.removeRow(self.table_contact.currentRow())
         if contact_uid == 'new_value':
             position = self.table_contact.currentRow()
@@ -709,10 +711,11 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
                 fin += 1
             array_contact = array_contact[:debut - 1] + array_contact[fin + 1:]
             # print('a:', array_contact)
+        elif contact_uid is True:
+            print('Pas de ligne "Contact"')
         else:
             uid_delete_list_contact += "'" + contact_uid + "',"
 
-
     def fletch_ref(self):
         cur = login_base()
 
@@ -766,6 +769,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
             folder = folder[0]
             if folder[len(folder) - 4:] == '.xml':
                 print('is .xml')
-    def issues_open(self):
+
-        self.issues = CenRa_Issues()
+    # def issues_open(self):
-        self.issues.show()
+    #    self.issues = CenRa_Issues()
+    #    self.issues.show()

CenRa_METABASE/metadata.txt

@@ -5,8 +5,10 @@
 [general]
 name=CenRa_Metabase
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
+supportsQt6=True
 description=CenRa_METABASE
-version=0.1.6
+version=0.3.2
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,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>07/01/2025 - Version 0.1.6: </h3> - ByPass du certif ssl ci erreur.</br></p><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></br>
+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/PythonSQL.py

@@ -1,34 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-#print(IPAddr)
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.81"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user='stage'

CenRa_METABASE/tools/resources.py

@@ -3,11 +3,12 @@
 import configparser
 import shutil
 import tempfile
-import base64
+# import base64
-import psycopg2
+# import psycopg2
-import psycopg2.extras
+# import psycopg2.extras
+import os
 from os.path import abspath, join, pardir, dirname
-from qgis.PyQt.QtWidgets import QApplication
+
 from qgis.PyQt import uic
 
 __copyright__ = "Copyright 2019, 3Liz"
@@ -107,65 +108,60 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-    from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
 
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+def pyperclip():
-    user = res_ident[1]
+    dst = dirname(dirname(__file__)) + "\\tools\\"
+    if os.access('N:/', os.R_OK):
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
+    try:
+        shutil.copy(src, dst)
+    except FileNotFoundError:
+        print('404')
+    except UnboundLocalError:
+        print('404')
 
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
 
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url, titre, body, labels):
     import requests
+    import urllib.request
     import json
-    import os
+    # import os
-    import qgis
+    # import qgis
 
-    usr = os.environ['USERNAME']
+    # usr = os.environ['USERNAME']
     token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
     url = url + '?token=' + token
 
     headers = {'Authorization': 'token ' + token, 'accept': 'application/json', 'Content-Type': 'application/json'}
 
-
     payload = {'title': titre, 'body': body, 'labels': labels}
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except ValueError:
         binar = False
         r = ''
     if binar:
         r = requests.post(url, data=json.dumps(payload), headers=headers)
     return r
 
+
 def maj_verif(NAME):
     import qgis
     import urllib.request
     iface = qgis.utils.iface
     from qgis.core import Qgis
 
-    url = qgis.utils.pluginMetadata(NAME,'repository')
+    # url = qgis.utils.pluginMetadata(NAME, 'repository')
     # URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
     # print(URL)
     version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
@@ -175,13 +171,11 @@ 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:
+        except urllib.error.URLError:
             print("error gitea version ssl")
     else:
         iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)
 
-def tr(text, context="@default"):
-    return QApplication.translate(context, text)
 
 def devlog(NAME):
     import qgis

CenRa_METABASE/tools/ui/CenRa_Metabase_dockwidget_base.ui

@@ -64,24 +64,11 @@
      </layout>
     </item>
     <item>
-     <widget class="QWebView" name="viewer" native="true">
+     <widget class="QTextBrowser" name="viewer"/>
-      <property name="url" stdset="0">
-       <url>
-        <string>about:blank</string>
-       </url>
-      </property>
-     </widget>
     </item>
    </layout>
   </widget>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

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>
@@ -11,11 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Metabase</string>
+   <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>
@@ -29,9 +25,6 @@
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
@@ -56,7 +49,7 @@
        <property name="title">
         <string>DevLog</string>
        </property>
-       <widget class="QWebView" name="viewer" native="true">
+       <widget class="QTextBrowser" name="viewer">
         <property name="geometry">
          <rect>
           <x>10</x>
@@ -65,11 +58,6 @@
           <height>511</height>
          </rect>
         </property>
-        <property name="url" stdset="0">
-         <url>
-          <string>about:blank</string>
-         </url>
-        </property>
        </widget>
       </widget>
      </widget>
@@ -78,19 +66,12 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_PAGERENDER/CenRa_PageRender.py

@@ -4,9 +4,9 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
+from qgis.PyQt.QtCore import QUrl, QSettings
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction, QMessageBox
+from qgis.PyQt.QtWidgets import QAction
 from qgis.utils import iface
 import qgis
 
@@ -25,14 +25,13 @@ from pg_metadata.qgis_plugin_tools.tools.custom_logging import setup_logger
 '''
 import os
 from .tools.resources import (
-    plugin_path,
+    # plugin_path,
     resources_path,
     maj_verif,
 )
 from .canvas_editor import PageRender_Editor
 from .about_form import AboutDialog
 
-from PyQt5.QtCore import *
 
 class PgPageRender:
     def __init__(self):
@@ -73,7 +72,6 @@ class PgPageRender:
         if not self.canvas_editor:
             self.canvas_editor = PageRender_Editor()
 
-
             self.pagerender_action = QAction(icon, 'CenRa_PAGERENDER', None)
             self.toolBar.addAction(self.pagerender_action)
             self.pagerender_action.triggered.connect(self.open_editor)
@@ -115,7 +113,8 @@ class PgPageRender:
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))

CenRa_PAGERENDER/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog

CenRa_PAGERENDER/canvas_editor.py

@@ -1,75 +1,37 @@
 import logging
 import os
-from PyQt5.QtCore import QSettings,QPointF
+# from collections import namedtuple
-from collections import namedtuple
+# from enum import Enum
-from enum import Enum
+# from functools import partial
-from functools import partial
+# from pathlib import Path
-from pathlib import Path
+# from xml.dom.minidom import parseString
-from xml.dom.minidom import parseString
+# from qgis.gui import *
-from qgis.gui import *
+# import qgis
-import qgis
+from qgis.core import QgsSettings
-from qgis.core import (
+from qgis.PyQt.QtCore import Qt
-    NULL,
+# from qgis.PyQt.QtPrintSupport import QPrinter
-    QgsApplication,
+# from qgis.PyQt.QtWebKitWidgets import QWebPage
-    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,
-    QgsLayoutItemHtml,
-)
-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.QtWebKitWidgets import QWebPage
 from qgis.PyQt.QtWidgets import (
     QDialog,
-    QAction,
-    QDockWidget,
     QFileDialog,
-    QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
     QTableWidgetItem,
-    QVBoxLayout,
 )
-from PyQt5 import QtGui
+
-from PyQt5.QtWidgets import QApplication
+from qgis.PyQt import QtGui
-from qgis.PyQt.QtXml import QDomDocument
+from qgis.PyQt.QtWidgets import QApplication
-from qgis.utils import iface
+from qgis.PyQt.QtCore import QSettings
-import glob
+
+# from qgis.PyQt.QtXml import QDomDocument
+# from qgis.utils import iface
+# import glob
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
+    # send_issues,
-    send_issues,
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues
-from datetime import date
+# from datetime import date
+
 last_select = None
 maxV = 210
 maxH = 296
@@ -79,31 +41,10 @@ url_osm = 'https://osm.datagrandest.fr/mapcache/?crs=EPSG:2154&featureCount=10&f
 url_ortho = 'http://tiles.craig.fr/ortho/service/?crs=EPSG:2154&featureCount=10&format=image/jpeg&layers=ortho&maxHeight=256&maxWidth=256&styles=&url=http://tiles.craig.fr/ortho/service'
 url_mnt = 'http://tiles.craig.fr/mnt/crs=EPSG:2154&featureCount=10&format=image/png&layers=relief&maxHeight=256&maxWidth=256&styles=&url=http://tiles.craig.fr/mnt'
 url_pente = 'http://tiles.craig.fr/mnt/crs=EPSG:2154&featureCount=10&format=image/png&layers=pente&maxHeight=256&maxWidth=256&styles=&url=http://tiles.craig.fr/mnt'
-data_source = [
+data_source = ['CENRA', 'IGN', 'CRAIG', 'OpenStreetMap', 'Sandre', 'BRGM', 'MUSÉUM NATIONAL D’HISTOIRE NATURELLE', "Muséum national d'Histoire naturelle", 'ONF', '20xx LPO', 'ofb.gouv.fr', 'Stamen Design', 'MTES', 'MTES', 'FEDER', 'DREAL Auvergne-Rhône-Alpes', 'INSEE', 'DGFiP', 'Fédération des Conservatoires d’espaces naturels', 'Plan cadastral informatisé - Etalab - juillet 202X', 'Parcellaire Express - IGN - 202X']
-'CENRA',
-'IGN',
-'CRAIG',
-'OpenStreetMap',
-'Sandre',
-'BRGM',
-'MUSÉUM NATIONAL D’HISTOIRE NATURELLE',
-"Muséum national d'Histoire naturelle",
-'ONF',
-'20xx LPO',
-'ofb.gouv.fr',
-'Stamen Design',
-'MTES',
-'MTES',
-'FEDER',
-'DREAL Auvergne-Rhône-Alpes',
-'INSEE',
-'DGFiP',
-'Fédération des Conservatoires d’espaces naturels',
-'Plan cadastral informatisé - Etalab - juillet 202X',
-'Parcellaire Express - IGN - 202X',
-]
-class PageRender_Editor(QDialog, EDITOR_CLASS):
 
+
+class PageRender_Editor(QDialog, EDITOR_CLASS):
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -126,7 +67,8 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
             'Credit': 0,
             'Source': 0,
             'Echelle_2': 0,
-        'Logo_2':0,}
+            'Logo_2': 0}
+        self.varObject = {}
 
         path = ''
         ix = 0
@@ -142,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)
@@ -157,9 +100,10 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
         self.activateWindow()
         self.setNavigator()
         self.verticalScrollBar.setValue(self.frame.y())
+
     def mousePressEvent(self, event):
-        if self.tableWidget.currentItem() != None:
+        if self.tableWidget.currentItem() is not None:
-            QApplication.setOverrideCursor(Qt.OpenHandCursor)
+            QApplication.setOverrideCursor(Qt.CursorShape(18))
             global lastPos
             lastPos = {'x': event.pos().x(), 'y': event.pos().y()}
 
@@ -168,16 +112,15 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
 
     def keyPressEvent(self, event):
         # if event.modifiers() & Qt.ControlModifier:
-        if event.key() == Qt.Key_Up:
+        if event.key() == Qt.Key(0x01000015):
             self.verticalSlider.setValue(self.spinBox_2.value() + 1)
-        if event.key() == Qt.Key_Down:
+        if event.key() == Qt.Key(0x01000013):
             self.verticalSlider.setValue(self.spinBox_2.value() - 1)
-        if event.key() == Qt.Key_Right:
+        if event.key() == Qt.Key(0x01000014):
             self.horizontalSlider.setValue(self.spinBox.value() + 1)
-        if event.key() == Qt.Key_Left:
+        if event.key() == Qt.Key(0x01000012):
             self.horizontalSlider.setValue(self.spinBox.value() - 1)
 
-
     def wheelEvent(self, event):
         if (event.angleDelta().y() >= 1):
             vsb = self.verticalScrollBar.value() + 50
@@ -187,7 +130,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
 
     def mouseMoveEvent(self, event):
         updated_cursor_position = event.pos()
-        if self.tableWidget.currentItem() != None:
+        if self.tableWidget.currentItem() is not None:
             selection_name = (self.tableWidget.currentItem()).text()
             all_children = self.frame.children()
             selection = 0
@@ -203,14 +146,14 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
 
             orig_position_w = selection.width()
             orig_position_h = selection.height()
-            if (frame_x <= round(updated_cursor_position.x()) <= frame_w and self.radioButton.isChecked() == True):
+            if (frame_x <= round(updated_cursor_position.x()) <= frame_w and self.radioButton.isChecked() is True):
                 updated_cursor_position_x = orig_position_w + (round(updated_cursor_position.x() - lastPos['x']))
                 lastPos['x'] = event.pos().x()
                 selection.resize(updated_cursor_position_x, orig_position_h)
                 self.horizontalSlider.setValue(round(updated_cursor_position_x / 3.5))
             orig_position_w = selection.width()
             orig_position_h = selection.height()
-            if (frame_y <= round(updated_cursor_position.y()) <= frame_h and self.radioButton.isChecked() == True):
+            if (frame_y <= round(updated_cursor_position.y()) <= frame_h and self.radioButton.isChecked() is True):
                 updated_cursor_position_y = orig_position_h + (round(updated_cursor_position.y() - lastPos['y']))
                 lastPos['y'] = event.pos().y()
                 selection.resize(orig_position_w, updated_cursor_position_y)
@@ -218,7 +161,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
 
             orig_position_x = selection.pos().x()
             orig_position_y = selection.pos().y()
-            if (frame_x <= round(updated_cursor_position.x()) <= frame_w and self.radioButton.isChecked() == False):
+            if (frame_x <= round(updated_cursor_position.x()) <= frame_w and self.radioButton.isChecked() is False):
                 updated_cursor_position_x = orig_position_x + (round(updated_cursor_position.x() - lastPos['x']))
                 lastPos['x'] = event.pos().x()
                 # print(updated_cursor_position_x)
@@ -227,7 +170,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
 
             orig_position_x = selection.pos().x()
             orig_position_y = selection.pos().y()
-            if (frame_y <= round(updated_cursor_position.y()) <= frame_h and self.radioButton.isChecked() == False):
+            if (frame_y <= round(updated_cursor_position.y()) <= frame_h and self.radioButton.isChecked() is False):
                 updated_cursor_position_y = orig_position_y + (round(updated_cursor_position.y() - lastPos['y']))
                 lastPos['y'] = event.pos().y()
                 # print(updated_cursor_position_y)
@@ -236,17 +179,18 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
 
     def mouseReleaseEvent(self, event):
         # print('x: {0}, y: {1}'.format(event.pos().x(), event.pos().y()))
-        if self.tableWidget.currentItem() != None:
+        if self.tableWidget.currentItem() is not None:
             QApplication.restoreOverrideCursor()
 
     def select_file(self):
-        options = QFileDialog.Options()
+        # options = QFileDialog.Options()
-        options |= QFileDialog.ShowDirsOnly
+        # options |= QFileDialog.getExistingDirectory()
         folder = QFileDialog.getOpenFileName(self, "Sélection du fichier ", '', 'Python(*.py)')
         if folder[0] != '':
             return folder[0]
         else:
             return ''
+
     def load(self):
         folder = self.select_file()
         logopath = folder
@@ -255,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:
@@ -265,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
@@ -316,12 +270,13 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
             self.tableWidget.removeRow(0)
             xR = xR + 1
         self.tableWidget.clear()
-        id=0
+        # id = 0
         for children in all_children:
             position = self.tableWidget.rowCount()
             self.tableWidget.insertRow(position)
             self.tableWidget.setItem(position, 0, QTableWidgetItem(children.objectName()))
             # print(children.objectName())
+
     def export(self):
         self.type_page()
         self.type_page()
@@ -333,6 +288,8 @@ from qgis.core import (
     QgsUnitTypes,
     QgsLayoutPoint,
 )
+
+
 def fletch_canvas(self):
     if self.radioButton_6.isChecked():
         values_page = 'A4'
@@ -354,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:
@@ -411,6 +378,7 @@ def fletch_canvas(self):
         sourceFile = open(self.path, 'w')
         print(export_str, file=sourceFile)
         sourceFile.close()
+
     def type_page(self):
         all_children = self.frame.children()
         if self.toolButton_2.text() == 'Landscape':
@@ -461,9 +429,30 @@ def fletch_canvas(self):
         frame_x = round(frame_w / 3)
         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() != None:
+        if self.tableWidget.currentItem() is not None:
-            print(self.tableWidget.tabKeyNavigation())
             selection_name = (self.tableWidget.currentItem()).text()
             all_children = self.frame.children()
             selection = 0
@@ -475,7 +464,7 @@ def fletch_canvas(self):
                     selection = children
             if selection != 0:
                 self.rotate_color(selection, last_children)
-                if self.radioButton.isChecked() == False:
+                if self.radioButton.isChecked() is False:
                     xx = round(selection.x() / 3.5)
                     yy = round(selection.y() / 3.5)
                 else:
@@ -486,29 +475,30 @@ 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
-        if self.radioButton.isChecked() == False:
+        if self.radioButton.isChecked() is False:
             ColorCode = "10, 10, 80, 50"
         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()
 
     def rotate(self):
-        if self.tableWidget.currentItem() != None:
+        if self.tableWidget.currentItem() is not None:
             selection_name = (self.tableWidget.currentItem()).text()
             all_children = self.frame.children()
             selection = 0
@@ -522,7 +512,7 @@ def fletch_canvas(self):
                 xx = round(selection.size().width())
                 yy = round(selection.size().height())
                 selection.resize(round(yy), round(xx))
-                if self.radioButton.isChecked() == True:
+                if self.radioButton.isChecked() is True:
                     self.spinBox.setValue(yy)
                     self.spinBox_2.setValue(xx)
                     self.horizontalSlider.setValue(round(yy / 3.5))
@@ -535,7 +525,7 @@ def fletch_canvas(self):
                 self.rotate_color(selection, last_children)
 
     def vertical(self):
-        if self.tableWidget.currentItem() != None:
+        if self.tableWidget.currentItem() is not None:
             selection_name = (self.tableWidget.currentItem()).text()
             all_children = self.frame.children()
             selection = 0
@@ -543,7 +533,7 @@ def fletch_canvas(self):
                 if selection_name == children.objectName():
                     selection = children
             if selection != 0:
-                if self.radioButton.isChecked() == False:
+                if self.radioButton.isChecked() is False:
                     selection.move(round(self.horizontalSlider.value() * 3.5), round(self.verticalSlider.value() * 3.5))
                 else:
                     selection.resize(round(self.horizontalSlider.value() * 3.5), round(self.verticalSlider.value() * 3.5))
@@ -551,7 +541,7 @@ def fletch_canvas(self):
                 self.spinBox_2.setValue(round(self.verticalSlider.value()))
 
     def horizontal(self):
-        if self.tableWidget.currentItem() != None:
+        if self.tableWidget.currentItem() is not None:
             selection_name = (self.tableWidget.currentItem()).text()
             all_children = self.frame.children()
             selection = 0
@@ -559,10 +549,9 @@ def fletch_canvas(self):
                 if selection_name == children.objectName():
                     selection = children
             if selection != 0:
-                if self.radioButton.isChecked() == False:
+                if self.radioButton.isChecked() is False:
                     selection.move(round(self.horizontalSlider.value() * 3.5), round(self.verticalSlider.value() * 3.5))
                 else:
                     selection.resize(round(self.horizontalSlider.value() * 3.5), round(self.verticalSlider.value() * 3.5))
                 self.spinBox.setValue(round(self.horizontalSlider.value()))
                 self.spinBox_2.setValue(round(self.verticalSlider.value()))
-

CenRa_PAGERENDER/demoV2.py

@@ -0,0 +1,169 @@
+
+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(200.0, 200, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            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(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)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(51.42857142857143, 7, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(9, 197, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(45.714285714285715, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(3, 3, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(154.28571428571428, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(51, 3, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(51.42857142857143, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(151, 197, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 0
+            self.template_parameters['Source_size'] = QgsLayoutSize(51.42857142857143, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(229, 197, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 0
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(125.71428571428571, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(60, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(51.42857142857143, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(9, 184, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(28.571428571428573, 29, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(9, 151, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+        if values_page == 'A3':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(282, 282, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            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(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)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(73, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(12, 278, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(64, 16, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(4, 4, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(218, 16, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(73, 4, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(73, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(214, 278, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 0
+            self.template_parameters['Source_size'] = QgsLayoutSize(73, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(322, 278, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 0
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(177, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(85, 28, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(73, 18, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(12, 260, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40, 40, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(12, 214, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+    if page_rotate == 'Landscape':
+        if values_page == 'A4':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(200.0, 200, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            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(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)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(51.42857142857143, 7, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(9, 197, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(45.714285714285715, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(3, 3, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(154.28571428571428, 11, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(51, 3, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(51.42857142857143, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(151, 197, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 0
+            self.template_parameters['Source_size'] = QgsLayoutSize(51.42857142857143, 6, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(229, 197, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 0
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(125.71428571428571, 14, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(60, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(51.42857142857143, 13, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(9, 184, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(28.571428571428573, 29, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(9, 151, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+        if values_page == 'A3':
+            self.template_parameters['Carte_size'] = QgsLayoutSize(282, 282, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Carte_rotate'] = 0
+            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(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)
+            self.template_parameters['Arrow_rotate'] = 0
+            self.template_parameters['Echelle_size'] = QgsLayoutSize(73, 10, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(12, 278, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_rotate'] = 0
+            self.template_parameters['Logo_size'] = QgsLayoutSize(64, 16, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_locals'] = QgsLayoutPoint(4, 4, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_rotate'] = 0
+            self.template_parameters['Titre_size'] = QgsLayoutSize(218, 16, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_locals'] = QgsLayoutPoint(73, 4, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Titre_rotate'] = 0
+            self.template_parameters['Credit_size'] = QgsLayoutSize(73, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_locals'] = QgsLayoutPoint(214, 278, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Credit_rotate'] = 0
+            self.template_parameters['Source_size'] = QgsLayoutSize(73, 8, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_locals'] = QgsLayoutPoint(322, 278, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Source_rotate'] = 0
+            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(177, 20, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(85, 28, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Sous_titre_rotate'] = 0
+            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(73, 18, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(12, 260, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Echelle_2_rotate'] = 0
+            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40, 40, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(12, 214, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Logo_2_rotate'] = 0
+    return self.template_parameters

CenRa_PAGERENDER/metadata.txt

@@ -5,8 +5,10 @@
 [general]
 name=CenRa_PageRender
 qgisMinimumVersion=3.0
+qgisMaximumVersion=4.99
+supportsQt6=True
 description=CenRa_PageRender
-version=0.1.5
+version=0.2.5
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,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>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/PythonSQL.py

@@ -1,34 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-#print(IPAddr)
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.81"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user='stage'

CenRa_PAGERENDER/tools/resources.py

@@ -3,9 +3,9 @@
 import configparser
 import shutil
 import tempfile
-import base64
+# import base64
-import psycopg2
+# import psycopg2
-import psycopg2.extras
+# import psycopg2.extras
 from os.path import abspath, join, pardir, dirname
 from qgis.PyQt.QtWidgets import QApplication
 from qgis.PyQt import uic
@@ -107,65 +107,47 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-    from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
 
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
-
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-    
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url, titre, body, labels):
     import requests
+    import urllib.request
     import json
-    import os
+    # import os
-    import qgis
 
-    usr = os.environ['USERNAME']
+    # usr = os.environ['USERNAME']
     token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
     url = url + '?token=' + token
 
     headers = {'Authorization': 'token ' + token, 'accept': 'application/json', 'Content-Type': 'application/json'}
 
-
     payload = {'title': titre, 'body': body, 'labels': labels}
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.requests.URLError:
         binar = False
         r = ''
     if binar:
         r = requests.post(url, data=json.dumps(payload), headers=headers)
     return r
 
+
 def maj_verif(NAME):
     import qgis
     import urllib.request
     iface = qgis.utils.iface
     from qgis.core import Qgis
 
-    url = qgis.utils.pluginMetadata(NAME,'repository')
+    # url = qgis.utils.pluginMetadata(NAME, 'repository')
     # URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
@@ -175,14 +157,16 @@ 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:
+        except urllib.requests.URLError:
             print("error gitea version ssl")
     else:
         iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)
 
+
 def tr(text, context="@default"):
     return QApplication.translate(context, text)
 
+
 def devlog(NAME):
     import qgis
     devmaj = '<head><style>* {margin:0; padding:0; }</style></head>'

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>
+       <string notr="true">background-color: rgba(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>
       </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">
+      <property name="autoFillBackground">
-       <string notr="true">background-color: rgb(10, 10, 10, 50)</string>
+       <bool>false</bool>
       </property>
-      <property name="frameShadow">
+      <property name="styleSheet">
-       <enum>QFrame::Plain</enum>
+       <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>
+       <string notr="true">background-color: rgba(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>
       </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>
+       <string notr="true">background-color: rgba(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>
       </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">
@@ -29,9 +25,6 @@
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
@@ -56,7 +49,7 @@
        <property name="title">
         <string>DevLog</string>
        </property>
-       <widget class="QWebView" name="viewer" native="true">
+       <widget class="QTextBrowser" name="viewer">
         <property name="geometry">
          <rect>
           <x>10</x>
@@ -65,11 +58,6 @@
           <height>511</height>
          </rect>
         </property>
-        <property name="url" stdset="0">
-         <url>
-          <string>about:blank</string>
-         </url>
-        </property>
        </widget>
       </widget>
      </widget>
@@ -78,19 +66,12 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_POSTGIS/CenRa_Postgis.py

@@ -4,32 +4,43 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
+from qgis.PyQt.QtCore import QUrl
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction, QMessageBox
+from qgis.PyQt.QtWidgets import QAction
 from qgis.utils import iface
 import qgis
 
 
 # include <QSettings>
 
+import socket
 import os
+from qgis.PyQt.QtCore import QSettings
+from .about_form import AboutDialog
 from .tools.resources import (
-    plugin_path,
+    # plugin_path,
+    pyperclip,
     resources_path,
     maj_verif,
 )
+pyperclip()
+
+try:
     from .postgis_editor import Postgis_Editor
     from .postgis_creator import Postgis_Creator
-from .about_form import AboutDialog
+    from .postgis_rename import Postgis_Rename
+except NameError:
+    print('Module introuvable...')
+
+IPAddr = socket.gethostbyname(socket.gethostname())
 
-from PyQt5.QtCore import *
 
 class PgPostgis:
     def __init__(self):
         """ Constructor. """
         self.action_editor = None
         self.action_creator = None
+        self.action_rename = None
 #        self.issues = None
         self.provider = None
         self.locator_filter = None
@@ -58,6 +69,7 @@ class PgPostgis:
 
         icon = QIcon(resources_path('icons', 'page_new.png'))
         icon2 = QIcon(resources_path('icons', 'page_ajout.png'))
+        icon3 = QIcon(resources_path('icons', 'page_rename.png'))
 
         # Open the online help
         self.help_action = QAction(icon, "CenRa_Postgis", iface.mainWindow())
@@ -69,6 +81,11 @@ class PgPostgis:
             self.postgis_creator = QAction(icon, 'dossier_creator', None)
             self.toolBar.addAction(self.postgis_creator)
             self.postgis_creator.triggered.connect(self.open_creator)
+
+            self.postgis_creator.setEnabled(False)
+            if os.access('N:/', os.R_OK):
+                self.postgis_creator.setEnabled(True)
+
         if not self.action_editor:
             self.action_editor = Postgis_Editor()
 
@@ -76,12 +93,31 @@ class PgPostgis:
             self.toolBar.addAction(self.postgis_editor)
             self.postgis_editor.triggered.connect(self.open_editor)
 
+            self.postgis_editor.setEnabled(False)
+            if os.access('N:/', os.R_OK):
+                self.postgis_editor.setEnabled(True)
+
+        if not self.action_rename:
+            self.action_rename = Postgis_Rename()
+
+            self.postgis_rename = QAction(icon3, 'dossier_rename', None)
+            self.toolBar.addAction(self.postgis_rename)
+            self.postgis_rename.triggered.connect(self.open_rename)
+            self.postgis_rename.setEnabled(False)
+            self.postgis_rename.setVisible(0)
+
+            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):
         """
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -94,12 +130,18 @@ class PgPostgis:
         self.action_creator.show()
         self.action_creator.raise_()
 
+    def open_rename(self):
+        self.action_rename.show()
+        self.action_rename.raise_()
+
     def unload(self):
         """ Unload the plugin. """
         if self.action_editor:
             iface.removePluginMenu('CenRa_Postgis', self.postgis_editor)
         if self.action_creator:
             iface.removePluginMenu('CenRa_Postgis', self.postgis_creator)
+        if self.action_rename:
+            iface.removePluginMenu('CenRa_Postgis', self.postgis_rename)
 
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)

CenRa_POSTGIS/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog

CenRa_POSTGIS/metadata.txt

@@ -11,8 +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=2.4
+version=3.4
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,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>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

@@ -2,43 +2,51 @@
 
 from __future__ import absolute_import
 # Import the PyQt and QGIS libraries
-from builtins import next
+# from builtins import next
-from builtins import str
+# from builtins import str
-from builtins import object
+# from builtins import object
-import qgis
+import os
 from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog,QMessageBox
+from qgis.PyQt.QtWidgets import QDialog, QMessageBox
-from qgis.PyQt.QtGui import QIcon
+# from qgis.PyQt.QtGui import QIcon
-from PyQt5.QtCore import *
+
-from PyQt5.QtGui import *
+# from qgis.PyQt.QtCore import *
-from PyQt5 import QtGui
+# from qgis.PyQt.QtGui import *
-from qgis.core import *
+from qgis.PyQt import QtGui
-from qgis.core import QgsDataSourceUri
+
+# from qgis.core import *
+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')
+
+# from .tools.SQLRequet import *
 
-from .tools.PythonSQL import *
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
+    # send_issues,
-    send_issues,
     create_vierge,
     create_contour,
     create_travaux,
     create_habita
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues
 
 from qgis.utils import iface
-import os.path
+# import os.path
-import webbrowser, os
+# import webbrowser, os
-import psycopg2
+# import psycopg2
-import psycopg2.extras
+# import psycopg2.extras
-import base64
+# import base64
 
 EDITOR_CLASS = load_ui('CenRa_Postgis_base.ui')
 
-class Postgis_Creator(QDialog, EDITOR_CLASS):
 
+class Postgis_Creator(QDialog, EDITOR_CLASS):
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -50,20 +58,21 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
 
     # run method that performs all the real work
     def raise_(self):
+        self.activateWindow()
         # show the dialog
         self.show()
         # Run the dialog event loop
-        result = self.exec_()
+        result = self.exec()
         # See if OK was pressed
         if result == 1:
-
             # **********************************Debut_script****************************************
-
+            # Creation du schema pour le nouveau site
-            ### Creation du schema pour le nouveau site
             if self.at.isChecked():
-                schema = "_" + self.dept.currentText() + "_at_" + self.nom.text().lower() # Ajout de "_" pour eviter pb de numero en premier caractere
+                # Ajout de "_" pour eviter pb de numero en premier caractere
+                schema = "_" + self.dept.currentText() + "_at_" + self.nom.text().lower()
             else:
-                schema = "_" + self.dept.currentText() + "_" + self.nom.text().lower() # Ajout de "_" pour eviter pb de numero en premier caractere
+                # Ajout de "_" pour eviter pb de numero en premier caractere
+                schema = "_" + self.dept.currentText() + "_" + self.nom.text().lower()
 
             if self.nom.text() == "" or self.nom.text() == "NULL":
                 QMessageBox.warning(None, "Oups :", "Veuillez renseigner un nom de dossier.")
@@ -74,15 +83,14 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
                 if self.nom.text().find(car) != - 1:
                     QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.nom.text().lower())
                     return
-            first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+            account = login_base("account")
-            first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            user = account[0]
-            first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+            mdp = account[1]
-            res_ident = first_cur.fetchone()
+            host = account[2]
-            mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+            port = account[3]
-            user = res_ident[1]
+            dbname = account[4]
-            con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+            cur = account[7]
-            cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            con = account[8]
-            first_conn.close()
 
             SQL_schema = "CREATE SCHEMA " + schema + ";"
             SQL_GRANT_SCHEMA = "GRANT CREATE, USAGE ON SCHEMA " + schema + " TO grp_qgis; GRANT CREATE, USAGE ON SCHEMA " + schema + " TO grp_sig;"
@@ -98,6 +106,5 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
             create_travaux(self, schema, cur, con, host, port, dbname, user, mdp)
             create_vierge(self, schema, cur, con, host, port, dbname, user, mdp)
 
-
             con.close()
             pass

CenRa_POSTGIS/postgis_editor.py

@@ -4,41 +4,46 @@ from __future__ import absolute_import
 # Import the PyQt and QGIS libraries
 from builtins import next
 from builtins import str
-from builtins import object
+import os
-import qgis
+
-from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog
+from qgis.PyQt.QtWidgets import QDialog, QMessageBox
-from qgis.PyQt.QtGui import QIcon
+# from qgis.PyQt.QtGui import QIcon
-from PyQt5.QtCore import *
+
-from PyQt5.QtGui import *
+from qgis.PyQt import QtGui
-from PyQt5 import QtGui
+
-from qgis.core import *
+# from qgis.core import *
-from qgis.core import QgsDataSourceUri
+from qgis.core import QgsSettings
+
+try:
+    if os.path.exists('N:'):
+        from .tools.PythonSQL import login_base
+except ValueError:
+    print('Pas de fichier PythonSQL')
+# from .tools.SQLRequet import *
 
-from .tools.PythonSQL import *
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
+    # send_issues,
-    send_issues,
     create_vierge,
     create_contour,
     create_travaux,
     create_habita
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues
 
-import os.path
+# import os.path
-import webbrowser, os
+# import webbrowser
-import psycopg2
+# import psycopg2
-import psycopg2.extras
+# import psycopg2.extras
-import base64
+# import base64
 from qgis.utils import iface
 
 EDITOR_CLASS = load_ui('CenRa_PostgisTable_base.ui')
 
-class Postgis_Editor(QDialog, EDITOR_CLASS):
 
+class Postgis_Editor(QDialog, EDITOR_CLASS):
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
@@ -48,25 +53,23 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
         self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
         self.iface = iface
 
-    ### Outil Ajout de nouvelles couche a un dossier
+    # Outil Ajout de nouvelles couche a un dossier
     def raise_(self):
-        first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+        self.activateWindow()
-        first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        account = login_base("account")
-        first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+        user = account[0]
-        res_ident = first_cur.fetchone()
+        mdp = account[1]
-        mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+        host = account[2]
-        user = res_ident[1]
+        port = account[3]
-
+        dbname = account[4]
-        con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+        cur = account[7]
-        cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        con = account[8]
-        first_conn.close()
         # Creation de la liste des schemas de la base de donnees
         SQL = """WITH list_schema AS (
     select schemaname,'sig' as group from pg_catalog.pg_tables
     where schemaname  ~ E'^_(0|1|2|3|4|6|7|f)'
     group by schemaname
     order by schemaname)
-    
     select  string_agg(schemaname,',')
     from list_schema
     group by "group";"""
@@ -81,24 +84,24 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
 
         self.schema.clear()
         self.schema.addItems(listItems)
-        self.schema.setCurrentIndex(-1) # Pour ne pas commencer la liste au premier schema
+        # Pour ne pas commencer la liste au premier schema
+        self.schema.setCurrentIndex(-1)
 
         # show the dialog
         self.show()
         # Run the dialog event loop
-        result = self.exec_()
+        result = self.exec()
         # See if OK was pressed
         if result == 1:
             # ******************************debut script*********************************
-            first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+            account = login_base("account")
-            first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            user = account[0]
-            first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+            mdp = account[1]
-            res_ident = first_cur.fetchone()
+            host = account[2]
-            mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+            port = account[3]
-            user = res_ident[1]
+            dbname = account[4]
-            con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+            cur = account[7]
-            cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            con = account[8]
-            first_conn.close()
 
             if self.schema.currentIndex() == - 1:
                 QMessageBox.warning(None, "Oups :", "Veuillez choisir un nom de dossier.")

CenRa_POSTGIS/postgis_rename.py

@@ -0,0 +1,237 @@
+# -*- coding: utf-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 os
+from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt.QtWidgets import QDialog, QMessageBox, QDialogButtonBox
+# from qgis.PyQt.QtGui import QIcon
+
+# from qgis.PyQt.QtCore import *
+# from qgis.PyQt.QtGui import *
+from qgis.PyQt import QtGui
+
+# from qgis.core import *
+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')
+# from .tools.SQLRequet import *
+
+from .tools.resources import (
+    load_ui,
+    resources_path,
+    # send_issues,
+)
+# from .issues import CenRa_Issues
+
+# import os.path
+# import webbrowser
+# import psycopg2
+# import psycopg2.extras
+# import base64
+from qgis.utils import iface
+
+EDITOR_CLASS = load_ui('CenRa_PostgisRename_base.ui')
+ch = [u"à", u"À", u"â", u"Â", u"ä", u"Ä", u"å", u"Å", u"ç", u"Ç", u"é", u"É", u"è", u"È", u"ê", u"Ê", u"ë", u"Ë", u"î", u"Î", u"ï", u"Ï", u"ô", u"Ô", u"ö", u"Ö", u"ù", u"Ù", u"û", u"Û", u"ü", u"Ü", u"ÿ", u"Ÿ", u"'", u"-", u" "]
+try:
+    account = login_base("account")
+    user = account[0]
+    mdp = account[1]
+    host = account[2]
+    port = account[3]
+    dbname = account[4]
+    cur = account[7]
+    con = account[8]
+except NameError:
+    print('Fails to login DB for account')
+
+
+class Postgis_Rename(QDialog, EDITOR_CLASS):
+    def __init__(self, parent=None):
+        _ = parent
+        super().__init__()
+        self.setupUi(self)
+        self.settings = QgsSettings()
+        self.s = QSettings()
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
+        self.iface = iface
+
+        self.schema.currentIndexChanged.connect(self.Test)
+        self.buttonBox.accepted.connect(self.msgBox)
+    # Outil Ajout de nouvelles couche a un dossier
+
+    def raise_(self):
+        self.activateWindow()
+        self.groupBox_3.hide()
+        self.buttonBox.button(QDialogButtonBox.StandardButton(0x00000400)).setEnabled(False)
+        GET_ALL_SCHEMA = """SELECT DISTINCT table_schema FROM information_schema.tables WHERE table_schema LIKE '_form_%' OR table_schema LIKE '_01_%' OR table_schema LIKE '_07_%' OR table_schema LIKE '_26_%' OR table_schema LIKE '_42_%' OR table_schema LIKE '_69_%' ORDER BY table_schema;"""
+        cur.execute(GET_ALL_SCHEMA)
+        AllSchema = cur.fetchall()
+        last_value_schema = self.schema.currentText()
+        last_value_departement = self.departement.currentText()
+        self.schema.clear()
+        self.departement.clear()
+        self.schema.addItems([''])
+        for Schema in AllSchema:
+            self.schema.addItems(Schema)
+        self.departement.addItems(['', '01', '07', '26', '42', '69', 'form'])
+        if last_value_schema != '':
+            self.schema.setCurrentIndex(self.schema.findText(last_value_schema))
+        if last_value_departement != '':
+            self.departement.setCurrentIndex(self.departement.findText(last_value_departement))
+
+    def Test(self):
+        oldSchema = self.schema.currentText()
+        if oldSchema != '':
+            allIsGood = 0
+
+            GET_COUNT_LEFT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE left(table_name," + str(len(oldSchema)) + ") AND table_schema LIKE '" + oldSchema + "';"
+            GET_COUNT_TOT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE '" + oldSchema + "';"
+
+            cur.execute(GET_COUNT_TOT)
+            CountTot = cur.fetchall()[0]
+            cur.execute(GET_COUNT_LEFT)
+            CountLeft = cur.fetchall()[0]
+
+            if CountLeft[0] == CountTot[0]:
+                allIsGood = allIsGood + 1
+                self.couche.setChecked(1)
+            else:
+                self.couche.setChecked(0)
+
+            GET_GRANTEE_PRIVILEGE = "SELECT DISTINCT count(*) FROM information_schema.role_table_grants WHERE table_schema LIKE '" + oldSchema + "' AND grantee LIKE 'grp_qgis' AND privilege_type LIKE 'UPDATE';"
+            cur.execute(GET_GRANTEE_PRIVILEGE)
+            CountPrivilege = cur.fetchall()[0]
+
+            if CountTot[0] == CountPrivilege[0]:
+                allIsGood = allIsGood + 1
+                self.compte.setChecked(1)
+            else:
+                self.compte.setChecked(0)
+
+            if allIsGood == 2:
+                self.groupBox_3.show()
+                self.loadValue()
+                self.buttonBox.button(QDialogButtonBox.StandardButton(0x00000400)).setEnabled(True)
+            else:
+                self.groupBox_3.hide()
+                self.buttonBox.button(QDialogButtonBox.StandardButton(0x00000400)).setEnabled(False)
+        else:
+            self.old_name.setText('')
+            self.compte.setChecked(0)
+            self.couche.setChecked(0)
+            self.groupBox_3.hide()
+
+    def loadValue(self):
+        oldSchema = self.schema.currentText()
+        if oldSchema[:6] == '_form_':
+            oldSchema = self.schema.currentText()[6:]
+            prefixSchema = self.schema.currentText()[1:5]
+        else:
+            oldSchema = self.schema.currentText()[4:]
+            prefixSchema = self.schema.currentText()[1:3]
+        if oldSchema[:3] == 'at_':
+            oldSchema = oldSchema[3:]
+            self.animation.setChecked(1)
+        else:
+            self.animation.setChecked(0)
+        self.old_name.setText(oldSchema)
+        self.departement.setCurrentIndex(self.departement.findText(prefixSchema))
+
+    def updateName(self):
+        if self.departement.currentText() != '':
+            oldTableName = self.old_name.text()
+            newTableName = ((self.new_name.text()).lower()).replace(' ', '_')
+            newPrefixSchema = '_' + self.departement.currentText() + '_'
+            if self.schema.currentText()[:6] == '_form_':
+                oldPrefixSchema = self.schema.currentText()[:6]
+                if (self.schema.currentText()[6:9]) == "at_":
+                    oldPrefixSchema = oldPrefixSchema + 'at_'
+            else:
+                oldPrefixSchema = self.schema.currentText()[:4]
+                if (self.schema.currentText()[4:7]) == 'at_':
+                    oldPrefixSchema = oldPrefixSchema + 'at_'
+
+            if self.animation.isChecked():
+                newPrefixSchema = newPrefixSchema + 'at_'
+            oldSchemaName = oldPrefixSchema + oldTableName
+            newSchemaName = newPrefixSchema + newTableName
+
+            if oldSchemaName != newSchemaName:
+                global AllSQLrun
+                allSQLrun = ''
+
+                SQL_UPDATE = """UPDATE public.layer_styles SET f_table_schema = '""" + newSchemaName + """',f_table_name = replace(replace(f_table_name,'""" + oldTableName + """','""" + newTableName + """'),'""" + oldPrefixSchema + """','""" + newPrefixSchema + """') WHERE f_table_schema LIKE '""" + oldSchemaName + """';"""
+                allSQLrun = allSQLrun + SQL_UPDATE
+                cur.execute(SQL_UPDATE)
+
+                SQL_GET_TABLE_RENAME = """SELECT table_name,replace(replace(table_name,'""" + oldTableName + """','""" + newTableName + """'),'""" + oldPrefixSchema + """','""" + newPrefixSchema + """') from information_schema.tables WHERE table_schema LIKE '""" + oldSchemaName + """';"""
+                cur.execute(SQL_GET_TABLE_RENAME)
+                allTableRename = cur.fetchall()
+                allTableList = []
+                for TableRename in allTableRename:
+                    oldTable = TableRename[0]
+                    newTable = TableRename[1]
+                    allTableList.append([oldTable, newSchemaName, newTable])
+                    SQL_RENAME_TABLE = """ALTER TABLE """ + oldSchemaName + '.' + oldTable + """ RENAME TO """ + newTable + """;"""
+                    allSQLrun = allSQLrun + SQL_RENAME_TABLE
+                    cur.execute(SQL_RENAME_TABLE)
+
+                SQL_RENAME_SCHEMA = 'ALTER SCHEMA ' + oldSchemaName + ' RENAME TO ' + newSchemaName
+                allSQLrun = allSQLrun + SQL_RENAME_SCHEMA
+                cur.execute(SQL_RENAME_SCHEMA)
+                con.commit()
+                for LayerOpen in allTableList:
+                    self.UnloadLoadLayers(LayerOpen[0], LayerOpen[1], LayerOpen[2])
+
+    def UnloadLoadLayers(self, OldName, NewSchema, NewTable):
+        allLayers = (QgsProject.instance().mapLayers().values())
+        listLayers = []
+        listLayersName = []
+        for layer in allLayers:
+            listLayers.append(layer)
+            listLayersName.append(layer.name())
+        if OldName in listLayersName:
+            layer = (listLayers[listLayersName.index(OldName)])
+            provider = layer.dataProvider()
+            dbname = (QgsDataSourceUri(provider.dataSourceUri()).database())
+            user = QgsDataSourceUri(provider.dataSourceUri()).username()
+            mdp = QgsDataSourceUri(provider.dataSourceUri()).password()
+            host = QgsDataSourceUri(provider.dataSourceUri()).host()
+            port = QgsDataSourceUri(provider.dataSourceUri()).port()
+
+            # Affichage de la table
+            uri = QgsDataSourceUri()
+            # set host name, port, database name, username and password
+            uri.setConnection(host, port, dbname, user, mdp)
+            # set database schema, table name, geometry column and optionaly subset (WHERE clause)
+            uri.setDataSource(NewSchema, NewTable, 'geom')
+            QgsProject.instance().removeMapLayer(layer.id())
+            layer = self.iface.addVectorLayer(uri.uri(), NewTable, "postgres")
+
+    def msgBox(self):
+        self.QMBquestion = QMessageBox()
+        self.QMBquestion.setWindowTitle(u"Attention !")
+        self.QMBquestion.setIcon(QMessageBox.Icon.Warning)
+        self.QMBquestion.setText("Attention, le renommage de dossier PostGIS peut engendrer des pertes de liaisons avec des projets QGIS !")
+        self.QMBquestion.setStandardButtons(QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
+        if self.new_name.text() != '':
+            error_caracteres = 0
+            for caracteres in ch:
+                if self.new_name.text().find(caracteres) != - 1:
+                    error_caracteres = 1
+            if error_caracteres == 0:
+                self.QMBquestion = self.QMBquestion.exec()
+            else:
+                QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.new_name.text().lower())
+        else:
+            QMessageBox.warning(None, "Oups :", "Votre projet doit avoire un nom !")
+        if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
+            self.updateName()

CenRa_POSTGIS/tools/HubToTea.py

@@ -1,21 +0,0 @@
-from qgis.core import QgsApplication
-
-def gitea():
-    file_url = QgsApplication.qgisSettingsDirPath()+'QGIS/QGIS3.ini'
-    recherche_1 = 'plugin_repositories\\github\\url=https://github.com/CEN-Rhone-Alpes/Plugin_QGIS/releases/latest/download/plugins.xml'
-    replace_1 = 'plugin_repositories\\gitea\\url=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
-
-    recherche_2 = 'github'
-    replace_2 = 'gitea'
-
-    # Read in the file
-    with open(file_url, 'r') as file:
-        filedata = file.read()
-
-    # Replace the target string
-    filedata = filedata.replace(recherche_1, replace_1)
-    filedata = filedata.replace(recherche_2, replace_2)
-
-    # Write the file out again
-    with open(file_url, 'w') as file:
-        file.write(filedata)

CenRa_POSTGIS/tools/SQLRequet.py

@@ -1,36 +1,3 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.11"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user='stage'
 
 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))"""

CenRa_POSTGIS/tools/resources.py

@@ -3,13 +3,13 @@
 import configparser
 import shutil
 import tempfile
-import base64
+# import base64
-import psycopg2
+# import psycopg2
-import psycopg2.extras
+# import psycopg2.extras
+import os
 from os.path import abspath, join, pardir, dirname
 from qgis.core import QgsDataSourceUri
-from .PythonSQL import *
+from .SQLRequet import geom, champ_contour, champ_travaux_prevus_multilinestring, champ_travaux_prevus_point, champ_travaux_prevus_multipolygon, champ_vegethab_multipolygon, champ_vegethab_multilinestring, champ_vegethab_point, champ_viergeLigne, champ_viergePoint, champ_viergePolygone
-
 from qgis.PyQt import uic
 
 __copyright__ = "Copyright 2019, 3Liz"
@@ -109,64 +109,60 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-	from .PythonSQL import host,port,dbname,password,os_user
-	first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-	first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-	first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-	res_ident = first_cur.fetchone()
-	mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-	user = res_ident[1]
 
-	con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+def pyperclip():
+    dst = dirname(dirname(__file__)) + "\\tools\\"
+    if os.access('N:/', os.R_OK):
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
+    try:
+        shutil.copy(src, dst)
+    except FileNotFoundError:
+        print('404')
+    except UnboundLocalError:
+        print('404')
 
-	cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-	first_conn.close()
 
-	if take:
-		return cur,con
-	else:
-		return cur
 def send_issues(url, titre, body, labels):
     import requests
+    import urllib.request
     import json
-	import os
+    # import os
-	import qgis
+    # import qgis
 
-	usr = os.environ['USERNAME']
+    # usr = os.environ['USERNAME']
     token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
     url = url + '?token=' + token
 
     headers = {'Authorization': 'token ' + token, 'accept': 'application/json', 'Content-Type': 'application/json'}
 
-
     payload = {'title': titre, 'body': body, 'labels': labels}
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-	except:
+    except ValueError:
         binar = False
         r = ''
     if binar:
         r = requests.post(url, data=json.dumps(payload), headers=headers)
     return r
 
+
 def maj_verif(NAME):
     import qgis
     import urllib.request
     iface = qgis.utils.iface
     from qgis.core import Qgis
 
-	url = qgis.utils.pluginMetadata(NAME,'repository')
+    # url = qgis.utils.pluginMetadata(NAME, 'repository')
     # URL = url+'/raw/branch/main/plugins.xml'
-	URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
     # print(URL)
     version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-	except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
@@ -176,20 +172,23 @@ 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:
+        except NameError:
             print("error gitea version ssl")
     else:
         iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)
 
+
 def devlog(NAME):
     import qgis
     devmaj = '<head><style>* {margin:0; padding:0; }</style></head>'
     devmaj = devmaj + qgis.utils.pluginMetadata(NAME, 'changelog')
     return devmaj
 
+
 def create_contour(self, schema, cur, con, host, port, dbname, user, mdp):
-	### Creation de la table contour
+    # Creation de la table contour
-	if self.couche_contour.isChecked(): # Verifie si la checkbox est cochee
+    # Verifie si la checkbox est cochee
+    if self.couche_contour.isChecked():
         if self.annee_1.text() == 'aaaa' or self.annee_1.text() == '':
             tablename = schema + "_contour"
         else:
@@ -220,21 +219,24 @@ def create_contour(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
         cur.execute(SQL_trigger_area_ha)
         cur.execute(SQL_trigger_date_creation)
         cur.execute(SQL_trigger_date_maj)
-		cur.execute(SQL_style)    ## Enregistrement du style (comme style par defaut) dans la table layer_styles
+        # Enregistrement du style (comme style par defaut) dans la table layer_styles
+        cur.execute(SQL_style)
         cur.execute(SQL_GRANT_TABLE)
 
         con.commit()
 
-		## Affichage de la table
+        # Affichage de la table
         uri = QgsDataSourceUri()
         # set host name, port, database name, username and password
         uri.setConnection(host, port, dbname, user, mdp)
         # set database schema, table name, geometry column and optionaly subset (WHERE clause)
         uri.setDataSource(schema, tablename, geom)
 
-		layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+        self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+
+
 def create_travaux(self, schema, cur, con, host, port, dbname, user, mdp):
-	### Creation de la table travaux prevus
+    # Creation de la table travaux prevus
     if self.couche_travaux_prevus.isChecked():
         # **********Poly
         if self.annee_5.text() == 'aaaa' or self.annee_5.text() == '':
@@ -250,7 +252,6 @@ def create_travaux(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
         cur.execute(RETURNE)
         sequence_name = cur.fetchone()[0]
 
-
         SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename[len(schema):] + "_pkey" + " PRIMARY KEY (gid)"
         SQL_trigger_date_creation = "CREATE TRIGGER date_creation" + tablename + " BEFORE INSERT ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_creation();"
         SQL_trigger_date_maj = "CREATE TRIGGER date_maj" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_maj();"
@@ -268,19 +269,20 @@ def create_travaux(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
         cur.execute(SQL_trigger_date_maj)
         cur.execute(SQL_trigger_area_m2)
         cur.execute(SQL_trigger_area_ha)
-		cur.execute(SQL_style)    ## Enregistrement du style (comme style par defaut) dans la table layer_styles
+        # Enregistrement du style (comme style par defaut) dans la table layer_styles
+        cur.execute(SQL_style)
         cur.execute(SQL_GRANT_TABLE)
 
         con.commit()
 
-		## Affichage de la table
+        # Affichage de la table
         uri = QgsDataSourceUri()
         # set host name, port, database name, username and password
         uri.setConnection(host, port, dbname, user, mdp)
         # set database schema, table name, geometry column and optionaly subset (WHERE clause)
         uri.setDataSource(schema, tablename, geom)
 
-		layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+        self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
 
         # **********ligne
         if self.annee_5.text() == 'aaaa' or self.annee_5.text() == '':
@@ -313,19 +315,20 @@ def create_travaux(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
         cur.execute(SQL_trigger_date_maj)
         cur.execute(SQL_trigger_length_m)
         cur.execute(SQL_trigger_length_km)
-		cur.execute(SQL_style)    ## Enregistrement du style (comme style par defaut) dans la table layer_styles
+        # Enregistrement du style (comme style par defaut) dans la table layer_styles
+        cur.execute(SQL_style)
         cur.execute(SQL_GRANT_TABLE)
 
         con.commit()
 
-		## Affichage de la table
+        # Affichage de la table
         uri = QgsDataSourceUri()
         # set host name, port, database name, username and password
         uri.setConnection(host, port, dbname, user, mdp)
         # set database schema, table name, geometry column and optionaly subset (WHERE clause)
         uri.setDataSource(schema, tablename, geom)
 
-		layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+        self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
 
         # **********point
         if self.annee_5.text() == 'aaaa' or self.annee_5.text() == '':
@@ -356,22 +359,24 @@ def create_travaux(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
         cur.execute(SQL_trigger_date_creation)
         cur.execute(SQL_trigger_date_maj)
         cur.execute(SQL_trigger_coordonnees)
-		cur.execute(SQL_style)    ## Enregistrement du style (comme style par defaut) dans la table layer_styles
+        # Enregistrement du style (comme style par defaut) dans la table layer_styles
+        cur.execute(SQL_style)
         cur.execute(SQL_GRANT_TABLE)
 
         con.commit()
 
-		## Affichage de la table
+        # Affichage de la table
         uri = QgsDataSourceUri()
         # set host name, port, database name, username and password
         uri.setConnection(host, port, dbname, user, mdp)
         # set database schema, table name, geometry column and optionaly subset (WHERE clause)
         uri.setDataSource(schema, tablename, geom)
 
-		layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+        self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+
 
 def create_habita(self, schema, cur, con, host, port, dbname, user, mdp):
-	### Creation de la table habitat
+    # Creation de la table habitat
     if self.couche_habitat.isChecked():
         if self.annee_2.text() == 'aaaa' or self.annee_2.text() == '':
             tablename = schema + "_habitat"
@@ -379,10 +384,13 @@ def create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
             tablename = schema + "_habitat_" + self.annee_2.text()
 
         tablename_1 = tablename + "_points"
-		RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename_1[len(schema):]+"','gid')"
+        RETURNE = "SELECT pg_get_serial_sequence('" + schema + "." + tablename_1 + "','gid')"
         tablename_qgis = tablename_1[1:]  # Permet d'enlever le "_", ajouter a la premiere etape, dans qgis
         SQL_VEGETHAB = "CREATE TABLE " + schema + "." + tablename_1 + champ_vegethab_point
 
+        print(RETURNE)
+        print('')
+        print(SQL_VEGETHAB)
         cur.execute(SQL_VEGETHAB)
         cur.execute(RETURNE)
         sequence_name = cur.fetchone()[0]
@@ -401,14 +409,14 @@ def create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
         cur.execute(SQL_GRANT_TABLE)
 
         con.commit()
-		### Affichage de la table
+        # Affichage de la table
         uri = QgsDataSourceUri()
         # set host name, port, database name, username and password
         uri.setConnection(host, port, dbname, user, mdp)
         # set database schema, table name, geometry column and optionaly subset (WHERE clause)
         uri.setDataSource(schema, tablename_1, geom)
 
-		layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+        self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
 
         tablename_2 = tablename + "_lignes"
         RETURNE = "SELECT pg_get_serial_sequence('" + schema + "." + tablename_2 + "','gid')"
@@ -435,14 +443,14 @@ def create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
         cur.execute(SQL_GRANT_TABLE)
 
         con.commit()
-		### Affichage de la table
+        # Affichage de la table
         uri = QgsDataSourceUri()
         # set host name, port, database name, username and password
         uri.setConnection(host, port, dbname, user, mdp)
         # set database schema, table name, geometry column and optionaly subset (WHERE clause)
         uri.setDataSource(schema, tablename_2, geom)
 
-		layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+        self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
 
         tablename_3 = tablename + "_polygones"
         RETURNE = "SELECT pg_get_serial_sequence('" + schema + "." + tablename_3 + "','gid')"
@@ -469,16 +477,18 @@ def create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
         cur.execute(SQL_GRANT_TABLE)
 
         con.commit()
-		### Affichage de la table
+        # Affichage de la table
         uri = QgsDataSourceUri()
         # set host name, port, database name, username and password
         uri.setConnection(host, port, dbname, user, mdp)
         # set database schema, table name, geometry column and optionaly subset (WHERE clause)
         uri.setDataSource(schema, tablename_3, geom)
 
-		layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+        self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+
+
 def create_vierge(self, schema, cur, con, host, port, dbname, user, mdp):
-	### Creation de la table vierge
+    # Creation de la table vierge
     if self.couche_vierge.isChecked():
         if self.annee_4.text() == 'aaaa' or self.annee_4.text() == '':
             tablename = schema + "_" + self.nom_couche_vierge.text().lower()
@@ -527,11 +537,11 @@ def create_vierge(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
 
         con.commit()
 
-		### Affichage de la table
+        # Affichage de la table
         uri = QgsDataSourceUri()
         # set host name, port, database name, username and password
         uri.setConnection(host, port, dbname, user, mdp)
         # set database schema, table name, geometry column and optionaly subset (WHERE clause)
         uri.setDataSource(schema, tablename, geom)
 
-		layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")
+        self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres")

CenRa_POSTGIS/tools/ui/CenRa_PostgisRename_base.ui

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>table_postgis</class>
+ <widget class="QDialog" name="table_postgis">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>533</width>
+    <height>364</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Ajout d'une table</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_4">
+   <item row="1" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>3</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="schema_label">
+       <property name="maximumSize">
+        <size>
+         <width>90</width>
+         <height>1977</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Code analytique :</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="schema"/>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Tester mon éligibilite :</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="1">
+         <widget class="QCheckBox" name="compte">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Compte</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="1">
+         <widget class="QCheckBox" name="couche">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Couche</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Les changement :</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Nouvau nom :</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Partie a renommée :</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="old_name">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <italic>true</italic>
+            <bold>true</bold>
+           </font>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="new_name"/>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="maximumSize">
+           <size>
+            <width>130</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Département/Animation :</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="QRadioButton" name="animation">
+          <property name="text">
+           <string>Animation territoriale</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="departement"/>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="Titre">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>14</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Renommée de table</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>table_postgis</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>table_postgis</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

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">
@@ -29,9 +25,6 @@
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
@@ -56,7 +49,7 @@
        <property name="title">
         <string>DevLog</string>
        </property>
-       <widget class="QWebView" name="viewer" native="true">
+       <widget class="QTextBrowser" name="viewer">
         <property name="geometry">
          <rect>
           <x>10</x>
@@ -65,11 +58,6 @@
           <height>511</height>
          </rect>
         </property>
-        <property name="url" stdset="0">
-         <url>
-          <string>about:blank</string>
-         </url>
-        </property>
        </widget>
       </widget>
      </widget>
@@ -78,19 +66,12 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_SICEN/__init__.py

@@ -22,6 +22,7 @@
 """
 from __future__ import absolute_import
 
+
 def classFactory(iface):
     # load SICEN class from file SICEN
     from .sicen import SICEN

CenRa_SICEN/forms/CenRa_about_form.ui

@@ -29,9 +29,6 @@
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
@@ -41,7 +38,7 @@
         <x>0</x>
         <y>0</y>
         <width>453</width>
-        <height>547</height>
+        <height>570</height>
        </rect>
       </property>
       <widget class="QGroupBox" name="groupBox">
@@ -56,7 +53,7 @@
        <property name="title">
         <string>DevLog</string>
        </property>
-       <widget class="QWebView" name="viewer" native="true">
+       <widget class="QTextBrowser" name="viewer">
         <property name="geometry">
          <rect>
           <x>10</x>
@@ -65,11 +62,6 @@
           <height>511</height>
          </rect>
         </property>
-        <property name="url" stdset="0">
-         <url>
-          <string>about:blank</string>
-         </url>
-        </property>
        </widget>
       </widget>
      </widget>
@@ -78,19 +70,12 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::NoButton</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_SICEN/metadata.txt

@@ -11,8 +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=1.8
+version=2.2
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,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>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/resources_rc.py

@@ -6,7 +6,7 @@
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt5 import QtCore
+from qgis.PyQt import QtCore
 
 qt_resource_data = b"\
 \x00\x00\x0d\x89\
@@ -557,10 +557,13 @@ else:
     rcc_version = 2
     qt_resource_struct = qt_resource_struct_v2
 
+
 def qInitResources():
     QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
 
+
 def qCleanupResources():
     QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
 
+
 qInitResources()

CenRa_SICEN/sicen.py

@@ -1,52 +1,20 @@
 # -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- SICEN
-                                 A QGIS plugin
- Filtre sur données SICEN
-                              -------------------
-        begin                : 2014-10-17
-        copyright            : (C) 2014 by Guillaume COSTES (CENRA)
-        email                : guillaume.costes@espaces-naturels.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-"""
-"""from __future__ import absolute_import
-# Import the PyQt and QGIS libraries
-from builtins import str
-from builtins import object
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-from qgis.core import *
-from qgis.gui import *
-from qgis.utils import iface"""
 
 from builtins import str
 from builtins import object
 import os
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
-from qgis.PyQt import uic
-from qgis.core import *
-from qgis.core import QgsDataSourceUri, QgsWkbTypes, QgsLayerTreeGroup, QgsLayerTreeLayer
-from qgis.PyQt.QtGui import QFont
-from qgis.PyQt.QtWidgets import QMenu, QAction, QDialog, QDialogButtonBox, QLabel, QApplication, QTabWidget, QWidget, QGroupBox, QGridLayout, QComboBox, QCheckBox, QCalendarWidget, QToolBox, QFrame, QLineEdit, QSizePolicy, QFileDialog #Modifié
 
+# from qgis.PyQt import uic
+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
-from .tools.PythonSQL import *
+
-from .tools.resources import maj_verif
 import os.path
 import qgis
 import datetime
@@ -54,12 +22,15 @@ import csv
 
 from .forms.about_form import AboutDialog
 
-import psycopg2
+import socket
-import psycopg2.extras
-import base64
-#import socket
 import os
-#import sys
+
+from .tools.resources import maj_verif, pyperclip, resources_path
+pyperclip()
+try:
+    from .tools.PythonSQL import login_base
+except ValueError:
+    print('Pas de fichier PythonSQL')
 
 
 class SICEN(object):
@@ -96,33 +67,44 @@ class SICEN(object):
         self.toolBar = self.iface.addToolBar("SICEN")
         self.toolBar.setObjectName("SICEN")
 
-        ## Create action that will start plugin configuration
+        # Create action that will start plugin configuration
-        self.action = QAction(
+        self.action_open = QAction(
-            QIcon(":/plugins/sicen/sicen.png"),
+            QIcon(resources_path("icon", "sicen.png")),
             u"Ouverture des données SICEN", self.iface.mainWindow())
+        self.action_open.setEnabled(False)
+        if os.access('N:/', os.R_OK):
+            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.toolBar.addAction(self.action_open)
-        self.iface.addPluginToMenu(u"SICEN", self.action)
+        self.iface.addPluginToMenu(u"SICEN", self.action_open)
 
-        ## Create action that will start plugin configuration
+        # Create action that will start plugin configuration
-        self.action = QAction(
+        self.action_export = QAction(
-            QIcon(":/plugins/sicen/sicen_export.png"),
+            QIcon(resources_path("icon", "sicen_export.png")),
             u"Export liste d'espèces", self.iface.mainWindow())
+        self.action_export.setEnabled(False)
+        IPAddr = socket.gethostbyname(socket.gethostname())
+        if IPAddr[0:11] == "100.100.100":
+            self.action_export.setEnabled(True)
+        elif IPAddr[0:9] == "192.168.0":
+            self.action_export.setEnabled(True)
+        elif IPAddr[0:9] == "192.168.1":
+            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.toolBar.addAction(self.action_export)
-        self.iface.addPluginToMenu(u"SICEN", self.action)
+        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_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(":/plugins/SICEN/sicen_export.png"), QCoreApplication.translate("SICEN", u"Export liste d'espèces" ), 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])
 
@@ -136,28 +118,28 @@ class SICEN(object):
 
     def open_about_dialog(self):
         dialog = AboutDialog(self.iface)
-        dialog.exec_()
+        dialog.exec()
 
     def unload(self):
         # Remove the plugin menu item and icon
-        self.iface.removePluginMenu(u"&SICEN", self.action)
+        self.iface.removePluginMenu(u"&SICEN", self.action_open)
-        self.iface.removeToolBarIcon(self.action)
+        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):
 
-        first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+        account = login_base("account")
-        first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        user = account[0]
-        first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+        mdp = account[1]
-        res_ident = first_cur.fetchone()
+        host = account[2]
-        mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+        port = account[3]
-        user = res_ident[1]
+        dbname = account[4]
+        cur = account[7]
+        con = account[8]
 
-        con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+        # Creation des listes deroulantes
-        cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-        first_conn.close()
-
-        ## Creation des listes deroulantes
         # Listing de valeur des champs
         SQL_observateur = u"""SELECT DISTINCT nom || '_' || prenom as nom FROM md.personne ORDER BY nom"""
         SQL_nom_com = u"""SELECT DISTINCT nom FROM saisie.commune ORDER BY nom"""
@@ -183,14 +165,14 @@ class SICEN(object):
 
         con.close()
 
-
         # Ajout des items dans les combobox
         self.dlg.observateur_1.clear()
         i = 0
         while i < len(list_observateur):
             self.dlg.observateur_1.addItems(list_observateur[i])
             i = i + 1
-        self.dlg.observateur_1.setCurrentIndex(-1) # Pour ne pas commencer la liste au premier item
+        # Pour ne pas commencer la liste au premier item
+        self.dlg.observateur_1.setCurrentIndex(-1)
 
         self.dlg.observateur_2.clear()
         i = 0
@@ -251,20 +233,18 @@ class SICEN(object):
     # show the dialog
         self.dlg.show()
         # Run the dialog event loop
-        result = self.dlg.exec_()
+        result = self.dlg.exec()
         # See if OK was pressed
         if result == 1:
 
-            first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+            account = login_base("account")
-            first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            user = account[0]
-            first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+            mdp = account[1]
-            res_ident = first_cur.fetchone()
+            host = account[2]
-            mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+            port = account[3]
-            user = res_ident[1]
+            dbname = account[4]
-
+            cur = account[7]
-            con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+            con = account[8]
-            cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-            first_conn.close()
 
             # Requete filtre observateur
             if self.dlg.observateur_1.currentIndex() != - 1:
@@ -480,7 +460,6 @@ class SICEN(object):
             else:
                 sql_UICN = ''
 
-
             if self.dlg.PATRIMONIALITE.isChecked() == 1:
                 sql_patrimonialite = """"patrimonialite" IS NOT NULL """
             else:
@@ -526,7 +505,6 @@ class SICEN(object):
             else:
                 sql_patri74 = ''
 
-
             if self.dlg.ZNIEFF.isChecked() == 1:
                 sql_znieff = """"znieff" IS NOT NULL """
             else:
@@ -557,7 +535,7 @@ class SICEN(object):
             else:
                 sql_pr = ''
 
-            reqwhere_pat = sql_lrd01 + 'OR' + sql_lrd07 + 'OR' + sql_lrd26 + 'OR' + sql_lrd38 + 'OR' + sql_lrd42 + 'OR' + sql_lrd69 + 'OR' + sql_lrd73 + 'OR' + sql_lrd74 + 'OR' + sql_lre + 'OR' + sql_LRN_Flore + 'OR' + sql_LRN_Oiseaux + 'OR' + sql_LRN_Ortho + 'OR' + sql_LRN_Autre + 'OR' + sql_LRR_Flore + 'OR' + sql_LRR_Oiseaux + 'OR' + sql_LRR_Autre + 'OR' + sql_UICN + 'OR' + sql_pd38 + 'OR' + sql_pd42 + 'OR' + sql_pn + 'OR' + sql_pr + 'OR' + sql_dh_an2 + 'OR' + sql_patri01 + 'OR' + sql_patri07 + 'OR' + sql_patri26 + 'OR' + sql_patri38 + 'OR' + sql_patri42 + 'OR' + sql_patri69 + 'OR' + sql_patri73 + 'OR' + sql_patri74 + 'OR' + sql_patrimonialite
+            reqwhere_pat = sql_lrd01 + 'OR' + sql_lrd07 + 'OR' + sql_lrd26 + 'OR' + sql_lrd38 + 'OR' + sql_lrd42 + 'OR' + sql_lrd69 + 'OR' + sql_lrd73 + 'OR' + sql_lrd74 + 'OR' + sql_lre + 'OR' + sql_LRN_Flore + 'OR' + sql_LRN_Oiseaux + 'OR' + sql_LRN_Ortho + 'OR' + sql_LRN_Autre + 'OR' + sql_LRR_Flore + 'OR' + sql_LRR_Oiseaux + 'OR' + sql_LRR_Autre + 'OR' + sql_UICN + 'OR' + sql_pd38 + 'OR' + sql_pd42 + 'OR' + sql_pn + 'OR' + sql_pr + 'OR' + sql_znieff + 'OR' + sql_dh_an2 + 'OR' + sql_patri01 + 'OR' + sql_patri07 + 'OR' + sql_patri26 + 'OR' + sql_patri38 + 'OR' + sql_patri42 + 'OR' + sql_patri69 + 'OR' + sql_patri73 + 'OR' + sql_patri74 + 'OR' + sql_patrimonialite
 
             while reqwhere_pat.find('OROR') != - 1:
                 reqwhere_pat = reqwhere_pat.replace('OROR', 'OR')
@@ -570,7 +548,7 @@ class SICEN(object):
             if self.dlg.bouton_geom.isChecked() == 1:
 
                 layer = self.iface.activeLayer()
-                if layer == None :
+                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=Qgis.Warning, duration=5)
 
@@ -604,14 +582,14 @@ class SICEN(object):
                         while reqwhere_final[:3] == 'AND':
                             reqwhere_final = reqwhere_final[3:]
 
-                        ## Affichage des tables
+                        # Affichage des tables
                         table_name = 'observations'
 
                         uri = QgsDataSourceUri()
                         uri.setConnection(host, port, dbname, user, mdp)
 
                         if self.dlg.centroide.isChecked() == 1:
-                            ### Centroide
+                            # Centroide
                             if reqwhere_final.find('()') != - 1:
                                 reqwhere_final = ''
                             print(reqwhere_final)
@@ -620,15 +598,14 @@ class SICEN(object):
 
                         else:
 
-                            first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                            account = login_base("account")
-                            first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                            user = account[0]
-                            first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                            mdp = account[1]
-                            res_ident = first_cur.fetchone()
+                            host = account[2]
-                            mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                            port = account[3]
-                            user = res_ident[1]
+                            dbname = account[4]
-                            con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                            cur = account[7]
-                            cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                            con = account[8]
-                            first_conn.close()
 
                             # Creation group de couches
                             # i = qgis.utils.iface
@@ -645,9 +622,9 @@ class SICEN(object):
                             # groups = toc.
                             # groups = toc.groups()
                             # index = groups.index(nomgroupe)
-                            index = 1
+                            # index = 1
 
-                            ### Polygone
+                            # Polygone
                             reqwhere_final_poly = '(' + reqwhere_final + " AND GeometryType(geometrie) LIKE '%POLYGON%'" + ')'
                             if reqwhere_final_poly.find('()') != - 1:
                                 reqwhere_final_poly = "(GeometryType(geometrie) LIKE '%POLYGON%')"
@@ -666,7 +643,7 @@ class SICEN(object):
                                 # groupe.addLayer(layer_poly)
                                 groupe.insertChildNode(0, QgsLayerTreeLayer(layer_poly))
 
-                            ### Point
+                            # Point
                             reqwhere_final_point = '(' + reqwhere_final + " AND GeometryType(geometrie) LIKE '%POINT%'" + ')'
                             if reqwhere_final_point.find('()') != - 1:
                                 reqwhere_final_point = "(GeometryType(geometrie) LIKE '%POINT%')"
@@ -685,7 +662,7 @@ class SICEN(object):
                                 # groupe.addLayer(layer_point)
                                 groupe.insertChildNode(0, QgsLayerTreeLayer(layer_point))
 
-                            ### Ligne
+                            # Ligne
                             reqwhere_final_ligne = '(' + reqwhere_final + " AND GeometryType(geometrie) LIKE '%LINE%'" + ')'
                             if reqwhere_final_ligne.find('()') != - 1:
                                 reqwhere_final_ligne = "(GeometryType(geometrie) LIKE '%LINE%')"
@@ -708,8 +685,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=Qgis.Success, 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)
@@ -738,13 +714,13 @@ class SICEN(object):
                 while reqwhere_final[:3] == 'AND':
                     reqwhere_final = reqwhere_final[3:]
 
-                ## Affichage des tables
+                # Affichage des tables
                 table_name = 'observations'
 
                 uri = QgsDataSourceUri()
                 uri.setConnection(host, port, dbname, user, mdp)
 
-                ## Centroide
+                # Centroide
                 if self.dlg.centroide.isChecked() == 1:
                     if reqwhere_final.find('()') != - 1:
                         reqwhere_final = ''
@@ -753,15 +729,14 @@ class SICEN(object):
 
                 else:
 
-                    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                    account = login_base("account")
-                    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                    user = account[0]
-                    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                    mdp = account[1]
-                    res_ident = first_cur.fetchone()
+                    host = account[2]
-                    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                    port = account[3]
-                    user = res_ident[1]
+                    dbname = account[4]
-                    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                    cur = account[7]
-                    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                    con = account[8]
-                    first_conn.close()
 
                     # Creation group de couches
                     i = qgis.utils.iface
@@ -778,9 +753,9 @@ class SICEN(object):
                     # groups = toc.
                     # groups = toc.groups()
                     # index = groups.index(nomgroupe)
-                    index = 1
+                    # index = 1
 
-                    ### Polygone
+                    # Polygone
                     reqwhere_final_poly = '(' + reqwhere_final + " AND GeometryType(geometrie) LIKE '%POLYGON%'" + ')'
                     if reqwhere_final_poly.find('()') != - 1:
                         reqwhere_final_poly = "(GeometryType(geometrie) LIKE '%POLYGON%')"
@@ -799,7 +774,7 @@ class SICEN(object):
                         # groupe.addLayer(layer_poly)
                         groupe.insertChildNode(0, QgsLayerTreeLayer(layer_poly))
 
-                    ### Point
+                    # Point
                     reqwhere_final_point = '(' + reqwhere_final + " AND GeometryType(geometrie) LIKE '%POINT%'" + ')'
                     if reqwhere_final_point.find('()') != - 1:
                         reqwhere_final_point = "(GeometryType(geometrie) LIKE '%POINT%')"
@@ -818,7 +793,7 @@ class SICEN(object):
                         # groupe.addLayer(layer_point)
                         groupe.insertChildNode(0, QgsLayerTreeLayer(layer_point))
 
-                    ### Ligne
+                    # Ligne
                     reqwhere_final_ligne = '(' + reqwhere_final + " AND GeometryType(geometrie) LIKE '%LINE%'" + ')'
                     if reqwhere_final_ligne.find('()') != - 1:
                         reqwhere_final_ligne = "(GeometryType(geometrie) LIKE '%LINE%')"
@@ -841,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=Qgis.Success, 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
 
@@ -849,7 +824,7 @@ class SICEN(object):
 
         layer = self.iface.activeLayer()
 
-        if layer == None :
+        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=Qgis.Warning, duration=5)
 
@@ -862,16 +837,14 @@ class SICEN(object):
 
                 buffer = '100'
 
-                first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                account = login_base("account")
-                first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                # user = account[0]
-                first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                # mdp = account[1]
-                res_ident = first_cur.fetchone()
+                # host = account[2]
-                mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                # port = account[3]
-                user = res_ident[1]
+                # dbname = account[4]
-
+                cur = account[7]
-                con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                # con = account[8]
-                cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-                first_conn.close()
 
                 SQL_list_sp = u"""SELECT DISTINCT classe::text,ordre::text,nom_complet::text,split_part(nom_vern::text,', ',1) as nom_vern,cd_ref::text as cd_ref,max(COALESCE(date_obs, date_debut_obs))::text AS derniere_obs FROM _agregation_ra.observations_table WHERE ST_intersects(geometrie,ST_Buffer(ST_geomFromText('""" + poly + "',2154), " + buffer + " ))GROUP BY classe::text, ordre::text, nom_complet::text, nom_vern::text, cd_ref::text ORDER BY nom_complet::text"""
                 cur.execute(SQL_list_sp)
@@ -881,44 +854,51 @@ class SICEN(object):
                 file = open(chemin_fichier, 'w', newline='', encoding='utf-8')
                 # file.write('\ufeff'.encode('utf8')) # BOM (optionel...Permet a Excel d'ouvrir proprement le fichier en UTF-8)
                 file.write('\ufeff')
-                writer = csv.writer(file, delimiter = ';') # délimiteur ';' pour faciliter l'ouverture avec Excel
+                # délimiteur ';' pour faciliter l'ouverture avec Excel
-                writer.writerow(['Classe', 'Ordre', 'Nom Complet', 'Nom Vernaculaire','cd_ref', 'Date Derniere Observation']) # Création des entêtes
+                writer = csv.writer(file, delimiter=';')
+                # Création des entêtes
+                writer.writerow(['Classe', 'Ordre', 'Nom Complet', 'Nom Vernaculaire', 'cd_ref', 'Date Derniere Observation'])
 
-                for row in data_sp : # Boucle d'écriture ligne par ligne dans le csv
+                # Boucle d'écriture ligne par ligne dans le csv
+                for row in data_sp:
                     # print(1)
                     list_sp = []
-                    if row[0] == None : # Si la valeur est 'None' l'encodage ne peut se faire donc boucle d'évitement
+                    # Si la valeur est 'None' l'encodage ne peut se faire donc boucle d'évitement
+                    if row[0] is None:
                         row0 = str(row[0])
                         row0 = ''
                     else:
                         row0 = row[0]
                     # print(row0)
                     list_sp.append(row0)
-                    if row[1] == None : # Si la valeur est 'None' l'encodage ne peut se faire donc boucle d'évitement
+                    # Si la valeur est 'None' l'encodage ne peut se faire donc boucle d'évitement
+                    if row[1] is None:
                         row1 = str(row[1])
                         row1 = ''
                     else:
                         row1 = row[1]
                     list_sp.append(row1)
-                    if row[2] == None : # Si la valeur est 'None' l'encodage ne peut se faire donc boucle d'évitement
+                    # Si la valeur est 'None' l'encodage ne peut se faire donc boucle d'évitement
+                    if row[2] is None:
                         row2 = str(row[2])
                         row2 = ''
                     else:
                         row2 = row[2]
                     list_sp.append(row2)
-                    if row[3] == None : # Si la valeur est 'None' l'encodage ne peut se faire donc boucle d'évitement
+                    # Si la valeur est 'None' l'encodage ne peut se faire donc boucle d'évitement
+                    if row[3] is None:
                         row3 = str(row[3])
                         row3 = ''
                     else:
                         row3 = row[3]
                     list_sp.append(row3)
-                    if row[4] == None :
+                    if row[4] is None:
                         row4 = str(row[4])
                         row4 = ''
                     else:
                         row4 = row[4]
                     list_sp.append(row4)
-                    if row[5] == None :
+                    if row[5] is None:
                         row5 = str(row[5])
                         row5 = ''
                     else:
@@ -929,7 +909,7 @@ 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=Qgis.Success, 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)

CenRa_SICEN/sicendialog.py

@@ -20,8 +20,8 @@
  ***************************************************************************/
 """
 
-from qgis.PyQt import QtCore, QtGui
+# from qgis.PyQt import QtCore, QtGui
-from qgis.PyQt.QtWidgets import QAction, QDialog
+from qgis.PyQt.QtWidgets import QDialog
 from .ui_sicen import Ui_SICEN
 # create the dialog for zoom to point
 

CenRa_SICEN/tools/HubToTea.py

@@ -1,21 +0,0 @@
-from qgis.core import QgsApplication
-
-def gitea():
-    file_url = QgsApplication.qgisSettingsDirPath()+'QGIS/QGIS3.ini'
-    recherche_1 = 'plugin_repositories\\github\\url=https://github.com/CEN-Rhone-Alpes/Plugin_QGIS/releases/latest/download/plugins.xml'
-    replace_1 = 'plugin_repositories\\gitea\\url=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
-
-    recherche_2 = 'github'
-    replace_2 = 'gitea'
-
-    # Read in the file
-    with open(file_url, 'r') as file:
-        filedata = file.read()
-
-    # Replace the target string
-    filedata = filedata.replace(recherche_1, replace_1)
-    filedata = filedata.replace(recherche_2, replace_2)
-
-    # Write the file out again
-    with open(file_url, 'w') as file:
-        file.write(filedata)

CenRa_SICEN/tools/PythonSQL.py

@@ -1,172 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.11"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-
-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))"""
-champ_travaux_prevus_point = """(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, x_wgs84 double precision, y_wgs84 double precision,  date_creation date, date_maj date, geom geometry(Point,2154))"""
-
-champ_viergePolygone = """(gid serial NOT NULL, commentaire text, surface_m2 double precision, surface_ha double precision, geom geometry(MultiPolygon,2154))"""
-champ_viergeLigne = """(gid serial NOT NULL, commentaire text, longueur_m double precision, longueur_km double precision, geom geometry(MultiLineString,2154))"""
-champ_viergePoint = """(gid serial NOT NULL, commentaire text, x_wgs84 double precision, y_wgs84 double precision, geom geometry(Point,2154))"""
-
-champ_habitat = """(gid serial NOT NULL, cd_cb_01 text, lb_cb97_fr_01 text, occupation_01 integer, cd_cb_02 text, lb_cb97_fr_02 text, occupation_02 integer, cd_cb_03 text, lb_cb97_fr_03 text, occupation_03 integer, milieu_code text, milieu_libelle text, surface_m2 double precision, surface_ha double precision, commentaire text, date_creation date, date_maj date, geom geometry(MultiPolygon,2154))"""
-
-champ_contour="""(gid serial NOT NULL, date_creation date, date_maj date, utilisateur character varying, dept character(2), nom character varying, surface_m2 double precision, surface_ha double precision, type_site character varying, type_milieu character varying, date_premier_pg integer, date_debut_pg integer, date_fin_pg integer, referent character varying, gestion_deleguee character varying, terrain_militaire character(3), ens character(3), zh character(3), adapt_pmr character(3), inform character(3), guide character(3), ouverture_public character(3), obs character(3), anim character(3), n2000_anim character(3), contrat_n2000_conseil character(3), n2000_op character(3), contrat_n2000_benef character(3), contrat_agri character(3), bc_habitat integer, bc_amphibien integer, bc_coleoptere integer, bc_crustace integer, bc_mammifere integer, bc_chiroptere integer, bc_mollusque integer, bc_odonate integer, bc_oiseau integer, bc_orthoptere integer, bc_poisson integer, bc_reptile integer, bc_rhopalocere integer, bc_heterocere integer, bc_autre_invertebre integer, bc_flore integer, bc_bryophyte integer, bc_champignon integer, suiv_analyse_sol character(3), suiv_piezo character(3), suiv_climat character(3), suiv_topo character(3), suiv_habitat character(3), suiv_amphibien character(3), suiv_coleoptere character(3), suiv_crustace character(3), suiv_mammifere character(3), suiv_chiroptere character(3), suiv_mollusque character(3), suiv_odonate character(3), suiv_oiseau character(3), suiv_orthoptere character(3), suiv_poisson character(3), suiv_reptile character(3), suiv_rhopalocere character(3), suiv_heterocere character(3), suiv_autre_invertebre character(3), suiv_flore character(3), suiv_bryophyte character(3), suiv_champignon character(3), suiv_analyse_eau character(3), suiv_phenologie character(3), suiv_frequentation character(3), suiv_paysager character(3), suiv_autre character(3), commentaire text, geom geometry(MultiPolygon,2154))
-"""
-
-champ_vegethab_point = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(Point,2154)
-)
-"""
-champ_vegethab_multilinestring = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(MultiLineString,2154)
-)
-"""
-champ_vegethab_multipolygon = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(MultiPolygon,2154)
-)
-"""

CenRa_SICEN/tools/resources.py

@@ -3,9 +3,10 @@
 import configparser
 import shutil
 import tempfile
-import base64
+# import base64
-import psycopg2
+# import psycopg2
-import psycopg2.extras
+# import psycopg2.extras
+import os
 from os.path import abspath, join, pardir, dirname
 
 from qgis.PyQt import uic
@@ -89,7 +90,7 @@ def resources_path(*args):
     :return: Absolute path to the resources folder.
     :rtype: str
     """
-    path = abspath(abspath(join(plugin_path(), "CenRa_Metabase\\tools")))
+    path = abspath(abspath(join(plugin_path(), "CenRa_SICEN\\tools")))
     for item in args:
         path = abspath(join(path, item))
     return path
@@ -107,64 +108,60 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-    from .tools.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
 
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+def pyperclip():
+    dst = dirname(dirname(__file__)) + "\\tools\\"
+    if os.access('N:/', os.R_OK):
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
+    try:
+        shutil.copy(src, dst)
+    except FileNotFoundError:
+        print('404')
+    except UnboundLocalError:
+        print('404')
 
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
 
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url, titre, body, labels):
     import requests
+    import urllib.request
     import json
-    import os
+    # import os
-    import qgis
+    # import qgis
 
-    usr = os.environ['USERNAME']
+    # usr = os.environ['USERNAME']
     token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
     url = url + '?token=' + token
 
     headers = {'Authorization': 'token ' + token, 'accept': 'application/json', 'Content-Type': 'application/json'}
 
-
     payload = {'title': titre, 'body': body, 'labels': labels}
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except ValueError:
         binar = False
         r = ''
     if binar:
         r = requests.post(url, data=json.dumps(payload), headers=headers)
     return r
 
+
 def maj_verif(NAME):
     import qgis
     import urllib.request
     iface = qgis.utils.iface
     from qgis.core import Qgis
 
-    url = qgis.utils.pluginMetadata(NAME,'repository')
+    # url = qgis.utils.pluginMetadata(NAME, 'repository')
     # URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
     # print(URL)
     version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
@@ -174,11 +171,11 @@ 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:
+        except urllib.error.URLError:
             print("error gitea version ssl")
     else:
         iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)
-    #return version_plugin
+
 
 def devlog(NAME):
     import qgis

CenRa_SICEN/ui_sicen.py

@@ -8,9 +8,10 @@
 # WARNING! All changes made in this file will be lost!
 
 from builtins import object
-from qgis.PyQt import QtCore, QtGui
+from qgis.PyQt import QtCore
 from qgis.PyQt.QtGui import QFont
-from qgis.PyQt.QtWidgets import QAction, QDialog, QDialogButtonBox, QLabel, QApplication, QTabWidget, QWidget, QGroupBox, QGridLayout, QComboBox, QCheckBox, QCalendarWidget, QToolBox, QFrame, QLineEdit, QSizePolicy #Modifié
+# Modifié
+from qgis.PyQt.QtWidgets import QDialogButtonBox, QLabel, QApplication, QTabWidget, QWidget, QGroupBox, QGridLayout, QComboBox, QCheckBox, QCalendarWidget, QToolBox, QFrame, QLineEdit, QSizePolicy
 
 
 try:
@@ -21,20 +22,22 @@ except AttributeError:
 
 try:
     _encoding = QApplication.UnicodeUTF8
+
     def _translate(context, text, disambig):
         return QApplication.translate(context, text, disambig, _encoding)
 except AttributeError:
     def _translate(context, text, disambig):
         return QApplication.translate(context, text, disambig)
 
+
 class Ui_SICEN(object):
     def setupUi(self, SICEN):
         SICEN.setObjectName(_fromUtf8("SICEN"))
         SICEN.resize(592, 556)
         self.buttonBox = QDialogButtonBox(SICEN)
         self.buttonBox.setGeometry(QtCore.QRect(390, 520, 161, 32))
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        # self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton(0x00400000) | QDialogButtonBox.StandardButton(0x00000400))
         self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
         self.Titre = QLabel(SICEN)
         self.Titre.setGeometry(QtCore.QRect(110, 10, 331, 31))
@@ -46,8 +49,8 @@ class Ui_SICEN(object):
         self.Titre.setObjectName(_fromUtf8("Titre"))
         self.Emprise = QTabWidget(SICEN)
         self.Emprise.setGeometry(QtCore.QRect(10, 80, 571, 431))
-        self.Emprise.setTabPosition(QTabWidget.North)
+        self.Emprise.setTabPosition(QTabWidget.TabPosition(0))
-        self.Emprise.setTabShape(QTabWidget.Rounded)
+        self.Emprise.setTabShape(QTabWidget.TabShape(0))
         self.Emprise.setObjectName(_fromUtf8("Emprise"))
         self.tab_2 = QWidget()
         self.tab_2.setObjectName(_fromUtf8("tab_2"))
@@ -57,7 +60,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.groupBox_4.setFont(font)
-        self.groupBox_4.setAlignment(QtCore.Qt.AlignCenter)
+        self.groupBox_4.setAlignment(QtCore.Qt.Alignment(5))
         self.groupBox_4.setObjectName(_fromUtf8("groupBox_4"))
         self.gridLayoutWidget_5 = QWidget(self.groupBox_4)
         self.gridLayoutWidget_5.setGeometry(QtCore.QRect(10, 20, 521, 51))
@@ -99,7 +102,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.groupBox_5.setFont(font)
-        self.groupBox_5.setAlignment(QtCore.Qt.AlignCenter)
+        self.groupBox_5.setAlignment(QtCore.Qt.Alignment(5))
         self.groupBox_5.setObjectName(_fromUtf8("groupBox_5"))
         self.gridLayoutWidget_6 = QWidget(self.groupBox_5)
         self.gridLayoutWidget_6.setGeometry(QtCore.QRect(10, 20, 521, 41))
@@ -113,7 +116,7 @@ class Ui_SICEN(object):
         font.setItalic(True)
         font.setWeight(50)
         self.label.setFont(font)
-        self.label.setAlignment(QtCore.Qt.AlignCenter)
+        self.label.setAlignment(QtCore.Qt.Alignment(5))
         self.label.setObjectName(_fromUtf8("label"))
         self.gridLayout_6.addWidget(self.label, 0, 0, 1, 1)
         self.label_2 = QLabel(self.gridLayoutWidget_6)
@@ -122,7 +125,7 @@ class Ui_SICEN(object):
         font.setItalic(True)
         font.setWeight(50)
         self.label_2.setFont(font)
-        self.label_2.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_2.setAlignment(QtCore.Qt.Alignment(5))
         self.label_2.setObjectName(_fromUtf8("label_2"))
         self.gridLayout_6.addWidget(self.label_2, 0, 1, 1, 1)
         self.nom_com_1 = QComboBox(self.gridLayoutWidget_6)
@@ -147,7 +150,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.groupBox_7.setFont(font)
-        self.groupBox_7.setAlignment(QtCore.Qt.AlignCenter)
+        self.groupBox_7.setAlignment(QtCore.Qt.Alignment(5))
         self.groupBox_7.setObjectName(_fromUtf8("groupBox_7"))
         self.gridLayoutWidget_8 = QWidget(self.groupBox_7)
         self.gridLayoutWidget_8.setGeometry(QtCore.QRect(10, 20, 520, 191))
@@ -161,7 +164,7 @@ class Ui_SICEN(object):
         font.setItalic(True)
         font.setWeight(50)
         self.label_3.setFont(font)
-        self.label_3.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_3.setAlignment(QtCore.Qt.Alignment(5))
         self.label_3.setObjectName(_fromUtf8("label_3"))
         self.gridLayout_8.addWidget(self.label_3, 0, 0, 1, 1)
         self.label_4 = QLabel(self.gridLayoutWidget_8)
@@ -170,7 +173,7 @@ class Ui_SICEN(object):
         font.setItalic(True)
         font.setWeight(50)
         self.label_4.setFont(font)
-        self.label_4.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_4.setAlignment(QtCore.Qt.Alignment(5))
         self.label_4.setObjectName(_fromUtf8("label_4"))
         self.gridLayout_8.addWidget(self.label_4, 0, 1, 1, 1)
         self.date_min = QCalendarWidget(self.gridLayoutWidget_8)
@@ -188,7 +191,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.groupBox_8.setFont(font)
-        self.groupBox_8.setAlignment(QtCore.Qt.AlignCenter)
+        self.groupBox_8.setAlignment(QtCore.Qt.Alignment(5))
         self.groupBox_8.setObjectName(_fromUtf8("groupBox_8"))
         self.gridLayoutWidget_9 = QWidget(self.groupBox_8)
         self.gridLayoutWidget_9.setGeometry(QtCore.QRect(10, 20, 491, 21))
@@ -202,7 +205,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.Animalia.setFont(font)
-        self.Animalia.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.Animalia.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.Animalia.setObjectName(_fromUtf8("Animalia"))
         self.gridLayout_9.addWidget(self.Animalia, 0, 0, 1, 1)
         self.Plantae = QCheckBox(self.gridLayoutWidget_9)
@@ -226,8 +229,8 @@ class Ui_SICEN(object):
         font.setItalic(True)
         font.setWeight(50)
         self.label_6.setFont(font)
-        self.label_6.setLayoutDirection(QtCore.Qt.LeftToRight)
+        self.label_6.setLayoutDirection(QtCore.Qt.LayoutDirection(0))
-        self.label_6.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_6.setAlignment(QtCore.Qt.Alignment(5))
         self.label_6.setObjectName(_fromUtf8("label_6"))
         self.gridLayout_11.addWidget(self.label_6, 4, 0, 1, 1)
         self.nom_vern = QComboBox(self.gridLayoutWidget_10)
@@ -245,7 +248,7 @@ class Ui_SICEN(object):
         font.setItalic(True)
         font.setWeight(50)
         self.label_5.setFont(font)
-        self.label_5.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_5.setAlignment(QtCore.Qt.Alignment(5))
         self.label_5.setObjectName(_fromUtf8("label_5"))
         self.gridLayout_11.addWidget(self.label_5, 2, 0, 1, 1)
         self.nom_complet = QComboBox(self.gridLayoutWidget_10)
@@ -271,7 +274,7 @@ class Ui_SICEN(object):
         font.setItalic(True)
         font.setWeight(50)
         self.label_13.setFont(font)
-        self.label_13.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_13.setAlignment(QtCore.Qt.Alignment(5))
         self.label_13.setObjectName(_fromUtf8("label_13"))
         self.gridLayout_11.addWidget(self.label_13, 0, 0, 1, 1)
         self.Emprise.addTab(self.tab, _fromUtf8(""))
@@ -279,8 +282,8 @@ class Ui_SICEN(object):
         self.tab_3.setObjectName(_fromUtf8("tab_3"))
         self.protections = QToolBox(self.tab_3)
         self.protections.setGeometry(QtCore.QRect(10, 10, 511, 391))
-        self.protections.setFrameShape(QFrame.NoFrame)
+        self.protections.setFrameShape(QFrame.Shape(0))
-        self.protections.setFrameShadow(QFrame.Plain)
+        self.protections.setFrameShadow(QFrame.Shadow(0x0010))
         self.protections.setLineWidth(1)
         self.protections.setObjectName(_fromUtf8("protections"))
         self.page_2 = QWidget()
@@ -292,7 +295,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.groupBox.setFont(font)
-        self.groupBox.setAlignment(QtCore.Qt.AlignCenter)
+        self.groupBox.setAlignment(QtCore.Qt.Alignment(5))
         self.groupBox.setObjectName(_fromUtf8("groupBox"))
         self.gridLayoutWidget_2 = QWidget(self.groupBox)
         self.gridLayoutWidget_2.setGeometry(QtCore.QRect(10, 20, 491, 88))
@@ -306,7 +309,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.LRD_38.setFont(font)
-        self.LRD_38.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.LRD_38.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.LRD_38.setObjectName(_fromUtf8("LRD_38"))
         self.gridLayout_2.addWidget(self.LRD_38, 3, 0, 1, 1)
         self.LRD_01 = QCheckBox(self.gridLayoutWidget_2)
@@ -314,7 +317,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.LRD_01.setFont(font)
-        self.LRD_01.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.LRD_01.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.LRD_01.setObjectName(_fromUtf8("LRD_01"))
         self.gridLayout_2.addWidget(self.LRD_01, 0, 0, 1, 1)
         self.LRD_07 = QCheckBox(self.gridLayoutWidget_2)
@@ -322,7 +325,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.LRD_07.setFont(font)
-        self.LRD_07.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.LRD_07.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.LRD_07.setObjectName(_fromUtf8("LRD_07"))
         self.gridLayout_2.addWidget(self.LRD_07, 1, 0, 1, 1)
         self.LRD_26 = QCheckBox(self.gridLayoutWidget_2)
@@ -330,7 +333,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.LRD_26.setFont(font)
-        self.LRD_26.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.LRD_26.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.LRD_26.setObjectName(_fromUtf8("LRD_26"))
         self.gridLayout_2.addWidget(self.LRD_26, 2, 0, 1, 1)
         self.LRD_42 = QCheckBox(self.gridLayoutWidget_2)
@@ -367,7 +370,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.groupBox_2.setFont(font)
-        self.groupBox_2.setAlignment(QtCore.Qt.AlignCenter)
+        self.groupBox_2.setAlignment(QtCore.Qt.Alignment(5))
         self.groupBox_2.setObjectName(_fromUtf8("groupBox_2"))
         self.gridLayoutWidget_3 = QWidget(self.groupBox_2)
         self.gridLayoutWidget_3.setGeometry(QtCore.QRect(10, 20, 491, 42))
@@ -381,7 +384,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.LRR_Flore.setFont(font)
-        self.LRR_Flore.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.LRR_Flore.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.LRR_Flore.setObjectName(_fromUtf8("LRR_Flore"))
         self.gridLayout_3.addWidget(self.LRR_Flore, 0, 0, 1, 1)
         self.LRR_Oiseaux = QCheckBox(self.gridLayoutWidget_3)
@@ -389,7 +392,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.LRR_Oiseaux.setFont(font)
-        self.LRR_Oiseaux.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.LRR_Oiseaux.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.LRR_Oiseaux.setObjectName(_fromUtf8("LRR_Oiseaux"))
         self.gridLayout_3.addWidget(self.LRR_Oiseaux, 1, 0, 1, 1)
         self.LRR_Autre = QCheckBox(self.gridLayoutWidget_3)
@@ -405,7 +408,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.groupBox_3.setFont(font)
-        self.groupBox_3.setAlignment(QtCore.Qt.AlignCenter)
+        self.groupBox_3.setAlignment(QtCore.Qt.Alignment(5))
         self.groupBox_3.setObjectName(_fromUtf8("groupBox_3"))
         self.gridLayoutWidget_4 = QWidget(self.groupBox_3)
         self.gridLayoutWidget_4.setGeometry(QtCore.QRect(10, 20, 491, 42))
@@ -426,7 +429,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.LRN_Flore.setFont(font)
-        self.LRN_Flore.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.LRN_Flore.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.LRN_Flore.setObjectName(_fromUtf8("LRN_Flore"))
         self.gridLayout_4.addWidget(self.LRN_Flore, 0, 0, 1, 1)
         self.LRN_Oiseaux = QCheckBox(self.gridLayoutWidget_4)
@@ -434,7 +437,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.LRN_Oiseaux.setFont(font)
-        self.LRN_Oiseaux.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.LRN_Oiseaux.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.LRN_Oiseaux.setObjectName(_fromUtf8("LRN_Oiseaux"))
         self.gridLayout_4.addWidget(self.LRN_Oiseaux, 1, 0, 1, 1)
         self.LRN_Ortho = QCheckBox(self.gridLayoutWidget_4)
@@ -456,7 +459,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.UICN.setFont(font)
-        self.UICN.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.UICN.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.UICN.setObjectName(_fromUtf8("UICN"))
         self.gridLayout_12.addWidget(self.UICN, 0, 0, 1, 1)
         self.LRE = QCheckBox(self.gridLayoutWidget_11)
@@ -485,19 +488,19 @@ class Ui_SICEN(object):
         self.gridLayout.setHorizontalSpacing(50)
         self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
         self.PATRI38 = QCheckBox(self.gridLayoutWidget)
-        self.PATRI38.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.PATRI38.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.PATRI38.setObjectName(_fromUtf8("PATRI38"))
         self.gridLayout.addWidget(self.PATRI38, 3, 0, 1, 1)
         self.PATRI01 = QCheckBox(self.gridLayoutWidget)
-        self.PATRI01.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.PATRI01.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.PATRI01.setObjectName(_fromUtf8("PATRI01"))
         self.gridLayout.addWidget(self.PATRI01, 0, 0, 1, 1)
         self.PATRI07 = QCheckBox(self.gridLayoutWidget)
-        self.PATRI07.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.PATRI07.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.PATRI07.setObjectName(_fromUtf8("PATRI07"))
         self.gridLayout.addWidget(self.PATRI07, 1, 0, 1, 1)
         self.PATRI26 = QCheckBox(self.gridLayoutWidget)
-        self.PATRI26.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.PATRI26.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.PATRI26.setObjectName(_fromUtf8("PATRI26"))
         self.gridLayout.addWidget(self.PATRI26, 2, 0, 1, 1)
         self.PATRI42 = QCheckBox(self.gridLayoutWidget)
@@ -529,7 +532,7 @@ class Ui_SICEN(object):
         font.setBold(True)
         font.setWeight(75)
         self.groupBox_6.setFont(font)
-        self.groupBox_6.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.groupBox_6.setAlignment(QtCore.Qt.AlignmentFlag(0x0001) | QtCore.Qt.AlignmentFlag(0x0001) | QtCore.Qt.AlignmentFlag(0x0080))
         self.groupBox_6.setObjectName(_fromUtf8("groupBox_6"))
         self.gridLayoutWidget_7 = QWidget(self.groupBox_6)
         self.gridLayoutWidget_7.setGeometry(QtCore.QRect(10, 20, 491, 21))
@@ -550,7 +553,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.PD_38.setFont(font)
-        self.PD_38.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.PD_38.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
         self.PD_38.setObjectName(_fromUtf8("PD_38"))
         self.gridLayout_7.addWidget(self.PD_38, 0, 0, 1, 1)
         self.PR = QCheckBox(self.page_3)
@@ -604,14 +607,14 @@ class Ui_SICEN(object):
         self.label_12.setObjectName(_fromUtf8("label_12"))
         self.gridLayout_10.addWidget(self.label_12, 1, 1, 1, 1)
         self.buffer = QLineEdit(self.gridLayoutWidget_12)
-        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy(4), QSizePolicy.Policy(0))
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.buffer.sizePolicy().hasHeightForWidth())
         self.buffer.setSizePolicy(sizePolicy)
         self.buffer.setMaximumSize(QtCore.QSize(100, 16777215))
-        self.buffer.setInputMethodHints(QtCore.Qt.ImhPreferNumbers)
+        self.buffer.setInputMethodHints(QtCore.Qt.InputMethodHint(0x8))
-        self.buffer.setAlignment(QtCore.Qt.AlignCenter)
+        self.buffer.setAlignment(QtCore.Qt.Alignment(5))
         self.buffer.setObjectName(_fromUtf8("buffer"))
         self.gridLayout_10.addWidget(self.buffer, 2, 2, 1, 1)
         self.label_8 = QLabel(self.gridLayoutWidget_12)
@@ -664,7 +667,7 @@ class Ui_SICEN(object):
         font.setBold(False)
         font.setWeight(50)
         self.bouton_geom.setFont(font)
-        self.bouton_geom.setLayoutDirection(QtCore.Qt.LeftToRight)
+        self.bouton_geom.setLayoutDirection(QtCore.Qt.LayoutDirection(0))
         self.bouton_geom.setText(_fromUtf8(""))
         self.bouton_geom.setIconSize(QtCore.QSize(20, 20))
         self.bouton_geom.setObjectName(_fromUtf8("bouton_geom"))
@@ -681,7 +684,8 @@ class Ui_SICEN(object):
         self.Emprise.setCurrentIndex(0)
         self.protections.setCurrentIndex(0)
         self.buttonBox.accepted.connect(SICEN.accept)
-        self.buttonBox.rejected.connect(SICEN.reject) #Modifié
+        # Modifié
+        self.buttonBox.rejected.connect(SICEN.reject)
         QtCore.QMetaObject.connectSlotsByName(SICEN)
 
     def retranslateUi(self, SICEN):
@@ -753,4 +757,3 @@ class Ui_SICEN(object):
         self.label_11.setText(_translate("SICEN", "4.", None))
         self.Emprise.setTabText(self.Emprise.indexOf(self.tab_4), _translate("SICEN", "Filtre par Emprise", None))
         self.centroide.setText(_translate("SICEN", "Utiliser les centroïdes pour les observations autres que ponctuelles", None))
-

README.md

@@ -4,12 +4,12 @@ Point de départ de tout les plugin du CEN Rhône Alpes,
 Pour la création et le partage :heart:
 |Nom|Version|Statue|Date de création|
 |---|---|---|---|
-|CenRa_AUTOMAP|0.1.10|Alpha|2024-09-25|
+|CenRa_AUTOMAP|1.2|Releases|2024-09-25|
-|CenRa_COPIE|2.1|Releases|06-02-2024|
+|CenRa_COPIE|2.2|Releases|06-02-2024|
-|CenRa_FLUX|2.2|Releases|06-02-2024|
+|CenRa_FLUX|2.5|Releases|06-02-2024|
 |CenRa_METABASE|0.2.0|Alpha|12-09-2024|
 |CenRa_PAGERENDER|0.1.5|Alpha|09-10-2024|
-|CenRa_POSTGIS|2.4|Releases|2024-02-06|
+|CenRa_POSTGIS|2.6|Releases|2024-02-06|
 |CenRa_SICEN|1.8|Releases|06-02-2024|
 
 > [!NOTE]

plugins.xml

@@ -1,26 +1,27 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
 <plugins>
-    <pyqgis_plugin name="CenRa_POSTGIS" version="2.4">
+    <pyqgis_plugin name="CenRa_POSTGIS" version="3.4">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.4</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>
+        <create_date>2026-05-21</create_date>
-        <update_date>2025-01-23</update_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="2.1">
+    <pyqgis_plugin name="CenRa_COPIE" version="3.2">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.1</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>
@@ -28,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-01-07</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="1.8">
+    <pyqgis_plugin name="CenRa_SICEN" version="2.2">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>1.8</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>
@@ -45,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-01-07</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="2.2">
+    <pyqgis_plugin name="CenRa_FLUX" version="3.24">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.2</version>
+        <version>3.24</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>
+        <create_date>2026-05-22</create_date>
-        <update_date>2025-01-07</update_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.1.6">
+    <pyqgis_plugin name="CenRa_METABASE" version="0.3.2">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.1.6</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>
@@ -79,50 +83,53 @@
         <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-01-07</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="0.1.10">
+    <pyqgis_plugin name="CenRa_AUTOMAP" version="2.12">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.1.10</version>
+        <version>2.12</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>
+        <create_date>2026-06-30</create_date>
-        <update_date>2025-01-13</update_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.1.5">
+    <pyqgis_plugin name="CenRa_PAGERENDER" version="0.2.5">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.1.5</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>
+        <create_date>2026-03-23</create_date>
-        <update_date>2025-01-07</update_date>
+        <update_date>2026-03-12</update_date>
         <experimental>True</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,mise en page,atlas</tags>
     </pyqgis_plugin>
     
     <pyqgis_plugin name="CenRa_gn2qgis" version="0.1.0">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <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>
@@ -137,9 +144,10 @@
     </pyqgis_plugin>
     
     <pyqgis_plugin name="BiodivAURA" version="0.1.0">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <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>