flake8 and Qt6 fix

CenRa_AUTOMAP/CenRa_AutoMap.py

@@ -4,14 +4,14 @@ __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
 
 
-#include <QSettings>
+# include <QSettings>
 '''
 from pg_metadata.connection_manager import (
     store_connections,
@@ -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,9 +36,7 @@ pyperclip()
 
 from .canvas_editor import AutoMap_Editor
 from .style_invoke import AutoMap_Style
-from .about_form import AboutDialog
 
-from PyQt5.QtCore import *
 
 class PgAutoMap:
     def __init__(self):
@@ -49,18 +49,18 @@ class PgAutoMap:
         self.dock_action = None
         self.help_action = None
         plugin_dir = os.path.dirname(__file__)
-        end_find = plugin_dir.rfind('\\')+1
+        end_find = plugin_dir.rfind('\\') + 1
         global NAME
         NAME = plugin_dir[end_find:]
         maj_verif(NAME)
 
         # Display About window on first use
-        version = qgis.utils.pluginMetadata('CenRa_AUTOMAP','version')
+        version = qgis.utils.pluginMetadata('CenRa_AUTOMAP', 'version')
         s = QSettings()
         versionUse = s.value("automap/version", 1, type=str)
-        if str(versionUse) != str(version) :
+        if str(versionUse) != str(version):
             s.setValue("automap/version", str(version))
-            print(versionUse,version)
+            print(versionUse, version)
             self.open_about_dialog()
 
     def initGui(self):
@@ -78,7 +78,7 @@ class PgAutoMap:
         if not self.canvas_editor:
             self.canvas_editor = AutoMap_Editor()
 
-            self.automap_action = QAction(icon, 'CenRa_AutoMap',None)
+            self.automap_action = QAction(icon, 'CenRa_AutoMap', None)
             self.toolBar.addAction(self.automap_action)
             self.automap_action.triggered.connect(self.open_editor)
 
@@ -86,47 +86,15 @@ class PgAutoMap:
             self.style_dock = AutoMap_Style()
 
         if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
-            iface.addDockWidget(Qt.LeftDockWidgetArea, self.style_dock)
+            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_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -138,7 +106,7 @@ class PgAutoMap:
     def unload(self):
         """ Unload the plugin. """
         if self.canvas_editor:
-            iface.removePluginMenu('CenRa_AutoMap',self.automap_action)
+            iface.removePluginMenu('CenRa_AutoMap', self.automap_action)
 
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)

CenRa_AUTOMAP/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog
@@ -43,4 +43,4 @@ class AboutDialog(QDialog, ABOUT_FORM_CLASS):
         Run some actions when
         the user closes the dialog
         """
-        self.close()
+        self.close()

CenRa_AUTOMAP/canvas_editor.py

@@ -1,76 +1,41 @@
 import logging
 import os
-from PyQt5.QtCore import QSettings
-from collections import namedtuple
-from enum import Enum
-from functools import partial
-from pathlib import Path
-from xml.dom.minidom import parseString
-from qgis.gui import *
-import qgis
-from importlib import import_module
 from qgis.core import (
-    NULL,
-    QgsApplication,
-    QgsScaleBarSettings,	
-    QgsDataSourceUri,
+    QgsScaleBarSettings,
     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,
 )
-from PyQt5 import QtGui
-from PyQt5 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')
@@ -80,48 +45,48 @@ url_ortho = 'http://tiles.craig.fr/ortho/service/?crs=EPSG:2154&featureCount=10&
 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',
+    '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',
 ]
-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}}
+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):
-
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
         self.setupUi(self)
         self.settings = QgsSettings()
         self.s = QSettings()
-        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
 
         path = ''
         ix = 0
         plugin_dir = str(os.path.dirname(os.path.abspath(__file__))).split(os.sep)
         for i in plugin_dir[1:]:
-            ix = ix+1
-            path = path+'/'+i
-        self.tabWidget.setStyleSheet('background-image: url('+path+'/tools/bg/Capture.png);')
+            ix = ix + 1
+            path = path + '/' + i
+        # self.tabWidget.setStyleSheet('background-image: url('+path+'/tools/bg/Capture.png);')
 
         self.verticalScrollBar.hide()
         self.commandLinkButton.clicked.connect(self.chargement_qpt)
@@ -136,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")):
+        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)
@@ -150,35 +114,35 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
         self.template_parameters = {
             'Carte_size': None,
-            'Carte_locals' : None,
-            'Carte_rotate':None,
-            'Carte_2_size' : None,
-            'Carte_2_locals' : None,
-            'Carte_2_rotate':None,
+            'Carte_locals': None,
+            'Carte_rotate': None,
+            'Carte_2_size': None,
+            'Carte_2_locals': None,
+            'Carte_2_rotate': None,
             'Legande_size': None,
             'Legande_locals': None,
-            'Legande_rotate':None,
+            'Legande_rotate': None,
             'Arrow_size': None,
             'Arrow_locals': None,
-            'Arrow_rotate':None,
+            'Arrow_rotate': None,
             'Echelle_size': None,
             'Echelle_locals': None,
-            'Echelle_rotate':None,
+            'Echelle_rotate': None,
             'Logo_size': None,
             'Logo_locals': None,
-            'Logo_rotate':None,
-            'Titre_size':None,
-            'Titre_locals':None,
-            'Titre_rotate':None,
-            'Sous_titre_size':None,
-            'Sous_titre_locals':None,
-            'Sous_titre_rotate':None,
+            'Logo_rotate': None,
+            'Titre_size': None,
+            'Titre_locals': None,
+            'Titre_rotate': None,
+            'Sous_titre_size': None,
+            'Sous_titre_locals': None,
+            'Sous_titre_rotate': None,
             'Credit_size': None,
             'Credit_locals': None,
-            'Credit_rotate':None,
+            'Credit_rotate': None,
             'Source_size': None,
             'Source_locals': None,
-            'Source_rotate':None,
+            'Source_rotate': None,
             'Logo_2_size': None,
             'Logo_2_locals': None,
             'Logo_2_rotate': None,
@@ -194,23 +158,25 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.hide_source()
         self.hide_atlas()
 
-    def wheelEvent(self,event):
+    def wheelEvent(self, event):
         if (event.angleDelta().y() >= 1):
-            vsb = self.verticalScrollBar.value()+20
+            vsb = self.verticalScrollBar.value() + 20
         else:
-            vsb = self.verticalScrollBar.value()-20
+            vsb = self.verticalScrollBar.value() - 20
         self.verticalScrollBar.setValue(vsb)
+
     def moveFrame(self):
-        self.frame.move(self.frame.x(),self.verticalScrollBar.value())
+        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):
-            logo_library.append(' '+os.path.basename(logo_x))
+        custome_bibliotech = glob.glob(self.s.value("automap/logoteck", 1, type=str) + '*.*')
+        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):
+        bibliotech = glob.glob(resources_path("logo_library", "*.png"))
+        for number, logo_x in enumerate(bibliotech):
             logo_library.append(os.path.basename(logo_x))
         self.mComboBox_4.addItems(sorted(logo_library))
 
@@ -218,7 +184,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         options = QFileDialog.Options()
         options |= QFileDialog.ShowDirsOnly
         folder = QFileDialog.getExistingDirectory(self, "Sélection du dossier parent", options=options)
-        return folder+'/'
+        return folder + '/'
 
     def deflogoteck(self):
         folder = self.select_file()
@@ -233,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
+        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()
@@ -251,7 +221,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 if layeritem.name() == 'SuperFont':
                     myGroup = layerAll[xl]
                     layername = True
-                xl = xl+1
+                xl = xl + 1
             if layername:
                 (QgsProject.instance().layerTreeRoot()).removeChildNode(myGroup)
                 runing = True
@@ -261,32 +231,36 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             myGroup = (QgsProject.instance().layerTreeRoot()).addGroup("SuperFont")
             last_group = 'ortho'
 
-            #OSM_RASTER = QgsRasterLayer(url_osm, 'OpenStreetMap Backgound', 'wms')
+            # OSM_RASTER = QgsRasterLayer(url_osm, 'OpenStreetMap Backgound', 'wms')
             ORTHO_RASTER = QgsRasterLayer(url_ortho, 'Orthophoto AURA', 'wms')
             MNT_RASTER = QgsRasterLayer(url_mnt, 'MNT RGE Alti (<= 1:100000)', 'wms')
             PENTE_RASTER = QgsRasterLayer(url_pente, 'Pente RGE Alti 0 à 90°(<= 1:100000)', 'wms')
 
-            #OSM_RASTER.loadNamedStyle(resources_path("font","osm_background.qml"))
-            ORTHO_RASTER.loadNamedStyle(resources_path("font","ortho_aura.qml"))
-            MNT_RASTER.loadNamedStyle(resources_path("font","mnt_alti.qml"))
+            # OSM_RASTER.loadNamedStyle(resources_path("font", "osm_background.qml"))
+            ORTHO_RASTER.loadNamedStyle(resources_path("font", "ortho_aura.qml"))
+            MNT_RASTER.loadNamedStyle(resources_path("font", "mnt_alti.qml"))
 
-            #QgsProject.instance().addMapLayer(OSM_RASTER,False)
-            QgsProject.instance().addMapLayer(ORTHO_RASTER,False)
-            QgsProject.instance().addMapLayer(MNT_RASTER,False)
-            QgsProject.instance().addMapLayer(PENTE_RASTER,False)
+            # QgsProject.instance().addMapLayer(OSM_RASTER,False)
+            QgsProject.instance().addMapLayer(ORTHO_RASTER, False)
+            QgsProject.instance().addMapLayer(MNT_RASTER, False)
+            QgsProject.instance().addMapLayer(PENTE_RASTER, False)
 
-            #myGroup.addLayer(OSM_RASTER)
+            # myGroup.addLayer(OSM_RASTER)
             myGroup.addLayer(ORTHO_RASTER)
             myGroup.addLayer(MNT_RASTER)
             myGroup.addLayer(PENTE_RASTER)
 
     def load_osm(self):
-        global myGroup,last_group
+        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()
@@ -295,7 +269,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 if layeritem.name() == 'SuperFont':
                     myGroup = layerAll[xl]
                     layername = True
-                xl = xl+1
+                xl = xl + 1
             if layername:
                 (QgsProject.instance().layerTreeRoot()).removeChildNode(myGroup)
                 runing = True
@@ -305,21 +279,21 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             last_group = 'osm'
 
             OSM_RASTER = QgsRasterLayer(url_osm, 'OpenStreetMap Backgound', 'wms')
-            #ORTHO_RASTER = QgsRasterLayer(url_ortho, 'Orthophoto AURA', 'wms')
+            # ORTHO_RASTER = QgsRasterLayer(url_ortho, 'Orthophoto AURA', 'wms')
             MNT_RASTER = QgsRasterLayer(url_mnt, 'MNT RGE Alti (<= 1:100000)', 'wms')
             PENTE_RASTER = QgsRasterLayer(url_pente, 'Pente RGE Alti 0 à 90°(<= 1:100000)', 'wms')
 
-            OSM_RASTER.loadNamedStyle(resources_path("font","osm_background.qml"))
-            #ORTHO_RASTER.loadNamedStyle(resources_path("font","ortho_aura.qml"))
-            MNT_RASTER.loadNamedStyle(resources_path("font","mnt_alti.qml"))
+            OSM_RASTER.loadNamedStyle(resources_path("font", "osm_background.qml"))
+            # ORTHO_RASTER.loadNamedStyle(resources_path("font","ortho_aura.qml"))
+            MNT_RASTER.loadNamedStyle(resources_path("font", "mnt_alti.qml"))
 
-            QgsProject.instance().addMapLayer(OSM_RASTER,False)
-            #QgsProject.instance().addMapLayer(ORTHO_RASTER,False)
-            QgsProject.instance().addMapLayer(MNT_RASTER,False)
-            QgsProject.instance().addMapLayer(PENTE_RASTER,False)
+            QgsProject.instance().addMapLayer(OSM_RASTER, False)
+            # QgsProject.instance().addMapLayer(ORTHO_RASTER,False)
+            QgsProject.instance().addMapLayer(MNT_RASTER, False)
+            QgsProject.instance().addMapLayer(PENTE_RASTER, False)
 
             myGroup.addLayer(OSM_RASTER)
-            #myGroup.addLayer(ORTHO_RASTER)
+            # myGroup.addLayer(ORTHO_RASTER)
             myGroup.addLayer(MNT_RASTER)
             myGroup.addLayer(PENTE_RASTER)
 
@@ -361,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()
@@ -374,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()
@@ -391,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()
@@ -423,7 +400,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.comboBox_4.clear()
         if self.comboBox_2.currentText() != '':
             layer = QgsProject.instance().mapLayersByName(self.comboBox_2.currentText())[0]
-            #BUG sur layer.fields() pas défini sur ce qui est pas vecteur
+            # BUG sur layer.fields() pas défini sur ce qui est pas vecteur
             for vfields in layer.fields():
                 fields.append(vfields.name())
             self.comboBox_3.addItems(sorted(fields))
@@ -437,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")):
+        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)
@@ -451,12 +428,12 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
                 try:
                     cutLayout = layout_name.index("¶")
-                except:
+                except ValueError:
                     cutLayout = 0
- 
+
                 if cutLayout >= 1:
                     self.layout.setName(layout_name)
-                    titre_layout_name=layout_name[:cutLayout]
+                    titre_layout_name = layout_name[:cutLayout]
                 else:
                     self.layout.setName(layout_name)
                     titre_layout_name = layout_name
@@ -469,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)
@@ -495,18 +473,18 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                         if self.radioButton_12.isChecked() == 1:
                             self.position_map = QgsLayoutItemMap(self.layout)
                             self.position_map.setRect(20, 20, 20, 20)
-                            self.position_map.setExtent(QgsRectangle(641552,6647386, 995856,6331104))
+                            self.position_map.setExtent(QgsRectangle(641552, 6647386, 995856, 6331104))
                             self.position_map.setFollowVisibilityPreset(True)
                             self.position_map.setFollowVisibilityPresetName(self.comboBox_6.currentText())
                             self.position_map.setItemRotation(self.template_parameters['Carte_2_rotate'])
                             self.position_map.attemptResize(self.template_parameters['Carte_2_size'])
                             self.position_map.attemptMove(self.template_parameters['Carte_2_locals'])
                             self.position_map.overview().setLinkedMap(self.map_modele_test)
-                            #overviewitem = QgsLayoutItemMapOverviewStack(self.position_map)
-                            #map_overview = self.position_map.overview()
-                            #map_overview.setLinkedMap(self.map_modele_test)
-                            #map_overview.setCentered(True)
-                            #overviewitem.addOverview(map_overview)
+                            # overviewitem = QgsLayoutItemMapOverviewStack(self.position_map)
+                            # map_overview = self.position_map.overview()
+                            # map_overview.setLinkedMap(self.map_modele_test)
+                            # map_overview.setCentered(True)
+                            # overviewitem.addOverview(map_overview)
 
                             self.position_map.refresh()
                             self.map_modele_test.setFrameEnabled(True)
@@ -521,12 +499,12 @@ 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
                     title.setText(titre)
-                    title.setFont(QFont("Calibri", 15, QFont.Bold))
+                    title.setFont(QFont("Calibri", 15, False))
                     title.setItemRotation(self.template_parameters['Titre_rotate'])
                     title.attemptResize(self.template_parameters['Titre_size'])
                     title.attemptMove(self.template_parameters['Titre_locals'])
@@ -535,11 +513,10 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     title.setBackgroundColor(QColor(255, 255, 255, 130))
                     self.layout.addItem(title)
                     # title.adjustSizeToText() on n'utilise plutot setFixedSize pour pouvoir centrer le titre de manière plus optimale ici
-                    title.setHAlign(Qt.AlignHCenter)
-                    title.setVAlign(Qt.AlignVCenter)
+                    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()
@@ -554,23 +531,21 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     subtitle.setBackgroundEnabled(True)
                     subtitle.setBackgroundColor(QColor(255, 255, 255, 130))
                     self.layout.addItem(subtitle)
-                    subtitle.setHAlign(Qt.AlignHCenter)
-                    subtitle.setVAlign(Qt.AlignVCenter)
+                    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)
                     logo.setItemRotation(self.template_parameters['Logo_rotate'])
                     logo.setFixedSize(self.template_parameters['Logo_size'])
                     logo.attemptMove(self.template_parameters['Logo_locals'])
-                    logo.setPicturePath(resources_path("icons","CEN_RA.png"))
+                    logo.setPicturePath(resources_path("icons", "CEN_RA.png"))
                     logo.setId('logo')
                     self.layout.addLayoutItem(logo)
 
-
-                    ## Ajout de la legende :
+                    # Ajout de la legende :
                     legend = QgsLayoutItemLegend(self.layout)
 
                     legend.setId('legende_model1')
@@ -615,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
@@ -626,7 +601,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                         else:
                             root_group.removeLayer(layer)
 
-
                 legend.setEqualColumnWidth(True)
                 legend.setSplitLayer(True)
                 legend.setColumnSpace(5)
@@ -643,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)
@@ -663,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)
@@ -686,7 +660,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
                 # ajout de la fleche du Nord
                 north = QgsLayoutItemPicture(self.layout)
-                north.setPicturePath(resources_path("mises_en_pages","NorthArrow_02.svg"))
+                north.setPicturePath(resources_path("mises_en_pages", "NorthArrow_02.svg"))
                 self.layout.addLayoutItem(north)
                 north.attemptMove(self.template_parameters['Arrow_locals'])
                 north.attemptResize(self.template_parameters['Arrow_size'])
@@ -697,30 +671,30 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 if self.radioButton_10.isChecked() == 1:
                     text_source = ' '
                     for Item_mComboBox_3 in self.mComboBox_3.checkedItems():
-                        text_source = text_source+Item_mComboBox_3+','
+                        text_source = text_source + Item_mComboBox_3 + ','
                     text_source = text_source[:-1]
                     info_text = ["Source :" + text_source][0]
                 else:
                     info_text = ["Source : " + self.lineEdit_4.text()][0]
                 # ajout note info:
                 if self.radioButton_14.isChecked() == 1:
-                    self.s.setValue("automap/prenom_nom",self.lineEdit_5.text())
+                    self.s.setValue("automap/prenom_nom", self.lineEdit_5.text())
                     prenom_nom = self.s.value("automap/prenom_nom", 1, type=str)
-                    info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ") par "+prenom_nom]
+                    info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ") par " + prenom_nom]
                 else:
                     info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ")"]
                 credit_text = QgsLayoutItemLabel(self.layout)
                 credit_text.setText(info[0])
                 credit_text.setFont(QFont("Calibri", 9))
-                credit_text.setHAlign(Qt.AlignRight)
-                credit_text.setVAlign(Qt.AlignVCenter)
+                credit_text.setHAlign(Qt.AlignmentFlag(0x0002))
+                credit_text.setVAlign(Qt.AlignmentFlag(0x0080))
                 credit_text.setBackgroundEnabled(True)
                 credit_text.setBackgroundColor(QColor(255, 255, 255, 130))
                 credit_text2 = QgsLayoutItemLabel(self.layout)
                 credit_text2.setText(info_text)
                 credit_text2.setFont(QFont("Calibri", 9))
-                credit_text2.setHAlign(Qt.AlignRight)
-                credit_text2.setVAlign(Qt.AlignVCenter)
+                credit_text2.setHAlign(Qt.AlignmentFlag(0x0002))
+                credit_text2.setVAlign(Qt.AlignmentFlag(0x0080))
                 credit_text.setItemRotation(self.template_parameters['Credit_rotate'])
                 credit_text.attemptResize(self.template_parameters['Credit_size'])
                 credit_text.attemptMove(self.template_parameters['Credit_locals'])
@@ -732,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)
@@ -740,14 +714,15 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     logo_credit.setMode(QgsLayoutItemPicture.FormatRaster)
                     cur_x = self.template_parameters['Logo_2_locals'].x()
                     logo_credit.attemptMove(self.template_parameters['Logo_2_locals'])
-                    logo_credit.setPictureAnchor(4)
-                    self.template_parameters['Logo_2_locals'].setX(cur_x+(logo_div/len_item))
+                    print(logo_credit.pictureAnchor())
+                    # logo_credit.setPictureAnchor(4)
+                    self.template_parameters['Logo_2_locals'].setX(cur_x + (logo_div / len_item))
                     logo_credit.setFixedSize(self.template_parameters['Logo_2_size'])
                     if logo_run[0] == ' ':
-                        logo_credit.setPicturePath(self.s.value("automap/logoteck", 1, type=str)+logo_run[1:])
+                        logo_credit.setPicturePath(self.s.value("automap/logoteck", 1, type=str) + logo_run[1:])
                     else:
-                        logo_credit.setPicturePath(resources_path("logo_library",logo_run))
-                    logo_credit.setId('logo_'+logo_run)
+                        logo_credit.setPicturePath(resources_path("logo_library", logo_run))
+                    logo_credit.setId('logo_' + logo_run)
                     logo_credit.setBackgroundEnabled(True)
                     logo_credit.setBackgroundColor(QColor(255, 255, 255, 130))
                     self.layout.addLayoutItem(logo_credit)
@@ -760,35 +735,33 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             if existing_layout:
                 self.QMBquestion = QMessageBox()
                 self.QMBquestion.setWindowTitle(u"Attention !")
-                self.QMBquestion.setIcon(QMessageBox.Warning)
-                self.QMBquestion.setText("Mise en page existente, la mise en page vas être écraser !")
-                self.QMBquestion.setStandardButtons(QMessageBox.Yes|QMessageBox.No)
-                self.QMBquestion.addButton(QPushButton('Autre mise en page'),QMessageBox.AcceptRole)
+                self.QMBquestion.setIcon(QMessageBox.Icon.Warning)
+                self.QMBquestion.setText("Mise en page existante, la mise en page va être écrasée !")
+                self.QMBquestion.setStandardButtons(QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
+                self.QMBquestion.addButton(QPushButton('Autre mise en page'), QMessageBox.ButtonRole(0))
                 self.QMBquestion = self.QMBquestion.exec()
 
-                #if self.radioButton_12.isChecked() != 1:
-                if self.QMBquestion == QMessageBox.Yes:
+                # if self.radioButton_12.isChecked() != 1:
+                if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
                     project.layoutManager().removeLayout(existing_layout)
-                    result = project.layoutManager().addLayout(self.layout)
-                if self.QMBquestion == QMessageBox.AcceptRole:
-                    LayoutCOUNT=0
+                    # result = project.layoutManager().addLayout(self.layout)
+                elif self.QMBquestion != QMessageBox.StandardButton(0x00010000):
+                    LayoutCOUNT = 0
                     arrayManager = []
                     for AddArrayManager in project.layoutManager().layouts():
                         arrayManager.append(AddArrayManager.name())
                     arrayManager.sort()
                     for LayoutNAME in arrayManager:
                         if LayoutNAME == layout_name:
-                            LayoutCOUNT = LayoutCOUNT+1
-                        if LayoutNAME == layout_name+"¶"+str(LayoutCOUNT):
-                            LayoutCOUNT=LayoutCOUNT+1
-                    layout_name = (layout_name+"¶"+str(LayoutCOUNT))
+                            LayoutCOUNT = LayoutCOUNT + 1
+                        if LayoutNAME == layout_name + "¶" + str(LayoutCOUNT):
+                            LayoutCOUNT = LayoutCOUNT + 1
+                    layout_name = (layout_name + "¶" + str(LayoutCOUNT))
                     self.layout.setName(layout_name)
 
             else:
                 existing_layout = True
 
-
-
         self.manager.addLayout(self.layout)
         if self.radioButton_9.isChecked() == 1:
             self.layout.atlas().setEnabled(True)
@@ -806,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:
@@ -835,19 +810,18 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             pc.pages()[0].setPageSize('A3', QgsLayoutItemPage.Landscape)
 
         values_page_import = values_page[:-3]
-        eval("exec('from .tools.mises_en_pages import '+values_page_import)")
+        eval("exec('from .tools.mises_en_pages import ' + values_page_import)")
         eval("exec('self.template_parameters = '+ values_page_import + '.fletch_canvas(self)')")
 
     def bar_echelle_auto(self, echelle, bar_echelle):
-       
         if True:
             if echelle.scale() >= 40000:
                 bar_echelle.setUnits(QgsUnitTypes.DistanceKilometers)
                 bar_echelle.setUnitLabel("km")
-                bar_echelle.setUnitsPerSegment(round((echelle.scale()*0.04)/1000))
+                bar_echelle.setUnitsPerSegment(round((echelle.scale() * 0.04) / 1000))
             else:
                 bar_echelle.setUnits(QgsUnitTypes.DistanceMeters)
                 bar_echelle.setUnitLabel("m")
-                bar_echelle.setUnitsPerSegment(round(echelle.scale()*0.04))
+                bar_echelle.setUnitsPerSegment(round(echelle.scale() * 0.04))
 
         bar_echelle.update()

CenRa_AUTOMAP/issues.py

@@ -1,10 +1,4 @@
 import os
-plugin_dir = os.path.dirname(__file__)
-end_find = plugin_dir.rfind('\\')+1
-
-NAME = plugin_dir[end_find:]
-#print(NAME)
-
 from qgis.gui import *
 
 from qgis.core import (
@@ -27,7 +21,7 @@ from qgis.PyQt.QtWidgets import (
     QInputDialog,
     QMenu,
     QToolButton,
-    QTableWidget, 
+    QTableWidget,
     QTableWidgetItem,
 )
 from qgis.utils import iface
@@ -35,21 +29,27 @@ 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__()
         self.setupUi(self)
         self.settings = QgsSettings()
 
-        #place connect here
+        # place connect here
         self.annuler_button.clicked.connect(self.close)
         self.ok_button.clicked.connect(self.run_sendissues)
 
@@ -63,17 +63,22 @@ 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
-            url = qgis.utils.pluginMetadata(NAME,'tracker')
+            url = qgis.utils.pluginMetadata(NAME, 'tracker')
             print(text_message)
-            send_info = send_issues(url,text_titre,text_message,statu)
+            send_info = send_issues(url, text_titre, text_message, statu)
             code = send_info.status_code
             print(code)
         else:

CenRa_AUTOMAP/metadata.txt

@@ -5,8 +5,9 @@
 [general]
 name=CenRa_AutoMap
 qgisMinimumVersion=3.0
+supportsQt6=True
 description=CenRa_AutoMap
-version=1.4
+version=2.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,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>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

CenRa_AUTOMAP/style_invoke.py

@@ -1,91 +1,41 @@
 import logging
-import os
-from PyQt5.QtCore import QSettings
-from collections import namedtuple
-from enum import Enum
-from functools import partial
-from pathlib import Path
-from xml.dom.minidom import parseString
-from qgis.gui import *
-import qgis
-from importlib import import_module
+# from qgis.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.QtWebKitWidgets import QWebPage
+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
-from PyQt5 import QtGui
-from PyQt5 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__()
@@ -93,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)
@@ -114,7 +64,7 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
 
     def loginfo(self):
         InputDialog = QInputDialog()
-        mdp = InputDialog.getText(None,'Foncier','Mot de pass base foncier:')
+        mdp = InputDialog.getText(None, 'Foncier', 'Mot de pass base foncier:')
         return mdp
 
     def loadAdministratif(self):
@@ -125,24 +75,24 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
         mdp = self.loginfo()[0]
         if mdp != '':
             # couche = [['_form_power_rename','_form_power_rename_contour_2025'],['_42_bois_du_roy','_42_bois_du_roy_habitat_2021']]
-            couche = [['administratif','departements2024','gid'],['administratif','v_communes','id']]
+            couche = [['administratif', 'departements2024', 'gid'], ['administratif', 'v_communes', 'id']]
             for schema_table in couche:
                 schema = schema_table[0]
                 table = schema_table[1]
                 key = schema_table[2]
                 uri = QgsDataSourceUri()
-                uri.setConnection(host ,port ,dbname ,os_user ,mdp)
+                uri.setConnection(host, port, dbname, os_user, mdp)
                 # nom du schéma à remplacer: "hydrographie" à supprimer et mettre "couches_collaboratives" lorsqu'on aura regroupé les couches à modifier dans un même schéma
                 uri.setDataSource(schema, table, "geom")
                 uri.setKeyColumn(key)
                 layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                if layer.isValid() == 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])
@@ -167,23 +117,23 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
         mdp = self.loginfo()[0]
         if mdp != '':
             # couche = [['_form_power_rename','_form_power_rename_contour_2025'],['_42_bois_du_roy','_42_bois_du_roy_habitat_2021']]
-            couche = [['sites','v_sites_parcelles'],['sites','v_sites'],['inventaires','suivi_zh'],['inventaires','suivi_ps']]
+            couche = [['sites', 'v_sites_parcelles'], ['sites', 'v_sites'], ['inventaires', 'suivi_zh'], ['inventaires', 'suivi_ps']]
             for schema_table in couche:
                 schema = schema_table[0]
                 table = schema_table[1]
                 uri = QgsDataSourceUri()
-                uri.setConnection(host ,port ,dbname ,os_user ,mdp)
+                uri.setConnection(host, port, dbname, os_user, mdp)
                 # nom du schéma à remplacer: "hydrographie" à supprimer et mettre "couches_collaboratives" lorsqu'on aura regroupé les couches à modifier dans un même schéma
                 uri.setDataSource(schema, table, "geom")
                 uri.setKeyColumn('gid')
                 layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                if layer.isValid() == True:
+                if layer.isValid() is True:
                     layerName = layer.name()
                     listStyle = layer.listStylesInDatabase()
                     try:
                         StyleExist = True
                         indexStyle = (listStyle[2].index(layerName))
-                    except:
+                    except ValueError:
                         StyleExist = False
                     if StyleExist:
                         StyleId = (listStyle[1][indexStyle])

CenRa_AUTOMAP/tools/ui/CenRa_about_form.ui

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

CenRa_COPIE/CenRa_Copie.py

@@ -4,27 +4,25 @@ __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
+# include <QSettings>
 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
 
-from PyQt5.QtCore import *
 
 class PgCopie:
     def __init__(self):
@@ -36,18 +34,18 @@ class PgCopie:
         self.dock_action = None
         self.help_action = None
         plugin_dir = os.path.dirname(__file__)
-        end_find = plugin_dir.rfind('\\')+1
+        end_find = plugin_dir.rfind('\\') + 1
         global NAME
         NAME = plugin_dir[end_find:]
         maj_verif(NAME)
 
         # Display About window on first use
-        version = qgis.utils.pluginMetadata('CenRa_COPIE','version')
+        version = qgis.utils.pluginMetadata('CenRa_COPIE', 'version')
         s = QSettings()
         versionUse = s.value("copie/version", 1, type=str)
-        if str(versionUse) != str(version) :
+        if str(versionUse) != str(version):
             s.setValue("copie/version", str(version))
-            print(versionUse,version)
+            print(versionUse, version)
             self.open_about_dialog()
 
     def initGui(self):
@@ -65,12 +63,12 @@ class PgCopie:
         if not self.action_editor:
             self.action_editor = Copie_Editor()
 
-            self.copie_editor = QAction(icon, 'Copie',None)
+            self.copie_editor = QAction(icon, 'Copie', None)
             self.toolBar.addAction(self.copie_editor)
             self.copie_editor.triggered.connect(self.open_editor)
             self.copie_editor.setEnabled(False)
-            IPAddr=socket.gethostbyname(socket.gethostname())
-            if os.access('N:/',os.R_OK):
+            # IPAddr = socket.gethostbyname(socket.gethostname())
+            if os.access('N:/', os.R_OK):
                 self.copie_editor.setEnabled(True)
 
     def open_about_dialog(self):
@@ -78,7 +76,8 @@ class PgCopie:
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -90,8 +89,7 @@ class PgCopie:
     def unload(self):
         """ Unload the plugin. """
         if self.action_editor:
-            iface.removePluginMenu('CenRa_Copie',self.copie_editor)
-
+            iface.removePluginMenu('CenRa_Copie', self.copie_editor)
 
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)

CenRa_COPIE/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog
@@ -43,4 +43,4 @@ class AboutDialog(QDialog, ABOUT_FORM_CLASS):
         Run some actions when
         the user closes the dialog
         """
-        self.close()
+        self.close()

CenRa_COPIE/copie_editor.py

@@ -4,71 +4,69 @@ 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
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
-from PyQt5 import QtGui
-from qgis.core import *
-from qgis.core import QgsDataSourceUri
+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 ValueError:
+    print('Pas de fichier PythonSQL')
 
-from .tools.PythonSQL import login_base
-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__()
         self.setupUi(self)
         self.settings = QgsSettings()
         self.s = QSettings()
-        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
         self.iface = iface
 
     def raise_(self):
         """Run method that performs all the real work"""
         layer = self.iface.activeLayer()
 
-        if layer == None :
-            #self.iface.messageBar().pushMessage(u"Vous devez sélectionner une table !", level=QgsMessageBar.WARNING, duration=5)
+        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)
 
-        else :
+        else:
             # Récupération des sources de la couche active
             list_sources = layer.source().split(" ")
-                # dbname
+            # dbname
             source_db = [s for s in list_sources if "dbname" in s][0].split("'")[1]
-                # schema
+            # schema
             source_schema = [s for s in list_sources if "table" in s][0].split('"')[1]
-                # tablename
+            # 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(u"Un référentiel ne peut être copié, utilisez les filtres !", level=QgsMessageBar.CRITICAL, duration=10)
                 self.iface.messageBar().pushMessage("Ooops", u"Vous ne pouvez copier des couches que dans sigXX", level=Qgis.Critical, duration=5)
             else:
                 user = account[0]
@@ -79,7 +77,7 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
                 cur = account[7]
                 con = account[8]
 
-                            # Creation de la liste des schemas de la base de donnees
+                # Creation de la liste des schemas de la base de donnees
                 SQL = """WITH list_schema AS (
                 SELECT catalog_name, schema_name
                     FROM information_schema.schemata
@@ -96,26 +94,25 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
 
                 list_brut = str(next(cur))
 
-                list = list_brut [2:-3]
+                list = list_brut[2:-3]
                 listItems = list.split(",")
 
                 con.close()
 
                 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
-                result = self.exec_()
+                result = self.exec()
                 # See if OK was pressed
                 if result:
-        #******************************debut script*********************************
-
-
+                    # ******************************debut script*********************************
                     account = login_base("account")
                     user = account[0]
                     mdp = account[1]
@@ -130,47 +127,46 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
 
                     # Récupération des sources de la couche active
                     list_sources = layer.source().split(" ")
-                        # dbname
+                    # dbname
                     source_db = [s for s in list_sources if "dbname" in s][0].split("'")[1]
-                        # schema
+                    # schema
                     source_schema = [s for s in list_sources if "table" in s][0].split('"')[1]
-                        # tablename
+                    # tablename
                     source_tablename = [s for s in list_sources if "table" in s][0].split('"')[3]
 
-                    if self.schema.currentIndex() == -1 :
+                    if self.schema.currentIndex() == - 1:
                         QMessageBox.warning(None, "Oups :", "Veuillez choisir un dossier de destination.")
-                        return          
-                    
+                        return
+
                     schema = self.schema.currentText()
 
-                    if self.table_destination.text() == '' :
+                    if self.table_destination.text() == '':
                         QMessageBox.warning(None, "Oups :", "Veuillez choisir un nom de destination.")
-                        return                     
-                    
-                    if  self.annee.text() == 'aaaa' or self.annee.text() == '':
+                        return
+
+                    if self.annee.text() == 'aaaa' or self.annee.text() == '':
                         tablename = schema + "_" + self.table_destination.text().lower()
-                    else :
+                    else:
                         tablename = schema + "_" + self.table_destination.text().lower() + "_" + self.annee.text()
 
                     tablename_qgis = tablename[1:]  # Permet d'enlever le "_", ajouter a la premiere etape, dans qgis
 
-                    if self.table_vide.isChecked() == 1 :
+                    if self.table_vide.isChecked() == 1:
                         SQL_table = "CREATE TABLE " + schema + "." + tablename + " AS SELECT * FROM " + source_schema + "." + source_tablename + " LIMIT 0;"
-                    else :
+                    else:
                         SQL_table = "CREATE TABLE " + schema + "." + tablename + " AS SELECT * FROM " + source_schema + "." + source_tablename
 
-
                     SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename + "_pkey" + " PRIMARY KEY (gid)"
                     SQL_sequence_01 = "CREATE SEQUENCE " + schema + "." + tablename + "_gid_seq" + " INCREMENT 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1;"
-                    SQL_sequence_02 = "ALTER TABLE " + schema + "." + tablename + " ALTER COLUMN gid SET DEFAULT nextval(\'" + schema + "." + tablename + "_gid_seq\'::regclass);" 
+                    SQL_sequence_02 = "ALTER TABLE " + schema + "." + tablename + " ALTER COLUMN gid SET DEFAULT nextval(\'" + schema + "." + tablename + "_gid_seq\'::regclass);"
                     SQL_sequence_03 = "SELECT setval(\'" + schema + "." + tablename + "_gid_seq\'::regclass, (SELECT max(gid) AS max_gid FROM " + schema + "." + tablename + "));"
                     SQL_sequence_04 = "ALTER SEQUENCE " + schema + "." + tablename + "_gid_seq" + " OWNED BY " + schema + "." + tablename + ".gid;"
 
                     SQL_trigger_area_m2 = "CREATE TRIGGER area_m2" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.area_m2();"
-                    SQL_trigger_area_ha = "CREATE TRIGGER area_ha" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.area_ha();"               
+                    SQL_trigger_area_ha = "CREATE TRIGGER area_ha" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.area_ha();"
                     SQL_trigger_length_m = "CREATE TRIGGER length_m" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.length_m();"
-                    SQL_trigger_length_km = "CREATE TRIGGER length_km" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.length_km();"             
-                    SQL_trigger_coordonnees = "CREATE TRIGGER coordonnees" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.coordonnees();"               
+                    SQL_trigger_length_km = "CREATE TRIGGER length_km" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.length_km();"
+                    SQL_trigger_coordonnees = "CREATE TRIGGER coordonnees" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.coordonnees();"
 
                     cur.execute(SQL_table)
                     cur.execute(SQL_pkey)
@@ -179,31 +175,38 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
                     cur.execute(SQL_sequence_03)
                     cur.execute(SQL_sequence_04)
 
-                    if layer.wkbType() == QgsWkbTypes.PointGeometry :
+                    RETURNE = "SELECT pg_get_serial_sequence('" + schema + "." + tablename + "','gid')"
+                    cur.execute(RETURNE)
+                    sequence_name = cur.fetchone()[0]
+                    print(sequence_name)
+                    SQL_GRANT_TABLE = "GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON " + schema + "." + tablename + " TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON " + schema + "." + tablename + " TO grp_sig;GRANT ALL ON SEQUENCE " + sequence_name + " TO grp_qgis;"
+                    cur.execute(SQL_GRANT_TABLE)
+
+                    if layer.wkbType() == QgsWkbTypes.PointGeometry:
                         cur.execute(SQL_trigger_coordonnees)
 
-                    if layer.wkbType() == QgsWkbTypes.LineGeometry :
+                    if layer.wkbType() == QgsWkbTypes.LineGeometry:
                         cur.execute(SQL_trigger_length_m)
-                        cur.execute(SQL_trigger_length_km)                  
+                        cur.execute(SQL_trigger_length_km)
 
-                    if layer.wkbType() == QgsWkbTypes.PolygonGeometry :
+                    if layer.wkbType() == QgsWkbTypes.PolygonGeometry:
                         cur.execute(SQL_trigger_area_m2)
                         cur.execute(SQL_trigger_area_ha)
-                        
-                    con.commit()                
-               
-                    ### Affichage de la table
+
+                    con.commit()
+
+                    # 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)
+                    # 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")
-                        
+
                     con.commit()
                     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("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.Info, duration=5)
                     pass

CenRa_COPIE/metadata.txt

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

CenRa_COPIE/tools/SQLRequet.py

@@ -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)
-)
-"""

CenRa_COPIE/tools/resources.py

@@ -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,71 +108,77 @@ def load_ui(*args):
 
     return ui_class
 
+
 def pyperclip():
-    dst = dirname(dirname(__file__))+"\\tools\\"
-    if os.access('N:/',os.R_OK):
+    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):
+
+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'}
+    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 = url+'/raw/branch/main/plugins.xml'
+    # 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)
-    version = qgis.utils.pluginMetadata(NAME,'version')
+    # print(URL)
+    version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
             version_web = str(urllib.request.urlopen(URL).read())
             plugin_num = version_web.find(NAME)
-            valeur_version_web = version_web.find('<version>',plugin_num)+9
-            version_plugin = version_web[valeur_version_web:valeur_version_web+len_version]
+            valeur_version_web = version_web.find('<version>', plugin_num) + 9
+            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
+    devmaj = devmaj + qgis.utils.pluginMetadata(NAME, 'changelog')
+    return devmaj

CenRa_COPIE/tools/ui/CenRa_about_form.ui

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

CenRa_FLUX/CenRa_Flux.py

@@ -4,27 +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
+# include <QSettings>
+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
 
-from PyQt5.QtCore import *
+from .flux_editor import Flux_Editor
+
 
 class PgFlux:
     def __init__(self):
@@ -36,18 +33,18 @@ class PgFlux:
         self.dock_action = None
         self.help_action = None
         plugin_dir = os.path.dirname(__file__)
-        end_find = plugin_dir.rfind('\\')+1
+        end_find = plugin_dir.rfind('\\') + 1
         global NAME
         NAME = plugin_dir[end_find:]
         maj_verif(NAME)
 
         # Display About window on first use
-        version = qgis.utils.pluginMetadata('CenRa_FLUX','version')
+        version = qgis.utils.pluginMetadata('CenRa_FLUX', 'version')
         s = QSettings()
         versionUse = s.value("flux/version", 1, type=str)
-        if str(versionUse) != str(version) :
+        if str(versionUse) != str(version):
             s.setValue("flux/version", str(version))
-            print(versionUse,version)
+            print(versionUse, version)
             self.open_about_dialog()
 
     def initGui(self):
@@ -64,13 +61,11 @@ 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.flux_editor = QAction(icon, 'SigCEN', None)
             self.toolBar.addAction(self.flux_editor)
             self.flux_editor.triggered.connect(self.open_editor)
             self.flux_editor.setEnabled(False)
-            if os.access('N:/',os.R_OK):
+            if os.access('N:/', os.R_OK):
                 self.flux_editor.setEnabled(True)
 
     def open_about_dialog(self):
@@ -78,7 +73,8 @@ class PgFlux:
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -90,8 +86,7 @@ class PgFlux:
     def unload(self):
         """ Unload the plugin. """
         if self.action_editor:
-            iface.removePluginMenu('CenRa_Flux',self.flux_editor)
-
+            iface.removePluginMenu('CenRa_Flux', self.flux_editor)
 
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)

CenRa_FLUX/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog
@@ -43,4 +43,4 @@ class AboutDialog(QDialog, ABOUT_FORM_CLASS):
         Run some actions when
         the user closes the dialog
         """
-        self.close()
+        self.close()

CenRa_FLUX/flux_editor.py

@@ -2,57 +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
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
-from PyQt5 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]
@@ -63,142 +75,32 @@ 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())
+TranformCRS = QgsCoordinateTransform(layerCrs, targetCrs, QgsProject.instance())
+
 
 class Flux_Editor(QDialog, EDITOR_CLASS):
-
     def __init__(self, parent=None):
         _ = parent
         super().__init__()
         self.setupUi(self)
         self.settings = QgsSettings()
         self.s = QSettings()
-        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
         self.first_start = None
         self.iface = iface
-        self.label_3.setPixmap(QtGui.QPixmap(resources_path('ui','logo.png')))
-        self.commandLinkButton.setIcon(QtGui.QIcon(resources_path('ui','arrow-bottom.png')))
-        self.commandLinkButton_2.setIcon(QtGui.QIcon(resources_path('ui','arrow-up.png')))
+        self.label_3.setPixmap(QtGui.QPixmap(resources_path('ui', 'logo.png')))
+        self.commandLinkButton.setIcon(QtGui.QIcon(resources_path('ui', 'arrow-bottom.png')))
+        self.commandLinkButton_2.setIcon(QtGui.QIcon(resources_path('ui', 'arrow-up.png')))
 
-        self.tableWidget.setSelectionBehavior(QTableWidget.SelectRows)
-        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
-        self.toolButton.setIcon(QtGui.QIcon(resources_path('ui','find.png')))
+        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger(0))
+        self.toolButton.setIcon(QtGui.QIcon(resources_path('ui', 'find.png')))
         self.comboBox_2.addItem("SIG")
         self.comboBox_2.addItem('REF')
         self.comboBox.currentIndexChanged.connect(self.initialisation_flux)
@@ -209,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.titleChanged.connect(self.NewTitle)
+        # self.viewer.textChanged.connect(self.NewTitle)
         layout.addWidget(self.lineEdit)
         self.viewer.hide()
         self.DeBUG.addItem('')
@@ -222,21 +124,18 @@ 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()
 
     def mousePressEvent(self, event):
         global DeBUG
         if 330 <= event.pos().x() <= 560 and 5 <= event.pos().y() <= 75:
-            DeBUG = DeBUG+1
+            DeBUG = DeBUG + 1
             if DeBUG == 3:
                 DeBUG = 0
                 self.ModeDeBUG()
@@ -244,131 +143,17 @@ 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()
+            print(Tsplit[0], Tsplit[1])
+            self.openPostGIS(Tsplit[0], Tsplit[1])
+    """
 
     def bd_source(self):
         self.activateWindow()
-        bd_origine=self.comboBox_2.currentText()
+        bd_origine = self.comboBox_2.currentText()
         if bd_origine == 'REF':
             self.run_ref()
         if bd_origine == 'SIG':
@@ -377,22 +162,22 @@ var Travaux = L.geoJSON(TravauxJSON,{
     def run_ref(self):
         """Run method that performs all the real work"""
         while self.tableWidget_2.rowCount() > 0:
-            self.tableWidget_2.removeRow(self.tableWidget_2.rowCount()-1)
+            self.tableWidget_2.removeRow(self.tableWidget_2.rowCount() - 1)
 #            print(self.tableWidget_2.rowCount())
-        global cur,con,dbtype
-        dbtype=refdb
-        con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbtype+" user=" + user + " password=" + mdp)
-        cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        global cur, con, dbtype
+        dbtype = refdb
+        con = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + dbtype + " user=" + user + " password=" + mdp)
+        cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
         self.initialisation_flux()
         self.combobox_custom()
         # Create the dialog with elements (after translation) and keep reference
         # Only create GUI ONCE in callback, so that it will only load when the plugin is started
-        if self.first_start == True:
+        if self.first_start is True:
             self.first_start = False
         # show the dialog
         self.show()
         # Run the dialog event loop
-        result = self.exec_()
+        result = self.exec()
         # See if OK was pressed
         if result:
             # Do something useful here - delete the line containing pass and
@@ -402,21 +187,21 @@ var Travaux = L.geoJSON(TravauxJSON,{
     def run_sig(self):
         """Run method that performs all the real work"""
         while self.tableWidget_2.rowCount() > 0:
-            self.tableWidget_2.removeRow(self.tableWidget_2.rowCount()-1)
-        global cur,con,dbtype
-        dbtype=sigdb
-        con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbtype+" user=" + user + " password=" + mdp)
-        cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            self.tableWidget_2.removeRow(self.tableWidget_2.rowCount() - 1)
+        global cur, con, dbtype
+        dbtype = sigdb
+        con = psycopg2.connect("host=" + host + " port=" + port + " dbname=" + dbtype + " user=" + user + " password=" + mdp)
+        cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
         self.initialisation_flux()
         self.combobox_custom()
         # Create the dialog with elements (after translation) and keep reference
         # Only create GUI ONCE in callback, so that it will only load when the plugin is started
-        if self.first_start == True:
+        if self.first_start is True:
             self.first_start = False
         # show the dialog
         self.show()
         # Run the dialog event loop
-        result = self.exec_()
+        result = self.exec()
         # See if OK was pressed
         if result:
             # Do something useful here - delete the line containing pass and
@@ -426,132 +211,163 @@ 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)
             if self.comboBox.currentText() == 'toutes les catégories':
-                custom_list=schemaname_list
+                custom_list = schemaname_list
             elif self.comboBox.currentText() == 'travaux':
-                custom_list="""(SELECT schemaname,tablename from pg_catalog.pg_tables
-         where schemaname like '"""+ str(self.comboBox.currentText()) +"""%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '"""+ str(self.comboBox.currentText()) +"""%' order by schemaname,tablename) order by schemaname,tablename;"""
+                custom_list = """(SELECT schemaname,tablename from pg_catalog.pg_tables
+        where schemaname like '""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) order by schemaname,tablename;"""
             else:
-                custom_list="""(SELECT schemaname,tablename from pg_catalog.pg_tables
-         where schemaname like '\_"""+ str(self.comboBox.currentText()) +"""%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '\_"""+ str(self.comboBox.currentText()) +"""%' order by schemaname,tablename) order by schemaname,tablename;"""
+                custom_list = """(SELECT schemaname,tablename from pg_catalog.pg_tables
+        where schemaname like '\\_""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) UNION (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews where schemaname like '\\_""" + str(self.comboBox.currentText()) + """%' order by schemaname,tablename) order by schemaname,tablename;"""
         else:
             if self.comboBox.currentText() == 'toutes les catégories':
-                custom_list=schemaname_list_ref
+                custom_list = schemaname_list_ref
             else:
-                custom_list="""SELECT schemaname,tablename from pg_catalog.pg_tables
-         where schemaname like '"""+ str(self.comboBox.currentText()) +"""' order by schemaname,tablename;"""
+                custom_list = """SELECT schemaname,tablename from pg_catalog.pg_tables
+        where schemaname like '""" + str(self.comboBox.currentText()) + """' order by schemaname,tablename;"""
         cur.execute(custom_list)
         list_schema = cur.fetchall()
 
+        SQLcountRaster = """SELECT schemaname,viewname FROM pg_catalog.pg_views
+        WHERE schemaname LIKE 'public' AND viewname LIKE 'raster_columns';"""
+        cur.execute(SQLcountRaster)
+        RasterIF = len(cur.fetchall())
+
+        if RasterIF == 1:
+            SQLloadRaster = """SELECT concat(r_table_schema,'.',r_table_name) from public.raster_columns; """
+            cur.execute(SQLloadRaster)
+            list_raster = cur.fetchall()
+            RasterList = []
+            for rasterFind in list_raster:
+                RasterList.append(rasterFind[0])
+        else:
+            RasterList = []
+
         self.tableWidget.setRowCount(len(list_schema))
-        self.tableWidget.setColumnCount(3)
-        i=0
+        self.tableWidget.setColumnCount(4)
+        i = 0
         for value in list_schema:
             if dbtype == sigdb:
                 type_val = str(value[0])[1:3]
-                schema_name=str(value[0])[4:]
-                table_name=str(value[1][len(value[0])+1:])
+                schema_name = str(value[0])[4:]
+                table_name = str(value[1][len(value[0]) + 1:])
                 if value[0] == value[1][:len(value[0])]:
-                    table_name=str(value[1][len(value[0])+1:])
+                    table_name = str(value[1][len(value[0]) + 1:])
                 else:
-                    table_name=str(value[1])
+                    table_name = str(value[1])
             else:
                 type_val = ''
-                schema_name=str(value[0])
-                table_name=str(value[1])
+                schema_name = str(value[0])
+                table_name = str(value[1])
             if type_val == 'fo':
-                type_val=str(value[0])[1:5]
-                schema_name=str(value[0])[6:]
+                type_val = str(value[0])[1:5]
+                schema_name = str(value[0])[6:]
                 if value[0] == value[1][:len(value[0])]:
-                    table_name=str(value[1][len(value[0])+1:])
+                    table_name = str(value[1][len(value[0]) + 1:])
                 else:
-                    table_name=str(value[1])
+                    table_name = str(value[1])
             elif type_val == 'ra':
-                type_val='travaux'
-                schema_name=str(value[0])
-                table_name=str(value[1])
+                type_val = 'travaux'
+                schema_name = str(value[0])
+                table_name = str(value[1])
             elif type_val != '00' and type_val != '01' and type_val != '07' and type_val != '26' and type_val != '42' and type_val != '69' and type_val != 'ra':
-                type_val='agregation'
-                schema_name=str(value[0])
-                table_name=str(value[1])
+                type_val = 'agregation'
+                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)
+            self.tableWidget.setItem(i, 1, item)
             item = QTableWidgetItem(schema_name)
-            self.tableWidget.setItem(i,1,item)
+            self.tableWidget.setItem(i, 2, item)
             item = QTableWidgetItem(table_name)
-            self.tableWidget.setItem(i,2,item)
-            i=i+1
+            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.MatchExactly)
-
+        existing_items = self.tableWidget_2.findItems(new_item_text, QtCore.Qt.MatchFlag(0))
         # Check if there are any existing items with the same text in the first column
         return len(existing_items) > 0
 
-
-
     def limite_flux(self):
 
         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):
+
+    """
+    def openPostGIS(self, schema, table):
         uri = QgsDataSourceUri()
-        uri.setConnection(host ,port ,sigdb ,user ,mdp)
-        uri.setDataSource(schema, table, "geom")
-        uri.setKeyColumn('gid')
-        uri.setSrid('2154')
-        layer = QgsVectorLayer(uri.uri(), table, "postgres")
+        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 = {
@@ -563,65 +379,78 @@ 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 = 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]
+                        table = self.tableWidget_2.item(row, 3).text()
+                        table = schema + '_' + table
+                elif dbtype == refdb:
+                    # code = self.tableWidget_2.item(row,1).text()
+                    schema = self.tableWidget_2.item(row, 2).text()
+                    table = self.tableWidget_2.item(row, 3).text()
+                    # .split("?", 1)[0]
                 uri = QgsDataSourceUri()
-                uri.setConnection(host ,port ,dbtype ,user ,mdp)
+                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
-
-                uri.setDataSource(schema, table, "geom")
-                uri.setKeyColumn('gid')
-
-                # Chargement de la couche PostGIS
-                geom_type ='SELECT right(st_geometrytype(geom),-3) as a FROM '+schema+'.'+table+' GROUP BY a'
-                cur.execute(geom_type)
-                list_typegeom = cur.fetchall()
-                if len(list_typegeom) > 1:
-                    for typegeom in list_typegeom:
-                        if typegeom[0] == 'MultiPolygon':
-                            uri.setWkbType(QgsWkbTypes.MultiPolygon)
-                        elif typegeom[0] == 'MultiLineString':
-                            uri.setWkbType(QgsWkbTypes.MultiLineString)
-                        elif typegeom[0] == 'Point':
-                            uri.setWkbType(QgsWkbTypes.Point)
-                        if typegeom[0] == 'Polygon':
-                            uri.setWkbType(QgsWkbTypes.Polygon)
-                        elif typegeom[0] == 'LineString':
-                            uri.setWkbType(QgsWkbTypes.LineString)
-                        elif typegeom[0] == 'MultiPoint':
-                            uri.setWkbType(QgsWkbTypes.MultiPoint)
-                        if (typegeom[0] != None and typegeom[0] != 'Polygon'):
-                            uri.setSrid('2154')
-                            layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                            # Ajout de la couche au canevas QGIS
-                            QgsProject.instance().addMapLayer(layer)
-                else:
-                    layer = QgsVectorLayer(uri.uri(), table, "postgres")
-                    # Ajout de la couche au canevas QGIS
+                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')
+
+                    # Chargement de la couche PostGIS
+                    geom_type = 'SELECT right(st_geometrytype(geom),-3) as a FROM ' + schema + '.' + table + ' GROUP BY a'
+                    cur.execute(geom_type)
+                    list_typegeom = cur.fetchall()
+                    if len(list_typegeom) > 1:
+                        for typegeom in list_typegeom:
+                            if typegeom[0] == 'MultiPolygon':
+                                uri.setWkbType(QgsWkbTypes.MultiPolygon)
+                            elif typegeom[0] == 'MultiLineString':
+                                uri.setWkbType(QgsWkbTypes.MultiLineString)
+                            elif typegeom[0] == 'Point':
+                                uri.setWkbType(QgsWkbTypes.Point)
+                            if typegeom[0] == 'Polygon':
+                                uri.setWkbType(QgsWkbTypes.Polygon)
+                            elif typegeom[0] == 'LineString':
+                                uri.setWkbType(QgsWkbTypes.LineString)
+                            elif typegeom[0] == 'MultiPoint':
+                                uri.setWkbType(QgsWkbTypes.MultiPoint)
+                            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
+                                QgsProject.instance().addMapLayer(layer)
+                    else:
+                        layer = QgsVectorLayer(uri.uri(), table, "postgres")
+                        # 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)
@@ -638,7 +467,7 @@ var Travaux = L.geoJSON(TravauxJSON,{
             self.comboBox.addItem('form')
         if dbtype == refdb:
             self.toolButton.setEnabled(0)
-            custom_list=schemaname_distinct
+            custom_list = schemaname_distinct
             cur.execute(custom_list)
             list_schema = cur.fetchall()
             self.comboBox.clear()
@@ -648,7 +477,7 @@ var Travaux = L.geoJSON(TravauxJSON,{
 
     def filtre_dynamique(self, filter_text):
         if filter_text.find(' ') >= 0:
-            filter_text=filter_text.replace(" ","_")
+            filter_text = filter_text.replace(" ", "_")
         for i in range(self.tableWidget.rowCount()):
             for j in range(self.tableWidget.columnCount()):
                 item = self.tableWidget.item(i, j)
@@ -659,14 +488,14 @@ var Travaux = L.geoJSON(TravauxJSON,{
 
     def getCanevas(self):
         poly = iface.mapCanvas().extent()
-        geom = (str(poly.xMinimum())+','+str(poly.yMinimum())+','+str(poly.xMaximum())+','+str(poly.yMaximum()))
+        geom = (str(poly.xMinimum()) + ',' + str(poly.yMinimum()) + ',' + str(poly.xMaximum()) + ',' + str(poly.yMaximum()))
 
-        SQL_GEOM_CONTOUR = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_contour" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
-        SQL_GEOM_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_habitat" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
-        SQL_GEOM_EU_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_eu_habitat" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
-        SQL_GEOM_TRAVAUX_PREVUS_LIGNE = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_ligne" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
-        SQL_GEOM_TRAVAUX_PREVUS_POINT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_point" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
-        SQL_GEOM_TRAVAUX_PREVUS_POLY = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_poly" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
+        SQL_GEOM_CONTOUR = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_contour" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_habitat" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_EU_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_eu_habitat" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_LIGNE = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_ligne" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_POINT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_point" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_POLY = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_poly" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
 
         cur.execute(SQL_GEOM_CONTOUR)
         TableContour = cur.fetchall()
@@ -681,11 +510,11 @@ var Travaux = L.geoJSON(TravauxJSON,{
         cur.execute(SQL_GEOM_TRAVAUX_PREVUS_POLY)
         TableTravauxPoly = cur.fetchall()
 
-        TableHaveGeom = sorted(TableContour+TableHabitat+TableEuHabitat+TableTravauxLigne+TableTravauxPoint+TableTravauxPoly)
+        TableHaveGeom = sorted(TableContour + TableHabitat + TableEuHabitat + TableTravauxLigne + TableTravauxPoint + TableTravauxPoly)
         row_count = 0
         self.tableWidget.setRowCount(0)
         for e in TableHaveGeom:
-            cur.execute("""SELECT DISTINCT count(*) FROM pg_catalog.pg_tables WHERE schemaname LIKE '"""+e[0]+"""' AND tablename LIKE '"""+e[1]+"""';""")
+            cur.execute("""SELECT DISTINCT count(*) FROM pg_catalog.pg_tables WHERE schemaname LIKE '""" + e[0] + """' AND tablename LIKE '""" + e[1] + """';""")
             TableSomme = cur.fetchall()[0][0]
 
             if e[0][1:3] != 'fo':
@@ -694,28 +523,34 @@ var Travaux = L.geoJSON(TravauxJSON,{
             else:
                 DepName = QTableWidgetItem('form')
                 SchemaName = QTableWidgetItem(e[0][6:])
-            TableName = QTableWidgetItem(e[1][len(e[0])+1:])
+            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))
-                    self.tableWidget.item(row_count,j).setToolTip('Couche dans une autre BD !')
-            row_count = row_count+1
+                    self.tableWidget.item(row_count, j).setBackground(QtGui.QColor(246, 185, 73, 50))
+                    self.tableWidget.item(row_count, j).setToolTip('Couche dans une autre BD !')
+            row_count = row_count + 1
         if self.lineEdit.text() != 'Recherche par mots-clés':
             self.filtre_dynamique(self.lineEdit.text())
 
-    def SwitchGeom(self,vargeom):
+    def SwitchGeom(self, vargeom):
         new_object = '['
         obj = vargeom['coordinates'][0][0]
         for obj_X in obj:
-            new_object = new_object+'['+str(obj_X[1])+','+str(obj_X[0])+'],'
-        new_object = new_object[:-1]+']'
-        return(new_object)
+            new_object = new_object + '[' + str(obj_X[1]) + ',' + str(obj_X[0]) + '],'
+        new_object = new_object[:-1] + ']'
+        return (new_object)
 
-    def popup(self):
-
-        self.dialog = Popup()  # +++ - self
-        self.dialog.text_edit.show()
+    # def popup(self):
+        # self.dialog = Popup()  # +++ - self
+        # self.dialog.text_edit.show()

CenRa_FLUX/issues.py

@@ -1,54 +1,31 @@
 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__()
         self.setupUi(self)
         self.settings = QgsSettings()
 
-        #place connect here
+        # place connect here
         self.annuler_button.clicked.connect(self.close)
         self.ok_button.clicked.connect(self.run_sendissues)
 
@@ -62,27 +39,32 @@ 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
-            url = qgis.utils.pluginMetadata(NAME,'tracker')
+            url = qgis.utils.pluginMetadata(NAME, 'tracker')
             print(text_message)
-            send_info = send_issues(url,text_titre,text_message,statu)
+            send_info = send_issues(url, text_titre, text_message, statu)
             code = send_info.status_code
             print(code)
         else:
             code = 423
         if code == 201:
-            iface.messageBar().pushMessage("Envoyer :", "Votre messages à bien été envoyer.", level=Qgis.Success, duration=20)
+            iface.messageBar().pushMessage("Envoyer :", "Votre messages à bien été envoyer.", level=0, duration=20)
             self.close()
         elif code == 422:
-            iface.messageBar().pushMessage("Erreur :", "Erreur dans le contenu du messages.", level=Qgis.Critical, duration=20)
+            iface.messageBar().pushMessage("Erreur :", "Erreur dans le contenu du messages.", level=2, duration=20)
         elif code == 423:
-            iface.messageBar().pushMessage("Erreur :", "Pas de sujet sélectionné.", level=Qgis.Critical, duration=20)
+            iface.messageBar().pushMessage("Erreur :", "Pas de sujet sélectionné.", level=2, duration=20)
         elif code == 404:
-            iface.messageBar().pushMessage("Missing :", "Le serveur de messagerie est injoignable.", level=Qgis.Warning, duration=20)
+            iface.messageBar().pushMessage("Missing :", "Le serveur de messagerie est injoignable.", level=1, duration=20)

CenRa_FLUX/metadata.txt

@@ -5,8 +5,9 @@
 [general]
 name=CenRa_FLUX
 qgisMinimumVersion=3.0
+supportsQt6=True
 description=Permet d'ouvrire une table dans la base PostGis
-version=2.7
+version=3.5
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -18,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
@@ -32,7 +32,7 @@ icon=icon.png
 # experimental flag
 experimental=False
 
-changelog=<h2>CenRa_FLUX:</h2></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
@@ -45,4 +45,3 @@ deprecated=False
 
 # If the plugin can run on QGIS Server.
 server=False
-

CenRa_FLUX/tools/HubToTea.py

@@ -1,7 +1,8 @@
 from qgis.core import QgsApplication
 
+
 def gitea():
-    file_url = QgsApplication.qgisSettingsDirPath()+'QGIS/QGIS3.ini'
+    file_url = QgsApplication.qgisSettingsDirPath() + 'QGIS/QGIS3.ini'
     recherche_1 = 'plugin_repositories\\github\\url=https://github.com/CEN-Rhone-Alpes/Plugin_QGIS/releases/latest/download/plugins.xml'
     replace_1 = 'plugin_repositories\\gitea\\url=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 
@@ -18,4 +19,4 @@ def gitea():
 
     # Write the file out again
     with open(file_url, 'w') as file:
-        file.write(filedata)
+        file.write(filedata)

CenRa_FLUX/tools/SQLRequet.py

@@ -1,17 +1,17 @@
 
-schemaname_distinct="""SELECT DISTINCT schemaname from pg_catalog.pg_tables
+schemaname_distinct = """SELECT DISTINCT schemaname from pg_catalog.pg_tables
                             WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
                             order by schemaname;"""
-schemaname_list_ref="""SELECT schemaname,tablename from pg_catalog.pg_tables
-          WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
-          order by schemaname,tablename;"""
-schemaname_list="""(SELECT schemaname,tablename from pg_catalog.pg_tables
-         where schemaname like 'trav%' or schemaname like '\_ag%' or schemaname like '\_00%' or schemaname like '\_01%' or schemaname like '\_07%' or  schemaname like '\_26%' or schemaname like '\_form%' or schemaname like '\_42%' or schemaname like '\_69%' order by schemaname,tablename)
-         UNION
-         (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews order by schemaname,tablename) order by schemaname,tablename;"""
+schemaname_list_ref = """SELECT schemaname,tablename from pg_catalog.pg_tables
+        WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
+        order by schemaname,tablename;"""
+schemaname_list = """(SELECT schemaname,tablename from pg_catalog.pg_tables
+        where schemaname like 'trav%' or schemaname like '\\_ag%' or schemaname like '\\_00%' or schemaname like '\\_01%' or schemaname like '\\_07%' or  schemaname like '\\_26%' or schemaname like '\\_form%' or schemaname like '\\_42%' or schemaname like '\\_69%' order by schemaname,tablename)
+        UNION
+        (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews order by schemaname,tablename) order by schemaname,tablename;"""
 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_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))"""
@@ -20,7 +20,7 @@ champ_viergePoint = """(gid serial NOT NULL, commentaire text, x_wgs84 double pr
 
 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_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 = """(
@@ -148,4 +148,4 @@ champ_vegethab_multipolygon = """(
     class_name character varying(254) COLLATE pg_catalog."default",
     geom geometry(MultiPolygon,2154)
 )
-"""
+"""

CenRa_FLUX/tools/icons/mIconRaster.svg

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

CenRa_FLUX/tools/icons/mIconVecteur.svg

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

CenRa_FLUX/tools/resources.py

@@ -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):
+    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,62 +114,65 @@ def load_ui(*args):
     ui_class, _ = uic.loadUiType(resources_path("ui", *args))
 
     return ui_class
-def send_issues(url,titre,body,labels):
+
+
+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'}
+    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 = url+'/raw/branch/main/plugins.xml'
+    # 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)
-    version = qgis.utils.pluginMetadata(NAME,'version')
+    # print(URL)
+    version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except NameError:
         binar = False
     if binar:
         try:
             version_web = str(urllib.request.urlopen(URL).read())
             plugin_num = version_web.find(NAME)
-            valeur_version_web = version_web.find('<version>',plugin_num)+9
-            version_plugin = version_web[valeur_version_web:valeur_version_web+len_version]
+            valeur_version_web = version_web.find('<version>', plugin_num) + 9
+            version_plugin = version_web[valeur_version_web: valeur_version_web + len_version]
             if version_plugin != version:
                 iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30)
-        except:
+        except NameError:
             print("error gitea version ssl")
     else:
         iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)
 
+
 def devlog(NAME):
     import qgis
     devmaj = '<head><style>* {margin:0; padding:0; }</style></head>'
-    devmaj = devmaj+qgis.utils.pluginMetadata(NAME,'changelog')
-    return devmaj
+    devmaj = devmaj + qgis.utils.pluginMetadata(NAME, 'changelog')
+    return devmaj

CenRa_FLUX/tools/ui/CenRa_Flux_base.ui

@@ -59,7 +59,7 @@
       </size>
      </property>
      <property name="inputMethodHints">
-      <set>Qt::ImhNoEditMenu</set>
+      <set>Qt::ImhNoEditMenu|Qt::ImhNoTextHandles</set>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -159,9 +159,15 @@
          <height>181</height>
         </rect>
        </property>
+       <property name="inputMethodHints">
+        <set>Qt::ImhNoEditMenu|Qt::ImhNoTextHandles</set>
+       </property>
        <property name="selectionMode">
         <enum>QAbstractItemView::SingleSelection</enum>
        </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
       </widget>
       <widget class="QComboBox" name="comboBox">
        <property name="geometry">
@@ -235,9 +241,15 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="editTriggers">
+        <set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked</set>
+       </property>
        <property name="selectionMode">
         <enum>QAbstractItemView::SingleSelection</enum>
        </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
        <property name="sortingEnabled">
         <bool>true</bool>
        </property>
@@ -326,24 +338,6 @@
         </size>
        </property>
       </widget>
-      <widget class="QWebView" name="viewer" native="true">
-       <property name="geometry">
-        <rect>
-         <x>90</x>
-         <y>10</y>
-         <width>730</width>
-         <height>730</height>
-        </rect>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">background-color: rgba(255, 255, 255,0.50);</string>
-       </property>
-       <property name="url" stdset="0">
-        <url>
-         <string>about:blank</string>
-        </url>
-       </property>
-      </widget>
       <widget class="QCheckBox" name="checkBox">
        <property name="geometry">
         <rect>
@@ -379,33 +373,24 @@
         <string notr="true"/>
        </property>
       </widget>
-      <zorder>viewer</zorder>
-      <zorder>commandLinkButton_2</zorder>
-      <zorder>pushButton_2</zorder>
-      <zorder>label</zorder>
-      <zorder>tableWidget_2</zorder>
-      <zorder>comboBox</zorder>
-      <zorder>lineEdit</zorder>
-      <zorder>toolButton</zorder>
-      <zorder>tableWidget</zorder>
-      <zorder>label_2</zorder>
-      <zorder>label_3</zorder>
-      <zorder>comboBox_2</zorder>
-      <zorder>commandLinkButton</zorder>
-      <zorder>checkBox</zorder>
-      <zorder>DeBUG</zorder>
+      <widget class="QTextBrowser" name="viewer">
+       <property name="geometry">
+        <rect>
+         <x>90</x>
+         <y>10</y>
+         <width>731</width>
+         <height>731</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-color: rgba(255, 255, 255,0.50);</string>
+       </property>
+      </widget>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKitWidgets/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_FLUX/tools/ui/CenRa_about_form.ui

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

CenRa_METABASE/CenRa_Metabase.py

@@ -4,14 +4,13 @@ __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>
+# include <QSettings>
 '''
 from pg_metadata.connection_manager import (
     store_connections,
@@ -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,10 +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
 
-from PyQt5.QtCore import *
+# from CenRa_Metabase.issues import CenRa_Issues
+
 
 class PgMetadata:
     def __init__(self):
@@ -49,42 +48,42 @@ class PgMetadata:
         self.dock_action = None
         self.help_action = None
         plugin_dir = os.path.dirname(__file__)
-        end_find = plugin_dir.rfind('\\')+1
+        end_find = plugin_dir.rfind('\\') + 1
         global NAME
         NAME = plugin_dir[end_find:]
         maj_verif(NAME)
 
         # Display About window on first use
-        version = qgis.utils.pluginMetadata('CenRa_METABASE','version')
+        version = qgis.utils.pluginMetadata('CenRa_METABASE', 'version')
         s = QSettings()
         versionUse = s.value("metadata/version", 1, type=str)
-        if str(versionUse) != str(version) :
+        if str(versionUse) != str(version):
             s.setValue("metadata/version", str(version))
-            print(versionUse,version)
+            print(versionUse, version)
             self.open_about_dialog()
 #        setup_logger('pg_metadata')
 
-        #locale, file_path = setup_translation(
+        # locale, file_path = setup_translation(
         #    folder=plugin_path("i18n"), file_pattern="CenRa_Metabase_{}.qm")
-        #if file_path:
+        # if file_path:
         #    self.translator = QTranslator()
         #    self.translator.load(file_path)
             # noinspection PyCallByClass,PyArgumentList
         #    QCoreApplication.installTranslator(self.translator)
 
     # noinspection PyPep8Naming
-    #def initProcessing(self):
-        #""" Add the QGIS Processing provider. """
-        #if not self.provider:
-            #self.provider = PgMetadataProvider()
-            #QgsApplication.processingRegistry().addProvider(self.provider)
+    # def initProcessing(self):
+        # """ Add the QGIS Processing provider. """
+        # if not self.provider:
+            # self.provider = PgMetadataProvider()
+            # QgsApplication.processingRegistry().addProvider(self.provider)
 
     # noinspection PyPep8Naming
     def initGui(self):
         """ Build the plugin GUI. """
-        #self.initProcessing()
+        # self.initProcessing()
 
-        #self.check_invalid_connection_names()
+        # self.check_invalid_connection_names()
 
         self.toolBar = iface.addToolBar("CenRa_Metabase")
         self.toolBar.setObjectName("CenRa_Metabase")
@@ -99,14 +98,13 @@ class PgMetadata:
         if not self.editor:
             self.editor = Metabase_Editor()
 
-
-            self.editor_action = QAction(icon2, 'CenRa_Metabase',None)
+            self.editor_action = QAction(icon2, 'CenRa_Metabase', None)
             self.toolBar.addAction(self.editor_action)
             self.editor_action.triggered.connect(self.open_editor)
 
         if not self.dock:
             self.dock = CenRa_Metabase()
-            iface.addDockWidget(Qt.RightDockWidgetArea, self.dock)
+            iface.addDockWidget(Qt.DockWidgetArea(0x2), self.dock)
 
             # Open/close the dock from plugin menu
             self.dock_action = QAction(icon, 'CenRa_Metabase', iface.mainWindow())
@@ -157,7 +155,8 @@ class PgMetadata:
         About dialog
         """
         dialog = MetabaseAboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -177,9 +176,9 @@ class PgMetadata:
 
     def unload(self):
         """ Unload the plugin. """
-        #if self.editor:
-            #iface.removePluginMenu('CenRa_Metabase',self.editor_action)
-            #self.editor.removeToolBarIcon(self.editor_action)
+        # if self.editor:
+        # iface.removePluginMenu('CenRa_Metabase',self.editor_action)
+        # self.editor.removeToolBarIcon(self.editor_action)
 
         if self.dock:
             iface.removeDockWidget(self.dock)
@@ -201,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."""

CenRa_METABASE/about_form.py

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

CenRa_METABASE/dock.py

@@ -14,44 +14,31 @@ from pathlib import Path
 from xml.dom.minidom import parseString
 
 from qgis.core import (
-    NULL,
     QgsApplication,
-    QgsDataSourceUri,
-    QgsProject,
-    QgsProviderConnectionException,
     QgsProviderRegistry,
-    QgsRasterLayer,
     QgsSettings,
-    QgsVectorLayer,
 )
 from qgis.PyQt.QtCore import QLocale, QUrl
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
 from qgis.PyQt.QtPrintSupport import QPrinter
-from qgis.PyQt.QtWebKitWidgets import QWebPage
+# from qgis.PyQt.QtWebKitWidgets import QWebPage
 from qgis.PyQt.QtWidgets import (
-    QDialog,
     QAction,
     QDockWidget,
     QFileDialog,
-    QInputDialog,
     QMenu,
     QToolButton,
 )
-from qgis.gui import *
 from qgis.utils import iface
 import qgis
-'''
-from pg_metadata.connection_manager import (
-    check_pgmetadata_is_installed,
-    connections_list,
-    settings_connections_names,
-)
-'''
-from .tools.PythonSQL import login_base
 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')
@@ -80,8 +67,8 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
         self.current_datasource_uri = None
         self.current_connection = None
 
-        self.viewer.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
-        self.viewer.page().linkClicked.connect(self.open_link)
+        # self.viewer.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
+        # self.viewer.page().linkClicked.connect(self.open_link)
 
         # Help button
         self.external_help.setText('')
@@ -90,14 +77,14 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
 
         # Flat table button
         self.flatten_dataset_table.setText('')
-        #self.flatten_dataset_table.setToolTip(tr("Add the catalog table"))
+        # self.flatten_dataset_table.setToolTip(tr("Add the catalog table"))
         self.flatten_dataset_table.setIcon(QgsApplication.getThemeIcon("/mActionAddHtml.svg"))
-        #self.flatten_dataset_table.clicked.connect(self.add_flatten_dataset_table)
+        # self.flatten_dataset_table.clicked.connect(self.add_flatten_dataset_table)
 
         # Settings menu
         self.config.setAutoRaise(True)
-        #self.config.setToolTip(tr("Settings"))
-        self.config.setPopupMode(QToolButton.InstantPopup)
+        # self.config.setToolTip(tr("Settings"))
+        self.config.setPopupMode(QToolButton.ToolButtonPopupMode(2))
         self.config.setIcon(QgsApplication.getThemeIcon("/mActionOptions.svg"))
 
         self.auto_open_dock_action = QAction(
@@ -114,8 +101,8 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
 
         # Setting PDF/HTML menu
         self.save_button.setAutoRaise(True)
-        #self.save_button.setToolTip(tr("Save metadata"))
-        self.save_button.setPopupMode(QToolButton.InstantPopup)
+        # self.save_button.setToolTip(tr("Save metadata"))
+        self.save_button.setPopupMode(QToolButton.ToolButtonPopupMode(2))
         self.save_button.setIcon(QIcon(QgsApplication.iconPath('mActionFileSave.svg')))
 
         self.save_as_pdf = QAction(
@@ -142,21 +129,21 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
         self.metadata = QgsProviderRegistry.instance().providerMetadata('postgres')
 
         # Display message in the dock
-        #if not settings_connections_names():
-            #self.default_html_content_not_installed()
-        #else:
+        # if not settings_connections_names():
+        # 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:
-            #qgis.utils.plugins['CenRa_METABASE'].initGui()
+        except ValueError:
+            # qgis.utils.plugins['CenRa_METABASE'].initGui()
             qgis.utils.plugins['CenRa_METABASE'].unload()
-            #self.default_html_content_not_pg_layer()
+            # self.default_html_content_not_pg_layer()
 
         if iface.activeLayer():
-            layer=iface.activeLayer()
+            layer = iface.activeLayer()
             iface.layerTreeView().setCurrentLayer(None)
             iface.layerTreeView().setCurrentLayer(layer)
 
@@ -187,8 +174,8 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
 
         if output_format == OutputFormats.PDF:
             printer = QPrinter()
-            printer.setOutputFormat(QPrinter.PdfFormat)
-            printer.setPageMargins(20, 20, 20, 20, QPrinter.Millimeter)
+            printer.setOutputFormat(QPrinter.OutputFormat(1))
+            # printer.setPageMargins(20,20,20,20,QPrinter.Unit(0))
             printer.setOutputFileName(output_file_path)
             self.viewer.print(printer)
             iface.messageBar().pushSuccess(
@@ -198,7 +185,7 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
                     "<a href=\"{}\">{}</a>").format(parent_folder, output_file_path)
             )
 
-        elif output_format in [OutputFormats.HTML,OutputFormats.DCAT]:
+        elif output_format in [OutputFormats.HTML, OutputFormats.DCAT]:
             if output_format == OutputFormats.HTML:
                 data_str = self.viewer.page().currentFrame().toHtml()
             else:
@@ -211,7 +198,7 @@ class CenRa_Metabase(QDockWidget, DOCK_CLASS):
                     xml_template = xml_file.read()
 
                 xml = parseString(xml_template.format(language=data[0][0], content=data[0][1]))
-                
+
                 data_str = xml.toprettyxml()
 
             with open(output_file[0], "w", encoding='utf8') as file_writer:
@@ -227,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=''
+
+    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>')
-        publisher=''
+            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
 
@@ -273,7 +232,7 @@ publisher+
         locale = QgsSettings().value("locale/userLocale", QLocale().name())
         locale = locale.split('_')[0].lower()
 
-        if output_format == [OutputFormats.HTML,OutputFormats.DCAT]:
+        if output_format == [OutputFormats.HTML, OutputFormats.DCAT]:
             sql = (
                 "SELECT pgmetadata.get_dataset_item_html_content('{schema}', '{table}', '{locale}');"
             ).format(schema=uri.schema(), table=uri.table(), locale=locale)
@@ -288,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. """
         '''
@@ -333,17 +291,17 @@ 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()
 
         html = '<html><head>'
-        #html += '<script src="http://ignf.github.io/geoportal-sdk/latest/dist/2d/GpSDK2D.js" defer ></script>'
+        # html += '<script src="http://ignf.github.io/geoportal-sdk/latest/dist/2d/GpSDK2D.js" defer ></script>'
         html += '<style>{css}</style></head><body>'.format(css=css)
-        #html += '<link rel="stylesheet" href="http://ignf.github.io/geoportal-sdk/latest/dist/2d/GpSDK2D.css" >'
-        #html += '<script src="file:///C:/Users/tlaveille/Desktop/maps.js" defer></script>'
-        #html += '<noscript>Your browser does not support JavaScript!</noscript>'
+        # html += '<link rel="stylesheet" href="http://ignf.github.io/geoportal-sdk/latest/dist/2d/GpSDK2D.css" >'
+        # html += '<script src="file:///C:/Users/tlaveille/Desktop/maps.js" defer></script>'
+        # html += '<noscript>Your browser does not support JavaScript!</noscript>'
         if title:
             html += '<h2>{title} <img class=logo src=https://i2.wp.com/www.cen-rhonealpes.fr/wp-content/uploads/2013/04/cen-rhonealpes-couleurs1.jpg?w=340&ssl=1></h2>'.format(title=title)
         if body:
@@ -352,16 +310,16 @@ 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):
+    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=''
+            uri = ''
         if uri != '':
             if not uri.table():
                 layertype = layer.providerType().lower()
@@ -372,23 +330,23 @@ publisher+
                 self.save_button.setEnabled(False)
             else:
                 data_count = self.sql_check(uri)
-                #print(data_count)
+                # print(data_count)
                 if data_count == 0:
                     self.default_html_content_not_metadata()
                     self.save_button.setEnabled(False)
                 else:
-                    self.build_html_content(layer,uri)
+                    self.build_html_content(layer, uri)
                     self.save_button.setEnabled(True)
 
-    def build_html_content(self,layer,uri):
+    def build_html_content(self, layer, uri):
         body = ''
 
-        dataall=self.sql_info(uri)
-        data=dataall[0]
-        data_url=dataall[1]
-        data_contact=dataall[2]
-        #print(len(data_url))
-        data_collonne=[field.name() for field in layer.dataProvider().fields()]
+        dataall = self.sql_info(uri)
+        data = dataall[0]
+        data_url = dataall[1]
+        data_contact = dataall[2]
+        # print(len(data_url))
+        # 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)
@@ -411,7 +369,7 @@ publisher+
         body += '<tr><th>Emprise</th><td>{data[28]}</td></tr>'.format(data=data)
         body += '</table></div>'
 
-        #body += '<div id="map"></div>'
+        # body += '<div id="map"></div>'
 
         body += '<div><h3>Publication</h3><table class="table table-condensed">'
         body += '<tr><th>Date</th><td>{data[11]}</td></tr>'.format(data=data)
@@ -450,45 +408,46 @@ publisher+
         self.set_html_content(
             layer.name(), body)
 
-    def set_html_to_wms(self,layer):
+    def set_html_to_wms(self, layer):
         self.set_html_content(
-        'CenRa Metadata',(layer.htmlMetadata()))
+            '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.'))
 
-    def sql_check(self,uri):
-        cur=login_base()
+    def sql_check(self, uri):
+        cur = login_base()
         table = uri.table()
         schema = uri.schema()
 
         sql_count = """SELECT count(uid) FROM metadata.dataset
-            WHERE schema_name LIKE '"""+schema+"""' AND table_name LIKE '"""+table+"""';"""
+            WHERE schema_name LIKE '""" + schema + """' AND table_name LIKE '""" + table + """';"""
 
         cur.execute(sql_count)
         data_count = cur.fetchall()
         cur.close()
         return data_count[0][0]
 
-    def sql_info(self,uri):
-        cur=login_base()
+    def sql_info(self, uri):
+        cur = login_base()
         table = uri.table()
         schema = uri.schema()
-        #[s for s in iface.activeLayer().source().split(" ") if "dbname" in s][0].split("'")[1]
+        # [s for s in iface.activeLayer().source().split(" ") if "dbname" in s][0].split("'")[1]
         sql_find = """SELECT *,right(left(st_astext(geom,2),-2),-9) FROM metadata.dataset
-            WHERE schema_name LIKE '"""+schema+"""' AND table_name LIKE '"""+table+"""';"""
+            WHERE schema_name LIKE '""" + schema + """' AND table_name LIKE '""" + table + """';"""
         cur.execute(sql_find)
         data_general = cur.fetchall()
-        sql_findurl = """SELECT type,url,mime,format,taille FROM metadata.dataurl WHERE schema_name LIKE '"""+schema+"""' AND table_name LIKE '"""+table+"""';"""
+        sql_findurl = """SELECT type,url,mime,format,taille FROM metadata.dataurl WHERE schema_name LIKE '""" + schema + """' AND table_name LIKE '""" + table + """';"""
         cur.execute(sql_findurl)
         data_url = cur.fetchall()
-        sql_findcontact = """SELECT role,nom,organisation,email,telephone FROM metadata.datacontact WHERE schema_name LIKE '"""+schema+"""' AND table_name LIKE '"""+table+"""';"""
+        sql_findcontact = """SELECT role,nom,organisation,email,telephone FROM metadata.datacontact WHERE schema_name LIKE '""" + schema + """' AND table_name LIKE '""" + table + """';"""
         cur.execute(sql_findcontact)
         data_contact = cur.fetchall()
         cur.close()
-        return data_general[0],data_url,data_contact
-
+        return data_general[0], data_url, data_contact

CenRa_METABASE/editor.py

@@ -1,62 +1,54 @@
 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 PyQt5 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.QtWebKitWidgets import QWebPage
+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
 
-from .tools.PythonSQL import login_base
+try:
+    from .tools.PythonSQL import login_base
+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__()
         self.setupUi(self)
         self.settings = QgsSettings()
-        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
         self.import_xml.setAutoRaise(True)
         self.import_xml.setText('')
         self.import_xml.setIcon(QIcon(QgsApplication.iconPath('mActionAddHtml.svg')))
@@ -64,13 +56,13 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         self.issues_app.setAutoRaise(True)
         self.issues_app.setText('')
         self.issues_app.setIcon(QIcon(QgsApplication.iconPath('mIconInfo.svg')))
-        self.auto_adding.setIcon(QtGui.QIcon(resources_path('icons','auto_add.png')))
+        self.auto_adding.setIcon(QtGui.QIcon(resources_path('icons', 'auto_add.png')))
         self.auto_adding.hide()
         if os.getlogin() == 'tlaveille' or 'lpoulin' or 'rclement':
             self.auto_adding.show()
 
         self.auto_adding.clicked.connect(self.auto_run)
-        self.issues_app.clicked.connect(self.issues_open)
+        # self.issues_app.clicked.connect(self.issues_open)
         self.categories_select_view.itemDoubleClicked.connect(self.add_categories_view)
         self.categories_view.itemDoubleClicked.connect(self.deleter_categories_view)
         self.themes_select_view.itemDoubleClicked.connect(self.add_themes_view)
@@ -98,6 +90,7 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         self.format_box.setCurrentIndex(0)
         self.taille_line.setText('45')
         self.add_lien()
+
     def add_metadata(self):
         table_name = layer.dataProvider().uri().table()
         schema_name = layer.dataProvider().uri().schema()
@@ -113,19 +106,19 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         array_categories = '{'
         while row_count_categories >= row:
             if row_count_categories != row:
-                array_categories += (self.categories_view.item(row-1,0).text())+','
+                array_categories += (self.categories_view.item(row - 1, 0).text()) + ', '
             else:
-                array_categories += (self.categories_view.item(row-1,0).text())
-            row = row+1
+                array_categories += (self.categories_view.item(row - 1, 0).text())
+            row = row + 1
         array_categories += '}'
         row = 1
         array_themes = '{'
         while row_count_themes >= row:
             if row_count_themes != row:
-                array_themes += (self.themes_view.item(row-1,0).text())+','
+                array_themes += (self.themes_view.item(row - 1, 0).text()) + ', '
             else:
-                array_themes += (self.themes_view.item(row-1,0).text())
-            row = row+1
+                array_themes += (self.themes_view.item(row - 1, 0).text())
+            row = row + 1
         array_themes += '}'
 
         text_date_creation = str(self.date_creation_date.date().toPyDate())
@@ -158,65 +151,65 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         array_link = ''
         while row_count_link >= row:
             if row_count_link != row:
-                array_link += "('"+ table_name +"','"+ schema_name +"','"+ (self.table_lien.item(row-1,1).text()) +"','"+ (self.table_lien.item(row-1,2).text()) +"','"+ (self.table_lien.item(row-1,3).text()) +"','"+ (self.table_lien.item(row-1,4).text()) +"','"+ (self.table_lien.item(row-1,5).text()) +"')"+','
+                array_link += "('" + table_name + "', '" + schema_name + "', '" + (self.table_lien.item(row - 1,1).text()) + "', '" + (self.table_lien.item(row - 1,2).text()) + "', '" + (self.table_lien.item(row - 1,3).text()) + "', '" + (self.table_lien.item(row - 1,4).text()) + "', '" + (self.table_lien.item(row - 1,5).text()) + "')" + ', '
             else:
-                array_link += "('"+ table_name +"','"+ schema_name +"','"+ (self.table_lien.item(row-1,1).text()) +"','"+ (self.table_lien.item(row-1,2).text()) +"','"+ (self.table_lien.item(row-1,3).text()) +"','"+ (self.table_lien.item(row-1,4).text()) +"','"+ (self.table_lien.item(row-1,5).text()) +"')"
-            row = row+1
+                array_link += "('" + table_name + "', '" + schema_name + "', '" + (self.table_lien.item(row - 1,1).text()) + "', '" + (self.table_lien.item(row - 1,2).text()) + "', '" + (self.table_lien.item(row - 1,3).text()) + "', '" + (self.table_lien.item(row - 1,4).text()) + "', '" + (self.table_lien.item(row - 1,5).text()) + "')"
+            row = row + 1
 
         row_count_contact = self.table_contact.rowCount()
         row = 1
         array_contact = ''
         while row_count_contact >= row:
             if row_count_contact != row:
-                array_contact += "('"+ table_name +"','"+ schema_name +"','"+ (self.table_contact.item(row-1,1).text()) +"','"+ (self.table_contact.item(row-1,2).text()) +"','"+ (self.table_contact.item(row-1,3).text()) +"','"+ (self.table_contact.item(row-1,4).text()) +"','"+ (self.table_contact.item(row-1,5).text()) +"')"+','
+                array_contact += "('" + table_name + "', '" + schema_name + "', '" + (self.table_contact.item(row - 1,1).text()) + "', '" + (self.table_contact.item(row - 1,2).text()) + "', '" + (self.table_contact.item(row - 1,3).text()) + "', '" + (self.table_contact.item(row - 1,4).text()) + "', '" + (self.table_contact.item(row - 1,5).text()) + "')" + ', '
             else:
-                array_contact += "('"+ table_name +"','"+ schema_name +"','"+ (self.table_contact.item(row-1,1).text()) +"','"+ (self.table_contact.item(row-1,2).text()) +"','"+ (self.table_contact.item(row-1,3).text()) +"','"+ (self.table_contact.item(row-1,4).text()) +"','"+ (self.table_contact.item(row-1,5).text()) +"')"
-            row = row+1
+                array_contact += "('" + table_name + "', '" + schema_name + "', '" + (self.table_contact.item(row - 1,1).text()) + "', '" + (self.table_contact.item(row - 1,2).text()) + "', '" + (self.table_contact.item(row - 1,3).text()) + "', '" + (self.table_contact.item(row - 1,4).text()) + "', '" + (self.table_contact.item(row - 1,5).text()) + "')"
+            row = row + 1
         '''
 
-        exist=self.status_metadata(layer)
-        cur_con=login_base(take=True)
-        cur=cur_con[0]
-        con=cur_con[1]
+        exist = self.status_metadata(layer)
+        cur_con = login_base(take=True)
+        cur = cur_con[0]
+        con = cur_con[1]
         list_champs_sql = ''
         values_sql_add = ''
         if exist:
-            SQL_uid = """SELECT uid from metadata.dataset where table_name like '"""+table_name+"""' and schema_name like '"""+schema_name+"""';"""
+            SQL_uid = """SELECT uid from metadata.dataset where table_name like '""" + table_name + """' and schema_name like '""" + schema_name + """';"""
             cur.execute(SQL_uid)
             text_uid = (cur.fetchall())[0][0]
 
-            SQL_delete = """DELETE from metadata.dataset where table_name like '"""+table_name+"""' and schema_name like '"""+schema_name+"""';"""
+            SQL_delete = """DELETE from metadata.dataset where table_name like '""" + table_name + """' and schema_name like '""" + schema_name + """';"""
             cur.execute(SQL_delete)
-            values_sql_add += "'"+text_uid+"',"
+            values_sql_add += "'" + text_uid + "',"
 
-            list_champs_sql+='uid,'
-            global uid_delete_list_link,uid_delete_list_contact
+            list_champs_sql += 'uid,'
+            global uid_delete_list_link, uid_delete_list_contact
             if len(uid_delete_list_link) >= 35:
-                SQL_delete_link = """DELETE FROM metadata.dataurl WHERE uid IN ("""+ uid_delete_list_link[:-1] +""");"""
+                SQL_delete_link = """DELETE FROM metadata.dataurl WHERE uid IN (""" + uid_delete_list_link[:- 1] + """);"""
                 cur.execute(SQL_delete_link)
                 uid_delete_list_link = ''
             if len(uid_delete_list_contact) >= 35:
-                SQL_delete_contact = """DELETE FROM metadata.datacontact WHERE uid IN ("""+ uid_delete_list_contact[:-1] +""");"""
+                SQL_delete_contact = """DELETE FROM metadata.datacontact WHERE uid IN (""" + uid_delete_list_contact[:- 1] + """);"""
                 cur.execute(SQL_delete_contact)
-                uid_delete_list_contact=''
+                uid_delete_list_contact = ''
 
-        list_champs_sql += 'table_name,schema_name,title,abstract,keywords,data_last_update,langue,categories,themes,creation_date,update_date,encode,geom,spatial_extent,feature_count,geometry_type,projection_name,projection_authid,spatial_level,minimum_optimal_scale,maximum_optimal_scale,publication_date,publication_frequency,confidentiality,license,license_attribution'
-        values_sql_add += "'"+table_name+"','"+schema_name+"','"+text_titre+"','"+text_description+"','"+text_mots_cles+"','"+text_date_maj+"','"+text_langue+"','"+array_categories+"','"+array_themes+"','"+text_date_creation+"','"+text_date_modification+"','"+text_encode+"','"+text_extend+"','"+text_extend+"','"+int_nbr_entites+"','"+text_geomtype+"','"+text_crsname+"','"+text_crscode+"','"+text_niveau+"',"+text_echelle_min+","+text_echelle_max+",'"+text_date_publication+"','"+text_frequence+"','"+text_restriction+"','"+text_licence+"','"+text_licence_attrib+"'"
+        list_champs_sql += 'table_name, schema_name, title, abstract, keywords, data_last_update, langue, categories, themes, creation_date, update_date, encode, geom, spatial_extent, feature_count, geometry_type, projection_name, projection_authid, spatial_level, minimum_optimal_scale, maximum_optimal_scale, publication_date, publication_frequency, confidentiality, license, license_attribution'
+        values_sql_add += "'" + table_name + "', '" + schema_name + "', '" + text_titre + "', '" + text_description + "', '" + text_mots_cles + "', '" + text_date_maj + "', '" + text_langue + "', '" + array_categories + "', '" + array_themes + "', '" + text_date_creation + "', '" + text_date_modification + "', '" + text_encode + "', '" + text_extend + "', '" + text_extend + "', '" + int_nbr_entites + "', '" + text_geomtype + "', '" + text_crsname + "', '" + text_crscode + "', '" + text_niveau + "'," + text_echelle_min + "," + text_echelle_max + ",'" + text_date_publication + "', '" + text_frequence + "', '" + text_restriction + "', '" + text_licence + "', '" + text_licence_attrib + "'"
 
-        SQL_add = """INSERT INTO metadata.dataset ("""+list_champs_sql+""") VALUES ("""+values_sql_add+""");"""
+        SQL_add = """INSERT INTO metadata.dataset (""" + list_champs_sql + """) VALUES (""" + values_sql_add + """);"""
 
         cur.execute(SQL_add)
 
-        global array_link,array_contact
+        global array_link, array_contact
         if len(array_link) >= 25:
-            array_link=array_link[:-1]
-            SQL_add_link = """INSERT INTO metadata.dataurl (table_name,schema_name,type,url,mime,format,taille) VALUES """+array_link+""";"""
+            array_link = array_link[:- 1]
+            SQL_add_link = """INSERT INTO metadata.dataurl (table_name, schema_name, type, url, mime, format, taille) VALUES """ + array_link + """;"""
             cur.execute(SQL_add_link)
             array_link = ''
 
         if len(array_contact) >= 25:
-            array_contact=array_contact[0:-1]
-            SQL_add_contact = """INSERT INTO metadata.datacontact (table_name,schema_name,role,nom,organisation,email,telephone) VALUES """+array_contact+""";"""
+            array_contact = array_contact[0:- 1]
+            SQL_add_contact = """INSERT INTO metadata.datacontact (table_name, schema_name, role, nom, organisation, email, telephone) VALUES """ + array_contact + """;"""
             cur.execute(SQL_add_contact)
             array_contact = ''
 
@@ -231,28 +224,28 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         self.activateWindow()
         global layer
         layer = iface.activeLayer()
-        global uid_delete_list_link,uid_delete_list_contact,array_link,array_contact
-        uid_delete_list_link=''
-        uid_delete_list_contact=''
+        global uid_delete_list_link, uid_delete_list_contact, array_link, array_contact
+        uid_delete_list_link = ''
+        uid_delete_list_contact = ''
         array_link = ''
         array_contact = ''
 
-        is_ok=self.is_in_psql(layer)
+        is_ok = self.is_in_psql(layer)
         if is_ok:
-            exist=self.status_metadata(layer)
+            exist = self.status_metadata(layer)
             if exist:
                 self.reload_data(layer)
             else:
                 self.new_data(layer)
         else:
             self.close()
-            iface.messageBar().pushMessage("Information :", "Cette couche n'est pas stockée dans PostgreSQL", level=Qgis.Warning, duration=30)
+            iface.messageBar().pushMessage("Information:", "Cette couche n'est pas stockée dans PostgreSQL", level=Qgis.Warning, duration=30)
 
-    def is_in_psql(self,layer):
+    def is_in_psql(self, layer):
         try:
             uri = layer.dataProvider().uri()
-        except:
-            uri=''
+        except AttributeError:
+            uri = ''
             return False
         if uri != '':
             if not uri.table():
@@ -260,13 +253,13 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
             else:
                 return True
 
-    def status_metadata(self,layer):
+    def status_metadata(self, layer):
         uri = layer.dataProvider().uri()
         table = uri.table()
         schema = uri.schema()
 
-        cur=login_base()
-        count_sql = """ SELECT count(uid) FROM metadata.dataset WHERE table_name LIKE '"""+table+"""' AND schema_name LIKE '"""+schema+"""';"""
+        cur = login_base()
+        count_sql = """ SELECT count(uid) FROM metadata.dataset WHERE table_name LIKE '""" + table + """' AND schema_name LIKE '""" + schema + """';"""
 
         cur.execute(count_sql)
         data_count = (cur.fetchall())[0][0]
@@ -276,17 +269,17 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
             return False
         cur.close()
 
-    def new_data(self,layer):
-        #print(layer.name(),'is new data')
-        reloader=False
-        self.interface_view(layer,reloader)
+    def new_data(self, layer):
+        # print(layer.name(),'is new data')
+        reloader = False
+        self.interface_view(layer, reloader)
 
-    def reload_data(self,layer):
-        #print(layer.name(),'reload data')
-        reloader=True
-        self.interface_view(layer,reloader)
+    def reload_data(self, layer):
+        # print(layer.name(),'reload data')
+        reloader = True
+        self.interface_view(layer, reloader)
 
-    def interface_view(self,layer,reloader):
+    def interface_view(self, layer, reloader):
 
         self.description_text.setText(None)
         self.mots_cles_text.setText(None)
@@ -305,27 +298,26 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         self.licence_attrib_box.clear()
         self.restriction_box.clear()
 
-        all_list=self.fletch_ref()
+        all_list = self.fletch_ref()
 
-        categories_list=all_list[0]
-        themes_list=all_list[1]
-        langue_list=all_list[2]
-        encodage_list=all_list[3]
-        frequency_list=all_list[4]
-        confidentiality_list=all_list[5]
-        license_list=all_list[6]
-        type_list=all_list[7]
-        mime_list=all_list[8]
-        format_list=all_list[9]
-        role_list=all_list[10]
-        organisation_list=all_list[11]
+        categories_list = all_list[0]
+        themes_list = all_list[1]
+        langue_list = all_list[2]
+        encodage_list = all_list[3]
+        frequency_list = all_list[4]
+        confidentiality_list = all_list[5]
+        license_list = all_list[6]
+        type_list = all_list[7]
+        mime_list = all_list[8]
+        format_list = all_list[9]
+        role_list = all_list[10]
+        organisation_list = all_list[11]
 
-
-        #langue_box
+        # langue_box
         self.langue_box.clear()
         self.langue_box.addItem('')
-        #self.langue_box.addItem('Fr')
-        #self.langue_box.addItem('En')
+        # self.langue_box.addItem('Fr')
+        # self.langue_box.addItem('En')
         for langue_list_data in langue_list:
             self.langue_box.addItem(langue_list_data[0])
 
@@ -335,46 +327,46 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         self.table_ligne.setText(layer.dataProvider().uri().table())
         self.schema_ligne.setText(layer.dataProvider().uri().schema())
 
-        #categories_select_view
+        # categories_select_view
         self.categories_select_view.setColumnCount(1)
         self.categories_select_view.setColumnWidth(0, 230)
         self.categories_select_view.setHorizontalHeaderLabels(['List des categories'])
-        #categories_view
+        # categories_view
         self.categories_view.setRowCount(0)
         self.categories_view.setColumnCount(1)
         self.categories_view.setColumnWidth(0, 230)
         self.categories_view.setHorizontalHeaderLabels(['Categories'])
 
-        #themes_select_view
+        # themes_select_view
         self.themes_select_view.setColumnCount(1)
         self.themes_select_view.setColumnWidth(0, 230)
         self.themes_select_view.setHorizontalHeaderLabels(['List des thèmes'])
-        #themes_view
+        # themes_view
         self.themes_view.setRowCount(0)
         self.themes_view.setColumnCount(1)
         self.themes_view.setColumnWidth(0, 230)
         self.themes_view.setHorizontalHeaderLabels(['Thèmes'])
 
-        #lien_view
+        # lien_view
         self.table_lien.setRowCount(0)
         self.table_lien.setColumnCount(6)
         self.table_lien.setColumnWidth(0, 0)
-        self.table_lien.setHorizontalHeaderLabels(['','Type','URL','MIME','Format','Taille'])
+        self.table_lien.setHorizontalHeaderLabels(['', 'Type', 'URL', 'MIME', 'Format', 'Taille'])
 
-        #contact_view
+        # contact_view
         self.table_contact.setRowCount(0)
         self.table_contact.setColumnCount(6)
         self.table_contact.setColumnWidth(0, 0)
-        self.table_contact.setHorizontalHeaderLabels(['','Rôle','Nom','Organisation','Email','Telephone'])
+        self.table_contact.setHorizontalHeaderLabels(['', 'Rôle', 'Nom', 'Organisation', 'Email', 'Telephone'])
 
-        #print(self.date_maj_date.date().toPyDate())
+        # print(self.date_maj_date.date().toPyDate())
         vector_extend = layer.extent()
         polygone_extend = QgsGeometry.fromRect(vector_extend).asWkt()
         self.extend_plaintext.setPlainText(str(polygone_extend))
 
         qgstype = str(layer.type())[10:]
 
-        if qgstype != 'Raster' :
+        if qgstype != 'Raster':
             count_layers = str(layer.featureCount())
             geomtype = QgsWkbTypes.displayString(layer.wkbType())
         elif qgstype == 'Raster':
@@ -388,7 +380,6 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         crs_code = str(layer.crs().authid())
         self.crscode_plaintext.setPlainText(crs_code)
 
-
         self.frequence_box.addItem('')
         self.restriction_box.addItem('')
         self.licence_box.addItem('')
@@ -424,12 +415,12 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
             self.organisation_box.addItem(organisation_list_data[0])
 
         if reloader:
-            sql_dataload=self.sql_info(layer.dataProvider().uri())
-            sql_contactlink=self.sql_infoother(layer.dataProvider().uri())
-            sql_datalink=sql_contactlink[0]
-            sql_datacontact=sql_contactlink[1]
+            sql_dataload = self.sql_info(layer.dataProvider().uri())
+            sql_contactlink = self.sql_infoother(layer.dataProvider().uri())
+            sql_datalink = sql_contactlink[0]
+            sql_datacontact = sql_contactlink[1]
 
-            #print(sql_dataload)
+            # print(sql_dataload)
             self.titre_line.setText(sql_dataload[4])
             self.date_maj_date.setDateTime(sql_dataload[23])
             self.date_publication_date.setDateTime(sql_dataload[11])
@@ -440,38 +431,38 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
             self.uuid_ligne.setText(sql_dataload[1])
 
             self.categories_view.setRowCount(len(sql_dataload[6]))
-            i=0
+            i = 0
             for categorie_data in sql_dataload[6]:
-                self.categories_view.setItem(i,0,QTableWidgetItem(categorie_data))
-                i=i+1
+                self.categories_view.setItem(i, 0, QTableWidgetItem(categorie_data))
+                i = i + 1
             self.themes_view.setRowCount(len(sql_dataload[24]))
-            i=0
+            i = 0
             for themes_data in sql_dataload[24]:
-                self.themes_view.setItem(i,0,QTableWidgetItem(themes_data))
-                i=i+1
+                self.themes_view.setItem(i, 0, QTableWidgetItem(themes_data))
+                i = i + 1
 
-            self.categories_select_view.setRowCount(len(categories_list)-len(sql_dataload[6]))
-            self.themes_select_view.setRowCount(len(themes_list)-len(sql_dataload[24]))
-            i=0
+            self.categories_select_view.setRowCount(len(categories_list) - len(sql_dataload[6]))
+            self.themes_select_view.setRowCount(len(themes_list) - len(sql_dataload[24]))
+            i = 0
             for categorie_select_data in categories_list:
                 try:
                     in_index = sql_dataload[6].index(categorie_select_data[0])
-                    in_index=False
-                except:
-                    in_index=True
+                    in_index = False
+                except ValueError:
+                    in_index = True
                 if in_index:
-                    self.categories_select_view.setItem(i,0,QTableWidgetItem(categorie_select_data[0]))
-                    i=i+1
-            i=0
+                    self.categories_select_view.setItem(i, 0, QTableWidgetItem(categorie_select_data[0]))
+                    i = i + 1
+            i = 0
             for themes_select_data in themes_list:
                 try:
                     in_index = sql_dataload[24].index(themes_select_data[0])
-                    in_index=False
-                except:
-                    in_index=True
+                    in_index = False
+                except ValueError:
+                    in_index = True
                 if in_index:
-                    self.themes_select_view.setItem(i,0,QTableWidgetItem(themes_select_data[0]))
-                    i=i+1
+                    self.themes_select_view.setItem(i, 0, QTableWidgetItem(themes_select_data[0]))
+                    i = i + 1
 
             array_encodage_box = [self.encodage_box.itemText(i) for i in range(self.encodage_box.count())]
             self.encodage_box.setCurrentIndex(array_encodage_box.index(sql_dataload[27]))
@@ -500,35 +491,35 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
             array_licence_attrib_box = [self.licence_attrib_box.itemText(i) for i in range(self.licence_attrib_box.count())]
             self.licence_attrib_box.setCurrentIndex(array_licence_attrib_box.index(sql_dataload[25]))
 
-            c=0
-            #self.table_lien.setRowCount(len(sql_datalink))
+            c = 0
+            # self.table_lien.setRowCount(len(sql_datalink))
             for lien_data in sql_datalink:
                 self.table_lien.insertRow(c)
-                self.table_lien.setItem(c,0,QTableWidgetItem(lien_data[1]))
-                self.table_lien.setItem(c,1,QTableWidgetItem(lien_data[4]))
-                self.table_lien.setItem(c,2,QTableWidgetItem(lien_data[5]))
-                self.table_lien.setItem(c,3,QTableWidgetItem(lien_data[6]))
-                self.table_lien.setItem(c,4,QTableWidgetItem(lien_data[7]))
-                self.table_lien.setItem(c,5,QTableWidgetItem(lien_data[8]))
-                c=c+1
-            c=0
-            #self.table_contact.setRowCount(len(sql_datacontact))
+                self.table_lien.setItem(c, 0, QTableWidgetItem(lien_data[1]))
+                self.table_lien.setItem(c, 1, QTableWidgetItem(lien_data[4]))
+                self.table_lien.setItem(c, 2, QTableWidgetItem(lien_data[5]))
+                self.table_lien.setItem(c, 3, QTableWidgetItem(lien_data[6]))
+                self.table_lien.setItem(c, 4, QTableWidgetItem(lien_data[7]))
+                self.table_lien.setItem(c, 5, QTableWidgetItem(lien_data[8]))
+                c = c + 1
+            c = 0
+            # self.table_contact.setRowCount(len(sql_datacontact))
             for contact_data in sql_datacontact:
                 self.table_contact.insertRow(c)
-                self.table_contact.setItem(c,0,QTableWidgetItem(contact_data[1]))
-                self.table_contact.setItem(c,1,QTableWidgetItem(contact_data[4]))
-                self.table_contact.setItem(c,2,QTableWidgetItem(contact_data[5]))
-                self.table_contact.setItem(c,3,QTableWidgetItem(contact_data[6]))
-                self.table_contact.setItem(c,4,QTableWidgetItem(contact_data[7]))
-                self.table_contact.setItem(c,5,QTableWidgetItem(contact_data[8]))
-                c=c+1
+                self.table_contact.setItem(c, 0, QTableWidgetItem(contact_data[1]))
+                self.table_contact.setItem(c, 1, QTableWidgetItem(contact_data[4]))
+                self.table_contact.setItem(c, 2, QTableWidgetItem(contact_data[5]))
+                self.table_contact.setItem(c, 3, QTableWidgetItem(contact_data[6]))
+                self.table_contact.setItem(c, 4, QTableWidgetItem(contact_data[7]))
+                self.table_contact.setItem(c, 5, QTableWidgetItem(contact_data[8]))
+                c = c + 1
 
         else:
 
-            #titre_line
+            # titre_line
             self.titre_line.setText(layer.name())
             self.langue_box.setCurrentIndex(1)
-            #date_maj_date
+            # date_maj_date
             now = QtCore.QDateTime.currentDateTime()
             self.date_maj_date.setDateTime(now)
             self.date_creation_date.setDateTime(now)
@@ -536,87 +527,89 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
             self.date_publication_date.setDateTime(now)
             self.categories_select_view.setRowCount(len(categories_list))
             self.themes_select_view.setRowCount(len(themes_list))
-            i=0
+            i = 0
             for categorie_select_data in categories_list:
-                self.categories_select_view.setItem(i,0,QTableWidgetItem(categorie_select_data[0]))
-                i=i+1
-            i=0
+                self.categories_select_view.setItem(i, 0, QTableWidgetItem(categorie_select_data[0]))
+                i = i + 1
+            i = 0
             for themes_select_data in themes_list:
-                self.themes_select_view.setItem(i,0,QTableWidgetItem(themes_select_data[0]))
-                i=i+1
+                self.themes_select_view.setItem(i, 0, QTableWidgetItem(themes_select_data[0]))
+                i = i + 1
 
-        #print(self.langue_box.currentText())
+        # print(self.langue_box.currentText())
 
-    def sql_info(self,uri):
-        cur=login_base()
+    def sql_info(self, uri):
+        cur = login_base()
         table = uri.table()
         schema = uri.schema()
-        #[s for s in iface.activeLayer().source().split(" ") if "dbname" in s][0].split("'")[1]
-        sql_find = """SELECT *,right(left(st_astext(geom,2),-2),-9) FROM metadata.dataset
-            WHERE schema_name LIKE '"""+schema+"""' AND table_name LIKE '"""+table+"""';"""
+        # [s for s in iface.activeLayer().source().split(" ") if "dbname" in s][0].split("'")[1]
+        sql_find = """SELECT *, right(left(st_astext(geom,2),-2),-9) FROM metadata.dataset
+            WHERE schema_name LIKE '""" + schema + """' AND table_name LIKE '""" + table + """';"""
         cur.execute(sql_find)
         data_general = cur.fetchall()
         cur.close()
         return data_general[0]
 
-    def sql_infoother(self,uri):
-        cur=login_base()
+    def sql_infoother(self, uri):
+        cur = login_base()
         table = uri.table()
         schema = uri.schema()
 
         sql_findlink = """SELECT * FROM metadata.dataurl
-            WHERE schema_name LIKE '"""+schema+"""' AND table_name LIKE '"""+table+"""';"""
+            WHERE schema_name LIKE '""" + schema + """' AND table_name LIKE '""" + table + """';"""
         cur.execute(sql_findlink)
         data_link = cur.fetchall()
 
         sql_findcontact = """SELECT * FROM metadata.datacontact
-            WHERE schema_name LIKE '"""+schema+"""' AND table_name LIKE '"""+table+"""';"""
+            WHERE schema_name LIKE '""" + schema + """' AND table_name LIKE '""" + table + """';"""
         cur.execute(sql_findcontact)
         data_contact = cur.fetchall()
 
         cur.close()
-        return data_link,data_contact
+        return data_link, data_contact
 
     def add_categories_view(self):
         values_add_categories = self.categories_select_view.selectedItems()[0].text()
         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))
+        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())
         self.categories_select_view.insertRow(0)
-        self.categories_select_view.setItem(0,0,QTableWidgetItem(values_deleter_categories))
+        self.categories_select_view.setItem(0, 0, QTableWidgetItem(values_deleter_categories))
 
     def add_themes_view(self):
         values_add_themes = self.themes_select_view.selectedItems()[0].text()
         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))
+        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())
         self.themes_select_view.insertRow(0)
-        self.themes_select_view.setItem(0,0,QTableWidgetItem(values_deleter_themes))
+        self.themes_select_view.setItem(0, 0, QTableWidgetItem(values_deleter_themes))
 
     def add_lien(self):
-        cur=login_base()
-        maxrow=self.table_lien.rowCount()
+        cur = login_base()
+        maxrow = self.table_lien.rowCount()
         self.table_lien.insertRow(maxrow)
 
         table = layer.dataProvider().uri().table()
         schema = layer.dataProvider().uri().schema()
 
         if self.taille_line.text() == '':
-            sql_sizefile = """SELECT pg_size_pretty(pg_total_relation_size('"""+schema+'.'+table+"""'));"""
+            sql_sizefile = """SELECT pg_size_pretty(pg_total_relation_size('""" + schema + '.' + table + """'));"""
             try:
                 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 = ''
@@ -624,148 +617,159 @@ class Metabase_Editor(QDialog, EDITOR_CLASS):
         else:
             size_file = self.taille_line.text()
 
-        self.table_lien.setItem(maxrow,0,QTableWidgetItem('new_value'))
-        self.table_lien.setItem(maxrow,1,QTableWidgetItem(self.type_box.currentText()))
-        self.table_lien.setItem(maxrow,2,QTableWidgetItem(self.url_line.text()))
-        self.table_lien.setItem(maxrow,3,QTableWidgetItem(self.mime_box.currentText()))
-        self.table_lien.setItem(maxrow,4,QTableWidgetItem(self.format_box.currentText()))
-        self.table_lien.setItem(maxrow,5,QTableWidgetItem(str(size_file)))
+        self.table_lien.setItem(maxrow, 0, QTableWidgetItem('new_value'))
+        self.table_lien.setItem(maxrow, 1, QTableWidgetItem(self.type_box.currentText()))
+        self.table_lien.setItem(maxrow, 2, QTableWidgetItem(self.url_line.text()))
+        self.table_lien.setItem(maxrow, 3, QTableWidgetItem(self.mime_box.currentText()))
+        self.table_lien.setItem(maxrow, 4, QTableWidgetItem(self.format_box.currentText()))
+        self.table_lien.setItem(maxrow, 5, QTableWidgetItem(str(size_file)))
 
         global array_link
-        array_link += "('"+ table +"','"+ schema +"','"+ self.type_box.currentText() +"','"+ self.url_line.text() +"','"+ self.mime_box.currentText() +"','"+ self.format_box.currentText() +"','"+ size_file +"'),"
+        array_link += "('" + table + "', '" + schema + "', '" + self.type_box.currentText() + "', '" + self.url_line.text() + "', '" + self.mime_box.currentText() + "', '" + self.format_box.currentText() + "', '" + size_file + "'),"
 
         cur.close()
 
     def add_contact(self):
-        maxrow=self.table_contact.rowCount()
+        maxrow = self.table_contact.rowCount()
         self.table_contact.insertRow(maxrow)
 
-        self.table_contact.setItem(maxrow,0,QTableWidgetItem('new_value'))
-        self.table_contact.setItem(maxrow,1,QTableWidgetItem(self.role_box.currentText()))
-        self.table_contact.setItem(maxrow,2,QTableWidgetItem(self.nom_line.text()))
-        self.table_contact.setItem(maxrow,3,QTableWidgetItem(self.organisation_box.currentText()))
-        self.table_contact.setItem(maxrow,4,QTableWidgetItem(self.email_line.text()))
-        self.table_contact.setItem(maxrow,5,QTableWidgetItem(self.telephone_line.text()))
+        self.table_contact.setItem(maxrow, 0, QTableWidgetItem('new_value'))
+        self.table_contact.setItem(maxrow, 1, QTableWidgetItem(self.role_box.currentText()))
+        self.table_contact.setItem(maxrow, 2, QTableWidgetItem(self.nom_line.text()))
+        self.table_contact.setItem(maxrow, 3, QTableWidgetItem(self.organisation_box.currentText()))
+        self.table_contact.setItem(maxrow, 4, QTableWidgetItem(self.email_line.text()))
+        self.table_contact.setItem(maxrow, 5, QTableWidgetItem(self.telephone_line.text()))
 
         table = layer.dataProvider().uri().table()
         schema = layer.dataProvider().uri().schema()
 
         global array_contact
-        array_contact += "('"+ table +"','"+ schema +"','"+ self.role_box.currentText() +"','"+ self.nom_line.text() +"','"+ self.organisation_box.currentText() +"','"+ self.email_line.text() +"','"+ self.telephone_line.text() +"'),"
+        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):
-
-        global uid_delete_list_link,array_link
-        lien_uid = self.table_lien.item(self.table_lien.currentRow(),0).text()
+        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()
             if position < 0:
-                position=position+1
+                position = position + 1
             run_x = 0
             while position >= run_x:
-                #print(position,run_x)
+                # print(position, run_x)
                 if run_x == 0:
                     debut = array_link.find("(")
                 else:
-                    debut = array_link.find("(",fin+1)
-                fin = array_link.find(")",debut)
-                #print(debut,fin)
+                    debut = array_link.find("(", fin + 1)
+                fin = array_link.find(")", debut)
+                # print(debut, fin)
                 if run_x == 50:
                     break
-                run_x+=1
-            #print(array_link[fin+1:])
+                run_x += 1
+            # print(array_link[fin + 1:])
             if debut <= 0:
                 debut = 1
-                fin+= 1
-            array_link = array_link[:debut-1]+array_link[fin+1:]
-            #print('a:',array_link)
+                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+"',"
+            uid_delete_list_link += "'" + lien_uid + "',"
 
     def delete_contact(self):
-        global uid_delete_list_contact,array_contact
-        contact_uid = self.table_contact.item(self.table_contact.currentRow(),0).text()
+        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()
             if position < 0:
-                position=position+1
-            #print('p:',position)
+                position = position + 1
+            # print('p:', position)
             run_x = 0
             while position >= run_x:
                 if run_x == 0:
                     debut = array_contact.find("(")
                 else:
-                    debut = array_contact.find("(",fin+1)
-                fin = array_contact.find(")",debut)
-                #print(debut,fin)
+                    debut = array_contact.find("(", fin + 1)
+                fin = array_contact.find(")", debut)
+                # print(debut, fin)
                 if run_x == 50:
                     break
-                run_x+=1
-            #print(array_contact[fin+1:])
+                run_x += 1
+            # print(array_contact[fin + 1:])
             if debut <= 0:
                 debut = 1
-                fin+= 1
-            array_contact = array_contact[:debut-1]+array_contact[fin+1:]
-            #print('a:',array_contact)
+                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+"',"
-
+            uid_delete_list_contact += "'" + contact_uid + "',"
 
     def fletch_ref(self):
-        cur=login_base()
+        cur = login_base()
 
-        SQL_categories="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.categories' ORDER BY code,item_order;"""
-        SQL_themes="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.themes' ORDER BY label_fr;"""
-        SQL_langue="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.langue';"""
-        SQL_encodage="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.encodage';"""
-        SQL_frequency="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.publication_frequency' ORDER BY label_fr;"""
-        SQL_confidentiality="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.confidentiality' ORDER BY label_fr;"""
-        SQL_license="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.license' ORDER BY label_fr;"""
-        SQL_type="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'link.type' ORDER BY label_fr;"""
-        SQL_mime="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'link.mime' ORDER BY label_fr;"""
-        SQL_format="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'link.format' ORDER BY label_fr;"""
-        SQL_role="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'contact.contact_role' ORDER BY label_fr;"""
-        SQL_organisation="""SELECT label_fr FROM metadata.glossary WHERE field LIKE 'contact.organisation' ORDER BY label_fr;"""
+        SQL_categories = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.categories' ORDER BY code, item_order;"""
+        SQL_themes = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.themes' ORDER BY label_fr;"""
+        SQL_langue = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.langue';"""
+        SQL_encodage = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.encodage';"""
+        SQL_frequency = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.publication_frequency' ORDER BY label_fr;"""
+        SQL_confidentiality = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.confidentiality' ORDER BY label_fr;"""
+        SQL_license = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'dataset.license' ORDER BY label_fr;"""
+        SQL_type = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'link.type' ORDER BY label_fr;"""
+        SQL_mime = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'link.mime' ORDER BY label_fr;"""
+        SQL_format = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'link.format' ORDER BY label_fr;"""
+        SQL_role = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'contact.contact_role' ORDER BY label_fr;"""
+        SQL_organisation = """SELECT label_fr FROM metadata.glossary WHERE field LIKE 'contact.organisation' ORDER BY label_fr;"""
 
         cur.execute(SQL_categories)
-        categories_list=cur.fetchall()
+        categories_list = cur.fetchall()
         cur.execute(SQL_themes)
-        themes_list=cur.fetchall()
+        themes_list = cur.fetchall()
         cur.execute(SQL_langue)
-        langue_list=cur.fetchall()
+        langue_list = cur.fetchall()
         cur.execute(SQL_encodage)
-        encodage_list=cur.fetchall()
+        encodage_list = cur.fetchall()
 
         cur.execute(SQL_frequency)
-        frequency_list=cur.fetchall()
+        frequency_list = cur.fetchall()
         cur.execute(SQL_confidentiality)
-        confidentiality_list=cur.fetchall()
+        confidentiality_list = cur.fetchall()
         cur.execute(SQL_license)
-        license_list=cur.fetchall()
+        license_list = cur.fetchall()
 
         cur.execute(SQL_type)
-        type_list=cur.fetchall()
+        type_list = cur.fetchall()
         cur.execute(SQL_mime)
-        mime_list=cur.fetchall()
+        mime_list = cur.fetchall()
         cur.execute(SQL_format)
-        format_list=cur.fetchall()
+        format_list = cur.fetchall()
         cur.execute(SQL_role)
-        role_list=cur.fetchall()
+        role_list = cur.fetchall()
         cur.execute(SQL_organisation)
-        organisation_list=cur.fetchall()
+        organisation_list = cur.fetchall()
 
-        return categories_list,themes_list,langue_list,encodage_list,frequency_list,confidentiality_list,license_list,type_list,mime_list,format_list,role_list,organisation_list
+        return categories_list, themes_list, langue_list, encodage_list, frequency_list, confidentiality_list, license_list, type_list, mime_list, format_list, role_list, organisation_list
 
         cur.close()
 
     def py_import_xml(self):
         folder = QFileDialog.getOpenFileName()
         if folder:
-            folder=folder[0]
-            if folder[len(folder)-4:] == '.xml' :
+            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()

CenRa_METABASE/metadata.txt

@@ -5,8 +5,9 @@
 [general]
 name=CenRa_Metabase
 qgisMinimumVersion=3.0
+supportsQt6=True
 description=CenRa_METABASE
-version=0.2.1
+version=0.3.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,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>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

CenRa_METABASE/tools/resources.py

@@ -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,65 +108,77 @@ def load_ui(*args):
 
     return ui_class
 
-def send_issues(url,titre,body,labels):
+
+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'}
+    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 = url+'/raw/branch/main/plugins.xml'
+    # 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)
-    version = qgis.utils.pluginMetadata(NAME,'version')
+    # print(URL)
+    version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
             version_web = str(urllib.request.urlopen(URL).read())
             plugin_num = version_web.find(NAME)
-            valeur_version_web = version_web.find('<version>',plugin_num)+9
-            version_plugin = version_web[valeur_version_web:valeur_version_web+len_version]
+            valeur_version_web = version_web.find('<version>', plugin_num) + 9
+            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
     devmaj = '<head><style>* {margin:0; padding:0; }</style></head>'
-    devmaj = devmaj+qgis.utils.pluginMetadata(NAME,'changelog')
-    return devmaj
+    devmaj = devmaj + qgis.utils.pluginMetadata(NAME, 'changelog')
+    return devmaj

CenRa_METABASE/tools/ui/CenRa_Metabase_dockwidget_base.ui

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

CenRa_METABASE/tools/ui/CenRa_about_form.ui

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

CenRa_PAGERENDER/CenRa_PageRender.py

@@ -4,14 +4,14 @@ __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>
+# include <QSettings>
 '''
 from pg_metadata.connection_manager import (
     store_connections,
@@ -25,14 +25,13 @@ from pg_metadata.qgis_plugin_tools.tools.custom_logging import setup_logger
 '''
 import os
 from .tools.resources import (
-    plugin_path,
+    # plugin_path,
     resources_path,
     maj_verif,
 )
 from .canvas_editor import PageRender_Editor
 from .about_form import AboutDialog
 
-from PyQt5.QtCore import *
 
 class PgPageRender:
     def __init__(self):
@@ -44,18 +43,18 @@ class PgPageRender:
         self.dock_action = None
         self.help_action = None
         plugin_dir = os.path.dirname(__file__)
-        end_find = plugin_dir.rfind('\\')+1
+        end_find = plugin_dir.rfind('\\') + 1
         global NAME
         NAME = plugin_dir[end_find:]
         maj_verif(NAME)
 
         # Display About window on first use
-        version = qgis.utils.pluginMetadata('CenRa_PAGERENDER','version')
+        version = qgis.utils.pluginMetadata('CenRa_PAGERENDER', 'version')
         s = QSettings()
         versionUse = s.value("pagerender/version", 1, type=str)
-        if str(versionUse) != str(version) :
+        if str(versionUse) != str(version):
             s.setValue("pagerender/version", str(version))
-            print(versionUse,version)
+            print(versionUse, version)
             self.open_about_dialog()
 
     def initGui(self):
@@ -73,8 +72,7 @@ class PgPageRender:
         if not self.canvas_editor:
             self.canvas_editor = PageRender_Editor()
 
-
-            self.pagerender_action = QAction(icon, 'CenRa_PAGERENDER',None)
+            self.pagerender_action = QAction(icon, 'CenRa_PAGERENDER', None)
             self.toolBar.addAction(self.pagerender_action)
             self.pagerender_action.triggered.connect(self.open_editor)
     '''
@@ -115,7 +113,8 @@ class PgPageRender:
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -127,7 +126,7 @@ class PgPageRender:
     def unload(self):
         """ Unload the plugin. """
         if self.canvas_editor:
-            iface.removePluginMenu('CenRa_PAGERENDER',self.pagerender_action)
+            iface.removePluginMenu('CenRa_PAGERENDER', self.pagerender_action)
 
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)

CenRa_PAGERENDER/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog
@@ -43,4 +43,4 @@ class AboutDialog(QDialog, ABOUT_FORM_CLASS):
         Run some actions when
         the user closes the dialog
         """
-        self.close()
+        self.close()

CenRa_PAGERENDER/canvas_editor.py

@@ -1,142 +1,84 @@
 import logging
 import os
-from PyQt5.QtCore import QSettings,QPointF
-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 qgis.PyQt.QtWebKitWidgets import QWebPage
+# 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,
 )
-from PyQt5 import QtGui
-from PyQt5.QtWidgets import QApplication
-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
+maxV = 210
+maxH = 296
 EDITOR_CLASS = load_ui('CenRa_PageRender_base.ui')
 LOGGER = logging.getLogger('CenRa_PageRender')
 url_osm = 'https://osm.datagrandest.fr/mapcache/?crs=EPSG:2154&featureCount=10&format=image/png&layers=pure&maxHeight=256&maxWidth=256&styles=&url=https://osm.datagrandest.fr/mapcache'
 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__()
         self.setupUi(self)
         self.settings = QgsSettings()
         self.s = QSettings()
-        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
 
         self.varLandscape = {}
         self.varPortrait = {}
         self.rotate_object = {
-        'Titre':0,
-        'Sous_titre':0,
-        'Carte':0,
-        'Carte_2':0,
-        'Legande':0,
-        'Arrow':0,
-        'Echelle':0,
-        'Logo':0,
-        'Credit':0,
-        'Source':0,
-        'Echelle_2':0,
-        'Logo_2':0,}
+            'Titre': 0,
+            'Sous_titre': 0,
+            'Carte': 0,
+            'Carte_2': 0,
+            'Legande': 0,
+            'Arrow': 0,
+            'Echelle': 0,
+            'Logo': 0,
+            'Credit': 0,
+            'Source': 0,
+            'Echelle_2': 0,
+            'Logo_2': 0}
 
         path = ''
         ix = 0
         plugin_dir = str(os.path.dirname(os.path.abspath(__file__))).split(os.sep)
         for i in plugin_dir:
