flake8 and Qt6 fix

flake8 issues
flake8 metabase
2025-07-30 09:57:09 +02:00 · 2025-07-29 17:01:59 +02:00 · 2025-07-29 16:56:54 +02:00 · 2025-07-29 15:19:47 +02:00 · 2025-07-29 15:16:03 +02:00 · 2025-07-29 14:34:32 +02:00
50 changed files with 3024 additions and 3067 deletions
@@ -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 Qt, 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

@@ -24,8 +24,10 @@ 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,
@@ -34,12 +36,7 @@ pyperclip()

 from .canvas_editor import AutoMap_Editor
 from .style_invoke import AutoMap_Style
-from .about_form import AboutDialog

-try:
-    from PyQt5.QtCore import *
-except:
-    from PyQt6.QtCore import *

 class PgAutoMap:
    def __init__(self):
@@ -91,45 +88,13 @@ class PgAutoMap:
        if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
            iface.addDockWidget(Qt.DockWidgetArea(0x1), self.style_dock)

-    '''
-        if not self.locator_filter:
-            self.locator_filter = LocatorFilter(iface)
-            iface.registerLocatorFilter(self.locator_filter)
-
-    @staticmethod
-    def check_invalid_connection_names():
-        """ Check for invalid connection names in the QgsSettings. """
-        valid, invalid = validate_connections_names()
-        n_invalid = len(invalid)
-
-        if n_invalid == 0:
-            return
-
-        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()
+
    def open_help():
        """ Open the online help. """
        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -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
@@ -1,83 +1,41 @@
 import logging
 import os
-
-from collections import namedtuple
-from enum import Enum
-from functools import partial
-from pathlib import Path
-from xml.dom.minidom import parseString
-from qgis.gui import *
-import qgis
-from importlib import import_module
 from qgis.core import (
-    NULL,
-    QgsApplication,
    QgsScaleBarSettings,
-    QgsDataSourceUri,
    QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
    QgsRasterLayer,
    QgsSettings,
    QgsVectorLayer,
-    QgsGeometry,
    QgsPrintLayout,
    QgsReadWriteContext,
    QgsLayoutItemMap,
    QgsLayoutItemPage,
-    QgsLayoutSize,
    QgsUnitTypes,
-    QgsLayoutPoint,
    QgsLayoutItemLabel,
    QgsLayoutItemPicture,
    QgsLayoutItemLegend,
    QgsLegendStyle,
    QgsLayoutItemScaleBar,
    QgsLayerTreeGroup,
-    QgsCoordinateReferenceSystem,
-    QgsCoordinateTransform,
-    QgsLayerTree,
-    QgsLayoutTableColumn,
    QgsRectangle,
-    QgsLayoutItemMapOverviewStack,
 )
-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.QtCore import Qt
+from qgis.PyQt.QtGui import QColor, QFont
 from qgis.PyQt.QtWidgets import (
    QDialog,
-    QAction,
    QMessageBox,
    QPushButton,
-    QDockWidget,
    QFileDialog,
-    QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
-    QTableWidgetItem,
-    QVBoxLayout,
 )
-try:
-    from PyQt5.QtCore import QSettings
-    from PyQt5 import QtGui
-    from PyQt5 import QtWidgets
-except:
-    from PyQt6.QtCore import QSettings
-    from PyQt6 import QtGui
-    from PyQt6 import QtWidgets
-
+from qgis.PyQt.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,
-    send_issues,
 )
-from .issues import CenRa_Issues
-
 from datetime import date

 EDITOR_CLASS = load_ui('CenRa_AutoMap_base.ui')
@@ -112,8 +70,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__()
@@ -143,13 +101,12 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
        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)
@@ -207,17 +164,19 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
        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))

@@ -240,16 +199,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
-        except NameError: runing = True
-        try: last_group
-        except NameError: last_group = ''
+        try:
+            myGroup
+        except NameError:
+            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()
@@ -290,10 +253,14 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
    def load_osm(self):
        global myGroup, last_group
        runing = False
-        try: myGroup
-        except NameError: runing = True
-        try: last_group
-        except NameError: last_group = ''
+        try:
+            myGroup
+        except NameError:
+            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()
@@ -368,6 +335,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()
@@ -381,6 +349,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()
@@ -398,6 +367,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()
@@ -444,13 +414,13 @@ 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)
@@ -458,7 +428,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):

                try:
                    cutLayout = layout_name.index("¶")
-                except:
+                except ValueError:
                    cutLayout = 0

                if cutLayout >= 1:
@@ -476,11 +446,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)
@@ -528,7 +499,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                    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 = titre_layout_name
@@ -545,8 +516,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                    title.setHAlign(Qt.AlignmentFlag(0x0004))
                    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()
@@ -564,8 +534,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                    subtitle.setHAlign(Qt.AlignmentFlag(0x0004))
                    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.setMode(QgsLayoutItemPicture.FormatRaster)
@@ -576,8 +545,7 @@ 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')
@@ -622,7 +590,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
@@ -633,7 +601,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                        else:
                            root_group.removeLayer(layer)

-
                legend.setEqualColumnWidth(True)
                legend.setSplitLayer(True)
                legend.setColumnSpace(5)
@@ -650,7 +617,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)
@@ -670,7 +637,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):

                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)
@@ -739,7 +706,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                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)
@@ -777,7 +744,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                # if self.radioButton_12.isChecked() != 1:
                if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
                    project.layoutManager().removeLayout(existing_layout)
-                    result = project.layoutManager().addLayout(self.layout)
+                    # result = project.layoutManager().addLayout(self.layout)
                elif self.QMBquestion != QMessageBox.StandardButton(0x00010000):
                    LayoutCOUNT = 0
                    arrayManager = []
@@ -795,8 +762,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
            else:
                existing_layout = True

-
-
        self.manager.addLayout(self.layout)
        if self.radioButton_9.isChecked() == 1:
            self.layout.atlas().setEnabled(True)
@@ -814,10 +779,12 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
            else:
                TryMessage = False
            del self.QMBquestion
-        except:
+        except ValueError:
+            TryMessage = True
+        except AttributeError:
            TryMessage = True

-        if TryMessage == True:
+        if TryMessage is True:
            iface.openLayoutDesigner(layout_modifie)
            self.close()
        else:
@@ -847,7 +814,6 @@ 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)
@@ -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_aide == True : statu = statu + [3]
-        if statu_question == True : statu = statu + [5]
-        if statu_amelioration == True : statu = statu + [2]
-        if statu_autre == True : statu = statu + [6]
+        if statu_bug is True:
+            statu = statu + [1]
+        if statu_aide is True:
+            statu = statu + [3]
+        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
@@ -7,7 +7,7 @@ name=CenRa_AutoMap
 qgisMinimumVersion=3.0
 supportsQt6=True
 description=CenRa_AutoMap
-version=1.7
+version=2.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr

@@ -22,7 +22,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues

 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_AUTOMAP:</h2></br><p><h3>11/04/2025 - Version 1.7: </h3> - Correctif d'orthographe.</p></br><p><h3>09/04/2025 - Version 1.6: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 1.5: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.4: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 1.3: </h3> - Fenêtre redimensionnable avec déplaçable avec la mollette sourit.</p></br><p><h3>25/02/2025 - Version 1.2: </h3> - DockWidget pour ouverture de couche avec theme.</p></br><p><h3>28/01/2025 - Version 1.1: </h3> - Multi-Composeur pris en charge.</p></br><p><h3>27/01/2025 - Version 1.0: </h3> - Version releases.</br> - Ajoute un message d'avertissement au moment d'écraser la mise en page.</br> - Ajoute prénom et nom dans la réalisation.</br> - Utilisation de Calibri.</p></br><p><h3>13/01/2025 - Version 0.1.10: </h3> - Correctif.</p></br><p><h3>07/01/2025 - Version 0.1.9: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>19/12/2024 - Version 0.1.8: </h3> - Nouvelle mise en page.</br> - Incrémentation automatique de nouveau modele de mise en page. </br> - Correctif de bug.</p></br><p><h3>21/10/2024 - Version 0.1.7: </h3> - Epurations du code.</p></br><p><h3>07/10/2024 - Version 0.1.6: </h3> - Option de bibliotheque de logo custome.</p></br><p><h3>03/10/2024 - Version 0.1.5: </h3> - Remonte la fênetre dans la pille.</br> - Gestion du nombre de colonne dans la légend.</br></p></br><p><h3>02/10/2024 - Version 0.1.4: </h3> - Mise en page plein écrant.</br></p></br><p><h3>01/10/2024 - Version 0.1.3: </h3> - Récupération du titre et sous-titre pour mise en page existente.</br> - Integration de bibliotheque de logo.</br> - Integration de gestionaire pour les source de donnée.</br> - Mise en place d'une bar d'echelle adaptative. </br></p></br><p><h3>30/09/2024 - Version 0.1.2: </h3> - Activation du thème. </br> - Ajouter une carte de suivie. </br><p></br><h3>27/09/2024 - Version 0.1.1: </h3> - Ajout d'une liste déroulante pour les sources de données. </br>- Bouton pour ajouter des fonts de carte customisés. </br>- Fonctionnalité de génération d'atlas. </p></br><p><h3>26/09/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_AutoMap avec une seul mise en page. </p></br>
+changelog=<h2>CenRa_AUTOMAP:</h2></br><p><h3>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
@@ -1,95 +1,41 @@
 import logging
-import os
-from collections import namedtuple
-from enum import Enum
-from functools import partial
-from pathlib import Path
-from xml.dom.minidom import parseString
-from qgis.gui import *
-import qgis
-from importlib import import_module
+# from qgis.gui import *
+
 from qgis.core import (
-    NULL,
-    QgsApplication,
-    QgsScaleBarSettings,	
    QgsDataSourceUri,
    QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
-    QgsRasterLayer,
    QgsSettings,
    QgsVectorLayer,
-    QgsGeometry,
-    QgsPrintLayout,
-    QgsReadWriteContext,
-    QgsLayoutItemMap,
-    QgsLayoutItemPage,
-    QgsLayoutSize,
-    QgsUnitTypes,
-    QgsLayoutPoint,
-    QgsLayoutItemLabel,
-    QgsLayoutItemPicture,
-    QgsLayoutItemLegend,
-    QgsLegendStyle,
-    QgsLayoutItemScaleBar,
-    QgsLayerTreeGroup,
-    QgsCoordinateReferenceSystem,
-    QgsCoordinateTransform,
-    QgsLayerTree,
-    QgsLayoutTableColumn,
-    QgsRectangle,
-    QgsLayoutItemMapOverviewStack,
    QgsMapThemeCollection,
 )
-from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime, Qt
-from qgis.PyQt.QtGui import QDesktopServices, QIcon, QColor, QFont, QMovie
-from qgis.PyQt.QtPrintSupport import QPrinter
+from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import (
    QDockWidget,
-    QAction,
-    QMessageBox,
-    QPushButton,
-    QDockWidget,
-    QFileDialog,
    QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
-    QTableWidgetItem,
-    QVBoxLayout,
 )
-import psycopg2
-try:
-    from PyQt5.QtCore import QSettings
-    from PyQt5 import QtGui
-    from PyQt5 import QtWidgets
-except:
-    from PyQt6.QtCore import QSettings
-    from PyQt6 import QtGui
-    from PyQt6 import QtWidgets
-from qgis.PyQt.QtXml import QDomDocument
-from qgis.utils import iface
-import glob
-try:

+from qgis.PyQt.QtXml import QDomDocument
+
+try:
    Enabled = True
-    from .tools.StyleLayer import *
-except:
+    from .tools.StyleLayer import host, port, dbname, os_user
+except ValueError:
    Enabled = False
 from .tools.resources import (
    load_ui,
    resources_path,
-    send_issues,
+    # send_issues,
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues

-from datetime import date
+# from datetime import date

 EDITOR_CLASS = load_ui('CenRa_AutoMapStyle_base.ui')
 LOGGER = logging.getLogger('CenRa_AutoMapStyle')

-class AutoMap_Style(QDockWidget, EDITOR_CLASS):

+class AutoMap_Style(QDockWidget, EDITOR_CLASS):
    def __init__(self, parent=None):
        _ = parent
        super().__init__()
@@ -97,7 +43,7 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
        self.settings = QgsSettings()
        self.s = QSettings()

-        self.toolButton.setIcon(QtGui.QIcon(resources_path('icons','loader.png')))
+        self.toolButton.setIcon(QIcon(resources_path('icons', 'loader.png')))

        self.loadComboBox()
        self.toolButton.clicked.connect(self.loadStyle)
@@ -140,13 +86,13 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
                uri.setDataSource(schema, table, "geom")
                uri.setKeyColumn(key)
                layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                if layer.isValid() == True:
+                if layer.isValid() is True:
                    layerName = layer.name()
                    listStyle = layer.listStylesInDatabase()
                    try:
                        StyleExist = True
                        indexStyle = (listStyle[2].index(layerName))
-                    except:
+                    except ValueError:
                        StyleExist = False
                    if StyleExist:
                        StyleId = (listStyle[1][indexStyle])
@@ -181,13 +127,13 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
                uri.setDataSource(schema, table, "geom")
                uri.setKeyColumn('gid')
                layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                if layer.isValid() == True:
+                if layer.isValid() is True:
                    layerName = layer.name()
                    listStyle = layer.listStylesInDatabase()
                    try:
                        StyleExist = True
                        indexStyle = (listStyle[2].index(layerName))
-                    except:
+                    except ValueError:
                        StyleExist = False
                    if StyleExist:
                        StyleId = (listStyle[1][indexStyle])
@@ -4,30 +4,26 @@ __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 socket
 import os
+from .about_form import AboutDialog
 from .tools.resources import (
-    plugin_path,
+    # plugin_path,
    pyperclip,
    resources_path,
    maj_verif,
 )
 pyperclip()
 from .copie_editor import Copie_Editor
-from .about_form import AboutDialog

-try:
-    from PyQt5.QtCore import *
-except:
-    from PyQt6.QtCore import *
+
 class PgCopie:
    def __init__(self):
        """ Constructor. """
@@ -71,7 +67,7 @@ class PgCopie:
            self.toolBar.addAction(self.copie_editor)
            self.copie_editor.triggered.connect(self.open_editor)
            self.copie_editor.setEnabled(False)
-            IPAddr=socket.gethostbyname(socket.gethostname())
+            # IPAddr = socket.gethostbyname(socket.gethostname())
            if os.access('N:/', os.R_OK):
                self.copie_editor.setEnabled(True)

@@ -81,6 +77,7 @@ class PgCopie:
        """
        dialog = AboutDialog(iface)
        dialog.exec()
+
    def open_help():
        """ Open the online help. """
        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -94,7 +91,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
@@ -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
@@ -4,47 +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
-import qgis
+# from builtins import object
+# import qgis
 from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog
-from qgis.PyQt.QtGui import QIcon
-try:
-    from PyQt5.QtCore import *
-    from PyQt5.QtGui import *
-    from PyQt5 import QtGui
-except:
-    from PyQt6.QtCore import *
-    from PyQt6.QtGui import *
-    from PyQt6 import QtGui
-
-from qgis.core import *
-from qgis.core import QgsDataSourceUri
-import os
+from qgis.PyQt.QtWidgets import QDialog, QMessageBox
+from qgis.PyQt import QtGui
+from qgis.core import QgsDataSourceUri, QgsSettings, QgsWkbTypes, Qgis

 try:
    from .tools.PythonSQL import login_base
-except:
+except ValueError:
    print('Pas de fichier PythonSQL')
-from .tools.SQLRequet import *
+
 from .tools.resources import (
    load_ui,
    resources_path,
-    send_issues,
+    # send_issues,
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues

 from qgis.utils import iface
-import os.path
-import webbrowser, os
-import psycopg2
-import psycopg2.extras
-import base64
+# import os
+# import os.path
+# import webbrowser
+# import psycopg2
+# 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__()
@@ -58,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)

@@ -72,11 +62,9 @@ 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)
@@ -113,10 +101,11 @@ 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)

-
-                self.table_source.setText(source_schema + "." + source_tablename) # Affiche le nom de la table source
+                # 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
@@ -124,8 +113,6 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
                # See if OK was pressed
                if result:
                    # ******************************debut script*********************************
-
-
                    account = login_base("account")
                    user = account[0]
                    mdp = account[1]
@@ -208,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")

@@ -221,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
@@ -11,7 +11,7 @@ name=CenRA_COPIE
 qgisMinimumVersion=3.0
 supportsQt6=True
 description=Permet la copie d'une table dans une base PostGis
-version=2.5
+version=3.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr

@@ -20,7 +20,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>11/04/2025 - Version 2.5: </h3> - Correctif de bug.</p></br><p><h3>09/04/2025 - Version 2.4: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.3: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.2: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>22/10/2024 - Version 2:</h3>- Refonte du code.</p></br><p><h3>13/09/2024 - Version 1.5:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
+changelog=<h2>CenRa_COPIE:</h2></br><p><h3>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
@@ -1,141 +0,0 @@
-
-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)
-)
-"""
@@ -3,9 +3,9 @@
 import configparser
 import shutil
 import tempfile
-import base64
-import psycopg2
-import psycopg2.extras
+# import base64
+# import psycopg2
+# import psycopg2.extras
 import os
 from os.path import abspath, join, pardir, dirname

@@ -108,46 +108,51 @@ def load_ui(*args):

    return ui_class

+
 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:
+    except FileNotFoundError:
        print('404')
+    except UnboundLocalError:
+        print('404')
+

 def send_issues(url, titre, body, labels):
    import requests
+    import urllib.request
    import json
-    import os
-    import qgis
+    # 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 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/latest/plugins.xml'
    # print(URL)
@@ -156,7 +161,7 @@ def maj_verif(NAME):
    try:
        urllib.request.urlopen('https://google.com')
        binar = True
-    except:
+    except urllib.error.URLError:
        binar = False
    if binar:
        try:
@@ -166,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>'
@@ -4,30 +4,24 @@ __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>
-import socket
+from .about_form import AboutDialog
 import os
 from .tools.resources import (
-    plugin_path,
    pyperclip,
    resources_path,
    maj_verif,
 )
 pyperclip()
-from .flux_editor import Flux_Editor
-from .about_form import AboutDialog

-try:
-    from PyQt5.QtCore import *
-except:
-    from PyQt6.QtCore import *
+from .flux_editor import Flux_Editor
+

 class PgFlux:
    def __init__(self):
@@ -67,8 +61,6 @@ 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)
@@ -82,6 +74,7 @@ class PgFlux:
        """
        dialog = AboutDialog(iface)
        dialog.exec()
+
    def open_help():
        """ Open the online help. """
        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -95,7 +88,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
@@ -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
@@ -2,63 +2,69 @@

 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 object
-import qgis
-from qgis.PyQt import QtCore
+# from builtins import object
+
+from qgis.PyQt import QtCore, QtGui
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt import QtWidgets
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog
+# from qgis.PyQt.QtWidgets import  QDialog
 from qgis.PyQt.QtGui import QIcon
-try:
-    from PyQt5.QtCore import *
-    from PyQt5.QtGui import *
-    from PyQt5 import QtGui
-except:
-    from PyQt6.QtCore import *
-    from PyQt6.QtGui import *
-    from PyQt6 import QtGui

-from qgis.core import *
-from qgis.core import QgsDataSourceUri
+# from qgis.PyQt.QtCore import *
+
+# from qgis.core import QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsProject, QgsSettings
+from qgis.core import QgsDataSourceUri, QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsProject, QgsSettings, QgsApplication, QgsVectorLayer, QgsRasterLayer, QgsWkbTypes
 from qgis.PyQt.QtWidgets import (
    QDialog,
-    QAction,
-    QDockWidget,
-    QFileDialog,
-    QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
+    # QAction,
+    # QDockWidget,
+    # QFileDialog,
+    # QInputDialog,
+    # QMenu,
+    # QToolButton,
+    # QTableWidget,
    QTableWidgetItem,
    QMessageBox,
    QVBoxLayout,
 )
-from .tools.SQLRequet import *
+from .tools.SQLRequet import schemaname_list, schemaname_list_ref, schemaname_distinct
 from .tools.resources import (
    load_ui,
    resources_path,
-    send_issues,
+    # send_issues,
 )
 try:
    from .tools.PythonSQL import login_base
-except:
+except NameError:
    print('Pas de fichier PythonSQL')

-from .issues import CenRa_Issues

-from ast import literal_eval
+# from .issues import CenRa_Issues
+
+# from ast import literal_eval
 from qgis.utils import iface
-import os.path
-import webbrowser, os
+# import os.path
+# import os
+# import webbrowser
 import psycopg2
 import psycopg2.extras
-import base64
+# import base64

 global DeBUG
 DeBUG = 0

+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)
+
 try:
    account = login_base('account')
    user = account[0]
@@ -69,126 +75,17 @@ try:
    sigdb = account[5]
    refdb = account[6]

+except NameError:
+    print('Fails to login DB for account')

-
-except:
-    print('')
 EDITOR_CLASS = load_ui('CenRa_Flux_base.ui')
-html = '''<!DOCTYPE html>
-<html>
-<head>
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
-     integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
-     crossorigin=""/>
-    <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
-     integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
-     crossorigin=""></script>
-    <style>
-        body { padding: 0; margin: 0; }
-        html, body, #map { height: 100%; }
-        .leaflet-control-layers-toggle {
-          background-image: url(https://intranet.cenra-outils.org/Intranet/css/images/layers.png);
-        }
-        .legend_parc {
-          border-radius: 15px;
-          box-shadow: 2px 2px 3px 0 #6a6a6a;
-          background-color: #fefafab3;
-          opacity:0;
-        }
-        .legend_parc:hover{
-          opacity:1;
-        }
-        .popup-with-no-events {
-          pointer-events: none;
-        }
-    </style>
-</head>
-<body>
-    <div id="map"></div>
-    <script src="map.js"></script>
-</body>
-</html>
-<script>'''
-font = '''var OrthoIGN = L.tileLayer('https://wmts.geopf.fr/wmts?'+
-'&LAYER={ignLayer}&STYLE={style}&TILEMATRIXSET=PM'+
-'&SERVICE={service}&REQUEST=GetTile&VERSION=1.0.0'+
-'&FORMAT={format}&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}',
-{
-	ignLayer: 'ORTHOIMAGERY.ORTHOPHOTOS',
-	style: 'normal',
-	service: 'WMTS',
-	format: 'image/jpeg',
-	minZoom: 0,
-	maxZoom: 19,
-	attribution: '&copy; IGN'
-}).addTo(map);
-// Plan IGN avec une transparence de 50%
-var PlanIGN = L.tileLayer('https://wmts.geopf.fr/wmts?'+
-'&LAYER={ignLayer}&STYLE={style}&TILEMATRIXSET=PM'+
-'&SERVICE={service}&REQUEST=GetTile&VERSION=1.0.0'+
-'&FORMAT={format}&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}',
-{
-	ignLayer: 'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2',
-	style: 'normal',
-	service: 'WMTS',
-	format: 'image/png',
-	minZoom: 0,
-	maxZoom: 19,
-	attribution: '&copy; IGN'
-});
-var baseMaps = {
-	// "BDORTHO2" : bdortho,
-// "Openstreetmap": openStreetMap,
-// "Opentopomap": openTopoMap,				
-"BDORTHO" : OrthoIGN,
-"PlanIGN": PlanIGN
-};
-var overlayMaps = {
-"Sites": Sites,
-//"Parcelle":JSON
-};
-L.control.layers(baseMaps,overlayMaps).addTo(map);
-var scale = L.control.scale({position: 'bottomleft', metric:true, imperial:false});
-scale.addTo(map);
-var legend = L.control({position: 'bottomleft'});

-legend.onAdd = function (map) {
-    var div = L.DomUtil.create('div', 'info legend_parc'),
-    labels = [];
-    labels.push('<i style="background:#73004c;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition')
-
-    labels.push('<i style="background:#ff00c5;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquis en partie BND')
-
-    labels.push('<i style="background:#f0ade1ab;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition pour partie')
-
-    labels.push('<i style="background:#73462e;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition / Convention')
-
-    labels.push('<i style="background:#e69800;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention')
-
-    labels.push('<i style="background:#ffd37f;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention en partie BND')
-
-    labels.push('<i style="background:#ffebaf;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention pour partie')
-
-    labels.push('<i style="background:#c8c8c8;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Autre')
-
-    labels.push('<i style="background:#f9ff08;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Projet en cours')
-
-    labels.push('<i style="background:#fe0000;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Problème de mise à jour')
-
-    labels.push('<i style="background:#000;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Pas de maitrise')
-
-    div.innerHTML = labels.join('<br>');
-    return div;
-};
-
-legend.addTo(map);
-</script>'''
 targetCrs = QgsCoordinateReferenceSystem('EPSG:4326')
 layerCrs = QgsCoordinateReferenceSystem('EPSG:2154')
 TranformCRS = QgsCoordinateTransform(layerCrs, targetCrs, QgsProject.instance())

-class Flux_Editor(QDialog, EDITOR_CLASS):

+class Flux_Editor(QDialog, EDITOR_CLASS):
    def __init__(self, parent=None):
        _ = parent
        super().__init__()
@@ -202,7 +99,6 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
        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.selectRow)
        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger(0))
        self.toolButton.setIcon(QtGui.QIcon(resources_path('ui', 'find.png')))
        self.comboBox_2.addItem("SIG")
@@ -215,11 +111,11 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
        self.tableWidget_2.itemDoubleClicked.connect(self.suppression_flux)
        self.comboBox_2.currentIndexChanged.connect(self.bd_source)
        self.checkBox.hide()
-        self.checkBox.stateChanged.connect(self.modeCarte)
+        # self.checkBox.stateChanged.connect(self.modeCarte)
        self.toolButton.clicked.connect(self.getCanevas)
        layout = QVBoxLayout()
        self.lineEdit.textChanged.connect(self.filtre_dynamique)
-        self.viewer.textChanged.connect(self.NewTitle)
+        # self.viewer.textChanged.connect(self.NewTitle)
        layout.addWidget(self.lineEdit)
        self.viewer.hide()
        self.DeBUG.addItem('')
@@ -228,14 +124,11 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
        self.DeBUG.addItem('4269')

        self.DeBUG.hide()
-        #self.lineEdit.mousePressEvent = self._mousePressEvent
-
-        #metadonnees_plugin = open(self.plugin_path + '/metadata.txt')
-        #infos_metadonnees = metadonnees_plugin.readlines()

    def raise_(self):
        """Run method that performs all the real work"""
        self.bd_source()
+
    def ModeDeBUG(self):
        self.DeBUG.show()

@@ -250,127 +143,13 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
            DeBUG = 0
            self.DeBUG.hide()

+    """
    def NewTitle(self):
        if self.viewer.title() != '':
            Tsplit = ((self.viewer.title()).split('.'))
            print(Tsplit[0], Tsplit[1])
            self.openPostGIS(Tsplit[0], Tsplit[1])
-
-    def modeCarte(self):
-        if self.checkBox.isChecked():
-            self.viewer.show()
-
-            cur.execute("SELECT ST_AsGeoJSON(st_centroid(ST_Transform(geom,4326))) FROM _agregation_ra._agreg_contour")
-            varcenter = literal_eval(cur.fetchall()[0][0])
-            varcenter = [varcenter['coordinates'][1],varcenter['coordinates'][0]]
-
-            cur.execute("SELECT ST_AsGeoJSON(ST_Transform(st_collect(geom),4326)),tschema,tname FROM _agregation_ra._agreg_contour WHERE geom IS NOT NULL GROUP BY tschema,tname;" )
-            varSite = cur.fetchall()
-            cur.execute("SELECT ST_AsGeoJSON(ST_Transform(st_collect(geom),4326)),tschema,tname FROM _agregation_ra._agreg_travaux_prevus_poly WHERE geom IS NOT NULL GROUP BY tschema,tname;")
-            varTravaux = cur.fetchall()
-            cur.execute("SELECT ST_AsGeoJSON(ST_Transform(geom,4326)),milieu_libelle ,lb_eu_01,tschema,tname FROM _agregation_ra._agreg_eu_habitat WHERE geom IS NOT NULL;")
-            varHabitat = cur.fetchall()
-
-            vargeomS = literal_eval(varSite[0][0])
-            vargeomT = literal_eval(varTravaux[0][0])
-            vargeomH = literal_eval(varHabitat[0][0])
-            #new_objectS = self.SwitchGeom(vargeomS)
-            #new_objectT = self.SwitchGeom(vargeomT)
-            #new_objectH = self.SwitchGeom(vargeomH)
-
-            script = 'var map = L.map("map").setView('+str(varcenter)+', 13);'
-
-            id = 0
-            varSiteJSON = '''var ParcelleJSON = {
-    "type": "FeatureCollection",
-    "features":['''
-            for varP in varSite:
-                id = id+1
-                varSiteJSON = varSiteJSON+'{"properties": {"code": "'+str(varP[1])+'.'+str(varP[2])+'" },'+str(varP[0][1:])+','
-            varSiteJSON = varSiteJSON[:-1]+''']};
-var Sites = L.geoJSON(ParcelleJSON,{
-    style: function(feature) {
-        switch (feature.geometry.properties.code) {
-            case 'Ensemble de sites': return {fillColor: "#9a7863",color:"white",weight: 1,fillOpacity: 0.7};
-            case 'Sous-site conservatoire': return {fillColor: "#e69800",color:"white",weight: 1,fillOpacity: 0.7};
-            case 'Site non géré': return {fillColor: "#73004c",color:"white",weight: 1,fillOpacity: 0.7};
-            case 'Animation territoriale': return {fillColor: "#ffebaf",color:"white",weight: 1,fillOpacity: 0.7};
-            case 'Site conservatoire': return {fillColor: "#f9ff08",color:"white",weight: 1,fillOpacity: 0.7};
-            default: return {fillColor: "#c8c8c8",color:"white",weight: 1,fillOpacity: 0.7};
-        }
-    },
-    onEachFeature: function (feature,layer) { 
-        layer.on('click', function(e) {
-            map.fitBounds(layer.getBounds());
-            document.title = feature.properties.code.toString();
-        });
-        layer.on('mouseover', function(e) {
-            layer.setStyle({
-                weight: 5,
-                color: '#fe0000',
-                dashArray: '',
-            });
-        });
-        //layer.on('mousemove', function(e) {
-            //layer.openPopup(e.latlng);
-        //});
-        layer.on('mouseout', function(e) {
-            layer.setStyle({
-                color:"white",
-                weight: 1,
-            });
-        });
-        layer.bindTooltip(feature.properties.code.toString(), {
-            sticky: true,
-            permanent: false,
-            direction: 'right',
-            className: 'label_parc'
-        });
-    }
-}).addTo(map);'''
-            id = 0
-            varTravauxJSON = '''var TravauxJSON = {
-    "type": "FeatureCollection",
-    "features":['''
-            for varT in varTravaux:
-                id = id+1
-                varTravauxJSON = varTravauxJSON+'{"properties": {"code": "'+str(varT[1])+'.'+str(varT[2])+'" },'+str(varT[0][1:])+','
-            varTravauxJSON = varTravauxJSON[:-1]+''']};
-var Travaux = L.geoJSON(TravauxJSON,{
-    onEachFeature: function (feature,layer) { 
-        layer.on('click', function(e) {
-            map.fitBounds(layer.getBounds());
-            document.title = feature.properties.code.toString();
-        });
-        layer.on('mouseover', function(e) {
-            layer.setStyle({
-                weight: 5,
-                color: '#fe0000',
-                dashArray: '',
-            });
-        });
-        //layer.on('mousemove', function(e) {
-            //layer.openPopup(e.latlng);
-        //});
-        layer.on('mouseout', function(e) {
-            layer.setStyle({
-                color:"white",
-                weight: 1,
-            });
-        });
-        layer.bindTooltip(feature.properties.code.toString(), {
-            sticky: true,
-            permanent: false,
-            direction: 'right',
-            className: 'label_parc'
-        });
-    }
-}).addTo(map);'''
-            script = script+varSiteJSON+varTravauxJSON
-            self.viewer.setHtml(html+script+font)
-
-        else:
-            self.viewer.hide()
+    """

    def bd_source(self):
        self.activateWindow()
@@ -393,7 +172,7 @@ var Travaux = L.geoJSON(TravauxJSON,{
        self.combobox_custom()
        # Create the dialog with elements (after translation) and keep reference
        # Only create GUI ONCE in callback, so that it will only load when the plugin is started
-        if self.first_start == True:
+        if self.first_start is True:
            self.first_start = False
        # show the dialog
        self.show()
@@ -417,7 +196,7 @@ var Travaux = L.geoJSON(TravauxJSON,{
        self.combobox_custom()
        # Create the dialog with elements (after translation) and keep reference
        # Only create GUI ONCE in callback, so that it will only load when the plugin is started
-        if self.first_start == True:
+        if self.first_start is True:
            self.first_start = False
        # show the dialog
        self.show()
@@ -432,9 +211,6 @@ var Travaux = L.geoJSON(TravauxJSON,{
    def suppression_flux(self):
        self.tableWidget_2.removeRow(self.tableWidget_2.currentRow())

-    def open_url(self, item):
-        url = item.data(Qt.UserRole)
-
    def initialisation_flux(self):
        if dbtype == sigdb:
            # self.toolButton.setEnabled(1)
@@ -445,7 +221,7 @@ var Travaux = L.geoJSON(TravauxJSON,{
        where schemaname like '""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) order by schemaname,tablename;"""
            else:
                custom_list = """(SELECT schemaname,tablename from pg_catalog.pg_tables
-         where schemaname like '\_"""+ str(self.comboBox.currentText()) +"""%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '\_"""+ str(self.comboBox.currentText()) +"""%' order by schemaname,tablename) order by schemaname,tablename;"""
+        where schemaname like '\\_""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '\\_""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) order by schemaname,tablename;"""
        else:
            if self.comboBox.currentText() == 'toutes les catégories':
                custom_list = schemaname_list_ref
@@ -455,8 +231,23 @@ var Travaux = L.geoJSON(TravauxJSON,{
        cur.execute(custom_list)
        list_schema = cur.fetchall()

+        SQLcountRaster = """SELECT schemaname,viewname FROM pg_catalog.pg_views
+        WHERE schemaname LIKE 'public' AND viewname LIKE 'raster_columns';"""
+        cur.execute(SQLcountRaster)
+        RasterIF = len(cur.fetchall())
+
+        if RasterIF == 1:
+            SQLloadRaster = """SELECT concat(r_table_schema,'.',r_table_name) from public.raster_columns; """
+            cur.execute(SQLloadRaster)
+            list_raster = cur.fetchall()
+            RasterList = []
+            for rasterFind in list_raster:
+                RasterList.append(rasterFind[0])
+        else:
+            RasterList = []
+
        self.tableWidget.setRowCount(len(list_schema))
-        self.tableWidget.setColumnCount(3)
+        self.tableWidget.setColumnCount(4)
        i = 0
        for value in list_schema:
            if dbtype == sigdb:
@@ -487,77 +278,96 @@ var Travaux = L.geoJSON(TravauxJSON,{
                schema_name = str(value[0])
                table_name = str(value[1])

+            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)
            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.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table"])

    def selection_flux(self):
        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[2].text()
+        # svgTake = (selected_items[2].tableWidget().cellWidget(0,0))
+        new_item_text = selected_items[3].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.setColumnCount(3)
+                self.tableWidget_2.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table"])
+                self.tableWidget_2.setColumnCount(4)
                self.tableWidget_2.setItem(selected_row, column, cloned_item)

-            self.tableWidget_2.setColumnWidth(0, 50)
-            self.tableWidget_2.setColumnWidth(1, 300)
+            self.tableWidget_2.setColumnWidth(0, 20)
+            self.tableWidget_2.setColumnWidth(1, 70)
            self.tableWidget_2.setColumnWidth(2, 300)
-
+            self.tableWidget_2.setColumnWidth(3, 300)

    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.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):

        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)
-            if self.QMBquestion == QMessageBox.Yes:
+                                                    QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
+            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 openPostGIS(self, schema, table):
        uri = QgsDataSourceUri()
        uri.setConnection(host, port, sigdb, user, mdp)
+
+        if (schema + '.' + table) in LRasterList:
+            uri.setDataSource(schema, table, "rast")
+            uri.setKeyColumn('rid')
+            uri.setSrid('2154')
+            layer = QgsRasterLayer(uri.uri(), table, "postgresraster")
+        else:
            uri.setDataSource(schema, table, "geom")
            uri.setKeyColumn('gid')
            uri.setSrid('2154')
            layer = QgsVectorLayer(uri.uri(), table, "postgres")
        # Ajout de la couche au canevas QGIS
        QgsProject.instance().addMapLayer(layer)
+    """

    def chargement_flux(self):
-
        managerAU = QgsApplication.authManager()
-        k = managerAU.availableAuthMethodConfigs().keys()
+        managerAU.availableAuthMethodConfigs().keys()

        def REQUEST(type):
            switcher = {
@@ -569,33 +379,45 @@ var Travaux = L.geoJSON(TravauxJSON,{
            }
            return switcher.get(type, "nothing")

+        # def displayOnWindows(type, uri, name):
+        #    p = []

-
-        def displayOnWindows(type, uri, name):
-            p = []
+        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])

        for row in range(0, self.tableWidget_2.rowCount()):
            color_rgba = 855030089
-            if self.tableWidget_2.item(row, 0).background().color().rgba() != 855030089:
-                ## supression de la partie de l'url après le point d'interrogation
+            if self.tableWidget_2.item(row, 1).background().color().rgba() != color_rgba:
+                # supression de la partie de l'url après le point d'interrogation
                if dbtype == sigdb:
-                    code = self.tableWidget_2.item(row,0).text()
-                    schema = '_'+code+'_'+self.tableWidget_2.item(row,1).text()
+                    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()
-                        table = self.tableWidget_2.item(row,2).text()
+                        schema = self.tableWidget_2.item(row, 2).text()
+                        table = self.tableWidget_2.item(row, 3).text()
                    else:
-                        table = self.tableWidget_2.item(row,2).text()
+                        table = self.tableWidget_2.item(row, 3).text()
                        table = schema + '_' + table
-                if dbtype == refdb:
-#                    code = self.tableWidget_2.item(row,0).text()
-                    schema = self.tableWidget_2.item(row,1).text()
-                    table = self.tableWidget_2.item(row,2).text()#.split("?", 1)[0]
+                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()
+                    # .split("?", 1)[0]
                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
-
+                if (schema + '.' + table) in RasterList:
+                    uri.setDataSource(schema, table, "rast")
+                    uri.setKeyColumn('rid')
+                    uri.setSrid('2154')
+                    layer = QgsRasterLayer(uri.uri(), table, "postgresraster")
+                    QgsProject.instance().addMapLayer(layer)
+                else:
                    uri.setDataSource(schema, table, "geom")
                    uri.setKeyColumn('gid')

@@ -617,7 +439,7 @@ var Travaux = L.geoJSON(TravauxJSON,{
                                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
@@ -627,7 +449,8 @@ var Travaux = L.geoJSON(TravauxJSON,{
                        # Ajout de la couche au canevas QGIS
                        QgsProject.instance().addMapLayer(layer)
            else:
-                self.QMBquestion = QMessageBox.question(iface.mainWindow(), u"Attention !","La couche «" + str(self.tableWidget_2.item(row,1).text()) +' '+ str(self.tableWidget_2.item(row,2).text()) + "» ne ce trouve pas dans cette BD !",QMessageBox.Yes)
+                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):
        if dbtype == sigdb:
            self.toolButton.setEnabled(1)
@@ -702,9 +525,16 @@ var Travaux = L.geoJSON(TravauxJSON,{
                SchemaName = QTableWidgetItem(e[0][6:])
            TableName = QTableWidgetItem(e[1][len(e[0]) + 1:])
            self.tableWidget.insertRow(row_count)
-            self.tableWidget.setItem(row_count,0,DepName)
-            self.tableWidget.setItem(row_count,1,SchemaName)
-            self.tableWidget.setItem(row_count,2,TableName)
+
+            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)
            if TableSomme == 0:
                for j in range(self.tableWidget.columnCount()):
                    self.tableWidget.item(row_count, j).setBackground(QtGui.QColor(246, 185, 73, 50))
@@ -721,7 +551,6 @@ var Travaux = L.geoJSON(TravauxJSON,{
        new_object = new_object[:-1] + ']'
        return (new_object)

-    def popup(self):
-
-        self.dialog = Popup()  # +++ - self
-        self.dialog.text_edit.show()
+    # def popup(self):
+        # self.dialog = Popup()  # +++ - self
+        # self.dialog.text_edit.show()
@@ -1,47 +1,24 @@
 import os
-plugin_dir = os.path.dirname(__file__)
-end_find = plugin_dir.rfind('\\')+1
+# from qgis.gui import *

-NAME = plugin_dir[end_find:]
-
-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.core import QgsSettings
+from qgis.PyQt.QtWidgets import QDialog
 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_aide == True : statu = statu + [3]
-        if statu_question == True : statu = statu + [5]
-        if statu_amelioration == True : statu = statu + [2]
-        if statu_autre == True : statu = statu + [6]
+        if statu_bug is True:
+            statu = statu + [1]
+        if statu_aide is True:
+            statu = statu + [3]
+        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)
@@ -7,7 +7,7 @@ name=CenRa_FLUX
 qgisMinimumVersion=3.0
 supportsQt6=True
 description=Permet d'ouvrire une table dans la base PostGis
-version=2.9
+version=3.5
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr

@@ -19,7 +19,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
@@ -33,7 +32,7 @@ icon=icon.png
 # experimental flag
 experimental=False

-changelog=<h2>CenRa_FLUX:</h2></br><p><h3>09/04/2025 - Version 2.9: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>07/04/2025 - Version 2.7: </h3> - mode debug.</p></br><p><h3>03/04/2025 - Version 2.6: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 2.5: </h3> - Visualisation distincte des couches ne se trouvant pas dans l'antenne.</p></br><p><h3>13/02/2025 - Version 2.4: </h3> - Ajoute redimensionnement et déplacement mollette.</p></br><p><h3>05/02/2025 - Version 2.3: </h3> - Bouton de visualisation des couches se trouvent uniquement dans le canva de la carte.</p></br><p><h3>07/01/2025 - Version 2.2: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.1:</h3> - Correctif de bug.</br> - Evolution de la limit de 3 à 5. </br></p></br><p><h3>22/10/2024 - Version 2.0:</h3> - Reformatage du code.</br></p></br><p><h3>03/10/2024 - Version 1.14:</h3> - Remonte la fênetre dans la pille.</br></p><p><h3>13/09/2024 - Version 1.13:</h3>- MAJ sur le lien du changelog</br>- Bug-fix: Ouvre MultiPolygone et Polygon séparément.</p></br><p><h3>10/09/2024 - Version 1.11:</h3>- Ouverture de table contenant plusieurs géométries.</p></br><p><h3>26/08/2024 - Version 1.10:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
+changelog=<h2>CenRa_FLUX:</h2></br><p><h3>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
@@ -46,4 +45,3 @@ deprecated=False

 # If the plugin can run on QGIS Server.
 server=False
-
@@ -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'
@@ -6,7 +6,7 @@ schemaname_list_ref="""SELECT schemaname,tablename from pg_catalog.pg_tables
        WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
        order by schemaname,tablename;"""
 schemaname_list = """(SELECT schemaname,tablename from pg_catalog.pg_tables
-         where schemaname like 'trav%' or schemaname like '\_ag%' or schemaname like '\_00%' or schemaname like '\_01%' or schemaname like '\_07%' or  schemaname like '\_26%' or schemaname like '\_form%' or schemaname like '\_42%' or schemaname like '\_69%' order by schemaname,tablename)
+        where schemaname like 'trav%' or schemaname like '\\_ag%' or schemaname like '\\_00%' or schemaname like '\\_01%' or schemaname like '\\_07%' or  schemaname like '\\_26%' or schemaname like '\\_form%' or schemaname like '\\_42%' or schemaname like '\\_69%' order by schemaname,tablename)
        UNION
        (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews order by schemaname,tablename) order by schemaname,tablename;"""
 geom = "geom"
@@ -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>
@@ -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>
@@ -77,15 +77,17 @@ def plugin_test_data_path(*args, copy=False):
    else:
        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:
+    except NameError:
        print('404')

+
 def resources_path(*args):
    """Get the path to our resources folder.

@@ -112,37 +114,39 @@ def load_ui(*args):
    ui_class, _ = uic.loadUiType(resources_path("ui", *args))

    return ui_class
+
+
 def send_issues(url, titre, body, labels):
    import requests
    import json
-    import os
-    import qgis
+    # 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 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/latest/plugins.xml'
    # print(URL)
@@ -151,7 +155,7 @@ def maj_verif(NAME):
    try:
        urllib.request.urlopen('https://google.com')
        binar = True
-    except:
+    except NameError:
        binar = False
    if binar:
        try:
@@ -161,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>'
@@ -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,8 +23,9 @@ 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,
@@ -33,13 +33,9 @@ from .tools.resources import (
 pyperclip()
 from .dock import CenRa_Metabase
 from .editor import Metabase_Editor
-from .about_form import MetabaseAboutDialog
+
 # from CenRa_Metabase.issues import CenRa_Issues

-try:
-    from PyQt5.QtCore import *
-except:
-    from PyQt6.QtCore import *

 class PgMetadata:
    def __init__(self):
@@ -102,7 +98,6 @@ 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)
@@ -161,6 +156,7 @@ class PgMetadata:
        """
        dialog = MetabaseAboutDialog(iface)
        dialog.exec()
+
    def open_help():
        """ Open the online help. """
        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -204,7 +200,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."""
@@ -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
@@ -16,6 +16,7 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType(
    )
 )

+
 class MetabaseAboutDialog(QDialog, ABOUT_FORM_CLASS):

    """ About - Let the user display the about dialog. """
@@ -14,48 +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.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,
-)
-'''
-try:
-    from .tools.PythonSQL import login_base
-except:
-    print('Pas de fichier PythonSQL')
-
 from .tools.resources import (
    load_ui,
    resources_path,
 )
+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')
@@ -150,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()
@@ -231,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 + (
-            '<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>')
+            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>')
        publisher = ''
        for z in dataall[2]:
-            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>')
-        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])]]
+            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>')
+        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

