maj flux 3.20

CenRa_FLUX/flux_editor.py

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

CenRa_FLUX/metadata.txt

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

CenRa_FLUX/tools/SQLRequet.py

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

CenRa_FLUX/tools/ui/CenRa_Flux_base - Copie.ui

@@ -9,243 +9,387 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>910</width>
+    <width>890</width>
-    <height>800</height>
+    <height>810</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>910</width>
+    <width>600</width>
-    <height>800</height>
+    <height>400</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>910</width>
+    <width>890</width>
-    <height>800</height>
+    <height>810</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>SIG CEN-RA</string>
   </property>
-  <widget class="QComboBox" name="comboBox">
+  <property name="sizeGripEnabled">
-   <property name="geometry">
+   <bool>false</bool>
-    <rect>
+  </property>
-     <x>260</x>
+  <layout class="QGridLayout" name="gridLayout">
-     <y>130</y>
+   <property name="sizeConstraint">
-     <width>171</width>
+    <enum>QLayout::SetMaximumSize</enum>
-     <height>22</height>
-    </rect>
    </property>
-   <property name="editable">
+   <property name="leftMargin">
-    <bool>false</bool>
+    <number>0</number>
    </property>
-   <property name="currentText">
+   <property name="topMargin">
-    <string notr="true"/>
+    <number>0</number>
    </property>
-  </widget>
+   <property name="rightMargin">
-  <widget class="QComboBox" name="comboBox_2">
+    <number>0</number>
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>80</y>
-     <width>171</width>
-     <height>22</height>
-    </rect>
    </property>
-   <property name="editable">
+   <property name="bottomMargin">
-    <bool>false</bool>
+    <number>0</number>
    </property>
-   <property name="currentText">
+   <property name="spacing">
-    <string notr="true"/>
+    <number>0</number>
    </property>