-            ix = ix+1
-            path = path+'\\'+i
-        self.path = path[1:]+'\\demoV2.py'
+            ix = ix + 1
+            path = path + '\\' + i
+        self.path = path[1:] + '\\demoV2.py'
 
-        #self.tabWidget.setStyleSheet('background-image: url('+path+'/tools/bg/Capture.png);')
-        self.toolButton.setIcon(QtGui.QIcon(resources_path('ui','rotate.png')))
+        # self.tabWidget.setStyleSheet('background-image: url('+path+'/tools/bg/Capture.png);')
+        self.toolButton.setIcon(QtGui.QIcon(resources_path('ui', 'rotate.png')))
 
         self.horizontalSlider.valueChanged.connect(self.horizontal)
         self.verticalSlider.valueChanged.connect(self.vertical)
@@ -149,44 +91,44 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
         self.toolButton_2.clicked.connect(self.type_page)
         self.pushButton_2.clicked.connect(self.load)
         self.verticalScrollBar.valueChanged.connect(self.moveFrame)
-        #self.setAcceptHoverEvents(True)
+        # self.setAcceptHoverEvents(True)
         self.tableWidget.setTabKeyNavigation(False)
 
     def raise_(self):
         self.activateWindow()
         self.setNavigator()
         self.verticalScrollBar.setValue(self.frame.y())