@@ -292,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. """
        '''
@@ -337,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()
@@ -356,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'))
-        self.viewer.setHtml(html)#, base_url)
+        # base_url = QUrl.fromLocalFile(resources_path('images', 'must_be_a_file.png'))
+        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 = ''
@@ -392,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)
@@ -457,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.'))
@@ -495,4 +451,3 @@ publisher+
        data_contact = cur.fetchall()
        cur.close()
        return data_general[0], data_url, data_contact
-
@@ -1,60 +1,48 @@
 import logging
 import os

-from collections import namedtuple
-from enum import Enum
-from functools import partial
-from pathlib import Path
-from xml.dom.minidom import parseString
-from qgis.gui import *
+# 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 *
 from qgis.core import (
-    NULL,
    QgsApplication,
-    QgsDataSourceUri,
-    QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
-    QgsRasterLayer,
    QgsSettings,
-    QgsVectorLayer,
    QgsGeometry,
    QgsWkbTypes,
+    Qgis,
 )
-from qgis.PyQt import QtGui
-from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime
-from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtPrintSupport import QPrinter
+from qgis.PyQt import QtGui, QtCore
+from qgis.PyQt.QtGui import QIcon
+# from qgis.PyQt.QtPrintSupport import QPrinter
 # 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:
+except ValueError:
    print('Pas de fichier PythonSQL')

 from .tools.resources import (
    load_ui,
    resources_path,
-    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__()
@@ -74,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)
@@ -102,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()
@@ -255,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 != '':
@@ -324,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('')
@@ -392,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('')
@@ -461,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]))
@@ -471,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]))
@@ -586,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())
@@ -597,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())
@@ -617,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 = ''
@@ -658,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()
@@ -684,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()
@@ -713,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()

@@ -770,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()
-        self.issues.show()
+
+    # def issues_open(self):
+    #    self.issues = CenRa_Issues()
+    #    self.issues.show()
@@ -7,7 +7,7 @@ name=CenRa_Metabase
 qgisMinimumVersion=3.0
 supportsQt6=True
 description=CenRa_METABASE
-version=0.2.3
+version=0.3.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr

@@ -22,7 +22,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues

 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_METABASE:</h2></br><p><h3>09/04/2025 - Version 0.2.3: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 0.2.2: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 0.2.1: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.2.0: </h3> - Deployment sur serveur SIG.</p></br><p><h3>07/01/2025 - Version 0.1.6: </h3> - ByPass du certif ssl ci erreur</p></br><p><h3>19/12/2024 - Version 0.1.5: </h3> - Fix les problem de lenteur qu'en la base est down.</p></br><p><h3>12/12/2024 - Version 0.1.4: </h3> - Crash Fix .</p></br><p><h3>08/10/2024 - Version 0.1.3: </h3> - Lecture de métadonnée des flux WMS/WFS.</p></br><p><h3>07/10/2024 - Version 0.1.2: </h3> - Correctif de bug.</p></br><p><h3>03/10/2024 - Version 0.1.1: </h3> - Remonte la fênetre dans la pille.</p></br><p><h3>26/08/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_Metabase </p>
+changelog=<h2>CenRa_METABASE:</h2></br><p><h3>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
@@ -3,9 +3,12 @@
 import configparser
 import shutil
 import tempfile
+# import base64
+# import psycopg2
+# 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"
@@ -92,14 +95,6 @@ def resources_path(*args):
        path = abspath(join(path, item))
    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:
-        print('404')

 def load_ui(*args):
    """Get compile UI file.