-  </widget>
+   <item row="0" column="0">
-  <widget class="QLabel" name="label_3">
+    <widget class="QScrollArea" name="scrollArea">
-   <property name="geometry">
+     <property name="maximumSize">
-    <rect>
+      <size>
-     <x>345</x>
+       <width>890</width>
-     <y>10</y>
+       <height>810</height>
-     <width>221</width>
+      </size>
-     <height>71</height>
+     </property>
-    </rect>
+     <property name="inputMethodHints">
-   </property>
+      <set>Qt::ImhNoEditMenu|Qt::ImhNoTextHandles</set>
-   <property name="text">
+     </property>
-    <string/>
+     <property name="frameShape">
-   </property>
+      <enum>QFrame::NoFrame</enum>
-   <property name="pixmap">
+     </property>
-    <pixmap>:/plugins/CenRa_FLUX/logo.jpg</pixmap>
+     <property name="frameShadow">
-   </property>
+      <enum>QFrame::Sunken</enum>
-   <property name="scaledContents">
+     </property>
-    <bool>true</bool>
+     <property name="lineWidth">
-   </property>
+      <number>0</number>
-  </widget>
+     </property>
-  <widget class="QPushButton" name="pushButton_2">
+     <property name="midLineWidth">
-   <property name="geometry">
+      <number>0</number>
-    <rect>
+     </property>
-     <x>370</x>
+     <property name="verticalScrollBarPolicy">
-     <y>750</y>
+      <enum>Qt::ScrollBarAlwaysOff</enum>
-     <width>171</width>
+     </property>
-     <height>23</height>
+     <property name="horizontalScrollBarPolicy">
-    </rect>
+      <enum>Qt::ScrollBarAlwaysOff</enum>
-   </property>
+     </property>
-   <property name="text">
+     <widget class="QWidget" name="scrollAreaWidgetContents_2">
-    <string>Charger les couches</string>
+      <property name="geometry">
-   </property>
+       <rect>
-  </widget>
+        <x>0</x>
-  <widget class="QTableWidget" name="tableWidget">
+        <y>0</y>
-   <property name="enabled">
+        <width>890</width>
-    <bool>true</bool>
+        <height>810</height>
-   </property>
+       </rect>
-   <property name="geometry">
+      </property>
-    <rect>
+      <property name="maximumSize">
-     <x>30</x>
+       <size>
-     <y>170</y>
+        <width>890</width>
-     <width>850</width>
+        <height>810</height>
-     <height>281</height>
+       </size>
-    </rect>
+      </property>
-   </property>
+      <widget class="QCommandLinkButton" name="commandLinkButton_2">
-   <property name="selectionMode">
+       <property name="geometry">
-    <enum>QAbstractItemView::SingleSelection</enum>
+        <rect>
-   </property>
+         <x>450</x>
-   <property name="sortingEnabled">
+         <y>470</y>
-    <bool>true</bool>
+         <width>61</width>
-   </property>
+         <height>61</height>
-  </widget>
+        </rect>
-  <widget class="QTableWidget" name="tableWidget_2">
+       </property>
-   <property name="geometry">
+       <property name="text">
-    <rect>
+        <string/>
-     <x>30</x>
+       </property>
-     <y>550</y>
+       <property name="icon">
-     <width>850</width>
+        <iconset>
-     <height>181</height>
+         <normaloff>:/plugins/CenRa_FLUX/arrow-up.png</normaloff>:/plugins/CenRa_FLUX/arrow-up.png</iconset>
-    </rect>
+       </property>
-   </property>
+       <property name="iconSize">
-   <property name="selectionMode">
+        <size>
-    <enum>QAbstractItemView::SingleSelection</enum>
+         <width>50</width>
-   </property>
+         <height>40</height>
-  </widget>
+        </size>
-  <widget class="QCommandLinkButton" name="commandLinkButton">
+       </property>
-   <property name="geometry">
+      </widget>
-    <rect>
+      <widget class="QPushButton" name="pushButton_2">
-     <x>400</x>
+       <property name="geometry">
-     <y>470</y>
+        <rect>
-     <width>61</width>
+         <x>360</x>
-     <height>61</height>
+         <y>750</y>
-    </rect>
+         <width>171</width>
-   </property>
+         <height>23</height>
-   <property name="text">
+        </rect>
-    <string/>
+       </property>
-   </property>
+       <property name="text">
-   <property name="icon">
+        <string>Charger les couches</string>
-    <iconset>
+       </property>
-     <normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</iconset>
+      </widget>
-   </property>
+      <widget class="QLabel" name="label">
-   <property name="iconSize">
+       <property name="geometry">
-    <size>
+        <rect>
-     <width>50</width>
+         <x>30</x>
-     <height>40</height>
+         <y>150</y>
-    </size>
+         <width>161</width>
-   </property>
+         <height>16</height>
-  </widget>
+        </rect>
-  <widget class="QCommandLinkButton" name="commandLinkButton_2">
+       </property>
-   <property name="geometry">
+       <property name="font">
-    <rect>
+        <font>
-     <x>460</x>
+         <family>Calibri</family>
-     <y>470</y>
+         <pointsize>10</pointsize>
-     <width>61</width>
+         <italic>false</italic>
-     <height>61</height>
+        </font>
-    </rect>
+       </property>
-   </property>
+       <property name="text">
-   <property name="text">
+        <string>Liste des flux disponibles :</string>
-    <string/>
+       </property>
-   </property>
+      </widget>
-   <property name="icon">
+      <widget class="QTableWidget" name="tableWidget_2">
-    <iconset>
+       <property name="geometry">
-     <normaloff>:/plugins/CenRa_FLUX/arrow-up.png</normaloff>:/plugins/CenRa_FLUX/arrow-up.png</iconset>
+        <rect>
-   </property>
+         <x>20</x>
-   <property name="iconSize">
+         <y>550</y>
-    <size>
+         <width>851</width>
-     <width>50</width>
+         <height>181</height>
-     <height>40</height>
+        </rect>
-    </size>
+       </property>
-   </property>
+       <property name="inputMethodHints">
-  </widget>
+        <set>Qt::ImhNoEditMenu|Qt::ImhNoTextHandles</set>
-  <widget class="QLineEdit" name="lineEdit">
+       </property>
-   <property name="enabled">
+       <property name="selectionMode">
-    <bool>true</bool>
+        <enum>QAbstractItemView::SingleSelection</enum>
-   </property>
+       </property>
-   <property name="geometry">
+       <property name="selectionBehavior">
-    <rect>
+        <enum>QAbstractItemView::SelectRows</enum>
-     <x>480</x>
+       </property>
-     <y>130</y>
+      </widget>
-     <width>171</width>
+      <widget class="QComboBox" name="comboBox">
-     <height>21</height>
+       <property name="geometry">
-    </rect>
+        <rect>
-   </property>
+         <x>250</x>
-   <property name="text">
+         <y>130</y>
-    <string>Recherche par mots-clés</string>
+         <width>171</width>
-   </property>
+         <height>22</height>
-   <property name="alignment">
+        </rect>
-    <set>Qt::AlignCenter</set>
+       </property>
-   </property>
+       <property name="editable">
-   <property name="readOnly">
+        <bool>false</bool>
-    <bool>false</bool>
+       </property>
-   </property>
+       <property name="currentText">
-   <property name="clearButtonEnabled">
+        <string notr="true"/>
-    <bool>true</bool>
+       </property>
-   </property>
+      </widget>
-  </widget>
+      <widget class="QLineEdit" name="lineEdit">
-  <widget class="QLabel" name="label">
+       <property name="enabled">
-   <property name="geometry">
+        <bool>true</bool>
-    <rect>
+       </property>
-     <x>40</x>
+       <property name="geometry">
-     <y>150</y>
+        <rect>
-     <width>161</width>
+         <x>470</x>
-     <height>16</height>
+         <y>130</y>
-    </rect>
+         <width>171</width>
-   </property>
+         <height>21</height>
-   <property name="font">
+        </rect>
-    <font>
+       </property>
-     <family>Calibri</family>
+       <property name="text">
-     <pointsize>10</pointsize>
+        <string>Recherche par mots-clés</string>
-     <italic>false</italic>
+       </property>
-    </font>
+       <property name="alignment">
-   </property>
+        <set>Qt::AlignCenter</set>
-   <property name="text">
+       </property>
-    <string>Liste des flux disponibles :</string>
+       <property name="readOnly">
-   </property>
+        <bool>false</bool>
-  </widget>
+       </property>
-  <widget class="QLabel" name="label_2">
+       <property name="clearButtonEnabled">
-   <property name="geometry">
+        <bool>true</bool>
-    <rect>
+       </property>
-     <x>30</x>
+      </widget>
-     <y>530</y>
+      <widget class="QToolButton" name="toolButton">
-     <width>171</width>
+       <property name="geometry">
-     <height>16</height>
+        <rect>
-    </rect>
+         <x>660</x>
-   </property>
+         <y>130</y>
-   <property name="font">
+         <width>21</width>
-    <font>
+         <height>21</height>
-     <family>Calibri</family>
+        </rect>
-     <pointsize>10</pointsize>
+       </property>
-     <italic>false</italic>
+       <property name="text">
-    </font>
+        <string/>
-   </property>
+       </property>
-   <property name="text">
+      </widget>
-    <string>Flux sélectionné(s) à charger :</string>
+      <widget class="QTableWidget" name="tableWidget">
-   </property>
+       <property name="enabled">
-  </widget>
+        <bool>true</bool>
-  <zorder>label_3</zorder>
+       </property>
-  <zorder>comboBox</zorder>
+       <property name="geometry">
-  <zorder>comboBox_2</zorder>
+        <rect>
-  <zorder>pushButton_2</zorder>
+         <x>20</x>
-  <zorder>tableWidget</zorder>
+         <y>170</y>
-  <zorder>tableWidget_2</zorder>
+         <width>850</width>
-  <zorder>commandLinkButton</zorder>
+         <height>281</height>
-  <zorder>commandLinkButton_2</zorder>
+        </rect>
-  <zorder>lineEdit</zorder>
+       </property>
-  <zorder>label</zorder>
+       <property name="sizePolicy">
-  <zorder>label_2</zorder>
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editTriggers">
+        <set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::SingleSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label_2">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>530</y>
+         <width>171</width>
+         <height>16</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <family>Calibri</family>
+         <pointsize>10</pointsize>
+         <italic>false</italic>
+        </font>
+       </property>
+       <property name="text">
+        <string>Flux sélectionné(s) à charger :</string>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label_3">
+       <property name="geometry">
+        <rect>
+         <x>335</x>
+         <y>10</y>
+         <width>221</width>
+         <height>71</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap>:/plugins/CenRa_FLUX/logo.jpg</pixmap>
+       </property>
+       <property name="scaledContents">
+        <bool>true</bool>
+       </property>
+      </widget>
+      <widget class="QComboBox" name="comboBox_2">
+       <property name="geometry">
+        <rect>
+         <x>360</x>
+         <y>80</y>
+         <width>171</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="currentText">
+        <string notr="true"/>
+       </property>
+      </widget>
+      <widget class="QCommandLinkButton" name="commandLinkButton">
+       <property name="geometry">
+        <rect>
+         <x>390</x>
+         <y>470</y>
+         <width>61</width>
+         <height>61</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>50</width>
+         <height>40</height>
+        </size>
+       </property>
+      </widget>
+      <widget class="QCheckBox" name="checkBox">
+       <property name="geometry">
+        <rect>
+         <x>830</x>
+         <y>20</y>
+         <width>70</width>
+         <height>17</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <widget class="QComboBox" name="DeBUG">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>20</y>
+         <width>71</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="currentText">
+        <string notr="true"/>
+       </property>
+      </widget>
+      <widget class="QTextBrowser" name="viewer">
+       <property name="geometry">
+        <rect>
+         <x>90</x>
+         <y>10</y>
+         <width>731</width>
+         <height>731</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-color: rgba(255, 255, 255,0.50);</string>
+       </property>
+      </widget>
+     </widget>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections/>

CenRa_FLUX/tools/ui/CenRa_Flux_base.ui

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

plugins.xml

@@ -50,9 +50,9 @@
         <tags>cenra,sicen</tags>
     </pyqgis_plugin>
 
-    <pyqgis_plugin name="CenRa_FLUX" version="3.14">
+    <pyqgis_plugin name="CenRa_FLUX" version="3.20">
         <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>3.14</version>
+        <version>3.20</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_FLUX.zip</file_name>
@@ -61,7 +61,7 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_FLUX.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-02-06</create_date>
-        <update_date>2025-12-15</update_date>
+        <update_date>2026-03-05</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,flux</tags>