+
     def mousePressEvent(self, event):
-        if self.tableWidget.currentItem() != None:
-            QApplication.setOverrideCursor(Qt.OpenHandCursor)
+        if self.tableWidget.currentItem() is not None:
+            QApplication.setOverrideCursor(Qt.CursorShape(18))
             global lastPos
-            lastPos = {'x':event.pos().x(),'y':event.pos().y()}
+            lastPos = {'x': event.pos().x(), 'y': event.pos().y()}
 
     def moveFrame(self):
-        self.frame.move(self.frame.x(),self.verticalScrollBar.value())
+        self.frame.move(self.frame.x(), self.verticalScrollBar.value())
 
     def keyPressEvent(self, event):
-        #if event.modifiers() & Qt.ControlModifier:
-        if event.key() == Qt.Key_Up:
-            self.verticalSlider.setValue(self.spinBox_2.value()+1)
-        if event.key() == Qt.Key_Down:
-            self.verticalSlider.setValue(self.spinBox_2.value()-1)
-        if event.key() == Qt.Key_Right:
-            self.horizontalSlider.setValue(self.spinBox.value()+1)
-        if event.key() == Qt.Key_Left:
-            self.horizontalSlider.setValue(self.spinBox.value()-1)
+        # if event.modifiers() & Qt.ControlModifier:
+        if event.key() == Qt.Key(0x01000015):
+            self.verticalSlider.setValue(self.spinBox_2.value() + 1)
+        if event.key() == Qt.Key(0x01000013):
+            self.verticalSlider.setValue(self.spinBox_2.value() - 1)
+        if event.key() == Qt.Key(0x01000014):
+            self.horizontalSlider.setValue(self.spinBox.value() + 1)
+        if event.key() == Qt.Key(0x01000012):
+            self.horizontalSlider.setValue(self.spinBox.value() - 1)
 