@@ -113,37 +108,51 @@ def load_ui(*args):

    return ui_class

+
+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')
+
+
 def send_issues(url, titre, body, labels):
    import requests
+    import urllib.request
    import json
-    import os
-    import qgis
+    # 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 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/latest/plugins.xml'
    # print(URL)
@@ -152,7 +161,7 @@ def maj_verif(NAME):
    try:
        urllib.request.urlopen('https://google.com')
        binar = True
-    except:
+    except urllib.error.URLError:
        binar = False
    if binar:
        try:
@@ -162,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
@@ -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,17 +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

-try:
-    from PyQt5.QtCore import *
-except:
-    from PyQt6.QtCore import *

 class PgPageRender:
    def __init__(self):
@@ -76,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)
@@ -119,6 +114,7 @@ class PgPageRender:
        """
        dialog = AboutDialog(iface)
        dialog.exec()
+
    def open_help():
        """ Open the online help. """
        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -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
@@ -1,79 +1,37 @@
 import logging
 import os
-from collections import namedtuple
-from enum import Enum
-from functools import partial
-from pathlib import Path
-from xml.dom.minidom import parseString
-from qgis.gui import *
-import qgis
-from qgis.core import (
-    NULL,
-    QgsApplication,
-    QgsScaleBarSettings,	
-    QgsDataSourceUri,
-    QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
-    QgsRasterLayer,
-    QgsSettings,
-    QgsVectorLayer,
-    QgsGeometry,
-    QgsPrintLayout,
-    QgsReadWriteContext,
-    QgsLayoutItemMap,
-    QgsLayoutItemPage,
-    QgsLayoutSize,
-    QgsUnitTypes,
-    QgsLayoutPoint,
-    QgsLayoutItemLabel,
-    QgsLayoutItemPicture,
-    QgsLayoutItemLegend,
-    QgsLegendStyle,
-    QgsLayoutItemScaleBar,
-    QgsLayerTreeGroup,
-    QgsCoordinateReferenceSystem,
-    QgsCoordinateTransform,
-    QgsLayerTree,
-    QgsLayoutTableColumn,
-    QgsRectangle,
-    QgsLayoutItemMapOverviewStack,
-    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 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 qgis.core import QgsSettings
+from qgis.PyQt.QtCore import Qt
+# 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,
 )
-try:
-    from PyQt5 import QtGui
-    from PyQt5.QtWidgets import QApplication
-    from PyQt5.QtCore import QSettings,QPointF
-except:
-    from PyQt6 import QtGui
-    from PyQt6.QtWidgets import QApplication
-    from PyQt6.QtCore import QSettings,QPointF
-from qgis.PyQt.QtXml import QDomDocument
-from qgis.utils import iface
-import glob
+
+from qgis.PyQt import QtGui
+from qgis.PyQt.QtWidgets import QApplication
+from qgis.PyQt.QtCore import QSettings
+
+# from qgis.PyQt.QtXml import QDomDocument
+# from qgis.utils import iface
+# import glob
 from .tools.resources import (
    load_ui,
    resources_path,
-    send_issues,
+    # send_issues,
 )
-from .issues import CenRa_Issues
-from datetime import date
+# from .issues import CenRa_Issues
+# from datetime import date
+
 last_select = None
 maxV = 210
 maxH = 296
@@ -83,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 = [
-'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):
+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']

+
+class PageRender_Editor(QDialog, EDITOR_CLASS):
    def __init__(self, parent=None):
        _ = parent
        super().__init__()
@@ -130,7 +67,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
            'Credit': 0,
            'Source': 0,
            'Echelle_2': 0,
-        'Logo_2':0,}
+            'Logo_2': 0}

        path = ''
        ix = 0
@@ -161,8 +98,9 @@ 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.CursorShape(18))
            global lastPos
            lastPos = {'x': event.pos().x(), 'y': event.pos().y()}
@@ -181,7 +119,6 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
        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
@@ -191,7 +128,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
@@ -207,14 +144,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)
@@ -222,7 +159,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)
@@ -231,7 +168,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)
@@ -240,7 +177,7 @@ 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):
@@ -251,6 +188,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
            return folder[0]
        else:
            return ''
+
    def load(self):
        folder = self.select_file()
        logopath = folder
@@ -320,12 +258,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()
@@ -415,6 +354,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':
@@ -465,8 +405,9 @@ def fletch_canvas(self):
        frame_x = round(frame_w / 3)
        frame_y = self.frame.y()
        self.frame.move(frame_x, frame_y)
+
    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()
@@ -479,7 +420,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:
@@ -493,7 +434,7 @@ def fletch_canvas(self):

    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"
@@ -512,7 +453,7 @@ def fletch_canvas(self):
        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
@@ -526,7 +467,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))
@@ -539,7 +480,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
@@ -547,7 +488,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))
@@ -555,7 +496,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
@@ -563,10 +504,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()))
-
@@ -17,13 +17,13 @@ def fletch_canvas(self):
    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, 2, 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_size'] = QgsLayoutSize(140.0,147, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(41, 110, 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)
@@ -49,56 +49,56 @@ def fletch_canvas(self):
            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(122.0,45, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(31, 21, QgsUnitTypes.LayoutMillimeters)
+            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, 3, 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(295, 4, 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(295, 104, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(197,207, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(58, 156, QgsUnitTypes.LayoutMillimeters)
            self.template_parameters['Legande_rotate'] = 0
            self.template_parameters['Arrow_size'] = QgsLayoutSize(20,20, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(267, 28, 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(13, 278, 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(72, 4, 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(213, 278, 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(323, 278, 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(13, 259, 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(172,64, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(44, 29, QgsUnitTypes.LayoutMillimeters)
+            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, 2, 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_size'] = QgsLayoutSize(140.0,147, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(49, 15, 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)
@@ -124,44 +124,44 @@ def fletch_canvas(self):
            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(122.0,45, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(31, 21, QgsUnitTypes.LayoutMillimeters)
+            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, 3, 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(295, 4, 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(295, 104, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_size'] = QgsLayoutSize(197,207, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['Legande_locals'] = QgsLayoutPoint(69, 21, QgsUnitTypes.LayoutMillimeters)
            self.template_parameters['Legande_rotate'] = 0
            self.template_parameters['Arrow_size'] = QgsLayoutSize(20,20, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(267, 28, 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(13, 278, 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(72, 4, 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(213, 278, 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(323, 278, 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(13, 259, 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(172,64, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(44, 29, QgsUnitTypes.LayoutMillimeters)
+            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
@@ -7,7 +7,7 @@ name=CenRa_PageRender
 qgisMinimumVersion=3.0
 supportsQt6=True
 description=CenRa_PageRender
-version=0.1.6
+version=0.2.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr

@@ -22,7 +22,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues

 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_PAGERENDER:</h2></br><p><h3>03/04/2025 - Version 0.1.6: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.1.5: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>14/11/2024 - Version 0.1.4: </h3> - Implementation de la mollet. </br> - Implementation du dragging pour déplacer et modification de la taille </br></p></br><p><h3>08/11/2024 - Version 0.1.3: </h3> - Correctif de bug. </br><p><h3>21/10/2024 - Version 0.1.1: </h3> - Les match en if. </br> - Bouton de scroll et adaptation portrait.</p></br><p><h3>09/10/2024 - Version 0.1.0: </h3> - Création.</p>
+changelog=<h2>CenRa_PAGERENDER:</h2></br><p><h3>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
@@ -3,9 +3,9 @@
 import configparser
 import shutil
 import tempfile
-import base64
-import psycopg2
-import psycopg2.extras
+# import base64
+# import psycopg2
+# import psycopg2.extras
 from os.path import abspath, join, pardir, dirname
 from qgis.PyQt.QtWidgets import QApplication
 from qgis.PyQt import uic
@@ -107,37 +107,38 @@ def load_ui(*args):

    return ui_class

+
 def send_issues(url, titre, body, labels):
    import requests
+    import urllib.request
    import json
-    import os
-    import qgis
+    # import os

-    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/latest/plugins.xml'
 #    print(URL)
@@ -146,7 +147,7 @@ def maj_verif(NAME):
    try:
        urllib.request.urlopen('https://google.com')
        binar = True
-    except:
+    except urllib.requests.URLError:
        binar = False
    if binar:
        try:
@@ -156,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>'
@@ -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
 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

@@ -15,8 +15,10 @@ import qgis

 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,
@@ -26,15 +28,11 @@ pyperclip()
 from .postgis_editor import Postgis_Editor
 from .postgis_creator import Postgis_Creator
 from .postgis_rename import Postgis_Rename
-from .about_form import AboutDialog

-try:
-    from PyQt5.QtCore import *
-except:
-    from PyQt6.QtCore import *

 IPAddr = socket.gethostbyname(socket.gethostname())

+
 class PgPostgis:
    def __init__(self):
        """ Constructor. """
@@ -123,6 +121,7 @@ class PgPostgis:
        """
        dialog = AboutDialog(iface)
        dialog.exec()