-
-    def wheelEvent(self,event):
+    def wheelEvent(self, event):
         if (event.angleDelta().y() >= 1):
-            vsb = self.verticalScrollBar.value()+50
+            vsb = self.verticalScrollBar.value() + 50
         else:
-            vsb = self.verticalScrollBar.value()-50
+            vsb = self.verticalScrollBar.value() - 50
         self.verticalScrollBar.setValue(vsb)
 
     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
@@ -196,96 +138,97 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
 
             frame_x = self.frame.x()
             frame_y = self.frame.y()
-            frame_w = self.frame.width()+frame_x
-            frame_h = self.frame.height()+frame_y
+            frame_w = self.frame.width() + frame_x
+            frame_h = self.frame.height() + frame_y
             global lastPos
 
             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):
-                updated_cursor_position_x = orig_position_w+(round(updated_cursor_position.x()-lastPos['x']))
+            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))
+                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):
-                updated_cursor_position_y = orig_position_h+(round(updated_cursor_position.y()-lastPos['y']))
+            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)
-                self.verticalSlider.setValue(round(updated_cursor_position_y/3.5))
+                selection.resize(orig_position_w, updated_cursor_position_y)
+                self.verticalSlider.setValue(round(updated_cursor_position_y / 3.5))
 
             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):