+
    def open_help():
        """ Open the online help. """
        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -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
@@ -13,7 +13,7 @@ name=CenRa_POSTGIS
 qgisMinimumVersion=3.0
 supportsQt6=True
 description=Permet de crée un dossier dans la base PostGis
-version=2.9
+version=3.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr

@@ -22,7 +22,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>09/04/2025 - Version 2.9: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.7: </h3> - Mise a jour de securite.</p></br><p><h3>12/02/2025 - Version 2.6: </h3> - InDev:renomé les schema et table.</p></br><p><h3>04/02/2025 - Version 2.5: </h3> - Correctif bug création de couche.</p></br><p><h3>23/01/2025 - Version 2.4: </h3> - Correctif sur les pkey.</p></br><p><h3>22/01/2025 - Version 2.3: </h3> - Correctif sur la creation de projet.</p></br><p><h3>21/01/2025 - Version 2.2: </h3> - Correctif sur la longeur des nom.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.0:</h3>- Refont du code.</p>
+changelog=<h2>CenRa_POSTGIS:</h2></br><p><h3>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
@@ -2,53 +2,50 @@

 from __future__ import absolute_import
 # Import the PyQt and QGIS libraries
-from builtins import next
-from builtins import str
-from builtins import object
-import qgis
+# from builtins import next
+# from builtins import str
+# from builtins import object
+# import qgis
 from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog,QMessageBox
-from qgis.PyQt.QtGui import QIcon
-try:
-    from PyQt5.QtCore import *
-    from PyQt5.QtGui import *
-    from PyQt5 import QtGui
-except:
-    from PyQt6.QtCore import *
-    from PyQt6.QtGui import *
-    from PyQt6 import QtGui
-from qgis.core import *
-from qgis.core import QgsDataSourceUri
+from qgis.PyQt.QtWidgets import QDialog, QMessageBox
+# 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, Qgis

 try:
    from .tools.PythonSQL import login_base
-except:
+except ValueError:
    print('Pas de fichier PythonSQL')

-from .tools.SQLRequet import *
+# from .tools.SQLRequet import *

 from .tools.resources import (
    load_ui,
    resources_path,
-    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 webbrowser, os
-import psycopg2
-import psycopg2.extras
-import base64
+# import os.path
+# import webbrowser, os
+# import psycopg2
+# import psycopg2.extras
+# 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__()
@@ -67,14 +64,14 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
        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.")
@@ -108,6 +105,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
@@ -4,50 +4,45 @@ from __future__ import absolute_import
 # Import the PyQt and QGIS libraries
 from builtins import next
 from builtins import str
-from builtins import object
-import qgis
+# from builtins import object
+# import qgis
 from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog
-from qgis.PyQt.QtGui import QIcon
-try:
-    from PyQt5.QtCore import *
-    from PyQt5.QtGui import *
-    from PyQt5 import QtGui
-except:
-    from PyQt6.QtCore import *
-    from PyQt6.QtGui import *
-    from PyQt6 import QtGui
-from qgis.core import *
-from qgis.core import QgsDataSourceUri
+from qgis.PyQt.QtWidgets import QDialog, QMessageBox
+# from qgis.PyQt.QtGui import QIcon
+
+from qgis.PyQt import QtGui
+
+# from qgis.core import *
+from qgis.core import QgsSettings

 try:
    from .tools.PythonSQL import login_base
-except:
+except ValueError:
    print('Pas de fichier PythonSQL')
-from .tools.SQLRequet import *
+# from .tools.SQLRequet import *

 from .tools.resources import (
    load_ui,
    resources_path,
-    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 webbrowser, os
-import psycopg2
-import psycopg2.extras
-import base64
+# import os.path
+# import webbrowser
+# import psycopg2
+# import psycopg2.extras
+# 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__()
@@ -57,7 +52,7 @@ 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):
        self.activateWindow()
        account = login_base("account")
@@ -74,7 +69,6 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
    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";"""
@@ -89,7 +83,8 @@ 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()
@@ -2,46 +2,39 @@

 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 object
-import qgis
+# from builtins import object
+# import qgis
 from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog, QMessageBox,QDialogButtonBox
-from qgis.PyQt.QtGui import QIcon
-try:
-    from PyQt5.QtCore import *
-    from PyQt5.QtGui import *
-    from PyQt5 import QtGui
-except:
-    from PyQt6.QtCore import *
-    from PyQt6.QtGui import *
-    from PyQt6 import QtGui
-from qgis.core import *
-from qgis.core import QgsDataSourceUri
+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:
    from .tools.PythonSQL import login_base
-except:
+except ValueError:
    print('Pas de fichier PythonSQL')
-from .tools.SQLRequet import *
+# from .tools.SQLRequet import *

 from .tools.resources import (
    load_ui,
    resources_path,
-    send_issues,
-    create_vierge,
-    create_contour,
-    create_travaux,
-    create_habita
+    # send_issues,
 )
-from .issues import CenRa_Issues
+# from .issues import CenRa_Issues

-import os.path
-import webbrowser, os
-import psycopg2
-import psycopg2.extras
-import base64
+# 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')
@@ -55,10 +48,11 @@ try:
    dbname = account[4]
    cur = account[7]
    con = account[8]
-except:
+except ValueError:
    print('')
-class Postgis_Rename(QDialog, EDITOR_CLASS):

+
+class Postgis_Rename(QDialog, EDITOR_CLASS):
    def __init__(self, parent=None):
        _ = parent
        super().__init__()
@@ -70,7 +64,8 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):

        self.schema.currentIndexChanged.connect(self.Test)
        self.buttonBox.accepted.connect(self.msgBox)