-                updated_cursor_position_x = orig_position_x+(round(updated_cursor_position.x()-lastPos['x']))
+            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)
-                selection.move(updated_cursor_position_x,orig_position_y)
-                self.horizontalSlider.setValue(round(updated_cursor_position_x/3.5))
+                # print(updated_cursor_position_x)
+                selection.move(updated_cursor_position_x, orig_position_y)
+                self.horizontalSlider.setValue(round(updated_cursor_position_x / 3.5))
 
             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):
-                updated_cursor_position_y = orig_position_y+(round(updated_cursor_position.y()-lastPos['y']))
+            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)
-                selection.move(orig_position_x,updated_cursor_position_y)
-                self.verticalSlider.setValue(round(updated_cursor_position_y/3.5))
+                # print(updated_cursor_position_y)
+                selection.move(orig_position_x, updated_cursor_position_y)
+                self.verticalSlider.setValue(round(updated_cursor_position_y / 3.5))
 
     def mouseReleaseEvent(self, event):
-        #print('x: {0}, y: {1}'.format(event.pos().x(), event.pos().y()))
-        if self.tableWidget.currentItem() != None:
+        # print('x: {0}, y: {1}'.format(event.pos().x(), event.pos().y()))
+        if self.tableWidget.currentItem() is not None:
             QApplication.restoreOverrideCursor()
 
     def select_file(self):
         options = QFileDialog.Options()
         options |= QFileDialog.ShowDirsOnly