-    ### Outil Ajout de nouvelles couche a un dossier
+    # Outil Ajout de nouvelles couche a un dossier
+
    def raise_(self):
        self.activateWindow()
        self.groupBox_3.hide()
@@ -191,12 +186,10 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
                SQL_RENAME_SCHEMA = 'ALTER SCHEMA ' + oldSchemaName + ' RENAME TO ' + newSchemaName
                allSQLrun = allSQLrun + SQL_RENAME_SCHEMA
                cur.execute(SQL_RENAME_SCHEMA)
-                #print(allSQLrun)
                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 = []
@@ -213,7 +206,7 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
            host = QgsDataSourceUri(provider.dataSourceUri()).host()
            port = QgsDataSourceUri(provider.dataSourceUri()).port()

-            ### 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)
@@ -3,13 +3,13 @@
 import configparser
 import shutil
 import tempfile
-import base64
-import psycopg2
-import psycopg2.extras
+# import base64
+# import psycopg2
+# import psycopg2.extras
 import os
 from os.path import abspath, join, pardir, dirname
 from qgis.core import QgsDataSourceUri
-from .SQLRequet 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,46 +109,51 @@ def load_ui(*args):

    return ui_class

+
 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:
+    except FileNotFoundError:
        print('404')
+    except UnboundLocalError:
+        print('404')
+

 def send_issues(url, titre, body, labels):
    import requests
+    import urllib.request
    import json
-	import os
-	import qgis
+    # 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 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/latest/plugins.xml'
 #    print(URL)
@@ -157,7 +162,7 @@ def maj_verif(NAME):
    try:
        urllib.request.urlopen('https://google.com')
        binar = True
-	except:
+    except urllib.error.URLError:
        binar = False
    if binar:
        try:
@@ -167,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 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>'
    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
-	if self.couche_contour.isChecked(): # Verifie si la checkbox est cochee
+    # Creation de la table contour
+    # 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:
@@ -211,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() == '':
@@ -241,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();"
@@ -259,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() == '':
@@ -304,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() == '':
@@ -347,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"
@@ -395,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')"
@@ -429,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')"
@@ -463,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()
@@ -521,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")
@@ -22,6 +22,7 @@
 """
 from __future__ import absolute_import

+
 def classFactory(iface):
    # load SICEN class from file SICEN
    from .sicen import SICEN
@@ -13,7 +13,7 @@ name=CenRa SICEN
 qgisMinimumVersion=3.0
 supportsQt6=True
 description=Filtre des données saisies dans SICEN et export d'une liste d'espèces.
-version=1.11
+version=2.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr

@@ -22,7 +22,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>09/04/2025 - Version 1.11: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 1.10: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.9: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 1.8: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>13/09/2024 - Version 1.7:</h3> - Il est maintenant possible de sélectionné plusieurs entité pour le filtre par Emprise.</br>- Ajoute d'un changelog.</br>- Ajoute une vérification de mise à jour.</p>
+changelog=<h2>CenRa_SICEN:</h2></br><p><h3>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
@@ -5,10 +5,9 @@
 # Created by: The Resource Compiler for PyQt5 (Qt v5.15.2)
 #
 # WARNING! All changes made in this file will be lost!
-try:
-    from PyQt5 import QtCore
-except:
-    from PyQt6 import QtCore
+
+from qgis.PyQt import QtCore
+
 qt_resource_data = b"\
 \x00\x00\x0d\x89\
 \x89\
@@ -558,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()
@@ -1,61 +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
-try:
-    from PyQt5.QtCore import *
-    from PyQt5.QtGui import *
-except:
-    from PyQt6.QtCore import *
-    from PyQt6.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
 # Import the code for the dialog
 from .sicendialog import SICENDialog

-from .tools.resources import maj_verif,pyperclip
-pyperclip()
-try:
-    from .tools.PythonSQL import login_base
-except:
-    print('Pas de fichier PythonSQL')
 import os.path
 import qgis
 import datetime
@@ -63,11 +22,19 @@ import csv

 from .forms.about_form import AboutDialog

-import psycopg2
-import psycopg2.extras
-import base64
+# import psycopg2
+# import psycopg2.extras
+# import base64
 import socket
 import os
+
+from .tools.resources import maj_verif, pyperclip
+pyperclip()
+try:
+    from .tools.PythonSQL import login_base
+except ValueError:
+    print('Pas de fichier PythonSQL')
+
 # import sys


@@ -105,7 +72,7 @@ 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(
            QIcon(":/plugins/sicen/sicen.png"),
            u"Ouverture des données SICEN", self.iface.mainWindow())
@@ -119,7 +86,7 @@ class SICEN(object):
        self.toolBar.addAction(self.action)
        self.iface.addPluginToMenu(u"SICEN", self.action)

-        ## Create action that will start plugin configuration
+        # Create action that will start plugin configuration
        self.action = QAction(
            QIcon(":/plugins/sicen/sicen_export.png"),
            u"Export liste d'espèces", self.iface.mainWindow())
@@ -175,7 +142,7 @@ class SICEN(object):
        cur = account[7]
        con = account[8]

-        ## Creation des listes deroulantes
+        # 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"""
@@ -201,14 +168,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
@@ -496,7 +463,6 @@ class SICEN(object):
            else:
                sql_UICN = ''

-
            if self.dlg.PATRIMONIALITE.isChecked() == 1:
                sql_patrimonialite = """"patrimonialite" IS NOT NULL """
            else:
@@ -542,7 +508,6 @@ class SICEN(object):
            else:
                sql_patri74 = ''

-
            if self.dlg.ZNIEFF.isChecked() == 1:
                sql_znieff = """"znieff" IS NOT NULL """
            else:
@@ -573,7 +538,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')
@@ -586,7 +551,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)

@@ -620,14 +585,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)
@@ -660,9 +625,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%')"
@@ -681,7 +646,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%')"
@@ -700,7 +665,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%')"
@@ -723,8 +688,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)
@@ -753,13 +717,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 = ''
@@ -792,9 +756,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%')"
@@ -813,7 +777,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%')"
@@ -832,7 +796,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%')"
@@ -855,7 +819,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