-        folder = QFileDialog.getOpenFileName(self, "Sélection du fichier ",'','Python(*.py)')
+        folder = QFileDialog.getOpenFileName(self, "Sélection du fichier ", '', 'Python(*.py)')
         if folder[0] != '':
             return folder[0]
         else:
             return ''
+
     def load(self):
         folder = self.select_file()
         logopath = folder
         if logopath != '':
-            #logopath = (os.path.dirname(logopath).split('/'))
+            # logopath = (os.path.dirname(logopath).split('/'))
             sourcefile = open(logopath, 'r')
             splitsource = sourcefile.read().splitlines()
             all_children = self.frame.children()
-            all_element = ['_locals','_size','_rotate']
+            all_element = ['_locals', '_size', '_rotate']
             for children in all_children:
                 flen = 0
                 for element in all_element:
                     flen = 0
-                    recherche_element = children.objectName()+element
+                    recherche_element = children.objectName() + element
                     for find_it in splitsource:
                         if find_it.find(recherche_element) != -1:
-                            flen = flen+1
+                            flen = flen + 1
                             if flen == 1:
                                 if element != '_rotate':
-                                    value_find = (find_it[find_it[:].find('(')+1:-33]).split(',')
+                                    value_find = (find_it[find_it[:].find('(') + 1:-33]).split(',')
                                     if element == '_size':
-                                        Psize_h = float(value_find[0])*3.5
-                                        Psize_w = float(value_find[1])*3.5
+                                        Psize_h = float(value_find[0]) * 3.5
+                                        Psize_w = float(value_find[1]) * 3.5
                                     if element == '_locals':
-                                        Plocals_h = float(value_find[0])*3.5
-                                        Plocals_w = float(value_find[1])*3.5
+                                        Plocals_h = float(value_find[0]) * 3.5
+                                        Plocals_w = float(value_find[1]) * 3.5
                                 else:
-                                    Protate = float((find_it[find_it[:].find('=')+2:]).split(',')[0])
+                                    Protate = float((find_it[find_it[:].find('=') + 2:]).split(',')[0])
                             if flen == 3:
                                 if element != '_rotate':
-                                    value_find = (find_it[find_it[:].find('(')+1:-33]).split(',')
+                                    value_find = (find_it[find_it[:].find('(') + 1:-33]).split(',')
                                     if element == '_size':
-                                        Lsize_h = float(value_find[0])*3.5
-                                        Lsize_w = float(value_find[1])*3.5
+                                        Lsize_h = float(value_find[0]) * 3.5
+                                        Lsize_w = float(value_find[1]) * 3.5
                                     if element == '_locals':
-                                        Llocals_h = float(value_find[0])*3.5
-                                        Llocals_w = float(value_find[1])*3.5
+                                        Llocals_h = float(value_find[0]) * 3.5
+                                        Llocals_w = float(value_find[1]) * 3.5
                                 else:
-                                    Lrotate = float((find_it[find_it[:].find('=')+2:]).split(',')[0])
-                #print('sh',Psize_h,',sw',Psize_w,',lh',Plocals_h,',lw',Plocals_w,',r',Protate)
+                                    Lrotate = float((find_it[find_it[:].find('=') + 2:]).split(',')[0])
+                # print('sh',Psize_h,',sw',Psize_w,',lh',Plocals_h,',lw',Plocals_w,',r',Protate)
                 if Lrotate == 90 or Lrotate == 270:
                     old = Lsize_w
                     Lsize_w = Lsize_h
@@ -295,12 +238,12 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
                     Psize_w = Psize_h
                     Psize_h = old
                 if self.toolButton_2.text() == 'Landscape':
-                    children.resize(round(Lsize_h),round(Lsize_w))
-                    children.move(round(Llocals_h),round(Llocals_w))
+                    children.resize(round(Lsize_h), round(Lsize_w))
+                    children.move(round(Llocals_h), round(Llocals_w))
                     self.rotate_object[children.objectName()] = Lrotate
                 if self.toolButton_2.text() == 'Portrait':
-                    children.resize(round(Psize_h),round(Psize_w))
-                    children.move(round(Plocals_h),round(Plocals_w))
+                    children.resize(round(Psize_h), round(Psize_w))
+                    children.move(round(Plocals_h), round(Plocals_w))
                     self.rotate_object[children.objectName()] = Protate
 
     def valueSlider(self):
@@ -309,52 +252,53 @@ class PageRender_Editor(QDialog, EDITOR_CLASS):
 
     def setNavigator(self):
         all_children = self.frame.children()
-        xR=0
+        xR = 0
         baseRow = self.tableWidget.rowCount()
         while baseRow >= xR:
             self.tableWidget.removeRow(0)
-            xR = xR+1
+            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())
+            self.tableWidget.setItem(position, 0, QTableWidgetItem(children.objectName()))
+            # print(children.objectName())
+
     def export(self):
         self.type_page()
         self.type_page()
         all_children = self.frame.children()
-        #selection_name = (self.tableWidget.currentItem()).text()
+        # selection_name = (self.tableWidget.currentItem()).text()
         export_str = """
 from qgis.core import (
-	QgsLayoutSize,
-	QgsUnitTypes,
-	QgsLayoutPoint,
+    QgsLayoutSize,
+    QgsUnitTypes,
+    QgsLayoutPoint,
 )
 def fletch_canvas(self):
-	if self.radioButton_6.isChecked():
-		values_page = 'A4'
-	else:
-		values_page = 'A3'
-	if self.radioButton_7.isChecked():
-		page_rotate = 'Portrait' 
-	else:
-		page_rotate = 'Landscape'
+    if self.radioButton_6.isChecked():
+        values_page = 'A4'
+    else:
+        values_page = 'A3'
+    if self.radioButton_7.isChecked():
+        page_rotate = 'Portrait'
+    else:
+        page_rotate = 'Landscape'
 """
 
-        type = ["Portrait","Landscape"]
-        page = ["A4","A3"]
+        type = ["Portrait", "Landscape"]
+        page = ["A4", "A3"]
         for page_type in type:
-            export_str = export_str+"""
-	if page_rotate == '"""+page_type+"""':"""
+            export_str = export_str + """
+    if page_rotate == '""" + page_type + """':"""
             for page_size in page:
-                export_str = export_str+"""
-		if values_page == '"""+page_size+"""':"""
+                export_str = export_str + """
+        if values_page == '""" + page_size + """':"""
                 for children in all_children:
                     selection = children
                     if page_type == 'Portrait':
-                        item_rotate_object=self.varPortrait[selection.objectName()+'_rotate'][0]
+                        item_rotate_object = self.varPortrait[selection.objectName() + '_rotate'][0]
                         if item_rotate_object == 0 or item_rotate_object == 180:
                             sw = 0
                             sh = 1
@@ -362,17 +306,17 @@ def fletch_canvas(self):
                             sw = 1
                             sh = 0
                         if page_size == 'A3':
-                            size_w = (round((self.varPortrait[selection.objectName()+'_size'][sw]/3.5)*1.41))
-                            size_h = (round((self.varPortrait[selection.objectName()+'_size'][sh]/3.5)*1.41))
-                            locals_w = (round((self.varPortrait[selection.objectName()+'_locals'][1]/3.5)*1.41))
-                            locals_h = (round((self.varPortrait[selection.objectName()+'_locals'][0]/3.5)*1.41))
+                            size_w = (round((self.varPortrait[selection.objectName() + '_size'][sw] / 3.5) * 1.41))
+                            size_h = (round((self.varPortrait[selection.objectName() + '_size'][sh] / 3.5) * 1.41))
+                            locals_w = (round((self.varPortrait[selection.objectName() + '_locals'][1] / 3.5) * 1.41))
+                            locals_h = (round((self.varPortrait[selection.objectName() + '_locals'][0] / 3.5) * 1.41))
                         else:
-                            size_w = (round(self.varPortrait[selection.objectName()+'_size'][sw])/3.5)
-                            size_h = (round(self.varPortrait[selection.objectName()+'_size'][sh]/3.5))
-                            locals_w = (round(self.varPortrait[selection.objectName()+'_locals'][1]/3.5))
-                            locals_h = (round(self.varPortrait[selection.objectName()+'_locals'][0]/3.5))
+                            size_w = (round(self.varPortrait[selection.objectName() + '_size'][sw]) / 3.5)
+                            size_h = (round(self.varPortrait[selection.objectName() + '_size'][sh] / 3.5))
+                            locals_w = (round(self.varPortrait[selection.objectName() + '_locals'][1] / 3.5))
+                            locals_h = (round(self.varPortrait[selection.objectName() + '_locals'][0] / 3.5))
                     if page_type == 'Landscape':
-                        item_rotate_object=self.varLandscape[selection.objectName()+'_rotate'][0]
+                        item_rotate_object = self.varLandscape[selection.objectName() + '_rotate'][0]
                         if item_rotate_object == 0 or item_rotate_object == 180:
                             sw = 0
                             sh = 1
@@ -380,42 +324,43 @@ def fletch_canvas(self):
                             sw = 1
                             sh = 0
                         if page_size == 'A3':
-                            size_w = (round((self.varLandscape[selection.objectName()+'_size'][sw]/3.5)*1.41))
-                            size_h = (round((self.varLandscape[selection.objectName()+'_size'][sh]/3.5)*1.41))
-                            locals_w = (round((self.varLandscape[selection.objectName()+'_locals'][1]/3.5)*1.41))
-                            locals_h = (round((self.varLandscape[selection.objectName()+'_locals'][0]/3.5)*1.41))
+                            size_w = (round((self.varLandscape[selection.objectName() + '_size'][sw] / 3.5) * 1.41))
+                            size_h = (round((self.varLandscape[selection.objectName() + '_size'][sh] / 3.5) * 1.41))
+                            locals_w = (round((self.varLandscape[selection.objectName() + '_locals'][1] / 3.5) * 1.41))
+                            locals_h = (round((self.varLandscape[selection.objectName() + '_locals'][0] / 3.5) * 1.41))
                         else:
-                            size_w = (round(self.varLandscape[selection.objectName()+'_size'][sw])/3.5)
-                            size_h = (round(self.varLandscape[selection.objectName()+'_size'][sh]/3.5))
-                            locals_w = (round(self.varLandscape[selection.objectName()+'_locals'][1]/3.5))
-                            locals_h = (round(self.varLandscape[selection.objectName()+'_locals'][0]/3.5))
+                            size_w = (round(self.varLandscape[selection.objectName() + '_size'][sw]) / 3.5)
+                            size_h = (round(self.varLandscape[selection.objectName() + '_size'][sh] / 3.5))
+                            locals_w = (round(self.varLandscape[selection.objectName() + '_locals'][1] / 3.5))
+                            locals_h = (round(self.varLandscape[selection.objectName() + '_locals'][0] / 3.5))
 
                     if item_rotate_object == 270:
-                        locals_h= locals_h + size_w
+                        locals_h = locals_h + size_w
                     if item_rotate_object == 180:
-                        locals_h= locals_h + size_h
-                        locals_w= locals_w + size_w
+                        locals_h = locals_h + size_h
+                        locals_w = locals_w + size_w
 
                     size_w = str(size_w)
                     size_h = str(size_h)
                     locals_w = str(locals_w)
                     locals_h = str(locals_h)
 
-                    export_str = export_str+"""
-			self.template_parameters['"""+selection.objectName()+"""_size'] = QgsLayoutSize("""+size_w+""","""+ size_h+""", QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['"""+selection.objectName()+"""_locals'] = QgsLayoutPoint("""+locals_w+""", """+locals_h+""", QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['"""+selection.objectName()+"""_rotate'] = """+str(item_rotate_object)
-        export_str= export_str+"""
-	return self.template_parameters"""
-        sourceFile = open(self.path,'w')
-        print(export_str, file = sourceFile)
+                    export_str = export_str + """
+            self.template_parameters['""" + selection.objectName() + """_size'] = QgsLayoutSize(""" + size_w + """,""" + size_h + """, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['""" + selection.objectName() + """_locals'] = QgsLayoutPoint(""" + locals_w + """, """ + locals_h + """, QgsUnitTypes.LayoutMillimeters)
+            self.template_parameters['""" + selection.objectName() + """_rotate'] = """ + str(item_rotate_object)
+        export_str = export_str + """
+    return self.template_parameters"""
+        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':
             self.horizontalSlider.setMaximum(maxV)
             self.verticalSlider.setMaximum(maxH)
-            last_children=0
+            last_children = 0
             for children in all_children:
                 selection = children
                 size_w = selection.size().width()
@@ -423,20 +368,20 @@ def fletch_canvas(self):
                 locals_h = selection.x()
                 locals_w = selection.y()
                 item_rotate_object = self.rotate_object[selection.objectName()]
-                self.varLandscape[selection.objectName()+'_size'] = [size_w,size_h]
-                self.varLandscape[selection.objectName()+'_locals'] = [locals_w,locals_h]
-                self.varLandscape[selection.objectName()+'_rotate'] = [item_rotate_object]
+                self.varLandscape[selection.objectName() + '_size'] = [size_w, size_h]
+                self.varLandscape[selection.objectName() + '_locals'] = [locals_w, locals_h]
+                self.varLandscape[selection.objectName() + '_rotate'] = [item_rotate_object]
                 if self.varPortrait != {}:
-                    selection.move(self.varPortrait[selection.objectName()+'_locals'][1],self.varPortrait[selection.objectName()+'_locals'][0])
-                    selection.resize(self.varPortrait[selection.objectName()+'_size'][0],self.varPortrait[selection.objectName()+'_size'][1])
-                    self.rotate_object[selection.objectName()] = self.varPortrait[selection.objectName()+'_rotate'][0]
-                    self.rotate_color(selection,last_children)
+                    selection.move(self.varPortrait[selection.objectName() + '_locals'][1], self.varPortrait[selection.objectName() + '_locals'][0])
+                    selection.resize(self.varPortrait[selection.objectName() + '_size'][0], self.varPortrait[selection.objectName() + '_size'][1])
+                    self.rotate_object[selection.objectName()] = self.varPortrait[selection.objectName() + '_rotate'][0]
+                    self.rotate_color(selection, last_children)
                 last_children = selection
             self.toolButton_2.setText('Portrait')
         elif self.toolButton_2.text() == 'Portrait':
             self.horizontalSlider.setMaximum(maxH)
             self.verticalSlider.setMaximum(maxV)
-            last_children=0
+            last_children = 0
             for children in all_children:
                 selection = children
                 size_w = selection.size().width()
@@ -444,24 +389,25 @@ def fletch_canvas(self):
                 locals_h = selection.x()
                 locals_w = selection.y()
                 item_rotate_object = self.rotate_object[selection.objectName()]
-                self.varPortrait[selection.objectName()+'_size'] = [size_w,size_h]
-                self.varPortrait[selection.objectName()+'_locals'] = [locals_w,locals_h]
-                self.varPortrait[selection.objectName()+'_rotate'] = [item_rotate_object]
+                self.varPortrait[selection.objectName() + '_size'] = [size_w, size_h]
+                self.varPortrait[selection.objectName() + '_locals'] = [locals_w, locals_h]
+                self.varPortrait[selection.objectName() + '_rotate'] = [item_rotate_object]
                 if self.varLandscape != {}:
-                    selection.move(self.varLandscape[selection.objectName()+'_locals'][1],self.varLandscape[selection.objectName()+'_locals'][0])
-                    selection.resize(self.varLandscape[selection.objectName()+'_size'][0],self.varLandscape[selection.objectName()+'_size'][1])
-                    self.rotate_object[selection.objectName()] = self.varLandscape[selection.objectName()+'_rotate'][0]
-                    self.rotate_color(selection,last_children)
+                    selection.move(self.varLandscape[selection.objectName() + '_locals'][1], self.varLandscape[selection.objectName() + '_locals'][0])
+                    selection.resize(self.varLandscape[selection.objectName() + '_size'][0], self.varLandscape[selection.objectName() + '_size'][1])
+                    self.rotate_object[selection.objectName()] = self.varLandscape[selection.objectName() + '_rotate'][0]
+                    self.rotate_color(selection, last_children)
                 last_children = selection
             self.toolButton_2.setText('Landscape')
         frame_w = self.frame.width()
         frame_h = self.frame.height()
-        self.frame.resize(frame_h,frame_w)
+        self.frame.resize(frame_h, frame_w)
         frame_x = round(frame_w / 3)
         frame_y = self.frame.y()
-        self.frame.move(frame_x,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()
@@ -473,33 +419,33 @@ def fletch_canvas(self):
                 if selection_name == children.objectName():
                     selection = children
             if selection != 0:
-                self.rotate_color(selection,last_children)
-                if self.radioButton.isChecked() == False:
-                    xx = round(selection.x()/3.5)
-                    yy = round(selection.y()/3.5)
+                self.rotate_color(selection, last_children)
+                if self.radioButton.isChecked() is False:
+                    xx = round(selection.x() / 3.5)
+                    yy = round(selection.y() / 3.5)
                 else:
-                    xx = round(selection.size().width()/3.5)
-                    yy = round(selection.size().height()/3.5)
-                #print(xx,yy)
+                    xx = round(selection.size().width() / 3.5)
+                    yy = round(selection.size().height() / 3.5)
+                # print(xx,yy)
                 self.horizontalSlider.setValue(xx)
                 self.verticalSlider.setValue(yy)
                 self.spinBox.setValue(xx)
                 self.spinBox_2.setValue(yy)
 
-    def rotate_color(self,selection,last_children):
+    def rotate_color(self, selection, last_children):
         global last_select
-        if self.radioButton.isChecked() == False:
+        if self.radioButton.isChecked() is False:
             ColorCode = "10, 10, 80, 50"
         else:
             ColorCode = "249, 238, 148, 50"
         if self.rotate_object[selection.objectName()] == 0:
-            selection.setStyleSheet("border: 2px solid;border-color:red;border-bottom-color: blue;background-color: rgb("+ColorCode+")")
+            selection.setStyleSheet("border: 2px solid;border-color:red;border-bottom-color: blue;background-color: rgb(" + ColorCode + ")")
         elif self.rotate_object[selection.objectName()] == 90:
-            selection.setStyleSheet("border: 2px solid;border-color:red;border-left-color: blue;background-color: rgb("+ColorCode+")")
+            selection.setStyleSheet("border: 2px solid;border-color:red;border-left-color: blue;background-color: rgb(" + ColorCode + ")")
         elif self.rotate_object[selection.objectName()] == 180:
-            selection.setStyleSheet("border: 2px solid;border-color:red;border-top-color: blue;background-color: rgb("+ColorCode+")")
+            selection.setStyleSheet("border: 2px solid;border-color:red;border-top-color: blue;background-color: rgb(" + ColorCode + ")")
         elif self.rotate_object[selection.objectName()] == 270:
-            selection.setStyleSheet("border: 2px solid;border-color:red;border-right-color: blue;background-color: rgb("+ColorCode+")")
+            selection.setStyleSheet("border: 2px solid;border-color:red;border-right-color: blue;background-color: rgb(" + ColorCode + ")")
         if last_children != 0:
             if last_select != selection.objectName():
                 last_children.setStyleSheet("background-color: rgb(10, 10, 10, 50)")
@@ -507,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
@@ -520,21 +466,21 @@ def fletch_canvas(self):
             if selection != 0:
                 xx = round(selection.size().width())
                 yy = round(selection.size().height())
-                selection.resize(round(yy),round(xx))
-                if self.radioButton.isChecked() == True:
+                selection.resize(round(yy), round(xx))
+                if self.radioButton.isChecked() is True:
                     self.spinBox.setValue(yy)
                     self.spinBox_2.setValue(xx)
-                    self.horizontalSlider.setValue(round(yy/3.5))
-                    self.verticalSlider.setValue(round(xx/3.5))
+                    self.horizontalSlider.setValue(round(yy / 3.5))
+                    self.verticalSlider.setValue(round(xx / 3.5))
 
                 if self.rotate_object[selection.objectName()] == 270:
                     self.rotate_object[selection.objectName()] = 0
                 else:
                     self.rotate_object[selection.objectName()] = self.rotate_object[selection.objectName()] + 90
-                self.rotate_color(selection,last_children)
+                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
@@ -542,15 +488,15 @@ def fletch_canvas(self):
                 if selection_name == children.objectName():
                     selection = children
             if selection != 0:
-                if self.radioButton.isChecked() == False:
-                    selection.move(round(self.horizontalSlider.value()*3.5),round(self.verticalSlider.value()*3.5))
+                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))
+                    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()))
 
     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
@@ -558,10 +504,9 @@ def fletch_canvas(self):
                 if selection_name == children.objectName():
                     selection = children
             if selection != 0:
-                if self.radioButton.isChecked() == False:
-                    selection.move(round(self.horizontalSlider.value()*3.5),round(self.verticalSlider.value()*3.5))
+                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))
+                    selection.resize(round(self.horizontalSlider.value() * 3.5), round(self.verticalSlider.value() * 3.5))
                 self.spinBox.setValue(round(self.horizontalSlider.value()))
                 self.spinBox_2.setValue(round(self.verticalSlider.value()))
-

CenRa_PAGERENDER/demoV2.py

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

CenRa_PAGERENDER/metadata.txt

@@ -5,8 +5,9 @@
 [general]
 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
 
@@ -21,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

CenRa_PAGERENDER/tools/resources.py

@@ -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,65 +107,68 @@ def load_ui(*args):
 
     return ui_class
 
-def send_issues(url,titre,body,labels):
+
+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'}
+    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 = url+'/raw/branch/main/plugins.xml'
+    # 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)
-    version = qgis.utils.pluginMetadata(NAME,'version')
+    version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.requests.URLError:
         binar = False
     if binar:
         try:
             version_web = str(urllib.request.urlopen(URL).read())
             plugin_num = version_web.find(NAME)
-            valeur_version_web = version_web.find('<version>',plugin_num)+9
-            version_plugin = version_web[valeur_version_web:valeur_version_web+len_version]
+            valeur_version_web = version_web.find('<version>', plugin_num) + 9
+            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>'
-    devmaj = devmaj+qgis.utils.pluginMetadata(NAME,'changelog')
-    return devmaj
+    devmaj = devmaj + qgis.utils.pluginMetadata(NAME, 'changelog')
+    return devmaj

CenRa_PAGERENDER/tools/ui/CenRa_about_form.ui

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

CenRa_POSTGIS/CenRa_Postgis.py

@@ -4,19 +4,21 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
+from qgis.PyQt.QtCore import QUrl
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction, QMessageBox
+from qgis.PyQt.QtWidgets import QAction
 from qgis.utils import iface
 import qgis
 
 
-#include <QSettings>
+# include <QSettings>
 
 import socket
 import os