@@ -863,7 +827,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)

@@ -877,13 +841,13 @@ class SICEN(object):
                buffer = '100'

                account = login_base("account")
-                user = account[0]
-                mdp = account[1]
-                host = account[2]
-                port = account[3]
-                dbname = account[4]
+                # user = account[0]
+                # mdp = account[1]
+                # host = account[2]
+                # port = account[3]
+                # dbname = account[4]
                cur = account[7]
-                con = account[8]
+                # con = account[8]

                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)
@@ -893,44 +857,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
-                writer.writerow(['Classe', 'Ordre', 'Nom Complet', 'Nom Vernaculaire','cd_ref', 'Date Derniere Observation']) # Création des entêtes
+                # délimiteur ';' pour faciliter l'ouverture avec Excel
+                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:
@@ -941,7 +912,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)
@@ -20,8 +20,8 @@
 ***************************************************************************/
 """

-from qgis.PyQt import QtCore, QtGui
-from qgis.PyQt.QtWidgets import QAction, QDialog
+# from qgis.PyQt import QtCore, QtGui
+from qgis.PyQt.QtWidgets import QDialog
 from .ui_sicen import Ui_SICEN
 # create the dialog for zoom to point

@@ -3,10 +3,10 @@
 import configparser
 import shutil
 import tempfile
+# import base64
+# import psycopg2
+# import psycopg2.extras
 import os
-import base64
-import psycopg2
-import psycopg2.extras
 from os.path import abspath, join, pardir, dirname

 from qgis.PyQt import uic
@@ -90,7 +90,7 @@ def resources_path(*args):
    :return: Absolute path to the resources folder.
    :rtype: str
    """
-    path = abspath(abspath(join(plugin_path(), "CenRa_SICEN\\tools")))
+    path = abspath(abspath(join(plugin_path(), "CenRa_COPIE\\tools")))
    for item in args:
        path = abspath(join(path, item))
    return path
@@ -108,46 +108,51 @@ def load_ui(*args):

    return ui_class

+
 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:
+    except FileNotFoundError:
        print('404')
+    except UnboundLocalError:
+        print('404')
+

 def send_issues(url, titre, body, labels):
    import requests
+    import urllib.request
    import json
-    import os
-    import qgis
+    # 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 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/latest/plugins.xml'
    # print(URL)
@@ -156,7 +161,7 @@ def maj_verif(NAME):
    try:
        urllib.request.urlopen('https://google.com')
        binar = True
-    except:
+    except urllib.error.URLError:
        binar = False
    if binar:
        try:
@@ -166,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
@@ -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,12 +22,14 @@ 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"))
@@ -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))
-
@@ -1,7 +1,7 @@
 <plugins>
-    <pyqgis_plugin name="CenRa_POSTGIS" version="2.9">
+    <pyqgis_plugin name="CenRa_POSTGIS" version="3.0">
        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.9</version>
+        <version>3.0</version>
        <qgis_minimum_version>3.16</qgis_minimum_version>
        <homepage>https://plateformesig.cenra-outils.org/</homepage>
        <file_name>CenRa_POSTGIS.zip</file_name>
@@ -10,15 +10,15 @@
        <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_POSTGIS.zip</download_url>
        <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
        <create_date>2024-02-06</create_date>
-        <update_date>2025-04-09</update_date>
+        <update_date>2025-05-19</update_date>
        <experimental>False</experimental>
        <deprecated>False</deprecated>
        <tags>cenra,postgis</tags>
    </pyqgis_plugin>

-    <pyqgis_plugin name="CenRa_COPIE" version="2.5">
+    <pyqgis_plugin name="CenRa_COPIE" version="3.0">
        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.5</version>
+        <version>3.0</version>
        <qgis_minimum_version>3.16</qgis_minimum_version>
        <homepage>https://plateformesig.cenra-outils.org/</homepage>
        <file_name>CenRa_COPIE.zip</file_name>
@@ -27,15 +27,15 @@
        <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-04-11</update_date>
+        <update_date>2025-05-19</update_date>
        <experimental>False</experimental>
        <deprecated>False</deprecated>
        <tags>cenra,copie</tags>
    </pyqgis_plugin>

-    <pyqgis_plugin name="CenRa_SICEN" version="1.11">
+    <pyqgis_plugin name="CenRa_SICEN" version="2.0">
        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>1.11</version>
+        <version>2.0</version>
        <qgis_minimum_version>3.16</qgis_minimum_version>
        <homepage>https://plateformesig.cenra-outils.org/</homepage>
        <file_name>CenRa_SICEN.zip</file_name>
@@ -44,15 +44,15 @@
        <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-04-09</update_date>
+        <update_date>2025-05-19</update_date>
        <experimental>False</experimental>
        <deprecated>False</deprecated>
        <tags>cenra,sicen</tags>
    </pyqgis_plugin>

-    <pyqgis_plugin name="CenRa_FLUX" version="2.9">
+    <pyqgis_plugin name="CenRa_FLUX" version="3.5">
        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.9</version>
+        <version>3.5</version>
        <qgis_minimum_version>3.16</qgis_minimum_version>
        <homepage>https://plateformesig.cenra-outils.org/</homepage>
        <file_name>CenRa_FLUX.zip</file_name>
@@ -61,15 +61,15 @@
        <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_FLUX.zip</download_url>
        <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
        <create_date>2024-02-06</create_date>
-        <update_date>2025-04-09</update_date>
+        <update_date>2025-07-29</update_date>
        <experimental>False</experimental>
        <deprecated>False</deprecated>
        <tags>cenra,flux</tags>
    </pyqgis_plugin>
    
-    <pyqgis_plugin name="CenRa_METABASE" version="0.2.3">
+    <pyqgis_plugin name="CenRa_METABASE" version="0.3.0">
        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.2.3</version>
+        <version>0.3.0</version>
        <qgis_minimum_version>3.16</qgis_minimum_version>
        <homepage>https://plateformesig.cenra-outils.org/</homepage>
        <file_name>CenRa_METABASE.zip</file_name>
@@ -78,15 +78,15 @@
        <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-04-09</update_date>
+        <update_date>2025-05-19</update_date>
        <experimental>True</experimental>
        <deprecated>False</deprecated>
        <tags>cenra,metabase</tags>
    </pyqgis_plugin>
    
-    <pyqgis_plugin name="CenRa_AUTOMAP" version="1.7">
+    <pyqgis_plugin name="CenRa_AUTOMAP" version="2.0">
        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>1.7</version>
+        <version>2.0</version>
        <qgis_minimum_version>3.16</qgis_minimum_version>
        <homepage>https://plateformesig.cenra-outils.org/</homepage>
        <file_name>CenRa_AUTOMAP.zip</file_name>
@@ -95,15 +95,15 @@
        <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_AUTOMAP.zip</download_url>
        <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
        <create_date>2024-09-25</create_date>
-        <update_date>2025-04-11</update_date>
+        <update_date>2025-05-19</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.6">
+    <pyqgis_plugin name="CenRa_PAGERENDER" version="0.2.0">
        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.1.6</version>
+        <version>0.2.0</version>
        <qgis_minimum_version>3.16</qgis_minimum_version>
        <homepage>https://plateformesig.cenra-outils.org/</homepage>
        <file_name>CenRa_PAGERENDER.zip</file_name>
@@ -112,7 +112,7 @@
        <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_PAGERENDER.zip</download_url>
        <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
        <create_date>2024-10-09</create_date>
-        <update_date>2025-04-03</update_date>
+        <update_date>2025-05-19</update_date>
        <experimental>True</experimental>
        <deprecated>False</deprecated>
        <tags>cenra,mise en page,atlas</tags>
Author	SHA1	Message	Date
tlaveille	36de24532a	flake8 and Qt6 fix	2025-07-30 09:57:09 +02:00
tlaveille	6c1af3c61c	flake8 issues	2025-07-29 17:01:59 +02:00
tlaveille	d7267c0542	flake8 metabase	2025-07-29 16:56:54 +02:00
tlaveille	fd5d516f14	flake8 sicen	2025-07-29 15:19:47 +02:00
tlaveille	ca1d895eb1	flake8 sicen	2025-07-29 15:16:03 +02:00
tlaveille	e503423e49	flake8 pagerender	2025-07-29 14:34:32 +02:00
tlaveille	3564209574	flake8 copie	2025-07-29 13:58:00 +02:00
tlaveille	7df08ae02a	flake8 postgis	2025-07-29 13:35:11 +02:00
tlaveille	133e785568	flake8 automap	2025-07-29 10:53:30 +02:00
tlaveille	9b7ab9ab15	3.5 flux	2025-07-29 10:24:51 +02:00
tlaveille	c02da75f0b	bug fix pg no raster_columnes views	2025-07-29 10:17:45 +02:00
tlaveille	d4b181ff61	flake8	2025-07-28 16:53:26 +02:00
tlaveille	7a3814a429	flake8	2025-07-28 16:45:44 +02:00
tlaveille	1cd816c706	flake8	2025-07-28 16:23:25 +02:00
tlaveille	94cac31fbb	Vue du type vecteur ou raster dans SIG	2025-07-23 16:15:28 +02:00
tlaveille	2690220a02	Vue du type vecteur ou raster dans SIG	2025-07-23 16:00:36 +02:00
tlaveille	3719456f04	Optimisation et Compatibiliter Qt6	2025-07-23 11:59:48 +02:00
tlaveille	bea31c870b	Ouverture de Raster en base psql	2025-07-22 16:55:07 +02:00
tlaveille	2d04e34ed2	Ouverture de Raster en base psql	2025-07-22 16:52:32 +02:00
tlaveille	ac070f866e	Nouvelle version	2025-07-21 11:48:35 +02:00
tlaveille	4851339008	Fix Erreur sur QMessageBox	2025-07-21 11:27:11 +02:00
tlaveille	f2d11a64e4	PyQt5 & PyQt6	2025-05-19 15:38:35 +02:00
tlaveille	4c52c85efb	v1.7	2025-05-19 14:03:49 +02:00