+from qgis.PyQt.QtCore import QSettings
+from .about_form import AboutDialog
 from .tools.resources import (
-    plugin_path,
+    # plugin_path,
     pyperclip,
     resources_path,
     maj_verif,
@@ -26,11 +28,10 @@ pyperclip()
 from .postgis_editor import Postgis_Editor
 from .postgis_creator import Postgis_Creator
 from .postgis_rename import Postgis_Rename
-from .about_form import AboutDialog
 
-from PyQt5.QtCore import *
 
-IPAddr=socket.gethostbyname(socket.gethostname())
+IPAddr = socket.gethostbyname(socket.gethostname())
+
 
 class PgPostgis:
     def __init__(self):
@@ -44,18 +45,18 @@ class PgPostgis:
         self.dock_action = None
         self.help_action = None
         plugin_dir = os.path.dirname(__file__)
-        end_find = plugin_dir.rfind('\\')+1
+        end_find = plugin_dir.rfind('\\') + 1
         global NAME
         NAME = plugin_dir[end_find:]
         maj_verif(NAME)
 
         # Display About window on first use
-        version = qgis.utils.pluginMetadata('CenRa_POSTGIS','version')
+        version = qgis.utils.pluginMetadata('CenRa_POSTGIS', 'version')
         s = QSettings()
         versionUse = s.value("postgis/version", 1, type=str)
-        if str(versionUse) != str(version) :
+        if str(versionUse) != str(version):
             s.setValue("postgis/version", str(version))
-            print(versionUse,version)
+            print(versionUse, version)
             self.open_about_dialog()
 
     def initGui(self):
@@ -75,29 +76,29 @@ class PgPostgis:
         if not self.action_creator:
             self.action_creator = Postgis_Creator()
 
-            self.postgis_creator = QAction(icon, 'dossier_creator',None)
+            self.postgis_creator = QAction(icon, 'dossier_creator', None)
             self.toolBar.addAction(self.postgis_creator)
             self.postgis_creator.triggered.connect(self.open_creator)
 
             self.postgis_creator.setEnabled(False)
-            if os.access('N:/',os.R_OK):
+            if os.access('N:/', os.R_OK):
                 self.postgis_creator.setEnabled(True)
 
         if not self.action_editor:
             self.action_editor = Postgis_Editor()
 
-            self.postgis_editor = QAction(icon2, 'dossier_editor',None)
+            self.postgis_editor = QAction(icon2, 'dossier_editor', None)
             self.toolBar.addAction(self.postgis_editor)
             self.postgis_editor.triggered.connect(self.open_editor)
 
             self.postgis_editor.setEnabled(False)
-            if os.access('N:/',os.R_OK):
+            if os.access('N:/', os.R_OK):
                 self.postgis_editor.setEnabled(True)
 
         if not self.action_rename:
             self.action_rename = Postgis_Rename()
 
-            self.postgis_rename = QAction(icon3, 'dossier_rename',None)
+            self.postgis_rename = QAction(icon3, 'dossier_rename', None)
             self.toolBar.addAction(self.postgis_rename)
             self.postgis_rename.triggered.connect(self.open_rename)
 
@@ -111,7 +112,7 @@ class PgPostgis:
                 self.postgis_rename.setVisible(0)
 
             self.postgis_rename.setEnabled(False)
-            if os.access('N:/',os.R_OK):
+            if os.access('N:/', os.R_OK):
                 self.postgis_rename.setEnabled(True)
 
     def open_about_dialog(self):
@@ -119,7 +120,8 @@ class PgPostgis:
         About dialog
         """
         dialog = AboutDialog(iface)
-        dialog.exec_()
+        dialog.exec()
+
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -139,11 +141,11 @@ class PgPostgis:
     def unload(self):
         """ Unload the plugin. """
         if self.action_editor:
-            iface.removePluginMenu('CenRa_Postgis',self.postgis_editor)
+            iface.removePluginMenu('CenRa_Postgis', self.postgis_editor)
         if self.action_creator:
-            iface.removePluginMenu('CenRa_Postgis',self.postgis_creator)
+            iface.removePluginMenu('CenRa_Postgis', self.postgis_creator)
         if self.action_rename:
-            iface.removePluginMenu('CenRa_Postgis',self.postgis_rename)
+            iface.removePluginMenu('CenRa_Postgis', self.postgis_rename)
 
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)

CenRa_POSTGIS/about_form.py

@@ -3,7 +3,7 @@ import os.path
 from pathlib import Path
 
 from qgis.PyQt import uic
-from qgis.PyQt.QtGui import QPixmap
+# from qgis.PyQt.QtGui import QPixmap
 from qgis.PyQt.QtWidgets import QDialog
 
 from .tools.resources import devlog
@@ -43,4 +43,4 @@ class AboutDialog(QDialog, ABOUT_FORM_CLASS):
         Run some actions when
         the user closes the dialog
         """
-        self.close()
+        self.close()

CenRa_POSTGIS/metadata.txt

@@ -11,8 +11,9 @@
 [general]
 name=CenRa_POSTGIS
 qgisMinimumVersion=3.0
+supportsQt6=True
 description=Permet de crée un dossier dans la base PostGis
-version=2.7
+version=3.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,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>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

CenRa_POSTGIS/postgis_creator.py

@@ -2,51 +2,57 @@
 
 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
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
-from PyQt5 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 .tools.PythonSQL import login_base
-from .tools.SQLRequet import *
+# 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 ValueError:
+    print('Pas de fichier PythonSQL')
+
+# 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__()
         self.setupUi(self)
         self.settings = QgsSettings()
         self.s = QSettings()
-        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
         self.iface = iface
 
     # run method that performs all the real work
@@ -55,26 +61,26 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
         # show the dialog
         self.show()
         # Run the dialog event loop
-        result = self.exec_()
+        result = self.exec()
         # See if OK was pressed
         if result == 1:
-
-#**********************************Debut_script****************************************
-
-            ### Creation du schema pour le nouveau site
+            # **********************************Debut_script****************************************
+            # 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
-            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() + "_at_" + self.nom.text().lower()
+            else:
+                # 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.")
                 return
 
             ch = [u"à", u"À", u"â", u"Â", u"ä", u"Ä", u"å", u"Å", u"ç", u"Ç", u"é", u"É", u"è", u"È", u"ê", u"Ê", u"ë", u"Ë", u"î", u"Î", u"ï", u"Ï", u"ô", u"Ô", u"ö", u"Ö", u"ù", u"Ù", u"û", u"Û", u"ü", u"Ü", u"ÿ", u"Ÿ", u"'", u"-", u" "]
-            for car in ch :
-                if self.nom.text().find(car) != -1 :
-                    QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.nom.text().lower() )
+            for car in ch:
+                if self.nom.text().find(car) != - 1:
+                    QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.nom.text().lower())
                     return
             account = login_base("account")
             user = account[0]
@@ -86,7 +92,7 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
             con = account[8]
 
             SQL_schema = "CREATE SCHEMA " + schema + ";"
-            SQL_GRANT_SCHEMA="GRANT CREATE, USAGE ON SCHEMA "+schema+" TO grp_qgis; GRANT CREATE, USAGE ON SCHEMA "+schema+" TO grp_sig;"
+            SQL_GRANT_SCHEMA = "GRANT CREATE, USAGE ON SCHEMA " + schema + " TO grp_qgis; GRANT CREATE, USAGE ON SCHEMA " + schema + " TO grp_sig;"
 
             if self.couche_contour.isChecked() or self.couche_habitat.isChecked() or self.couche_travaux_prevus.isChecked() or self.couche_vierge.isChecked():
                 cur.execute(SQL_schema)
@@ -94,11 +100,10 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
             else:
                 iface.messageBar().pushMessage("POSTGRESQL :", "Pas de couche sélectionnée, création refusée.", level=Qgis.Warning, duration=30)
 
-            create_contour(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
-            create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
-            create_travaux(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
-            create_vierge(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
-
+            create_contour(self, schema, cur, con, host, port, dbname, user, mdp)
+            create_habita(self, schema, cur, con, host, port, dbname, user, mdp)
+            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
+            pass

CenRa_POSTGIS/postgis_editor.py

@@ -4,52 +4,55 @@ 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
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
-from PyQt5 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 .tools.PythonSQL import login_base
-from .tools.SQLRequet import *
+from qgis.PyQt import QtGui
+
+# from qgis.core import *
+from qgis.core import QgsSettings
+
+try:
+    from .tools.PythonSQL import login_base
+except ValueError:
+    print('Pas de fichier PythonSQL')
+# from .tools.SQLRequet import *
 
 from .tools.resources import (
     load_ui,
     resources_path,
-    send_issues,
+    # 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__()
         self.setupUi(self)
         self.settings = QgsSettings()
         self.s = QSettings()
-        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        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")
@@ -60,13 +63,12 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
         dbname = account[4]
         cur = account[7]
         con = account[8]
-                    # Creation de la liste des schemas de la base de donnees
+        # Creation de la liste des schemas de la base de donnees
         SQL = """WITH list_schema AS (
     select schemaname,'sig' as group from pg_catalog.pg_tables
     where schemaname  ~ E'^_(0|1|2|3|4|6|7|f)'
     group by schemaname
     order by schemaname)
-    
     select  string_agg(schemaname,',')
     from list_schema
     group by "group";"""
@@ -74,22 +76,23 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
         cur.execute(SQL)
 
         list_brut = str(next(cur))
-        list = list_brut [2:-2]
+        list = list_brut[2:-2]
         listItems = list.split(",")
 
         con.close()
 
         self.schema.clear()
         self.schema.addItems(listItems)
-        self.schema.setCurrentIndex(-1) # Pour ne pas commencer la liste au premier schema
+        # Pour ne pas commencer la liste au premier schema
+        self.schema.setCurrentIndex(-1)
 
         # show the dialog
         self.show()
         # Run the dialog event loop
-        result = self.exec_()
+        result = self.exec()
         # See if OK was pressed
         if result == 1:
-#******************************debut script*********************************
+            # ******************************debut script*********************************
             account = login_base("account")
             user = account[0]
             mdp = account[1]
@@ -99,16 +102,16 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
             cur = account[7]
             con = account[8]
 
-            if self.schema.currentIndex() == -1 :
+            if self.schema.currentIndex() == - 1:
                 QMessageBox.warning(None, "Oups :", "Veuillez choisir un nom de dossier.")
                 return
 
             schema = self.schema.currentText()
 
-            create_contour(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
-            create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
-            create_travaux(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
-            create_vierge(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
+            create_contour(self, schema, cur, con, host, port, dbname, user, mdp)
+            create_habita(self, schema, cur, con, host, port, dbname, user, mdp)
+            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
+            pass

CenRa_POSTGIS/postgis_rename.py

@@ -2,38 +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
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
-from PyQt5 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 .tools.PythonSQL import login_base
-from .tools.SQLRequet import *
+# 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 ValueError:
+    print('Pas de fichier PythonSQL')
+# 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')
@@ -47,26 +48,28 @@ 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__()
         self.setupUi(self)
         self.settings = QgsSettings()
         self.s = QSettings()
-        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
         self.iface = iface
 
         self.schema.currentIndexChanged.connect(self.Test)
         self.buttonBox.accepted.connect(self.msgBox)
-    ### Outil Ajout de nouvelles couche a un dossier
+    # Outil Ajout de nouvelles couche a un dossier
+
     def raise_(self):
         self.activateWindow()
         self.groupBox_3.hide()
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        self.buttonBox.button(QDialogButtonBox.StandardButton(0x00000400)).setEnabled(False)
         GET_ALL_SCHEMA = """SELECT DISTINCT table_schema FROM information_schema.tables WHERE table_schema LIKE '_form_%' OR table_schema LIKE '_01_%' OR table_schema LIKE '_07_%' OR table_schema LIKE '_26_%' OR table_schema LIKE '_42_%' OR table_schema LIKE '_69_%' ORDER BY table_schema;"""
         cur.execute(GET_ALL_SCHEMA)
         AllSchema = cur.fetchall()
@@ -77,7 +80,7 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
         self.schema.addItems([''])
         for Schema in AllSchema:
             self.schema.addItems(Schema)
-        self.departement.addItems(['','01','07','26','42','69','form'])
+        self.departement.addItems(['', '01', '07', '26', '42', '69', 'form'])
         if last_value_schema != '':
             self.schema.setCurrentIndex(self.schema.findText(last_value_schema))
         if last_value_departement != '':
@@ -87,27 +90,27 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
         oldSchema = self.schema.currentText()
         if oldSchema != '':
             allIsGood = 0
-            
-            GET_COUNT_LEFT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE left(table_name,"+str(len(oldSchema))+") AND table_schema LIKE '"+oldSchema+"';"
-            GET_COUNT_TOT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE '"+oldSchema+"';"
-            
+
+            GET_COUNT_LEFT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE left(table_name," + str(len(oldSchema)) + ") AND table_schema LIKE '" + oldSchema + "';"
+            GET_COUNT_TOT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE '" + oldSchema + "';"
+
             cur.execute(GET_COUNT_TOT)
             CountTot = cur.fetchall()[0]
             cur.execute(GET_COUNT_LEFT)
             CountLeft = cur.fetchall()[0]
 
             if CountLeft[0] == CountTot[0]:
-                allIsGood = allIsGood+1
+                allIsGood = allIsGood + 1
                 self.couche.setChecked(1)
             else:
                 self.couche.setChecked(0)
 
-            GET_GRANTEE_PRIVILEGE = "SELECT DISTINCT count(*) FROM information_schema.role_table_grants WHERE table_schema LIKE '"+oldSchema+"' AND grantee LIKE 'grp_qgis' AND privilege_type LIKE 'UPDATE';"
+            GET_GRANTEE_PRIVILEGE = "SELECT DISTINCT count(*) FROM information_schema.role_table_grants WHERE table_schema LIKE '" + oldSchema + "' AND grantee LIKE 'grp_qgis' AND privilege_type LIKE 'UPDATE';"
             cur.execute(GET_GRANTEE_PRIVILEGE)
             CountPrivilege = cur.fetchall()[0]
 
             if CountTot[0] == CountPrivilege[0]:
-                allIsGood = allIsGood+1
+                allIsGood = allIsGood + 1
                 self.compte.setChecked(1)
             else:
                 self.compte.setChecked(0)
@@ -115,10 +118,10 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
             if allIsGood == 2:
                 self.groupBox_3.show()
                 self.loadValue()
-                self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(True)
+                self.buttonBox.button(QDialogButtonBox.StandardButton(0x00000400)).setEnabled(True)
             else:
                 self.groupBox_3.hide()
-                self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+                self.buttonBox.button(QDialogButtonBox.StandardButton(0x00000400)).setEnabled(False)
         else:
             self.old_name.setText('')
             self.compte.setChecked(0)
@@ -144,52 +147,50 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
     def updateName(self):
         if self.departement.currentText() != '':
             oldTableName = self.old_name.text()
-            newTableName = ((self.new_name.text()).lower()).replace(' ','_')
-            newPrefixSchema = '_'+self.departement.currentText()+'_'
+            newTableName = ((self.new_name.text()).lower()).replace(' ', '_')
+            newPrefixSchema = '_' + self.departement.currentText() + '_'
             if self.schema.currentText()[:6] == '_form_':
                 oldPrefixSchema = self.schema.currentText()[:6]
                 if (self.schema.currentText()[6:9]) == "at_":
-                    oldPrefixSchema=oldPrefixSchema+'at_'
+                    oldPrefixSchema = oldPrefixSchema + 'at_'
             else:
                 oldPrefixSchema = self.schema.currentText()[:4]
                 if (self.schema.currentText()[4:7]) == 'at_':
-                    oldPrefixSchema=oldPrefixSchema+'at_'
+                    oldPrefixSchema = oldPrefixSchema + 'at_'
 
             if self.animation.isChecked():
-                newPrefixSchema=newPrefixSchema+'at_'
-            oldSchemaName = oldPrefixSchema+oldTableName
-            newSchemaName = newPrefixSchema+newTableName
+                newPrefixSchema = newPrefixSchema + 'at_'
+            oldSchemaName = oldPrefixSchema + oldTableName
+            newSchemaName = newPrefixSchema + newTableName
 
             if oldSchemaName != newSchemaName:
                 global AllSQLrun
-                allSQLrun=''
+                allSQLrun = ''
 
-                SQL_UPDATE = """UPDATE public.layer_styles SET f_table_schema = '"""+newSchemaName+"""',f_table_name = replace(replace(f_table_name,'"""+oldTableName+"""','"""+newTableName+"""'),'"""+oldPrefixSchema+"""','"""+newPrefixSchema+"""') WHERE f_table_schema LIKE '"""+oldSchemaName+"""';"""
-                allSQLrun = allSQLrun+SQL_UPDATE
+                SQL_UPDATE = """UPDATE public.layer_styles SET f_table_schema = '""" + newSchemaName + """',f_table_name = replace(replace(f_table_name,'""" + oldTableName + """','""" + newTableName + """'),'""" + oldPrefixSchema + """','""" + newPrefixSchema + """') WHERE f_table_schema LIKE '""" + oldSchemaName + """';"""
+                allSQLrun = allSQLrun + SQL_UPDATE
                 cur.execute(SQL_UPDATE)
 
-                SQL_GET_TABLE_RENAME = """SELECT table_name,replace(replace(table_name,'"""+oldTableName+"""','"""+newTableName+"""'),'"""+oldPrefixSchema+"""','"""+newPrefixSchema+"""') from information_schema.tables WHERE table_schema LIKE '"""+oldSchemaName+"""';"""
+                SQL_GET_TABLE_RENAME = """SELECT table_name,replace(replace(table_name,'""" + oldTableName + """','""" + newTableName + """'),'""" + oldPrefixSchema + """','""" + newPrefixSchema + """') from information_schema.tables WHERE table_schema LIKE '""" + oldSchemaName + """';"""
                 cur.execute(SQL_GET_TABLE_RENAME)
                 allTableRename = cur.fetchall()
                 allTableList = []
                 for TableRename in allTableRename:
                     oldTable = TableRename[0]
                     newTable = TableRename[1]
-                    allTableList.append([oldTable,newSchemaName,newTable])
-                    SQL_RENAME_TABLE = """ALTER TABLE """+oldSchemaName+'.'+oldTable+""" RENAME TO """+newTable+""";"""
-                    allSQLrun = allSQLrun+SQL_RENAME_TABLE
+                    allTableList.append([oldTable, newSchemaName, newTable])
+                    SQL_RENAME_TABLE = """ALTER TABLE """ + oldSchemaName + '.' + oldTable + """ RENAME TO """ + newTable + """;"""
+                    allSQLrun = allSQLrun + SQL_RENAME_TABLE
                     cur.execute(SQL_RENAME_TABLE)
 
-                SQL_RENAME_SCHEMA = 'ALTER SCHEMA '+oldSchemaName+' RENAME TO '+newSchemaName
-                allSQLrun = allSQLrun+SQL_RENAME_SCHEMA
+                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])
+                    self.UnloadLoadLayers(LayerOpen[0], LayerOpen[1], LayerOpen[2])
 
-
-    def UnloadLoadLayers(self,OldName,NewSchema,NewTable):
+    def UnloadLoadLayers(self, OldName, NewSchema, NewTable):
         allLayers = (QgsProject.instance().mapLayers().values())
         listLayers = []
         listLayersName = []
@@ -205,10 +206,10 @@ 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)
+            uri.setConnection(host, port, dbname, user, mdp)
             # set database schema, table name, geometry column and optionaly subset (WHERE clause)
             uri.setDataSource(NewSchema, NewTable, 'geom')
             QgsProject.instance().removeMapLayer(layer.id())
@@ -217,19 +218,19 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
     def msgBox(self):
         self.QMBquestion = QMessageBox()
         self.QMBquestion.setWindowTitle(u"Attention !")
-        self.QMBquestion.setIcon(QMessageBox.Warning)
+        self.QMBquestion.setIcon(QMessageBox.Icon.Warning)
         self.QMBquestion.setText("Attention, le renommage de dossier PostGIS peut engendrer des pertes de liaisons avec des projets QGIS !")
-        self.QMBquestion.setStandardButtons(QMessageBox.Yes|QMessageBox.No)
+        self.QMBquestion.setStandardButtons(QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
         if self.new_name.text() != '':
             error_caracteres = 0
-            for caracteres in ch :
-                if self.new_name.text().find(caracteres) != -1 :
+            for caracteres in ch:
+                if self.new_name.text().find(caracteres) != - 1:
                     error_caracteres = 1
             if error_caracteres == 0:
                 self.QMBquestion = self.QMBquestion.exec()
             else:
-                QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.new_name.text().lower() )
+                QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.new_name.text().lower())
         else:
             QMessageBox.warning(None, "Oups :", "Votre projet doit avoire un nom !")
-        if self.QMBquestion == QMessageBox.Yes:
+        if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
             self.updateName()

CenRa_POSTGIS/tools/SQLRequet.py

@@ -1,7 +1,7 @@
 
 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_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))"""
@@ -10,7 +10,7 @@ champ_viergePoint = """(gid serial NOT NULL, commentaire text, x_wgs84 double pr
 
 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_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 = """(
@@ -138,4 +138,4 @@ champ_vegethab_multipolygon = """(
     class_name character varying(254) COLLATE pg_catalog."default",
     geom geometry(MultiPolygon,2154)
 )
-"""
+"""

CenRa_POSTGIS/tools/ui/CenRa_about_form.ui

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

CenRa_SICEN/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 """
 /***************************************************************************
- SICEN
-                                 A QGIS plugin
- Filtre sur données SICEN
-                             -------------------
+SICEN
+                                A QGIS plugin
+Filtre sur données SICEN
+                    -------------------
         begin                : 2014-10-17
         copyright            : (C) 2014 by Guillaume COSTES
         email                : guillaume.costes@espaces-naturels.fr
@@ -18,10 +18,11 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
- This script initializes the plugin, making it known to QGIS.
+This script initializes the plugin, making it known to QGIS.
 """
 from __future__ import absolute_import
 
+
 def classFactory(iface):
     # load SICEN class from file SICEN
     from .sicen import SICEN

CenRa_SICEN/forms/CenRa_about_form.ui

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

CenRa_SICEN/metadata.txt

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

CenRa_SICEN/resources_rc.py

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

CenRa_SICEN/sicendialog.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 """
 /***************************************************************************
- SICENDialog
-                                 A QGIS plugin
- Filtre sur données SICEN
-                             -------------------
+SICENDialog
+                                A QGIS plugin
+Filtre sur données SICEN
+                            -------------------
         begin                : 2014-10-17
         copyright            : (C) 2014 by Guillaume COSTES
         email                : guillaume.costes@espaces-naturels.fr
@@ -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
 

CenRa_SICEN/tools/resources.py

@@ -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,72 +108,77 @@ def load_ui(*args):
 
     return ui_class
 
+
 def pyperclip():
-    dst = dirname(dirname(__file__))+"\\tools\\"
-    if os.access('N:/',os.R_OK):
+    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):
+
+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'}
+    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 = url+'/raw/branch/main/plugins.xml'
+    # 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)
-    version = qgis.utils.pluginMetadata(NAME,'version')
+    # print(URL)
+    version = qgis.utils.pluginMetadata(NAME, 'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except:
+    except urllib.error.URLError:
         binar = False
     if binar:
         try:
             version_web = str(urllib.request.urlopen(URL).read())
             plugin_num = version_web.find(NAME)
-            valeur_version_web = version_web.find('<version>',plugin_num)+9
-            version_plugin = version_web[valeur_version_web:valeur_version_web+len_version]
+            valeur_version_web = version_web.find('<version>', plugin_num) + 9
+            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
     devmaj = '<head><style>* {margin:0; padding:0; }</style></head>'
-    devmaj = devmaj+qgis.utils.pluginMetadata(NAME,'changelog')
-    return devmaj
+    devmaj = devmaj + qgis.utils.pluginMetadata(NAME, 'changelog')
+    return devmaj

CenRa_SICEN/ui_sicen.py

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

plugins.xml

@@ -1,7 +1,7 @@
 <plugins>
-    <pyqgis_plugin name="CenRa_POSTGIS" version="2.7">
+    <pyqgis_plugin name="CenRa_POSTGIS" version="3.0">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.7</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-03</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.2">
+    <pyqgis_plugin name="CenRa_COPIE" version="3.0">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.2</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-03</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.9">
+    <pyqgis_plugin name="CenRa_SICEN" version="2.0">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>1.9</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-03</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.7">
+    <pyqgis_plugin name="CenRa_FLUX" version="3.5">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.7</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-07</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.1">
+    <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.1</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-03</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.4">
+    <pyqgis_plugin name="CenRa_AUTOMAP" version="2.0">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>1.4</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-03</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>