Custom CenIsere

.gitignore

@@ -1,21 +0,0 @@
-#Ignores gitignore
-/.gitignore
-
-#Ignores all folders
-/*
-!plugins.xml
-
-#Skip Ignores
-!CenRa_AUTOMAP/
-!CenRa_COPIE/
-!CenRa_FLUX/
-!CenRa_METABASE/
-!CenRa_POSTGIS/
-!CenRa_SICEN/
-!CenRa_PAGERENDER/
-
-#ReIgnore
-**/__pycache__
-**/test/
-PythonSQL.py
-StyleLayer.py

CenIsere_AUTOMAP/CenIsere_AutoMap.py

@@ -0,0 +1,142 @@
+__copyright__ = "Copyright 2021, 3Liz"
+__license__ = "GPL version 3"
+__email__ = "info@3liz.org"
+
+
+from qgis.core import QgsApplication
+from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
+from qgis.PyQt.QtGui import QDesktopServices, QIcon
+from qgis.PyQt.QtWidgets import QAction, QMessageBox
+from qgis.utils import iface
+import qgis
+
+
+#include <QSettings>
+'''
+from pg_metadata.connection_manager import (
+    store_connections,
+    validate_connections_names,
+)
+
+
+from pg_metadata.locator import LocatorFilter
+from pg_metadata.processing.provider import PgMetadataProvider
+from pg_metadata.qgis_plugin_tools.tools.custom_logging import setup_logger
+'''
+import os
+from .tools.resources import (
+    plugin_path,
+    resources_path,
+    maj_verif,
+)
+from .canvas_editor import AutoMap_Editor
+from .about_form import AutoMapAboutDialog
+
+from PyQt5.QtCore import *
+
+class PgAutoMap:
+    def __init__(self):
+        """ Constructor. """
+        self.canvas_editor = None
+#        self.issues = None
+        self.provider = None
+        self.locator_filter = None
+        self.dock_action = None
+        self.help_action = None
+        plugin_dir = os.path.dirname(__file__)
+        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('CenIsere_AUTOMAP','version')
+        s = QSettings()
+        versionUse = s.value("automap/version", 1, type=str)
+        if str(versionUse) != str(version) :
+            s.setValue("automap/version", str(version))
+            print(versionUse,version)
+            self.open_about_dialog()
+
+    def initGui(self):
+        """ Build the plugin GUI. """
+
+        self.toolBar = iface.addToolBar("CenIsere_AutoMap")
+        self.toolBar.setObjectName("CenIsere_AutoMap")
+
+        icon = QIcon(resources_path('icons', 'icon.png'))
+
+        # Open the online help
+        self.help_action = QAction(icon, 'CenIsere_AutoMap', iface.mainWindow())
+        iface.pluginHelpMenu().addAction(self.help_action)
+        self.help_action.triggered.connect(self.open_help)
+        if not self.canvas_editor:
+            self.canvas_editor = AutoMap_Editor()
+
+
+            self.automap_action = QAction(icon, 'CenIsere_AutoMap',None)
+            self.toolBar.addAction(self.automap_action)
+            self.automap_action.triggered.connect(self.open_editor)
+    '''
+        if not self.locator_filter:
+            self.locator_filter = LocatorFilter(iface)
+            iface.registerLocatorFilter(self.locator_filter)
+
+    @staticmethod
+    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 = AutoMapAboutDialog(iface)
+        dialog.exec_()
+    def open_help():
+        """ Open the online help. """
+        QDesktopServices.openUrl(QUrl('https://plateformesig.CenIsere-outils.org/'))
+
+    def open_editor(self):
+        self.canvas_editor.show()
+        self.canvas_editor.raise_()
+
+    def unload(self):
+        """ Unload the plugin. """
+        if self.canvas_editor:
+            iface.removePluginMenu('CenIsere_AutoMap',self.automap_action)
+
+        if self.provider:
+            QgsApplication.processingRegistry().removeProvider(self.provider)
+            del self.provider
+
+        if self.locator_filter:
+            iface.deregisterLocatorFilter(self.locator_filter)
+            del self.locator_filter
+
+        if self.help_action:
+            iface.pluginHelpMenu().removeAction(self.help_action)
+            del self.help_action

CenIsere_AUTOMAP/README.md

@@ -0,0 +1 @@
+# CenIsere_AutoMap

CenIsere_AUTOMAP/__init__.py

@@ -0,0 +1,10 @@
+__copyright__ = "Copyright 2021, 3Liz"
+__license__ = "GPL version 3"
+__email__ = "info@3liz.org"
+
+
+# noinspection PyPep8Naming
+def classFactory(iface):  # pylint: disable=invalid-name
+    _ = iface
+    from CenIsere_AUTOMAP.CenIsere_AutoMap import PgAutoMap
+    return PgAutoMap()

CenIsere_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
@@ -12,12 +12,12 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType(
     os.path.join(
         str(Path(__file__).resolve().parent),
         'tools/ui',
-        'CenRa_about_form.ui'
+        'CenIsere_AutoMap_about_form.ui'
     )
 )
 
 
-class AboutDialog(QDialog, ABOUT_FORM_CLASS):
+class AutoMapAboutDialog(QDialog, ABOUT_FORM_CLASS):
 
     """ About - Let the user display the about dialog. """
 
@@ -26,7 +26,7 @@ class AboutDialog(QDialog, ABOUT_FORM_CLASS):
         self.iface = iface
         self.setupUi(self)
 
-        self.viewer.setHtml(devlog('CenRa_AUTOMAP'))
+        self.viewer.setHtml(devlog('CenIsere_AUTOMAP'))
 
         self.rejected.connect(self.onReject)
         self.buttonBox.rejected.connect(self.onReject)

CenIsere_AUTOMAP/canvas_editor.py

@@ -1,95 +1,120 @@
 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 qgis.core import (
-    QgsScaleBarSettings,
+    NULL,
+    QgsApplication,
+    QgsScaleBarSettings,	
+    QgsDataSourceUri,
     QgsProject,
+    QgsProviderConnectionException,
+    QgsProviderRegistry,
     QgsRasterLayer,
     QgsSettings,
     QgsVectorLayer,
+    QgsGeometry,
     QgsPrintLayout,
     QgsReadWriteContext,
     QgsLayoutItemMap,
     QgsLayoutItemPage,
+    QgsLayoutSize,
     QgsUnitTypes,
+    QgsLayoutPoint,
     QgsLayoutItemLabel,
     QgsLayoutItemPicture,
     QgsLayoutItemLegend,
-    QgsLayoutItem,
     QgsLegendStyle,
     QgsLayoutItemScaleBar,
     QgsLayerTreeGroup,
+    QgsCoordinateReferenceSystem,
+    QgsCoordinateTransform,
+    QgsLayerTree,
+    QgsLayoutTableColumn,
     QgsRectangle,
+    QgsLayoutItemMapOverviewStack,
 )
-from qgis.PyQt.QtCore import Qt
-from qgis.PyQt.QtGui import QColor, QFont
+from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime, Qt
+from qgis.PyQt.QtGui import QDesktopServices, QIcon, QColor, QFont, QMovie
+from qgis.PyQt.QtPrintSupport import QPrinter
+from qgis.PyQt.QtWebKitWidgets import QWebPage
 from qgis.PyQt.QtWidgets import (
     QDialog,
-    QMessageBox,
-    QPushButton,
+    QAction,
+    QDockWidget,
     QFileDialog,
+    QInputDialog,
+    QMenu,
+    QToolButton,
+    QTableWidget, 
+    QTableWidgetItem,
+    QVBoxLayout,
 )
-from qgis.PyQt.QtCore import QSettings
-from qgis.PyQt import QtGui
 from qgis.PyQt.QtXml import QDomDocument
 from qgis.utils import iface
 import glob
 from .tools.resources import (
     load_ui,
     resources_path,
+    login_base,
+    send_issues,
 )
+from .tools.mises_en_pages.canvas import (fletch_canvas)
+from .issues import CenIsere_Issues
 from datetime import date
 
-EDITOR_CLASS = load_ui('CenRa_AutoMap_base.ui')
-LOGGER = logging.getLogger('CenRa_AutoMap')
+EDITOR_CLASS = load_ui('CenIsere_AutoMap_base.ui')
+LOGGER = logging.getLogger('CenIsere_AutoMap')
 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',
+'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}}
-
-
 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')))
 
         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)
         self.radioButton_9.clicked.connect(self.statu_atlas)
         self.radioButton_10.clicked.connect(self.statu_source)
@@ -100,62 +125,46 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.commandLinkButton_2.clicked.connect(self.load_ortho)
         self.commandLinkButton_3.clicked.connect(self.load_osm)
         self.CustomeLogo.clicked.connect(self.deflogoteck)
-        self.verticalScrollBar.valueChanged.connect(self.moveFrame)
 
-        # On ajoute le nom des templates à la liste déroulante de l'onglet "mises en page" :
+        ## On ajoute le nom des templates à la liste déroulante de l'onglet "mises en page" :
         mises_en_page = []
 
-        for filename in glob.glob(resources_path("mises_en_pages", "*.py")):
+        for filename in glob.glob(resources_path("mises_en_pages","*.qpt")):
             mises_en_page.append(filename)
 
+
         for i, filename in enumerate(mises_en_page):
             nom_fichier = os.path.basename(filename)
             self.comboBox.addItem(nom_fichier)
         self.comboBox.setCurrentIndex(1)
 
         self.template_parameters = {
-            'Carte_size': None,
-            'Carte_locals': None,
-            'Carte_rotate': None,
-            'Carte_frame': None,
-            'Carte_2_size': None,
-            'Carte_2_locals': None,
-            'Carte_2_rotate': None,
-            'Legande_size': None,
-            'Legande_locals': None,
-            'Legande_rotate': None,
-            'Legande_frame': None,
-            'Arrow_size': None,
-            'Arrow_locals': None,
-            'Arrow_rotate': None,
-            'Arrow_background': None,
-            'Arrow_path': None,
-            'Echelle_size': None,
-            'Echelle_locals': None,
-            'Echelle_rotate': None,
-            '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,
-            'Credit_size': None,
-            'Credit_locals': None,
-            'Credit_rotate': None,
-            'Credit_alignment': None,
-            'Source_size': None,
-            'Source_locals': None,
-            'Source_rotate': None,
-            'Source_alignment': None,
-            'Logo_2_size': None,
-            'Logo_2_locals': None,
-            'Logo_2_rotate': None,
-            'Echelle_2_size': None,
-            'Echelle_2_locals': None,
-            'Echelle_2_rotate': None,
+            'map_size': None,
+            'map_position' : None,
+            'position_map_size' : None,
+            'position_map_position' : None,
+            'title_position': None,
+            'title_size': None,
+            'subtitle_position': None,
+            'subtitle_size': None,
+            'logo_position': None,
+            'logo_size': None,
+            'legend_position': None,
+            'legend_size': None,
+            'scalebarnumeric_position':None,
+            'scalebarnumeric_size':None,
+            'scalebar_position': None,
+            'scalebar_size': None,
+            'north_position': None,
+            'north_size': None,
+            'credit_text_position': None,
+            'credit_text_size': None,
+            'credit_text2_position': None,
+            'credit_text2_size': None,
+            'image_size':None,
+            'image_position':None,
+            'image_size_2':None,
+            'image_position_2':None,
             # Add more variables as needed
         }
         self.update_logo_library()
@@ -165,25 +174,15 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.hide_source()
         self.hide_atlas()
 
-    def wheelEvent(self, event):
-        if (event.angleDelta().y() >= 1):
-            vsb = self.verticalScrollBar.value() + 20
-        else:
-            vsb = self.verticalScrollBar.value() - 20
-        self.verticalScrollBar.setValue(vsb)
-
-    def moveFrame(self):
-        self.frame.move(self.frame.x(), self.verticalScrollBar.value())
-
     def update_logo_library(self):
         self.mComboBox_4.clear()
         logo_library = []
-        custome_bibliotech = glob.glob(self.s.value("automap/logoteck", 1, type=str) + '*.*')
-        for number, 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 l,logo_x in enumerate(custome_bibliotech):
+            logo_library.append(' '+os.path.basename(logo_x))
 
-        bibliotech = glob.glob(resources_path("logo_library", "*.png"))
-        for number, logo_x in enumerate(bibliotech):
+        bibliotech = glob.glob(resources_path("logo_library","*.png"))
+        for l,logo_x in enumerate(bibliotech):
             logo_library.append(os.path.basename(logo_x))
         self.mComboBox_4.addItems(sorted(logo_library))
 
@@ -191,7 +190,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()
@@ -206,20 +205,16 @@ 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 NameError:
+                except:
                     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()
@@ -228,7 +223,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
@@ -238,36 +233,32 @@ 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()
@@ -276,7 +267,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
@@ -286,21 +277,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)
 
@@ -314,8 +305,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.comboBox_6.clear()
         self.comboBox_7.clear()
 
-        if (self.s.value("automap/prenom_nom", "1", type=str) != "1"):
-            self.lineEdit_5.setText(self.s.value("automap/prenom_nom", 1, type=str))
         couches = []
         couche_vecteur = ['']
         mapThemes = ['']
@@ -342,7 +331,6 @@ 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()
@@ -356,7 +344,6 @@ 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()
@@ -374,7 +361,6 @@ 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()
@@ -407,7 +393,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))
@@ -421,44 +407,25 @@ 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)
                 self.layout.loadFromTemplate(doc, QgsReadWriteContext(), True)
+                self.layout.setName(layout_name)
+                
 
-                try:
-                    cutLayout = layout_name.index("¶")
-                except ValueError:
-                    cutLayout = 0
-
-                if cutLayout >= 1:
-                    self.layout.setName(layout_name)
-                    titre_layout_name = layout_name[:cutLayout]
-                else:
-                    self.layout.setName(layout_name)
-                    titre_layout_name = layout_name
-
-                if self.radioButton_6.isChecked() and self.radioButton_7.isChecked():
-                    logo_div = A4_size['Portrait']['RIGHT']
-                if self.radioButton_6.isChecked() and self.radioButton_8.isChecked():
-                    logo_div = A4_size['Portrait']['BOTTOM']
-                if self.radioButton_5.isChecked() and self.radioButton_7.isChecked():
-                    logo_div = A3_size['Portrait']['RIGHT']
-                if self.radioButton_5.isChecked() and self.radioButton_8.isChecked():
-                    logo_div = A3_size['Portrait']['BOTTOM']
-                # os.path.basename(filename) == "1. Modèle carto standard (consolidé).qpt":
-                if True:
+                if True:#os.path.basename(filename) == "1. Modèle carto standard (consolidé).qpt":
 
                     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)
@@ -466,10 +433,10 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     self.map_modele_test.setExtent(iface.mapCanvas().extent())
                     # Position de la carte dans le composeur
 
-                    self.map_modele_test.setMapRotation(self.template_parameters['Carte_rotate'])
-                    self.map_modele_test.attemptResize(self.template_parameters['Carte_size'])
-                    self.map_modele_test.attemptMove(self.template_parameters['Carte_locals'])
+                    self.map_modele_test.attemptMove(self.template_parameters['map_position'])
+
                     # on dimensionne le rendu de la carte (pour référence la page totale est une page A4 donc 297*210)
+                    self.map_modele_test.attemptResize(self.template_parameters['map_size'])
                     self.map_modele_test.setKeepLayerSet(True)
                     self.map_modele_test.setKeepLayerStyles(True)
                     if self.radioButton_11.isChecked() == 1:
@@ -480,90 +447,101 @@ 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(618704, 6329245, 1018704, 6649245))
-                            # 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)
+                            self.position_map.attemptMove(self.template_parameters['position_map_position'])
+                            self.position_map.attemptResize(self.template_parameters['position_map_size'])
+                            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(self.template_parameters['Carte_frame'])
-                            self.position_map.setFrameEnabled(self.template_parameters['Carte_2_frame'])
+                            self.map_modele_test.setFrameEnabled(False)
                             self.layout.addLayoutItem(self.position_map)
-                            self.position_map.setId("Carte_locals")
+                            self.position_map.setId("carte_position")
                     self.map_modele_test.refresh()
 
                     self.map_modele_test.setBackgroundColor(QColor(255, 255, 255, 255))
-                    self.map_modele_test.setFrameEnabled(self.template_parameters['Carte_frame'])
+                  
+                    self.map_modele_test.setFrameEnabled(False)
+
                     if self.radioButton_9.isChecked() == 1:
                         self.map_modele_test.setAtlasDriven(True)
                     self.layout.addLayoutItem(self.map_modele_test)
                     self.map_modele_test.setId("carte_principale")
+                    
+                    if self.comboBox.currentText() == "3. Modèle carto standard Cen Isere.qpt":
+		                # Ajout de la vague haute
+                        image1 = QgsLayoutItemPicture(self.layout)
+                        image1.setPicturePath(resources_path("mises_en_pages","vague.png"))  
+                        image1.attemptMove(self.template_parameters['image_position'])
+                        image1.attemptResize(self.template_parameters['image_size'])
+                        self.layout.addLayoutItem(image1)
 
-                    # Ajout d'un titre à la mise en page
+                        # Ajout de la vague basse
+                        image2= QgsLayoutItemPicture(self.layout)
+                        image2.setPicturePath(resources_path("mises_en_pages","vague2.png"))  
+                        image2.attemptMove(self.template_parameters['image_position_2'])
+                        image2.attemptResize(self.template_parameters['image_size_2'])
+                        self.layout.addLayoutItem(image2)
+
+                        
+                    
+                    ## Ajout d'un titre à la mise en page
                     title = QgsLayoutItemLabel(self.layout)
                     self.layout.addLayoutItem(title)
-                    titre = titre_layout_name
+                    titre = layout_name
                     title.setText(titre)
-                    Font = QFont("Calibri", 15, False)
-                    Font.setBold(True)
-                    title.setFont(Font)
-                    title.setItemRotation(self.template_parameters['Titre_rotate'])
-                    title.attemptResize(self.template_parameters['Titre_size'])
-                    title.attemptMove(self.template_parameters['Titre_locals'])
-
+                    title.setFont(QFont("Calibri", 15, QFont.Bold))
+                    title.attemptMove(self.template_parameters['title_position'])
+                    title.attemptResize(self.template_parameters['title_size'])
                     title.setBackgroundEnabled(True)
                     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.AlignmentFlag(0x0004))
-                    title.setVAlign(Qt.AlignmentFlag(0x0080))
+                    title.setHAlign(Qt.AlignHCenter)
+                    title.setVAlign(Qt.AlignVCenter)
 
-                    # Ajout d'un sous titre à la mise en page
+
+                    ## Ajout d'un sous titre à la mise en page
                     subtitle = QgsLayoutItemLabel(self.layout)
                     self.layout.addLayoutItem(subtitle)
                     titre = self.lineEdit_3.text()
                     if self.radioButton_9.isChecked() == 1:
                         titre = titre + ' [%' + self.comboBox_4.currentText() + '%]'
                     subtitle.setText(titre)
-                    subtitle.setFont(QFont("Calibri", 10))
-                    subtitle.setItemRotation(self.template_parameters['Sous_titre_rotate'])
-                    subtitle.attemptResize(self.template_parameters['Sous_titre_size'])
-                    subtitle.attemptMove(self.template_parameters['Sous_titre_locals'])
+                    subtitle.setFont(QFont("MS Shell Dlg 2", 10))
+                    subtitle.attemptMove(self.template_parameters['subtitle_position'])
+                    subtitle.attemptResize(self.template_parameters['subtitle_size'])
                     subtitle.setId("SubTitle")
                     subtitle.setBackgroundEnabled(True)
                     subtitle.setBackgroundColor(QColor(255, 255, 255, 130))
                     self.layout.addItem(subtitle)
-                    subtitle.setHAlign(Qt.AlignmentFlag(0x0004))
-                    subtitle.setVAlign(Qt.AlignmentFlag(0x0080))
+                    subtitle.setHAlign(Qt.AlignHCenter)
+                    subtitle.setVAlign(Qt.AlignVCenter)
 
-                    # Ajout du logo CEN NA en haut à gauche de la page
+
+                    ## Ajout du logo CEN NA en haut à gauche de la page
                     logo = QgsLayoutItemPicture(self.layout)
                     logo.setResizeMode(QgsLayoutItemPicture.Zoom)
-                    logo.setPictureAnchor(QgsLayoutItem.ReferencePoint(4))
                     logo.setMode(QgsLayoutItemPicture.FormatRaster)
-                    logo.setItemRotation(self.template_parameters['Logo_rotate'])
-                    logo.setFixedSize(self.template_parameters['Logo_size'])
-                    logo.attemptMove(self.template_parameters['Logo_locals'])
-                    logo.setPicturePath(resources_path("icons", "CEN_RA.png"))
+                    logo.attemptMove(self.template_parameters['logo_position'])
+                    logo.setFixedSize(self.template_parameters['logo_size'])
+                    logo.setPicturePath(resources_path("icons","CEN.png"))
                     logo.setId('logo')
                     self.layout.addLayoutItem(logo)
 
-                    # Ajout de la legende :
+
+                    ## Ajout de la legende :
                     legend = QgsLayoutItemLegend(self.layout)
 
                     legend.setId('legende_model1')
                     # legend.setTitle('Legende')
                     legend.adjustBoxSize()
-                    legend.setFrameEnabled(self.template_parameters['Legande_frame'])
+                    legend.setFrameEnabled(False)
                     legend.setAutoUpdateModel(False)
 
                     legend.setLinkedMap(self.map_modele_test)
@@ -602,8 +580,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 is not None:
-                            parent = layertreelayer.parent()
+                        parent = layertreelayer.parent()
 
                         # if the parent is a group and has a name, find it and remove the layer
                         if isinstance(parent, QgsLayerTreeGroup) and parent.name():
@@ -613,6 +590,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                         else:
                             root_group.removeLayer(layer)
 
+
                 legend.setEqualColumnWidth(True)
                 legend.setSplitLayer(True)
                 legend.setColumnSpace(5)
@@ -620,7 +598,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 legend.rstyle(QgsLegendStyle.Group).setMargin(QgsLegendStyle.Top, 3)
                 legend.rstyle(QgsLegendStyle.Subgroup).setMargin(QgsLegendStyle.Top, 3)
                 legend.setColumnCount(self.spinBox.value())
-                legend.setItemRotation(self.template_parameters['Legande_rotate'])
 
                 legend.adjustBoxSize()
                 legend.setBackgroundEnabled(True)
@@ -628,9 +605,10 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.layout.refresh()
 
                 legend.updateLegend()
-                legend.attemptMove(self.template_parameters['Legande_locals'])
+                legend.attemptMove(self.template_parameters['legend_position'])
 
-                # 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)
@@ -640,31 +618,26 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebarnumeric_qpt.setNumberOfSegments(2)
                 self.scalebarnumeric_qpt.setNumberOfSegmentsLeft(0)
 
-                self.scalebarnumeric_qpt.setFont(QFont("Calibri", 12))
-                self.scalebarnumeric_qpt.setItemRotation(self.template_parameters['Echelle_rotate'])
-                self.scalebarnumeric_qpt.attemptMove(self.template_parameters['Echelle_locals'])
-                self.scalebarnumeric_qpt.attemptResize(self.template_parameters['Echelle_size'])
+                self.scalebarnumeric_qpt.attemptMove(self.template_parameters['scalebarnumeric_position'])
+                self.scalebarnumeric_qpt.attemptResize(self.template_parameters['scalebarnumeric_size'])
                 self.scalebarnumeric_qpt.setAlignment(QgsScaleBarSettings.Alignment(1))
                 self.scalebarnumeric_qpt.setBackgroundEnabled(True)
                 self.scalebarnumeric_qpt.setBackgroundColor(QColor(255, 255, 255, 130))
 
                 self.layout.addLayoutItem(self.scalebarnumeric_qpt)
 
-                # Ajout de l'échelle à la mise en page
+                ## Ajout de l'échelle à la mise en page
                 self.scalebar_qpt = QgsLayoutItemScaleBar(self.layout)
                 self.scalebar_qpt.setStyle('Single Box')
                 self.scalebar_qpt.setLinkedMap(self.map_modele_test)
-                self.scalebar_qpt.setFillColor(QColor(144, 144, 144, 255))
                 self.scalebar_qpt.applyDefaultSize()
                 self.scalebar_qpt.applyDefaultSettings()
 
                 self.scalebar_qpt.setNumberOfSegments(2)
                 self.scalebar_qpt.setNumberOfSegmentsLeft(0)
 
-                self.scalebar_qpt.setFont(QFont("Calibri", 12))
-                self.scalebar_qpt.setItemRotation(self.template_parameters['Echelle_2_rotate'])
-                self.scalebar_qpt.attemptMove(self.template_parameters['Echelle_2_locals'])
-                self.scalebar_qpt.attemptResize(self.template_parameters['Echelle_2_size'])
+                self.scalebar_qpt.attemptMove(self.template_parameters['scalebar_position'])
+                self.scalebar_qpt.attemptResize(self.template_parameters['scalebar_size'])
                 self.scalebar_qpt.setAlignment(QgsScaleBarSettings.Alignment(1))
                 self.scalebar_qpt.setBackgroundEnabled(True)
                 self.scalebar_qpt.setBackgroundColor(QColor(255, 255, 255, 130))
@@ -674,75 +647,51 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
                 # ajout de la fleche du Nord
                 north = QgsLayoutItemPicture(self.layout)
-                north.setPicturePath(resources_path("mises_en_pages", self.template_parameters['Arrow_path']))
-                north.setLinkedMap(self.map_modele_test)
+                north.setPicturePath(resources_path("mises_en_pages","NorthArrow_02.svg"))
                 self.layout.addLayoutItem(north)
-                north.setPictureAnchor(QgsLayoutItem.ReferencePoint(4))
-                north.setItemRotation(self.template_parameters['Arrow_rotate'])
-                north.attemptMove(self.template_parameters['Arrow_locals'])
-                north.attemptResize(self.template_parameters['Arrow_size'])
-                north.setSvgStrokeColor(QColor(255, 255, 255, 255))
-                north.setSvgFillColor(QColor(76, 76, 76, 255))
-                north.setBackgroundEnabled(self.template_parameters['Arrow_background'])
-                north.setBackgroundColor(QColor(255, 255, 255, 130))
+                north.attemptMove(self.template_parameters['north_position'])
+                north.attemptResize(self.template_parameters['north_size'])
 
                 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[:-1]
-                    info_text = ["Source :" + text_source][0]
+                    info_text = ["Source : " + self.mComboBox_3.currentText()][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())
-                    prenom_nom = self.s.value("automap/prenom_nom", 1, type=str)
-                    info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ") par " + prenom_nom]
-                else:
-                    info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ")"]
+                info = ["Réalisation : " + "CEN Isère (" + 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.AlignmentFlag(self.template_parameters['Credit_alignment']))
-                credit_text.setVAlign(Qt.AlignmentFlag(0x0080))
-                credit_text.setMarginX(2)
-                credit_text.setBackgroundEnabled(True)
-                credit_text.setBackgroundColor(QColor(255, 255, 255, 130))
+                credit_text.setHAlign(Qt.AlignRight)
+                credit_text.setVAlign(Qt.AlignVCenter)
+                credit_text.setItemRotation(-90)
                 credit_text2 = QgsLayoutItemLabel(self.layout)
                 credit_text2.setText(info_text)
                 credit_text2.setFont(QFont("Calibri", 9))
-                credit_text2.setHAlign(Qt.AlignmentFlag(self.template_parameters['Source_alignment']))
-                credit_text2.setVAlign(Qt.AlignmentFlag(0x0080))
-                credit_text2.setMarginX(2)
-                credit_text.setItemRotation(self.template_parameters['Credit_rotate'])
-                credit_text.attemptResize(self.template_parameters['Credit_size'])
-                credit_text.attemptMove(self.template_parameters['Credit_locals'])
-                credit_text2.setItemRotation(self.template_parameters['Source_rotate'])
-                credit_text2.attemptResize(self.template_parameters['Source_size'])
-                credit_text2.attemptMove(self.template_parameters['Source_locals'])
-                credit_text2.setBackgroundEnabled(True)
-                credit_text2.setBackgroundColor(QColor(255, 255, 255, 130))
+                credit_text2.setHAlign(Qt.AlignRight)
+                credit_text2.setVAlign(Qt.AlignVCenter)
+                credit_text.attemptMove(self.template_parameters['credit_text_position'])
+                credit_text.attemptResize(self.template_parameters['credit_text_size'])
+                credit_text2.attemptMove(self.template_parameters['credit_text2_position'])
+                credit_text2.attemptResize(self.template_parameters['credit_text2_size'])
                 self.layout.addLayoutItem(credit_text)
                 self.layout.addLayoutItem(credit_text2)
 
-                # Ajout du logo credit en bas à droit de la page
-                len_item = (len(self.mComboBox_4.checkedItems()))
+                ## Ajout du logo credit en bas à droit de la page
                 for logo_run in self.mComboBox_4.checkedItems():
                     logo_credit = QgsLayoutItemPicture(self.layout)
                     logo_credit.setResizeMode(QgsLayoutItemPicture.Zoom)
-                    logo_credit.setPictureAnchor(QgsLayoutItem.ReferencePoint(4))
                     logo_credit.setMode(QgsLayoutItemPicture.FormatRaster)
-                    cur_x = self.template_parameters['Logo_2_locals'].x()
-                    logo_credit.setItemRotation(self.template_parameters['Logo_2_rotate'])
-                    logo_credit.attemptMove(self.template_parameters['Logo_2_locals'])
-                    self.template_parameters['Logo_2_locals'].setX(cur_x + (logo_div / len_item))
-                    logo_credit.setFixedSize(self.template_parameters['Logo_2_size'])
+                    cur_x = self.template_parameters['logo_credit_position'].x()
+                    logo_credit.attemptMove(self.template_parameters['logo_credit_position'])
+                    logo_credit.setPictureAnchor(4)
+                    self.template_parameters['logo_credit_position'].setX(cur_x+51)
+                    logo_credit.setFixedSize(self.template_parameters['logo_credit_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)
@@ -753,34 +702,12 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
                 existing_layout = project.layoutManager().layoutByName(self.layout.name())
             if existing_layout:
-                self.QMBquestion = QMessageBox()
-                self.QMBquestion.setWindowTitle(u"Attention !")
-                self.QMBquestion.setIcon(QMessageBox.Icon.Warning)
-                self.QMBquestion.setText("Mise en page existante, la mise en page va être écrasée !")
-                self.QMBquestion.setStandardButtons(QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
-                self.QMBquestion.addButton(QPushButton('Autre mise en page'), QMessageBox.ButtonRole(0))
-                self.QMBquestion = self.QMBquestion.exec()
-
-                # if self.radioButton_12.isChecked() != 1:
-                if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
+                if self.radioButton_12.isChecked() != 1:
                     project.layoutManager().removeLayout(existing_layout)
-                    # result = project.layoutManager().addLayout(self.layout)
-                elif self.QMBquestion != QMessageBox.StandardButton(0x00010000):
-                    LayoutCOUNT = 0
-                    arrayManager = []
-                    for AddArrayManager in project.layoutManager().layouts():
-                        arrayManager.append(AddArrayManager.name())
-                    arrayManager.sort()
-                    for LayoutNAME in arrayManager:
-                        if LayoutNAME == layout_name:
-                            LayoutCOUNT = LayoutCOUNT + 1
-                        if LayoutNAME == layout_name + "¶" + str(LayoutCOUNT):
-                            LayoutCOUNT = LayoutCOUNT + 1
-                    layout_name = (layout_name + "¶" + str(LayoutCOUNT))
-                    self.layout.setName(layout_name)
 
-            else:
-                existing_layout = True
+                result = project.layoutManager().addLayout(self.layout)
+
+
 
         self.manager.addLayout(self.layout)
         if self.radioButton_9.isChecked() == 1:
@@ -791,26 +718,14 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
         fichier_mise_en_page = layout_name
         layout_modifie = QgsProject.instance().layoutManager().layoutByName(fichier_mise_en_page)
-        try:
-            if (self.QMBquestion == QMessageBox.AcceptRole):
-                TryMessage = (self.QMBquestion == QMessageBox.AcceptRole)
-            elif (self.QMBquestion == QMessageBox.Yes):
-                TryMessage = (self.QMBquestion == QMessageBox.Yes)
-            else:
-                TryMessage = False
-            del self.QMBquestion
-        except ValueError:
-            TryMessage = True
-        except AttributeError:
-            TryMessage = True
-
-        if TryMessage is True:
-            iface.openLayoutDesigner(layout_modifie)
-            self.close()
-        else:
-            self.activateWindow()
+        iface.openLayoutDesigner(layout_modifie)
+        self.close()
 
     def actualisation_mise_en_page(self):
+
+        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}}
+
         values_page = self.comboBox.currentText()
 
         if self.radioButton_6.isChecked() and self.radioButton_7.isChecked():
@@ -829,19 +744,19 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             pc = self.layout.pageCollection()
             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('self.template_parameters = '+ values_page_import + '.fletch_canvas(self)')")
+        self.template_parameters = fletch_canvas(self,values_page)
 
     def bar_echelle_auto(self, echelle, bar_echelle):
+       
         if True:
-            if echelle.scale() >= 40000:
+            if echelle.scale() >= 20000:
                 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.02)/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.02))
 
         bar_echelle.update()

CenIsere_AUTOMAP/issues.py

@@ -1,4 +1,10 @@
 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 (
@@ -21,7 +27,7 @@ from qgis.PyQt.QtWidgets import (
     QInputDialog,
     QMenu,
     QToolButton,
-    QTableWidget,
+    QTableWidget, 
     QTableWidgetItem,
 )
 from qgis.utils import iface
@@ -29,27 +35,21 @@ 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
+EDITOR_CLASS = load_ui('CenIsere_IssuesSend.ui')
 
-NAME = plugin_dir[end_find:]
-# print(NAME)
+class CenIsere_Issues(QDialog, EDITOR_CLASS):
 
-EDITOR_CLASS = load_ui('CenRa_IssuesSend.ui')
-
-
-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,22 +63,17 @@ class CenRa_Issues(QDialog, EDITOR_CLASS):
         statu_autre = self.check_autre.isChecked()
 
         statu = []
-        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 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 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:

CenIsere_AUTOMAP/metadata.txt

@@ -0,0 +1,48 @@
+# This file contains metadata for your plugin.
+
+# This file should be included when you package your plugin.# Mandatory items:
+
+[general]
+name=CenIsere_AutoMap
+qgisMinimumVersion=3.0
+description=CenIsere_AutoMap
+version=1.6
+author=Conservatoire d'Espaces Naturels de Rhône-Alpes
+
+
+about=Outils de création de mise en page prédéfinis pour simplifier et organiser cette étape.
+
+repository=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS
+homepage=https://plateformesig.cenra-outils.org/
+tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
+# End of mandatory metadata
+
+# Recommended items:
+
+hasProcessingProvider=no
+# Uncomment the following line and add your changelog:
+changelog=<h2>CenIsere_AutoMap:</h2></br><p><h3>07/10/2024 - Version 1.6: </h3> - Option de bibliotheque de logo custome.</p></br><p><h3>03/10/2024 - Version 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 1.4: </h3> - Mise en page plein écrant.</br></p></br><p><h3>01/10/2024 - Version 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 1.2: </h3> - Activation du thème. </br> - Ajouter une carte de suivie. </br><p></br><h3>27/09/2024 - Version 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 1.0: </h3> - Lancement du plugin CenIsere_AutoMap avec une seul mise en page. </p></br>
+
+# Tags are comma separated with spaces allowed
+tags=python
+
+
+category=Plugins
+icon=icon.png
+# experimental flag
+experimental=False
+
+# deprecated flag (applies to the whole plugin, not just a single version)
+deprecated=False
+
+# Since QGIS 3.8, a comma separated list of plugins to be installed
+# (or upgraded) can be specified.
+# Check the documentation for more information.
+# plugin_dependencies=
+
+Category of the plugin: Raster, Vector, Database or Web
+# category=CenIsere,mise en page,atlas
+
+# If the plugin can run on QGIS Server.
+server=False
+

CenIsere_AUTOMAP/tools/PythonSQL.py

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

CenIsere_AUTOMAP/tools/mises_en_pages/2. Modèle carto plein page.qpt

@@ -0,0 +1,120 @@
+<Layout worldFileMap="" name="test.qpt" printResolution="300" units="mm">
+ <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+ <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+ <PageCollection>
+  <symbol name="" clip_to_extent="1" type="fill" force_rhr="0" alpha="1">
+   <data_defined_properties>
+    <Option type="Map">
+     <Option name="name" value="" type="QString"/>
+     <Option name="properties"/>
+     <Option name="type" value="collection" type="QString"/>
+    </Option>
+   </data_defined_properties>
+   <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+    <Option type="Map">
+     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+     <Option name="color" value="255,255,255,255" type="QString"/>
+     <Option name="joinstyle" value="miter" type="QString"/>
+     <Option name="offset" value="0,0" type="QString"/>
+     <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+     <Option name="offset_unit" value="MM" type="QString"/>
+     <Option name="outline_color" value="35,35,35,255" type="QString"/>
+     <Option name="outline_style" value="no" type="QString"/>
+     <Option name="outline_width" value="0.26" type="QString"/>
+     <Option name="outline_width_unit" value="MM" type="QString"/>
+     <Option name="style" value="solid" type="QString"/>
+    </Option>
+    <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+    <prop k="color" v="255,255,255,255"/>
+    <prop k="joinstyle" v="miter"/>
+    <prop k="offset" v="0,0"/>
+    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+    <prop k="offset_unit" v="MM"/>
+    <prop k="outline_color" v="35,35,35,255"/>
+    <prop k="outline_style" v="no"/>
+    <prop k="outline_width" v="0.26"/>
+    <prop k="outline_width_unit" v="MM"/>
+    <prop k="style" v="solid"/>
+    <data_defined_properties>
+     <Option type="Map">
+      <Option name="name" value="" type="QString"/>
+      <Option name="properties"/>
+      <Option name="type" value="collection" type="QString"/>
+     </Option>
+    </data_defined_properties>
+   </layer>
+  </symbol>
+  <LayoutItem zValue="0" id="" itemRotation="0" position="0,0,mm" frame="false" templateUuid="{5c80221d-7561-455b-94fd-69a27d877679}" referencePoint="0" opacity="1" frameJoinStyle="miter" uuid="{5c80221d-7561-455b-94fd-69a27d877679}" blendMode="0" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" type="65638" excludeFromExports="0" positionLock="false" background="true" visibility="1">
+   <FrameColor green="0" blue="0" red="0" alpha="255"/>
+   <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+   <LayoutObject>
+    <dataDefinedProperties>
+     <Option type="Map">
+      <Option name="name" value="" type="QString"/>
+      <Option name="properties"/>
+      <Option name="type" value="collection" type="QString"/>
+     </Option>
+    </dataDefinedProperties>
+    <customproperties>
+     <Option/>
+    </customproperties>
+   </LayoutObject>
+   <symbol name="" clip_to_extent="1" type="fill" force_rhr="0" alpha="1">
+    <data_defined_properties>
+     <Option type="Map">
+      <Option name="name" value="" type="QString"/>
+      <Option name="properties"/>
+      <Option name="type" value="collection" type="QString"/>
+     </Option>
+    </data_defined_properties>
+    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+     <Option type="Map">
+      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+      <Option name="color" value="255,255,255,255" type="QString"/>
+      <Option name="joinstyle" value="miter" type="QString"/>
+      <Option name="offset" value="0,0" type="QString"/>
+      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+      <Option name="offset_unit" value="MM" type="QString"/>
+      <Option name="outline_color" value="35,35,35,255" type="QString"/>
+      <Option name="outline_style" value="no" type="QString"/>
+      <Option name="outline_width" value="0.26" type="QString"/>
+      <Option name="outline_width_unit" value="MM" type="QString"/>
+      <Option name="style" value="solid" type="QString"/>
+     </Option>
+     <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+     <prop k="color" v="255,255,255,255"/>
+     <prop k="joinstyle" v="miter"/>
+     <prop k="offset" v="0,0"/>
+     <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+     <prop k="offset_unit" v="MM"/>
+     <prop k="outline_color" v="35,35,35,255"/>
+     <prop k="outline_style" v="no"/>
+     <prop k="outline_width" v="0.26"/>
+     <prop k="outline_width_unit" v="MM"/>
+     <prop k="style" v="solid"/>
+     <data_defined_properties>
+      <Option type="Map">
+       <Option name="name" value="" type="QString"/>
+       <Option name="properties"/>
+       <Option name="type" value="collection" type="QString"/>
+      </Option>
+     </data_defined_properties>
+    </layer>
+   </symbol>
+  </LayoutItem>
+  <GuideCollection visible="1"/>
+ </PageCollection>
+ <customproperties>
+  <Option type="Map">
+   <Option name="atlasRasterFormat" value="png" type="QString"/>
+   <Option name="imageAntialias" value="true" type="bool"/>
+   <Option name="imageCropMarginBottom" value="0" type="int"/>
+   <Option name="imageCropMarginLeft" value="0" type="int"/>
+   <Option name="imageCropMarginRight" value="0" type="int"/>
+   <Option name="imageCropMarginTop" value="0" type="int"/>
+   <Option name="imageCropToContents" value="false" type="bool"/>
+   <Option name="singleFile" value="true" type="bool"/>
+  </Option>
+ </customproperties>
+ <Atlas coverageLayer="" pageNameExpression="" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" enabled="0" hideCoverage="0" sortFeatures="0"/>
+</Layout>

CenIsere_AUTOMAP/tools/mises_en_pages/3. Modèle carto standard Cen Isere.qpt

@@ -0,0 +1,114 @@
+<Layout units="mm" worldFileMap="" printResolution="300" name="3. Modèle_carto_standard_cenIsere">
+ <Snapper snapToGuides="1" tolerance="5" snapToItems="1" snapToGrid="0"/>
+ <Grid offsetUnits="mm" resUnits="mm" resolution="10" offsetX="0" offsetY="0"/>
+ <PageCollection>
+  <symbol clip_to_extent="1" force_rhr="0" type="fill" name="" alpha="1">
+   <data_defined_properties>
+    <Option type="Map">
+     <Option value="" type="QString" name="name"/>
+     <Option name="properties"/>
+     <Option value="collection" type="QString" name="type"/>
+    </Option>
+   </data_defined_properties>
+   <layer locked="0" pass="0" enabled="1" class="SimpleFill">
+    <Option type="Map">
+     <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+     <Option value="255,255,255,255" type="QString" name="color"/>
+     <Option value="miter" type="QString" name="joinstyle"/>
+     <Option value="0,0" type="QString" name="offset"/>
+     <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+     <Option value="MM" type="QString" name="offset_unit"/>
+     <Option value="35,35,35,255" type="QString" name="outline_color"/>
+     <Option value="no" type="QString" name="outline_style"/>
+     <Option value="0.26" type="QString" name="outline_width"/>
+     <Option value="MM" type="QString" name="outline_width_unit"/>
+     <Option value="solid" type="QString" name="style"/>
+    </Option>
+    <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+    <prop v="255,255,255,255" k="color"/>
+    <prop v="miter" k="joinstyle"/>
+    <prop v="0,0" k="offset"/>
+    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+    <prop v="MM" k="offset_unit"/>
+    <prop v="35,35,35,255" k="outline_color"/>
+    <prop v="no" k="outline_style"/>
+    <prop v="0.26" k="outline_width"/>
+    <prop v="MM" k="outline_width_unit"/>
+    <prop v="solid" k="style"/>
+    <data_defined_properties>
+     <Option type="Map">
+      <Option value="" type="QString" name="name"/>
+      <Option name="properties"/>
+      <Option value="collection" type="QString" name="type"/>
+     </Option>
+    </data_defined_properties>
+   </layer>
+  </symbol>
+  <LayoutItem type="65638" zValue="0" blendMode="0" referencePoint="0" frameJoinStyle="miter" outlineWidthM="0.3,mm" frame="false" groupUuid="" itemRotation="0" excludeFromExports="0" background="true" opacity="1" visibility="1" size="297,210,mm" positionOnPage="0,0,mm" id="" templateUuid="{2b090846-ab96-44d2-b168-90e1bcb35427}" uuid="{2b090846-ab96-44d2-b168-90e1bcb35427}" position="0,0,mm" positionLock="false">
+   <FrameColor red="0" blue="0" green="0" alpha="255"/>
+   <BackgroundColor red="255" blue="255" green="255" alpha="255"/>
+   <LayoutObject>
+    <dataDefinedProperties>
+     <Option type="Map">
+      <Option value="" type="QString" name="name"/>
+      <Option name="properties"/>
+      <Option value="collection" type="QString" name="type"/>
+     </Option>
+    </dataDefinedProperties>
+    <customproperties>
+     <Option/>
+    </customproperties>
+   </LayoutObject>
+   <symbol clip_to_extent="1" force_rhr="0" type="fill" name="" alpha="1">
+    <data_defined_properties>
+     <Option type="Map">
+      <Option value="" type="QString" name="name"/>
+      <Option name="properties"/>
+      <Option value="collection" type="QString" name="type"/>
+     </Option>
+    </data_defined_properties>
+    <layer locked="0" pass="0" enabled="1" class="SimpleFill">
+     <Option type="Map">
+      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+      <Option value="255,255,255,255" type="QString" name="color"/>
+      <Option value="miter" type="QString" name="joinstyle"/>
+      <Option value="0,0" type="QString" name="offset"/>
+      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+      <Option value="MM" type="QString" name="offset_unit"/>
+      <Option value="35,35,35,255" type="QString" name="outline_color"/>
+      <Option value="no" type="QString" name="outline_style"/>
+      <Option value="0.26" type="QString" name="outline_width"/>
+      <Option value="MM" type="QString" name="outline_width_unit"/>
+      <Option value="solid" type="QString" name="style"/>
+     </Option>
+     <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+     <prop v="255,255,255,255" k="color"/>
+     <prop v="miter" k="joinstyle"/>
+     <prop v="0,0" k="offset"/>
+     <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+     <prop v="MM" k="offset_unit"/>
+     <prop v="35,35,35,255" k="outline_color"/>
+     <prop v="no" k="outline_style"/>
+     <prop v="0.26" k="outline_width"/>
+     <prop v="MM" k="outline_width_unit"/>
+     <prop v="solid" k="style"/>
+     <data_defined_properties>
+      <Option type="Map">
+       <Option value="" type="QString" name="name"/>
+       <Option name="properties"/>
+       <Option value="collection" type="QString" name="type"/>
+      </Option>
+     </data_defined_properties>
+    </layer>
+   </symbol>
+  </LayoutItem>
+  <GuideCollection visible="1"/>
+ </PageCollection>
+ <customproperties>
+  <Option type="Map">
+   <Option value="png" type="QString" name="atlasRasterFormat"/>
+   <Option value="true" type="bool" name="singleFile"/>
+  </Option>
+ </customproperties>
+ <Atlas filterFeatures="0" pageNameExpression="" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="0" enabled="0" sortFeatures="0" coverageLayer=""/>
+</Layout>

CenIsere_AUTOMAP/tools/mises_en_pages/canvas.py

@@ -0,0 +1,492 @@
+from qgis.core import (
+    QgsLayoutSize,
+    QgsUnitTypes,
+    QgsLayoutPoint,
+)
+
+def fletch_canvas(self,values_page):
+	### Modèle carto standard ###
+	if values_page == '1. Modèle carto standard.qpt':
+		if self.radioButton_6.isChecked() and self.radioButton_7.isChecked():
+
+			self.template_parameters['position_map_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['position_map_position'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['map_size'] = QgsLayoutSize(199, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 205, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(55, 5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(145, 228, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(145, 215, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(193, 214, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(104, 201, QgsUnitTypes.LayoutMillimeters)
+
+
+
+		if self.radioButton_6.isChecked() and self.radioButton_8.isChecked():
+
+			self.template_parameters['position_map_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['position_map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['map_size'] = QgsLayoutSize(285, 145, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 185, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 168, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(207, 193, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(207, 180, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(273, 182, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(189, 168.5, QgsUnitTypes.LayoutMillimeters)
+
+
+
+		if self.radioButton_5.isChecked() and self.radioButton_7.isChecked():
+
+			self.template_parameters['map_size'] = QgsLayoutSize(285, 260, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 395, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 284, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(50, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(207, 310, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(50, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(207, 298, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(273, 297, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(189, 284, QgsUnitTypes.LayoutMillimeters)
+
+
+
+		if self.radioButton_5.isChecked() and self.radioButton_8.isChecked():
+
+			self.template_parameters['map_size'] = QgsLayoutSize(408.5, 222, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(5, 23.5, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 249, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(323, 282, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(323, 270, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(402, 270, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(415, 123, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(313, 247, QgsUnitTypes.LayoutMillimeters)
+
+	### Modèle carto plein page ###
+	if values_page == '2. Modèle carto plein page.qpt':
+		if self.radioButton_6.isChecked() and self.radioButton_7.isChecked():
+
+			self.template_parameters['position_map_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['position_map_position'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['map_size'] = QgsLayoutSize(210, 297, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(133, 215, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(3, 288, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(3, 273, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(196, 283, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(55, 292, QgsUnitTypes.LayoutMillimeters)
+
+		if self.radioButton_6.isChecked() and self.radioButton_8.isChecked():
+
+			self.template_parameters['position_map_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['position_map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['map_size'] = QgsLayoutSize(297, 210, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 185, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(231, 135, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(3, 201, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(3, 186, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(283, 196, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(98, 205, QgsUnitTypes.LayoutMillimeters)
+
+		if self.radioButton_5.isChecked() and self.radioButton_7.isChecked():
+
+			self.template_parameters['position_map_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['position_map_position'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['map_size'] = QgsLayoutSize(297, 420, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 370, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(219, 324, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(3, 410, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(3, 395, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(24, 24, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(271, 394, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291, 125, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(98, 414, QgsUnitTypes.LayoutMillimeters)
+
+		if self.radioButton_5.isChecked() and self.radioButton_8.isChecked():
+
+			self.template_parameters['position_map_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['position_map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['map_size'] = QgsLayoutSize(420, 297, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(411, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(411, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 247, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(341, 196, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(3, 287, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(3, 272, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(24, 24, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(394, 271, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(414, 123, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(185, 292, QgsUnitTypes.LayoutMillimeters)
+	
+	### Modèle carto standard CEN ISERE###
+	if values_page == '3. Modèle carto standard Cen Isere.qpt':
+		if self.radioButton_6.isChecked() and self.radioButton_7.isChecked():
+
+			self.template_parameters['position_map_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['position_map_position'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['map_size'] = QgsLayoutSize(199, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 205, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(55, 5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(145, 228, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(145, 215, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(193, 214, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(104, 201, QgsUnitTypes.LayoutMillimeters)
+			
+			self.template_parameters['image_size'] = QgsLayoutSize(200, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position'] = QgsLayoutPoint(4.5, 18, QgsUnitTypes.LayoutMillimeters)
+			
+			self.template_parameters['image_size_2'] = QgsLayoutSize(200, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position_2'] = QgsLayoutPoint(4.5, 194.9, QgsUnitTypes.LayoutMillimeters)
+			
+		if self.radioButton_6.isChecked() and self.radioButton_8.isChecked():
+
+			self.template_parameters['position_map_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['position_map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['map_size'] = QgsLayoutSize(285, 145, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 185, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 168, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(207, 193, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(207, 180, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(273, 182, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(189, 168.5, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['image_size'] = QgsLayoutSize(286, 145, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position'] = QgsLayoutPoint(5.5, 13, QgsUnitTypes.LayoutMillimeters)
+			
+			self.template_parameters['image_size_2'] = QgsLayoutSize(286, 145, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position_2'] = QgsLayoutPoint(5.5, 162.2, QgsUnitTypes.LayoutMillimeters)
+			
+
+		if self.radioButton_5.isChecked() and self.radioButton_7.isChecked():
+
+			self.template_parameters['map_size'] = QgsLayoutSize(285, 260, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 395, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 284, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(50, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(207, 310, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(50, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(207, 298, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(273, 297, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(189, 284, QgsUnitTypes.LayoutMillimeters)
+			
+			self.template_parameters['image_size'] = QgsLayoutSize(286, 260, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position'] = QgsLayoutPoint(5.5, 13, QgsUnitTypes.LayoutMillimeters)
+			
+			self.template_parameters['image_size_2'] = QgsLayoutSize(286, 260, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position_2'] = QgsLayoutPoint(5.5, 278.2, QgsUnitTypes.LayoutMillimeters)
+			
+
+
+		if self.radioButton_5.isChecked() and self.radioButton_8.isChecked():
+
+			self.template_parameters['map_size'] = QgsLayoutSize(408.5, 222, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_position'] = QgsLayoutPoint(5, 23.5, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['title_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['subtitle_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 249, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(323, 282, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['scalebar_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(323, 270, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(402, 270, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(415, 123, QgsUnitTypes.LayoutMillimeters)
+
+			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(313, 247, QgsUnitTypes.LayoutMillimeters)
+			
+			self.template_parameters['image_size'] = QgsLayoutSize(409.3, 222, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position'] = QgsLayoutPoint(4.5, 8, QgsUnitTypes.LayoutMillimeters)
+			
+			self.template_parameters['image_size_2'] = QgsLayoutSize(409.3, 222, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position_2'] = QgsLayoutPoint(4.6, 237.15, QgsUnitTypes.LayoutMillimeters)
+
+	# Retour des info #
+	return self.template_parameters

CenIsere_AUTOMAP/tools/mises_en_pages/carto_standard.py

@@ -0,0 +1,168 @@
+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_2_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_size'] = QgsLayoutSize(199, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(5, 205, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(55, 5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(145, 228, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(145, 215, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(193, 214, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(104, 201, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_rotate'] = 270
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_rotate'] = 0
+		if values_page == 'A3':
+			self.template_parameters['Carte_2_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_size'] = QgsLayoutSize(285, 260, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 395, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(5, 284, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(207, 310, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(207, 298, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(273, 297, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(189, 284, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_rotate'] = 270
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_rotate'] = 0
+
+	if page_rotate == 'Landscape':
+		if values_page == 'A4':
+			self.template_parameters['Carte_size'] = QgsLayoutSize(285, 145, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 185, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(5, 168, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(207, 193, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(207, 180, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(273, 182, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(189, 168.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_rotate'] = 270
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_rotate'] = 0
+		if values_page == 'A3':
+			self.template_parameters['Carte_size'] = QgsLayoutSize(408.5, 222, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(5, 23.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_size'] = QgsLayoutSize(46, 16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(5, 249, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(323, 282, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(323, 270, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(402, 270, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(415, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(313, 247, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_rotate'] = 270
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_rotate'] = 0
+
+	return self.template_parameters

CenIsere_AUTOMAP/tools/mises_en_pages/demo.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(80.0,80, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(126, 210, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_size'] = QgsLayoutSize(86.0,86, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 208, 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, 210, 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(113,113, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(178, 296, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_size'] = QgsLayoutSize(121,121, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 293, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(20,20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(267, 28, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(73,10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(13, 278, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_size'] = QgsLayoutSize(64,16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(4, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_size'] = QgsLayoutSize(218,16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(72, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_size'] = QgsLayoutSize(73,8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(213, 296, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_rotate'] = 0
+			self.template_parameters['Source_size'] = QgsLayoutSize(73,8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(323, 278, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(177,20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(85, 28, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(73,18, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(13, 259, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(40,40, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(13, 213, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_rotate'] = 0
+	if page_rotate == 'Landscape':
+		if values_page == 'A4':
+			self.template_parameters['Carte_size'] = QgsLayoutSize(200.0,200, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 6, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_size'] = QgsLayoutSize(85.71428571428571,69, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(209, 3, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_size'] = QgsLayoutSize(85.71428571428571,131, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(209, 74, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(14.285714285714286,14, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(189, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(51.42857142857143,7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(9, 197, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_size'] = QgsLayoutSize(45.714285714285715,11, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(3, 3, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_size'] = QgsLayoutSize(154.28571428571428,11, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(51, 3, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_size'] = QgsLayoutSize(51.42857142857143,6, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(151, 197, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_rotate'] = 0
+			self.template_parameters['Source_size'] = QgsLayoutSize(51.42857142857143,6, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(229, 197, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(125.71428571428571,14, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(60, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(51.42857142857143,13, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(9, 184, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(28.571428571428573,29, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(9, 151, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_rotate'] = 0
+		if values_page == 'A3':
+			self.template_parameters['Carte_size'] = QgsLayoutSize(282,282, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_size'] = QgsLayoutSize(121,97, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(294, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_size'] = QgsLayoutSize(121,185, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(294, 105, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(20,20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(266, 28, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(73,10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(12, 278, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_size'] = QgsLayoutSize(64,16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(4, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_size'] = QgsLayoutSize(218,16, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(73, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_size'] = QgsLayoutSize(73,8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(214, 278, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_rotate'] = 0
+			self.template_parameters['Source_size'] = QgsLayoutSize(73,8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(322, 278, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(177,20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(85, 28, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(73,18, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(12, 260, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(40,40, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(12, 214, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_rotate'] = 0
+	return self.template_parameters

CenIsere_AUTOMAP/tools/mises_en_pages/full_page.py

@@ -0,0 +1,170 @@
+
+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_2_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_size'] = QgsLayoutSize(210, 297, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(133, 215, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 288, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 273, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(196, 283, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(55, 292, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_rotate'] = 270
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_rotate'] = 0
+		if values_page == 'A3':
+			self.template_parameters['Carte_2_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_size'] = QgsLayoutSize(297, 420, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 370, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(219, 324, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 410, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 395, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(24, 24, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(271, 394, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(291, 125, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(98, 414, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_rotate'] = 270
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_rotate'] = 0
+
+	if page_rotate == 'Landscape':
+		if values_page == 'A4':
+			self.template_parameters['Carte_2_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_size'] = QgsLayoutSize(420, 297, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_size'] = QgsLayoutSize(411, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(411, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 247, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(341, 196, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 287, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 272, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(24, 24, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(394, 271, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(414, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(185, 292, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_rotate'] = 270
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_rotate'] = 0
+		if values_page == 'A3':
+			self.template_parameters['Carte_2_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_size'] = QgsLayoutSize(297, 210, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 185, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Legande_locals'] = QgsLayoutPoint(231, 135, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 201, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 186, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Arrow_locals'] = QgsLayoutPoint(283, 196, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Credit_locals'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Source_locals'] = QgsLayoutPoint(98, 205, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['Carte_rotate'] = 0
+			self.template_parameters['Carte_2_rotate'] = 0
+			self.template_parameters['Legande_rotate'] = 0
+			self.template_parameters['Arrow_rotate'] = 0
+			self.template_parameters['Echelle_rotate'] = 0
+			self.template_parameters['Logo_rotate'] = 0
+			self.template_parameters['Titre_rotate'] = 0
+			self.template_parameters['Credit_rotate'] = 270
+			self.template_parameters['Source_rotate'] = 0
+			self.template_parameters['Sous_titre_rotate'] = 0
+			self.template_parameters['Echelle_2_rotate'] = 0
+			self.template_parameters['Logo_2_rotate'] = 0
+
+	# Retour des info #
+	return self.template_parameters

CenIsere_AUTOMAP/tools/mises_en_pages/modele_carto.qpt

@@ -0,0 +1,120 @@
+<Layout worldFileMap="" name="test.qpt" printResolution="300" units="mm">
+ <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
+ <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+ <PageCollection>
+  <symbol name="" clip_to_extent="1" type="fill" force_rhr="0" alpha="1">
+   <data_defined_properties>
+    <Option type="Map">
+     <Option name="name" value="" type="QString"/>
+     <Option name="properties"/>
+     <Option name="type" value="collection" type="QString"/>
+    </Option>
+   </data_defined_properties>
+   <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+    <Option type="Map">
+     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+     <Option name="color" value="255,255,255,255" type="QString"/>
+     <Option name="joinstyle" value="miter" type="QString"/>
+     <Option name="offset" value="0,0" type="QString"/>
+     <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+     <Option name="offset_unit" value="MM" type="QString"/>
+     <Option name="outline_color" value="35,35,35,255" type="QString"/>
+     <Option name="outline_style" value="no" type="QString"/>
+     <Option name="outline_width" value="0.26" type="QString"/>
+     <Option name="outline_width_unit" value="MM" type="QString"/>
+     <Option name="style" value="solid" type="QString"/>
+    </Option>
+    <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+    <prop k="color" v="255,255,255,255"/>
+    <prop k="joinstyle" v="miter"/>
+    <prop k="offset" v="0,0"/>
+    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+    <prop k="offset_unit" v="MM"/>
+    <prop k="outline_color" v="35,35,35,255"/>
+    <prop k="outline_style" v="no"/>
+    <prop k="outline_width" v="0.26"/>
+    <prop k="outline_width_unit" v="MM"/>
+    <prop k="style" v="solid"/>
+    <data_defined_properties>
+     <Option type="Map">
+      <Option name="name" value="" type="QString"/>
+      <Option name="properties"/>
+      <Option name="type" value="collection" type="QString"/>
+     </Option>
+    </data_defined_properties>
+   </layer>
+  </symbol>
+  <LayoutItem zValue="0" id="" itemRotation="0" position="0,0,mm" frame="false" templateUuid="{5c80221d-7561-455b-94fd-69a27d877679}" referencePoint="0" opacity="1" frameJoinStyle="miter" uuid="{5c80221d-7561-455b-94fd-69a27d877679}" blendMode="0" size="297,210,mm" groupUuid="" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" type="65638" excludeFromExports="0" positionLock="false" background="true" visibility="1">
+   <FrameColor green="0" blue="0" red="0" alpha="255"/>
+   <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+   <LayoutObject>
+    <dataDefinedProperties>
+     <Option type="Map">
+      <Option name="name" value="" type="QString"/>
+      <Option name="properties"/>
+      <Option name="type" value="collection" type="QString"/>
+     </Option>
+    </dataDefinedProperties>
+    <customproperties>
+     <Option/>
+    </customproperties>
+   </LayoutObject>
+   <symbol name="" clip_to_extent="1" type="fill" force_rhr="0" alpha="1">
+    <data_defined_properties>
+     <Option type="Map">
+      <Option name="name" value="" type="QString"/>
+      <Option name="properties"/>
+      <Option name="type" value="collection" type="QString"/>
+     </Option>
+    </data_defined_properties>
+    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+     <Option type="Map">
+      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+      <Option name="color" value="255,255,255,255" type="QString"/>
+      <Option name="joinstyle" value="miter" type="QString"/>
+      <Option name="offset" value="0,0" type="QString"/>
+      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+      <Option name="offset_unit" value="MM" type="QString"/>
+      <Option name="outline_color" value="35,35,35,255" type="QString"/>
+      <Option name="outline_style" value="no" type="QString"/>
+      <Option name="outline_width" value="0.26" type="QString"/>
+      <Option name="outline_width_unit" value="MM" type="QString"/>
+      <Option name="style" value="solid" type="QString"/>
+     </Option>
+     <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+     <prop k="color" v="255,255,255,255"/>
+     <prop k="joinstyle" v="miter"/>
+     <prop k="offset" v="0,0"/>
+     <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+     <prop k="offset_unit" v="MM"/>
+     <prop k="outline_color" v="35,35,35,255"/>
+     <prop k="outline_style" v="no"/>
+     <prop k="outline_width" v="0.26"/>
+     <prop k="outline_width_unit" v="MM"/>
+     <prop k="style" v="solid"/>
+     <data_defined_properties>
+      <Option type="Map">
+       <Option name="name" value="" type="QString"/>
+       <Option name="properties"/>
+       <Option name="type" value="collection" type="QString"/>
+      </Option>
+     </data_defined_properties>
+    </layer>
+   </symbol>
+  </LayoutItem>
+  <GuideCollection visible="1"/>
+ </PageCollection>
+ <customproperties>
+  <Option type="Map">
+   <Option name="atlasRasterFormat" value="png" type="QString"/>
+   <Option name="imageAntialias" value="true" type="bool"/>
+   <Option name="imageCropMarginBottom" value="0" type="int"/>
+   <Option name="imageCropMarginLeft" value="0" type="int"/>
+   <Option name="imageCropMarginRight" value="0" type="int"/>
+   <Option name="imageCropMarginTop" value="0" type="int"/>
+   <Option name="imageCropToContents" value="false" type="bool"/>
+   <Option name="singleFile" value="true" type="bool"/>
+  </Option>
+ </customproperties>
+ <Atlas coverageLayer="" pageNameExpression="" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" enabled="0" hideCoverage="0" sortFeatures="0"/>
+</Layout>

CenIsere_AUTOMAP/tools/resources.py

@@ -1,184 +1,187 @@
-"""Tools to work with resource files."""
-
-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 import uic
-
-__copyright__ = "Copyright 2019, 3Liz"
-__license__ = "GPL version 3"
-__email__ = "info@3liz.org"
-__revision__ = "$Format:%H$"
-
-
-def plugin_path(*args):
-    """Get the path to plugin root folder.
-
-    :param args List of path elements e.g. ['img', 'logos', 'image.png']
-    :type args: str
-
-    :return: Absolute path to the plugin path.
-    :rtype: str
-    """
-    path = dirname(dirname(__file__))
-    path = abspath(abspath(join(path, pardir)))
-    for item in args:
-        path = abspath(join(path, item))
-
-    return path
-
-
-def plugin_name():
-    """Return the plugin name according to metadata.txt.
-
-    :return: The plugin name.
-    :rtype: basestring
-    """
-    metadata = metadata_config()
-    name = metadata["general"]["name"]
-    return name
-
-
-def metadata_config() -> configparser:
-    """Get the INI config parser for the metadata file.
-
-    :return: The config parser object.
-    :rtype: ConfigParser
-    """
-    path = plugin_path("metadata.txt")
-    config = configparser.ConfigParser()
-    config.read(path, encoding='utf8')
-    return config
-
-
-def plugin_test_data_path(*args, copy=False):
-    """Get the path to the plugin test data path.
-
-    :param args List of path elements e.g. ['img', 'logos', 'image.png']
-    :type args: str
-
-    :param copy: If the file must be copied into a temporary directory first.
-    :type copy: bool
-
-    :return: Absolute path to the resources folder.
-    :rtype: str
-    """
-    path = abspath(abspath(join(plugin_path(), "test", "data")))
-    for item in args:
-        path = abspath(join(path, item))
-
-    if copy:
-        temp = tempfile.mkdtemp()
-        shutil.copy(path, temp)
-        return join(temp, args[-1])
-    else:
-        return path
-
-
-def resources_path(*args):
-    """Get the path to our resources folder.
-
-    :param args List of path elements e.g. ['img', 'logos', 'image.png']
-    :type args: str
-
-    :return: Absolute path to the resources folder.
-    :rtype: str
-    """
-    path = abspath(abspath(join(plugin_path(), "CenRa_METABASE\\tools")))
-    for item in args:
-        path = abspath(join(path, item))
-    return path
-
-
-def load_ui(*args):
-    """Get compile UI file.
-
-    :param args List of path elements e.g. ['img', 'logos', 'image.png']
-    :type args: str
-
-    :return: Compiled UI file.
-    """
-    ui_class, _ = uic.loadUiType(resources_path("ui", *args))
-
-    return ui_class
-
-
-def pyperclip():
-    dst = dirname(dirname(__file__)) + "\\tools\\"
-    if os.access('N:/', os.R_OK):
-        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
-    try:
-        shutil.copy(src, dst)
-    except FileNotFoundError:
-        print('404')
-    except UnboundLocalError:
-        print('404')
-
-
-def send_issues(url, titre, body, labels):
-    import requests
-    import urllib.request
-    import json
-    # import os
-    # import qgis
-
-    # usr = os.environ['USERNAME']
-    token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
-    url = url + '?token=' + token
-
-    headers = {'Authorization': 'token ' + token, 'accept': 'application/json', 'Content-Type': 'application/json'}
-
-    payload = {'title': titre, 'body': body, 'labels': labels}
-    try:
-        urllib.request.urlopen('https://google.com')
-        binar = True
-    except 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 = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
-    # print(URL)
-    version = qgis.utils.pluginMetadata(NAME, 'version')
-    len_version = len(version)
-    try:
-        urllib.request.urlopen('https://google.com')
-        binar = True
-    except 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]
-            if version_plugin != version:
-                iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30)
-        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
+"""Tools to work with resource files."""
+
+import configparser
+import shutil
+import tempfile
+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
+
+__copyright__ = "Copyright 2019, 3Liz"
+__license__ = "GPL version 3"
+__email__ = "info@3liz.org"
+__revision__ = "$Format:%H$"
+
+
+def plugin_path(*args):
+    """Get the path to plugin root folder.
+
+    :param args List of path elements e.g. ['img', 'logos', 'image.png']
+    :type args: str
+
+    :return: Absolute path to the plugin path.
+    :rtype: str
+    """
+    path = dirname(dirname(__file__))
+    path = abspath(abspath(join(path, pardir)))
+    for item in args:
+        path = abspath(join(path, item))
+
+    return path
+
+
+def plugin_name():
+    """Return the plugin name according to metadata.txt.
+
+    :return: The plugin name.
+    :rtype: basestring
+    """
+    metadata = metadata_config()
+    name = metadata["general"]["name"]
+    return name
+
+
+def metadata_config() -> configparser:
+    """Get the INI config parser for the metadata file.
+
+    :return: The config parser object.
+    :rtype: ConfigParser
+    """
+    path = plugin_path("metadata.txt")
+    config = configparser.ConfigParser()
+    config.read(path, encoding='utf8')
+    return config
+
+
+def plugin_test_data_path(*args, copy=False):
+    """Get the path to the plugin test data path.
+
+    :param args List of path elements e.g. ['img', 'logos', 'image.png']
+    :type args: str
+
+    :param copy: If the file must be copied into a temporary directory first.
+    :type copy: bool
+
+    :return: Absolute path to the resources folder.
+    :rtype: str
+    """
+    path = abspath(abspath(join(plugin_path(), "test", "data")))
+    for item in args:
+        path = abspath(join(path, item))
+
+    if copy:
+        temp = tempfile.mkdtemp()
+        shutil.copy(path, temp)
+        return join(temp, args[-1])
+    else:
+        return path
+
+
+def resources_path(*args):
+    """Get the path to our resources folder.
+
+    :param args List of path elements e.g. ['img', 'logos', 'image.png']
+    :type args: str
+
+    :return: Absolute path to the resources folder.
+    :rtype: str
+    """
+    path = abspath(abspath(join(plugin_path(), "CenIsere_AUTOMAP/tools")))
+    for item in args:
+        path = abspath(join(path, item))
+    return path
+
+
+def load_ui(*args):
+    """Get compile UI file.
+
+    :param args List of path elements e.g. ['img', 'logos', 'image.png']
+    :type args: str
+
+    :return: Compiled UI file.
+    """
+    ui_class, _ = uic.loadUiType(resources_path("ui", *args))
+
+    return ui_class
+
+def login_base(take=None):
+    from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user
+    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+    res_ident = first_cur.fetchone()
+
+    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+    user = res_ident[1]
+
+    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+    
+    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+    first_conn.close()
+
+    if take:
+        return cur,con
+    else:
+        return cur
+def send_issues(url,titre,body,labels):
+    import requests
+    import json
+    import os
+    import qgis
+
+    usr = os.environ['USERNAME']
+    token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
+    url=url+'?token='+token
+
+    headers = {'Authorization': 'token ' + token,'accept': 'application/json','Content-Type': 'application/json'}
+
+
+    payload = {'title': titre, 'body': body, 'labels': labels}
+    try:
+        urllib.request.urlopen('https://google.com')
+        binar = True
+    except:
+        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 = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+#    print(URL)
+    version = qgis.utils.pluginMetadata(NAME,'version')
+    len_version = len(version)
+    try:
+        urllib.request.urlopen('https://google.com')
+        binar = True
+    except:
+        binar = False
+    if binar:
+        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]
+        if version_plugin != version:
+            iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30)
+    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

CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_about_form.ui

@@ -1,81 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CenRa_Metabase_editorwidget_base</class>
- <widget class="QDialog" name="CenRa_Metabase_editorwidget_base">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>471</width>
-    <height>594</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Journal des modifications</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>../../CenRa_Metabase/tools/ui/icon.svg</normaloff>../../CenRa_Metabase/tools/ui/icon.svg</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="mouseTracking">
-      <bool>true</bool>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>453</width>
-        <height>570</height>
-       </rect>
-      </property>
-      <widget class="QGroupBox" name="groupBox">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>451</width>
-         <height>541</height>
-        </rect>
-       </property>
-       <property name="title">
-        <string>DevLog</string>
-       </property>
-       <widget class="QTextBrowser" name="viewer">
-        <property name="geometry">
-         <rect>
-          <x>10</x>
-          <y>20</y>
-          <width>431</width>
-          <height>511</height>
-         </rect>
-        </property>
-       </widget>
-      </widget>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::NoButton</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CenRa_Metabase_editorwidget_base</class>
+ <widget class="QDialog" name="CenRa_Metabase_editorwidget_base">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>471</width>
+    <height>594</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Metabase</string>
+  </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>../../CenRa_Metabase/tools/ui/icon.svg</normaloff>../../CenRa_Metabase/tools/ui/icon.svg</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="mouseTracking">
+      <bool>true</bool>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>453</width>
+        <height>547</height>
+       </rect>
+      </property>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>451</width>
+         <height>541</height>
+        </rect>
+       </property>
+       <property name="title">
+        <string>DevLog</string>
+       </property>
+       <widget class="QWebView" name="viewer" native="true">
+        <property name="geometry">
+         <rect>
+          <x>10</x>
+          <y>20</y>
+          <width>431</width>
+          <height>511</height>
+         </rect>
+        </property>
+        <property name="url" stdset="0">
+         <url>
+          <string>about:blank</string>
+         </url>
+        </property>
+       </widget>
+      </widget>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header location="global">QtWebKitWidgets/QWebView</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

CenRa_AUTOMAP/CenRa_AutoMap.py

@@ -1,121 +0,0 @@
-__copyright__ = "Copyright 2021, 3Liz"
-__license__ = "GPL version 3"
-__email__ = "info@3liz.org"
-
-
-from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import Qt, QUrl
-from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction
-from qgis.utils import iface
-import qgis
-
-
-# include <QSettings>
-'''
-from pg_metadata.connection_manager import (
-    store_connections,
-    validate_connections_names,
-)
-
-
-from pg_metadata.locator import LocatorFilter
-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,
-    resources_path,
-    pyperclip,
-    maj_verif,
-)
-pyperclip()
-
-from .canvas_editor import AutoMap_Editor
-from .style_invoke import AutoMap_Style
-
-
-class PgAutoMap:
-    def __init__(self):
-        """ Constructor. """
-        self.canvas_editor = None
-        self.style_dock = None
-#        self.issues = None
-        self.provider = None
-        self.locator_filter = None
-        self.dock_action = None
-        self.help_action = None
-        plugin_dir = os.path.dirname(__file__)
-        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')
-        s = QSettings()
-        versionUse = s.value("automap/version", 1, type=str)
-        if str(versionUse) != str(version):
-            s.setValue("automap/version", str(version))
-            print(versionUse, version)
-            self.open_about_dialog()
-
-    def initGui(self):
-        """ Build the plugin GUI. """
-
-        self.toolBar = iface.addToolBar("CenRa_AutoMap")
-        self.toolBar.setObjectName("CenRa_AutoMap")
-
-        icon = QIcon(resources_path('icons', 'icon.png'))
-
-        # Open the online help
-        self.help_action = QAction(icon, 'CenRa_AutoMap', iface.mainWindow())
-        iface.pluginHelpMenu().addAction(self.help_action)
-        self.help_action.triggered.connect(self.open_help)
-        if not self.canvas_editor:
-            self.canvas_editor = AutoMap_Editor()
-
-            self.automap_action = QAction(icon, 'CenRa_AutoMap', None)
-            self.toolBar.addAction(self.automap_action)
-            self.automap_action.triggered.connect(self.open_editor)
-
-        if not self.style_dock:
-            self.style_dock = AutoMap_Style()
-
-        if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
-            iface.addDockWidget(Qt.DockWidgetArea(0x1), self.style_dock)
-
-    def open_about_dialog(self):
-        """
-        About dialog
-        """
-        dialog = AboutDialog(iface)
-        dialog.exec()
-
-    def open_help():
-        """ Open the online help. """
-        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
-
-    def open_editor(self):
-        self.canvas_editor.show()
-        self.canvas_editor.raise_()
-
-    def unload(self):
-        """ Unload the plugin. """
-        if self.canvas_editor:
-            iface.removePluginMenu('CenRa_AutoMap', self.automap_action)
-
-        if self.provider:
-            QgsApplication.processingRegistry().removeProvider(self.provider)
-            del self.provider
-
-        if self.locator_filter:
-            iface.deregisterLocatorFilter(self.locator_filter)
-            del self.locator_filter
-
-        if self.help_action:
-            iface.pluginHelpMenu().removeAction(self.help_action)
-            del self.help_action

CenRa_AUTOMAP/README.md

@@ -1,6 +0,0 @@
-# CenRa_AutoMap
----
-Outil de création de mise en page,
-Permet de préprogramé des mise en page pour les mêtre à disposition des collégue.
-
-> [Point de départ de création du plugin](https://github.com/CEN-Nouvelle-Aquitaine/MapCEN)

CenRa_AUTOMAP/__init__.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-__copyright__ = "Copyright 2021, 3Liz"
-__license__ = "GPL version 3"
-__email__ = "info@3liz.org"
-
-
-def classFactory(iface):
-    _ = iface
-    from CenRa_AUTOMAP.CenRa_AutoMap import PgAutoMap
-    return PgAutoMap()

CenRa_AUTOMAP/metadata.txt

@@ -1,49 +0,0 @@
-# This file contains metadata for your plugin.
-
-# This file should be included when you package your plugin.# Mandatory items:
-
-[general]
-name=CenRa_AutoMap
-qgisMinimumVersion=3.0
-supportsQt6=True
-description=CenRa_AutoMap
-version=2.7
-author=Conservatoire d'Espaces Naturels de Rhône-Alpes
-email=si_besoin@cen-rhonealpes.fr
-
-about=Outils de création de mise en page prédéfinis pour simplifier et organiser cette étape.
-
-repository=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS
-homepage=https://plateformesig.cenra-outils.org/
-tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
-# End of mandatory metadata
-
-# Recommended items:
-
-hasProcessingProvider=no
-# Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_AUTOMAP:</h2></br><p><h3>18/12/2025 - Version 2.7: </h3> - fix de bug gitea.</p></br><p><h3>18/12/2025 - Version 2.6: </h3> - ajoue du logo n2000 et region.</p></br><p><h3>17/12/2025 - Version 2.5: </h3> - Carte n2000 mise a jour landscape et portrait.</p></br><p><h3>15/12/2025 - Version 2.4: </h3> - Landescape pour n2000.</p></br><p><h3>15/12/2025 - Version 2.3: </h3> - nouvelle mise en page n2000.</p></br><p><h3>12/12/2025 - Version 2.2: </h3> - nouvelle mise en page pour n2000.</p></br><p><h3>30/07/2025 - Version 2.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 2.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>11/04/2025 - Version 1.7: </h3> - Correctif d'orthographe.</p></br><p><h3>09/04/2025 - Version 1.6: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 1.5: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.4: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 1.3: </h3> - Fenêtre redimensionnable avec déplaçable avec la mollette sourit.</p></br><p><h3>25/02/2025 - Version 1.2: </h3> - DockWidget pour ouverture de couche avec theme.</p></br><p><h3>28/01/2025 - Version 1.1: </h3> - Multi-Composeur pris en charge.</p></br><p><h3>27/01/2025 - Version 1.0: </h3> - Version releases.</br> - Ajoute un message d'avertissement au moment d'écraser la mise en page.</br> - Ajoute prénom et nom dans la réalisation.</br> - Utilisation de Calibri.</p></br><p><h3>13/01/2025 - Version 0.1.10: </h3> - Correctif.</p></br><p><h3>07/01/2025 - Version 0.1.9: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>19/12/2024 - Version 0.1.8: </h3> - Nouvelle mise en page.</br> - Incrémentation automatique de nouveau modele de mise en page. </br> - Correctif de bug.</p></br><p><h3>21/10/2024 - Version 0.1.7: </h3> - Epurations du code.</p></br><p><h3>07/10/2024 - Version 0.1.6: </h3> - Option de bibliotheque de logo custome.</p></br><p><h3>03/10/2024 - Version 0.1.5: </h3> - Remonte la fênetre dans la pille.</br> - Gestion du nombre de colonne dans la légend.</br></p></br><p><h3>02/10/2024 - Version 0.1.4: </h3> - Mise en page plein écrant.</br></p></br><p><h3>01/10/2024 - Version 0.1.3: </h3> - Récupération du titre et sous-titre pour mise en page existente.</br> - Integration de bibliotheque de logo.</br> - Integration de gestionaire pour les source de donnée.</br> - Mise en place d'une bar d'echelle adaptative. </br></p></br><p><h3>30/09/2024 - Version 0.1.2: </h3> - Activation du thème. </br> - Ajouter une carte de suivie. </br><p></br><h3>27/09/2024 - Version 0.1.1: </h3> - Ajout d'une liste déroulante pour les sources de données. </br>- Bouton pour ajouter des fonts de carte customisés. </br>- Fonctionnalité de génération d'atlas. </p></br><p><h3>26/09/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_AutoMap avec une seul mise en page. </p></br>
-
-# Tags are comma separated with spaces allowed
-tags=python
-
-
-category=Plugins
-icon=icon.png
-# experimental flag
-experimental=False
-
-# deprecated flag (applies to the whole plugin, not just a single version)
-deprecated=False
-
-# Since QGIS 3.8, a comma separated list of plugins to be installed
-# (or upgraded) can be specified.
-# Check the documentation for more information.
-# plugin_dependencies=
-
-Category of the plugin: Raster, Vector, Database or Web
-# category=cenra,mise en page,atlas
-
-# If the plugin can run on QGIS Server.
-server=False
-

CenRa_AUTOMAP/style_invoke.py

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

CenRa_AUTOMAP/tools/mises_en_pages/carto_standard.py

@@ -1,198 +0,0 @@
-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(198.85714285714286, 175, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0.0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50.0, 50, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0.0
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_size'] = QgsLayoutSize(198.85714285714286, 90, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(5, 205, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0.0
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(12.0, 12, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(191, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0.0
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(54.857142857142854, 5, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(145, 229, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0.0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(46.0, 16, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0.0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(198.85714285714286, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0.0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(100.0, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(205, 158.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 270.0
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_size'] = QgsLayoutSize(100.0, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(104, 200, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0.0
-            self.template_parameters['Source_alignment'] = 0x0002
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(198.85714285714286, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0.0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(54.857142857142854, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(145, 215, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0.0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(50.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0.0
-        if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(280, 247, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(7, 35, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0.0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(70, 70, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(7, 35, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0.0
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_size'] = QgsLayoutSize(280, 127, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(7, 289, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0.0
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(17, 17, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(269, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0.0
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(77, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(205, 323, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0.0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(65, 23, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0.0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(280, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(7, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0.0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(141, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(289, 223, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 270.0
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_size'] = QgsLayoutSize(141, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(147, 282, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0.0
-            self.template_parameters['Source_alignment'] = 0x0002
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(280, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(7, 17, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0.0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(77, 21, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(205, 303, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0.0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(70, 28, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(7, 388, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0.0
-
-    if page_rotate == 'Landscape':
-        if values_page == 'A4':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(285.14285714285717, 145, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0.0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(100.0, 100, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0.0
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_size'] = QgsLayoutSize(285.14285714285717, 41, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 168, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0.0
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(13.142857142857142, 12, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(277, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0.0
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(54.857142857142854, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(232, 193, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0.0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(46.0, 16, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0.0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(286.0, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0.0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(100.0, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(291, 127.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 270.0
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_size'] = QgsLayoutSize(100.0, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(189, 169, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0.0
-            self.template_parameters['Source_alignment'] = 0x0002
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286.0, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0.0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(54.857142857142854, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(232, 179, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0.0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(50.0, 50, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(6, 118, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0.0
-        if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(402, 205, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 32, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0.0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(141, 141, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(8, 32, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0.0
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_size'] = QgsLayoutSize(402, 58, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 237, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0.0
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(19, 17, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(391, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0.0
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(77, 21, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(327, 272, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0.0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(65, 23, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0.0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(403, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(7, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0.0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(141, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(410, 179, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 270.0
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_size'] = QgsLayoutSize(141, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(267, 238, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0.0
-            self.template_parameters['Source_alignment'] = 0x0002
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(403, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(7, 17, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0.0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(77, 21, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(327, 252, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0.0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(70, 70, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(8, 166, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0.0
-
-    return self.template_parameters

CenRa_AUTOMAP/tools/mises_en_pages/full_page.py

@@ -1,203 +0,0 @@
-
-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_2_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_size'] = QgsLayoutSize(210, 297, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(133, 215, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 288, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 273, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(196, 283, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(55, 292, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_rotate'] = 270
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_alignment'] = 0x0002
-        if values_page == 'A3':
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_size'] = QgsLayoutSize(297, 420, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 370, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(219, 324, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 410, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 395, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(24, 24, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(271, 394, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(291, 125, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(98, 414, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_rotate'] = 270
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_alignment'] = 0x0002
-
-    if page_rotate == 'Landscape':
-        if values_page == 'A3':
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_size'] = QgsLayoutSize(420, 297, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_size'] = QgsLayoutSize(411, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(411, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 247, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(341, 196, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 287, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 272, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(24, 24, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(394, 271, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(414, 123, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(185, 292, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_rotate'] = 270
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_alignment'] = 0x0002
-        if values_page == 'A4':
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(100, 100, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_size'] = QgsLayoutSize(297, 210, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 185, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(231, 135, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(64, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 201, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 186, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(283, 196, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(98, 205, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_rotate'] = 270
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_alignment'] = 0x0002
-
-    # Retour des info #
-    return self.template_parameters

CenRa_AUTOMAP/tools/mises_en_pages/left_corner.py

@@ -1,203 +0,0 @@
-
-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(168.0, 262, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(41, 1, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(78.85714285714286, 70, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(130, 1, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_size'] = QgsLayoutSize(168.0, 32, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(41, 264, 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(13, 254, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(38.857142857142854, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(1, 289, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(34.857142857142854, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(3, 139, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(38.857142857142854, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(1, 3, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(74.85714285714286, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(43, 3, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 0
-            self.template_parameters['Source_size'] = QgsLayoutSize(104.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(104, 256, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(38.857142857142854, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(1, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(38.857142857142854, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(1, 276, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(30.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(41, 233, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_alignment'] = 0x0002
-        if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(237, 369, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(58, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(111, 99, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(183, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_size'] = QgsLayoutSize(237, 45, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(58, 372, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(20, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(19, 358, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(55, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(2, 408, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(49, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(4, 196, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(106, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(60, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 0
-            self.template_parameters['Source_size'] = QgsLayoutSize(147, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(147, 361, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(55, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(2, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(55, 19, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(2, 389, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(42, 42, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(58, 329, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_alignment'] = 0x0002
-
-    if page_rotate == 'Landscape':
-        if values_page == 'A4':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(254.85714285714286, 175, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(41, 1, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(78.85714285714286, 70, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(217, 1, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_size'] = QgsLayoutSize(254.85714285714286, 32, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(41, 177, 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(13, 168, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(38.857142857142854, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(1, 202, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(34.857142857142854, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(3, 94, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(38.857142857142854, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(1, 3, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(74.85714285714286, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(43, 3, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 0
-            self.template_parameters['Source_size'] = QgsLayoutSize(104.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(190, 169, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(38.857142857142854, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(1, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(38.857142857142854, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(1, 189, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(30.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(41, 146, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_alignment'] = 0x0002
-        if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(359, 247, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(58, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(111, 99, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(306, 2, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Legande_size'] = QgsLayoutSize(359, 45, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(58, 250, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(20, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(19, 237, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(55, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(2, 285, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(49, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(4, 133, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(106, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(60, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 0
-            self.template_parameters['Source_size'] = QgsLayoutSize(147, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(268, 238, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(55, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(2, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(55, 19, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(2, 267, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(42, 42, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(58, 206, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Logo_2_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_frame'] = False
-            self.template_parameters['Legande_frame'] = False
-            self.template_parameters['Arrow_background'] = True
-            self.template_parameters['Arrow_path'] = "NorthArrow_02.svg"
-            self.template_parameters['Credit_alignment'] = 0x0002
-            self.template_parameters['Source_alignment'] = 0x0002
-
-    return self.template_parameters

CenRa_AUTOMAP/tools/mises_en_pages/n2000.py

@@ -1,197 +0,0 @@
-
-from qgis.core import (
-    QgsLayoutSize,
-    QgsUnitTypes,
-    QgsLayoutPoint,
-)
-
-
-def fletch_canvas(self):
-    if self.radioButton_6.isChecked():
-        values_page = 'A4'
-    else:
-        values_page = 'A3'
-    if self.radioButton_7.isChecked():
-        page_rotate = 'Portrait'
-    else:
-        page_rotate = 'Landscape'
-
-    if page_rotate == 'Portrait':
-        if values_page == 'A4':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(206.0, 200, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(2, 29, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(58.857142857142854, 40, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(146, 218, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(198.85714285714286, 36, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 260, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Legande_frame'] = True
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(191, 32, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Arrow_background'] = False
-            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(50.0, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(90, 244, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(6, 234, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(206.0, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 3, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(198.0, 5, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(3, 228.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 270
-            self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(198.0, 5, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(8, 228.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 270
-            self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(202.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(4, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50.0, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(90, 233, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(48, 234, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-        if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(290, 282, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(3, 41, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(83, 56, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(206, 307, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(280, 51, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 367, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Legande_frame'] = True
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(20, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(269, 45, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Arrow_background'] = False
-            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(70, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(125, 350, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(56, 28, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(8, 330, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(290, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 4, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(280, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(4, 322, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 270
-            self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(280, 7, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(11, 322, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 270
-            self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(285, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(6, 19, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(70, 19, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(125, 330, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(56, 28, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(68, 330, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-    if page_rotate == 'Landscape':
-        if values_page == 'A4':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(189.0, 189, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(9, 18.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50.0, 40, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(194, 20.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(203.0, 62, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(199, 63.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Legande_frame'] = True
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(177, 20.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Arrow_background'] = False
-            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(247, 43, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(209, 174.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(289.0, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(191, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(8, 201, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 0
-            self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(191, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(8, 195, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(289.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 12.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(249, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(252, 174, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-        if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(305.0, 273, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(9, 18.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50.0, 40, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(311, 20.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(203.0, 62, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(317, 63.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Legande_frame'] = True
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(296, 20.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Arrow_background'] = False
-            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(364, 43, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(320, 264.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(413.0, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(306, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(8, 285, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 0
-            self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(306, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(8, 279, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(413.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 12.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(366, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(369, 264, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-    return self.template_parameters

CenRa_AUTOMAP/tools/mises_en_pages/n2000_comparaison.py

@@ -1,197 +0,0 @@
-
-from qgis.core import (
-    QgsLayoutSize,
-    QgsUnitTypes,
-    QgsLayoutPoint,
-)
-
-
-def fletch_canvas(self):
-    if self.radioButton_6.isChecked():
-        values_page = 'A4'
-    else:
-        values_page = 'A3'
-    if self.radioButton_7.isChecked():
-        page_rotate = 'Portrait'
-    else:
-        page_rotate = 'Landscape'
-
-    if page_rotate == 'Portrait':
-        if values_page == 'A4':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(145.0, 135, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(4, 18, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50, 40, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(146, 21, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(198.85714285714286, 36, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(153, 64, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Legande_frame'] = True
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(6, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Arrow_background'] = False
-            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(50.0, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(154, 220, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(160, 264, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(205.0, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 1, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(145.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(4, 147.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 0
-            self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(145.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(4, 141.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(205, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(2, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50.0, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(162, 208, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(160, 234, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-        if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(233.0, 192, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(4, 18, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(50, 40, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(234, 21, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(190, 36, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(242, 64, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Legande_frame'] = True
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(6, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Arrow_background'] = False
-            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(50.0, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(154, 220, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(248, 386, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(293.0, 10, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 1, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(233.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(4, 204.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 0
-            self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(233.0, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(4, 198.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 0
-            self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(293, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(2, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50.0, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(252, 330, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(160, 234, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-    if page_rotate == 'Landscape':
-        if values_page == 'A4':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(145.0, 140, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(150, 27.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(253, 144.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(110.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(183, 175.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Legande_frame'] = True
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(278, 29.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Arrow_background'] = False
-            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(110, 191, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 175.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(288.0, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(140, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(150, 167, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 270
-            self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(140, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(156, 167, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 270
-            self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(288.0, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 11.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(110, 180, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(52, 175, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-        if values_page == 'A3':
-            self.template_parameters['Carte_size'] = QgsLayoutSize(200.0, 230, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_locals'] = QgsLayoutPoint(216, 27.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_rotate'] = 0
-            self.template_parameters['Carte_frame'] = True
-            self.template_parameters['Carte_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(373, 234.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Carte_2_rotate'] = 0
-            self.template_parameters['Carte_2_frame'] = True
-            self.template_parameters['Legande_size'] = QgsLayoutSize(110.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_locals'] = QgsLayoutPoint(253, 264.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Legande_rotate'] = 0
-            self.template_parameters['Legande_frame'] = True
-            self.template_parameters['Arrow_size'] = QgsLayoutSize(14.0, 14, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_locals'] = QgsLayoutPoint(401, 29.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Arrow_rotate'] = 0
-            self.template_parameters['Arrow_background'] = False
-            self.template_parameters['Arrow_path'] = "NorthArrow_03.svg"
-            self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_locals'] = QgsLayoutPoint(150, 281, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_rotate'] = 0
-            self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 265.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_rotate'] = 0
-            self.template_parameters['Titre_size'] = QgsLayoutSize(413.0, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Titre_rotate'] = 0
-            self.template_parameters['Credit_size'] = QgsLayoutSize(230, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_locals'] = QgsLayoutPoint(216, 257, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Credit_rotate'] = 270
-            self.template_parameters['Credit_alignment'] = 0x0001
-            self.template_parameters['Source_size'] = QgsLayoutSize(230, 6, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_locals'] = QgsLayoutPoint(222, 257, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Source_rotate'] = 270
-            self.template_parameters['Source_alignment'] = 0x0001
-            self.template_parameters['Sous_titre_size'] = QgsLayoutSize(413.0, 11, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 11.0, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Sous_titre_rotate'] = 0
-            self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(150, 270, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Echelle_2_rotate'] = 0
-            self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(72, 265, QgsUnitTypes.LayoutMillimeters)
-            self.template_parameters['Logo_2_rotate'] = 0
-    return self.template_parameters

CenRa_AUTOMAP/tools/ui/CenRa_AutoMapStyle_base.ui

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

CenRa_COPIE/CenRa_Copie.py

@@ -4,25 +4,25 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QSettings, QUrl
+from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction
+from qgis.PyQt.QtWidgets import QAction, QMessageBox
 from qgis.utils import iface
 import qgis
 
 
-# include <QSettings>
+#include <QSettings>
+
 import os
-from .about_form import AboutDialog
 from .tools.resources import (
-    # plugin_path,
-    pyperclip,
+    plugin_path,
     resources_path,
     maj_verif,
 )
-pyperclip()
 from .copie_editor import Copie_Editor
+from .about_form import CopieAboutDialog
 
+from PyQt5.QtCore import *
 
 class PgCopie:
     def __init__(self):
@@ -34,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):
@@ -63,21 +63,16 @@ 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):
-                self.copie_editor.setEnabled(True)
 
     def open_about_dialog(self):
         """
         About dialog
         """
-        dialog = AboutDialog(iface)
-        dialog.exec()
-
+        dialog = CopieAboutDialog(iface)
+        dialog.exec_()
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -89,7 +84,8 @@ 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
@@ -17,7 +17,7 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType(
 )
 
 
-class AboutDialog(QDialog, ABOUT_FORM_CLASS):
+class CopieAboutDialog(QDialog, ABOUT_FORM_CLASS):
 
     """ About - Let the user display the about dialog. """
 
@@ -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,80 +4,81 @@ 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 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 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 .tools.PythonSQL import *
 from .tools.resources import (
     load_ui,
     resources_path,
-    # send_issues,
+    login_base,
+    send_issues,
 )
-# from .issues import CenRa_Issues
+from .issues import CenRa_Issues
 
 from qgis.utils import iface
-# import os
-# import os.path
-# import webbrowser
-# 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_Copie_base.ui')
 
-
 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 is None:
-            # self.iface.messageBar().pushMessage(u"Vous devez sélectionner une table !", level=QgsMessageBar.WARNING, duration=5)
+        if layer == 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]
-                mdp = account[1]
-                host = account[2]
-                port = account[3]
-                dbname = account[4]
-                cur = account[7]
-                con = account[8]
 
-                # Creation de la liste des schemas de la base de donnees
+            else :
+
+                first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                res_ident = first_cur.fetchone()
+                mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                user = res_ident[1]
+                con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                first_conn.close()
+
+                            # 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
@@ -94,79 +95,81 @@ 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)
-                # Pour ne pas commencer la liste au premier schema
-                self.schema.setCurrentIndex(-1)
+                self.schema.setCurrentIndex(-1) # Pour ne pas commencer la liste au premier schema
 
-                # Affiche le nom de la table source
-                self.table_source.setText(source_schema + "." + source_tablename)
+
+                self.table_source.setText(source_schema + "." + source_tablename) # Affiche le nom de la table source
                 # show the dialog
                 self.show()
                 # Run the dialog event loop
-                result = self.exec()
+                result = self.exec_()
                 # See if OK was pressed
                 if result:
-                    # ******************************debut script*********************************
-                    account = login_base("account")
-                    user = account[0]
-                    mdp = account[1]
-                    host = account[2]
-                    port = account[3]
-                    dbname = account[4]
-                    cur = account[7]
-                    con = account[8]
+        #******************************debut script*********************************
 
+
+                    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                    res_ident = first_cur.fetchone()
+                    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                    user = res_ident[1]
+                    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                    first_conn.close()
                     # Récupération de la couche active
                     layer = self.iface.activeLayer()
 
                     # 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)
@@ -175,38 +178,31 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
                     cur.execute(SQL_sequence_03)
                     cur.execute(SQL_sequence_04)
 
-                    RETURNE = "SELECT pg_get_serial_sequence('" + schema + "." + tablename + "','gid')"
-                    cur.execute(RETURNE)
-                    sequence_name = cur.fetchone()[0]
-                    print(sequence_name)
-                    SQL_GRANT_TABLE = "GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON " + schema + "." + tablename + " TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON " + schema + "." + tablename + " TO grp_sig;GRANT ALL ON SEQUENCE " + sequence_name + " TO grp_qgis;"
-                    cur.execute(SQL_GRANT_TABLE)
-
-                    if layer.wkbType() == QgsWkbTypes.PointGeometry:
+                    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.Info, 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.Success, duration=5)
                     pass

CenRa_COPIE/metadata.txt

@@ -9,9 +9,8 @@
 [general]
 name=CenRA_COPIE
 qgisMinimumVersion=3.0
-supportsQt6=True
 description=Permet la copie d'une table dans une base PostGis
-version=3.1
+version=2.0
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -20,7 +19,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>30/07/2025 - Version 3.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>11/04/2025 - Version 2.5: </h3> - Correctif de bug.</p></br><p><h3>09/04/2025 - Version 2.4: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.3: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.2: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>22/10/2024 - Version 2:</h3>- Refonte du code.</p></br><p><h3>13/09/2024 - Version 1.5:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
+changelog=<h2>CenRa_COPIE:</h2></br><p><h3>22/10/2024 - Version 2:</h3>- Refonte du code.</p></br><p><h3>13/09/2024 - Version 1.5:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
 
 # Tags are comma separated with spaces allowed
 tags=cenra, database, table

CenRa_COPIE/tools/PythonSQL.py

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

CenRa_COPIE/tools/resources.py

@@ -3,10 +3,9 @@
 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 +89,7 @@ def resources_path(*args):
     :return: Absolute path to the resources folder.
     :rtype: str
     """
-    path = abspath(abspath(join(plugin_path(), "CenRa_COPIE\\tools")))
+    path = abspath(abspath(join(plugin_path(), "CenRa_Copie\\tools")))
     for item in args:
         path = abspath(join(path, item))
     return path
@@ -108,77 +107,77 @@ def load_ui(*args):
 
     return ui_class
 
+def login_base(take=None):
+    from CenRa_Metabase.resources.PythonSQL import host,port,dbname,password,os_user
+    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+    res_ident = first_cur.fetchone()
+    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+    user = res_ident[1]
 
-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')
+    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
 
+    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+    first_conn.close()
 
-def send_issues(url, titre, body, labels):
+    if take:
+        return cur,con
+    else:
+        return cur
+def send_issues(url,titre,body,labels):
     import requests
-    import urllib.request
     import json
-    # import os
-    # import qgis
+    import os
+    import qgis
 
-    # usr = os.environ['USERNAME']
+    usr = os.environ['USERNAME']
     token = '9d0a4e0bea561710e0728f161f7edf4e5201e112'
-    url = url + '?token=' + token
+    url=url+'?token='+token
+
+    headers = {'Authorization': 'token ' + token,'accept': 'application/json','Content-Type': 'application/json'}
 
-    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 ValueError:
+    except:
         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 = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
-    # print(URL)
-    version = qgis.utils.pluginMetadata(NAME, 'version')
+    url = qgis.utils.pluginMetadata(NAME,'repository')
+    #URL = url+'/raw/branch/main/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+#    print(URL)
+    version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)
     try:
         urllib.request.urlopen('https://google.com')
         binar = True
-    except urllib.error.URLError:
+    except:
         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]
-            if version_plugin != version:
-                iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30)
-        except urllib.error.URLError:
-            print("error gitea version ssl")
+        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]
+        if version_plugin != version:
+            iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30)
     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

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

CenRa_FLUX/CenRa_Flux.py

@@ -4,24 +4,25 @@ __email__ = "info@3liz.org"
 
 
 from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import QUrl, QSettings
+from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction
+from qgis.PyQt.QtWidgets import QAction, QMessageBox
 from qgis.utils import iface
 import qgis
 
-# include <QSettings>
-from .about_form import AboutDialog
+
+#include <QSettings>
+
 import os
 from .tools.resources import (
-    pyperclip,
+    plugin_path,
     resources_path,
     maj_verif,
 )
-pyperclip()
-
 from .flux_editor import Flux_Editor
+from .about_form import FluxAboutDialog
 
+from PyQt5.QtCore import *
 
 class PgFlux:
     def __init__(self):
@@ -33,18 +34,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):
@@ -61,20 +62,17 @@ 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):
-                self.flux_editor.setEnabled(True)
 
     def open_about_dialog(self):
         """
         About dialog
         """
-        dialog = AboutDialog(iface)
-        dialog.exec()
-
+        dialog = CopieAboutDialog(iface)
+        dialog.exec_()
     def open_help():
         """ Open the online help. """
         QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -86,7 +84,8 @@ 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/README.md

@@ -1,6 +1,60 @@
+# <p align="center">FluxCEN</p>
+
+<img align="left" src=https://raw.githubusercontent.com/CEN-Nouvelle-Aquitaine/fluxcen/main/icon.png  width="220"/>
+<br>
+<br>
+<br>
+Le plugin QGIS FluxCEN permet d'accéder rapidement à un large éventail de flux WFS/WMS organisés par catégories et interrogeables sous forme de mots-clés. 
+<br>
+<br>
+Il évite ainsi d'avoir à gérer dans QGIS une multitude de connexions.
+<br>
+<br>
+<br>
+
+## 🧐 Features    
+- Sélection rapide des ressources par autocomplétion
+- Regroupement des flux au sein de catégories
+- Gestion des styles par défaut à l'ouverture dans QGIS pour les données WFS
+- Centralisation  et gestion des flux simplifiée dans un fichier .csv
+- Code et ressources attachées gérées directement via le git
+- Prise en charge des flux Geoserver et Mapserver
+- Lien direct vers la fiche de métadonnées de la ressource
+
+## Composition du fichier .csv
+  
+  * service : type de service utilisé (WFS ou WMS)
+  * categorie : categorie de la couche pour affichage et recherche dans le plugin
+  * Nom_couche_plugin : nom de la couche qui s'affichera dans le plugin
+  * nom_technique : nom technique de la couche utilisé sur le serveur source (caché dans le plugin)
+  * url : URL du serveur pour accéder à la couche
+  * source : Source de la donnée
+  * style : nom du fichier de style pour affichage à l'ouverture dans QGIS
+  * metadonnees : URL d'accès à la fiche de métadonnées liée à la resource
+ 
+ Exemple pour accéder à la BD ORTHO® :
+ 
+ | service | categorie | Nom_couche_plugin | nom_technique | url | source | style |
+| -------- | -------- | -------- | -------- | -------- |-------- | -------- |
+| WMS Raster| Fonds cartos | BD ORTHO® | HR.ORTHOIMAGERY.ORTHOPHOTOS |https://wxs.ign.fr/ortho/geoportail/r/wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities| IGN  | |
+
+ 
+ 
+## Style des couches
+ 
+ Le dossier *styles_couches* stocke les styles QGIS au format .qml afin d'appliquer par défaut ce style à l'ouverture de la couche dans QGIS. L'ajout d'un style dans ce dossier nécessite de reporter le nom du fichier .qml dans le champ "style" du csv.
+ 
+  
+## Accès aux données protégées
+
+Si l'accès à la majorité des ressources reste public, certaines peuvent être protégées par un mot de passe (données métier confidentielles par exemple).
+
+ Cette authentification est gérée via le serveur cartographique qui génère les flux.
+Pour y accéder, il faut créer en amont une authentification dans QGIS. L'ouverture des données protégées se fera alors à partir de la première authentification enregistrée dans QGIS (pas de gestion multi-authentification pour le moment)
+
+## Interface du plugin:
+
+<img align="center" src=https://raw.githubusercontent.com/CEN-Nouvelle-Aquitaine/fluxcen/main/fluxcen_interface.PNG  width="600"/>
 
-> [Point de départ de création du plugin](https://github.com/CEN-Nouvelle-Aquitaine/MapCEN)
 
-Le plugin QGIS CenRa_FLUX permet d'accéder rapidement à un large éventail de données organisés dans PostGIS par catégories et interrogeables sous forme de mots-clés. 
 
-Il évite ainsi d'avoir à gérer dans QGIS une multitude de connexions.

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
@@ -17,7 +17,7 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType(
 )
 
 
-class AboutDialog(QDialog, ABOUT_FORM_CLASS):
+class FluxAboutDialog(QDialog, ABOUT_FORM_CLASS):
 
     """ About - Let the user display the about dialog. """
 
@@ -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,177 +2,100 @@
 
 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
-
-from qgis.PyQt import QtCore, QtGui
+from builtins import object
+import qgis
+from qgis.PyQt import QtCore
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt import QtWidgets
-# from qgis.PyQt.QtWidgets import  QDialog
+from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog
 from qgis.PyQt.QtGui import QIcon
-
-# 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 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,
-    # QAction,
-    # QDockWidget,
-    # QFileDialog,
-    # QInputDialog,
-    # QMenu,
-    # QToolButton,
-    # QTableWidget,
+    QAction,
+    QDockWidget,
+    QFileDialog,
+    QInputDialog,
+    QMenu,
+    QToolButton,
+    QTableWidget, 
     QTableWidgetItem,
     QMessageBox,
     QVBoxLayout,
 )
-from .tools.SQLRequet import schemaname_list, schemaname_list_ref, schemaname_distinct
+from .tools.PythonSQL import *
 from .tools.resources import (
     load_ui,
     resources_path,
-    # send_issues,
+    login_base,
+    send_issues,
 )
-try:
-    from .tools.PythonSQL import login_base
-except NameError:
-    print('Pas de fichier PythonSQL')
+from .issues import CenRa_Issues
 
-
-# from .issues import CenRa_Issues
-
-# from ast import literal_eval
 from qgis.utils import iface
-# import os.path
-# import os
-# import webbrowser
+import os.path
+import webbrowser, os
 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]
-    mdp = account[1]
-    host = account[2]
-    port = account[3]
-    dbname = account[4]
-    sigdb = account[5]
-    refdb = account[6]
-
-except NameError:
-    print('Fails to login DB for account')
+first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+res_ident = first_cur.fetchone()
+mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+user = res_ident[1]
+first_conn.close()
 
 EDITOR_CLASS = load_ui('CenRa_Flux_base.ui')
 
-targetCrs = QgsCoordinateReferenceSystem('EPSG:4326')
-layerCrs = QgsCoordinateReferenceSystem('EPSG:2154')
-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.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger(0))
-        self.toolButton.setIcon(QtGui.QIcon(resources_path('ui', 'find.png')))
+        self.tableWidget.setSelectionBehavior(QTableWidget.SelectRows)
+        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
         self.comboBox_2.addItem("SIG")
         self.comboBox_2.addItem('REF')
-
+        self.comboBox.currentIndexChanged.connect(self.initialisation_flux)
         self.commandLinkButton.clicked.connect(self.selection_flux)
         self.tableWidget.itemDoubleClicked.connect(self.selection_flux)
         self.pushButton_2.clicked.connect(self.limite_flux)
         self.commandLinkButton_2.clicked.connect(self.suppression_flux)
         self.tableWidget_2.itemDoubleClicked.connect(self.suppression_flux)
         self.comboBox_2.currentIndexChanged.connect(self.bd_source)
-        self.checkBox.hide()
-        # self.checkBox.stateChanged.connect(self.modeCarte)
-        self.toolButton.clicked.connect(self.getCanevas)
         layout = QVBoxLayout()
         self.lineEdit.textChanged.connect(self.filtre_dynamique)
-        # self.viewer.textChanged.connect(self.NewTitle)
         layout.addWidget(self.lineEdit)
-        self.viewer.hide()
-        self.DeBUG.addItem('')
-        self.DeBUG.addItem('Dev')
-        self.DeBUG.addItem('01')
-        self.DeBUG.addItem('0726')
-        self.DeBUG.addItem('4269')
-        self.comboBox.currentIndexChanged.connect(self.initialisation_flux)
+        #self.lineEdit.mousePressEvent = self._mousePressEvent
 
-        self.DeBUG.currentIndexChanged.connect(self.SwitchDEBUG)
-        self.DeBUG.hide()
+        #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 SwitchDEBUG(self):
-        try:
-            global user, mdp, host, port, dbname, sigdb, refdb
-            account = login_base(self.DeBUG.currentText())
-            user = account[0]
-            mdp = account[1]
-            host = account[2]
-            port = account[3]
-            dbname = account[4]
-            sigdb = account[5]
-            refdb = account[6]
-            self.bd_source()
-
-        except NameError:
-            print('Fails to switch DB for account')
-
-    def ModeDeBUG(self):
-        self.DeBUG.show()
-
-    def mousePressEvent(self, event):
-        global DeBUG
-        if 330 <= event.pos().x() <= 560 and 5 <= event.pos().y() <= 75:
-            DeBUG = DeBUG + 1
-            if DeBUG == 3:
-                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):
         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':
@@ -181,22 +104,22 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
     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()
-        # 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:
+        if self.first_start == 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
@@ -206,250 +129,138 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
     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()
-        # 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:
+        if self.first_start == True:
             self.first_start = False
         # show the dialog
-        # self.show()
+        self.show()
         # Run the dialog event loop
-        # result = self.exec()
+        result = self.exec_()
         # See if OK was pressed
-        # if result:
+        if result:
             # Do something useful here - delete the line containing pass and
             # substitute with your code.
-        #    pass
+            pass
 
     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):
-        print('run')
         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()) + """' AND tablename NOT LIKE 'qgis_projects' 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 = []
-
-        SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects'"""
-        cur.execute(SQLprojects)
-        list_projects = cur.fetchall()
-        list_projects_qgis = []
-        if len(list_projects) <= 1:
-            for ProjectName in list_projects:
-                SQLProjectsQgis = """SELECT name, metadata, content FROM """ + '"' + ProjectName[0] + '"."' + ProjectName[1] + '"'
-                cur.execute(SQLProjectsQgis)
-                list_projects_qgis.append(cur.fetchall())
-
-        if self.comboBox.currentText() == 'toutes les catégories':
-            SQLGrands = """SELECT concat(table_schema,'.',table_name) FROM information_schema.role_table_grants WHERE grantee in(SELECT rolname FROM pg_catalog.pg_roles WHERE oid in(SELECT roleid FROM pg_auth_members WHERE member = (SELECT usesysid FROM pg_catalog.pg_user WHERE usename = '""" + user + """'))) and privilege_type = 'SELECT';"""
-        else:
-            SQLGrands = """SELECT concat(table_schema,'.',table_name) FROM information_schema.role_table_grants WHERE grantee in(SELECT rolname FROM pg_catalog.pg_roles WHERE oid in(SELECT roleid FROM pg_auth_members WHERE member = (SELECT usesysid FROM pg_catalog.pg_user WHERE usename = '""" + user + """'))) and privilege_type = 'SELECT' AND table_schema LIKE '_""" + str(self.comboBox.currentText()) + """_%';"""
-        cur.execute(SQLGrands)
-        list_grands = cur.fetchall()
-        GrandUser = []
-        for grandsFind in list_grands:
-            GrandUser.append(grandsFind[0])
-
         self.tableWidget.setRowCount(len(list_schema))
-        self.tableWidget.setColumnCount(4)
-        i = 0
+        self.tableWidget.setColumnCount(3)
+        i=0
         for value in list_schema:
             if dbtype == sigdb:
                 type_val = str(value[0])[1:3]
-                schema_name = str(value[0])[4:]
-                table_name = str(value[1][len(value[0]) + 1:])
-                if value[0] == value[1][:len(value[0])]:
-                    table_name = str(value[1][len(value[0]) + 1:])
-                else:
-                    table_name = str(value[1])
+                schema_name=str(value[0])[4:]
+                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:]
-                if value[0] == value[1][:len(value[0])]:
-                    table_name = str(value[1][len(value[0]) + 1:])
-                else:
-                    table_name = str(value[1])
+                type_val=str(value[0])[1:5]
+                schema_name=str(value[0])[6:]
+                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, 1, item)
+            self.tableWidget.setItem(i,0,item)
             item = QTableWidgetItem(schema_name)
-            self.tableWidget.setItem(i, 2, item)
+            self.tableWidget.setItem(i,1,item)
             item = QTableWidgetItem(table_name)
-            self.tableWidget.setItem(i, 3, item)
-
-            if True:
-                if (str(value[0]) + '.' + str(value[1])) in GrandUser:
-                    pass
-                else:
-                    # print(str(value[0]) + '.' + str(value[1]), 'bad')
-                    for j in range(self.tableWidget.columnCount()):
-                        self.tableWidget.item(i, j).setBackground(QtGui.QColor(187, 134, 192, 50))
-                        self.tableWidget.item(i, j).setToolTip('Droit insuffisant pour ouvrire la couche !')
-
-            i = i + 1
-
-        if self.comboBox.currentText() == 'toutes les catégories':
-            SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects'"""
-        else:
-            SQLprojects = """SELECT schemaname, tablename FROM pg_catalog.pg_tables WHERE tablename LIKE 'qgis_projects' AND schemaname LIKE '""" + str(self.comboBox.currentText()) + """';"""
-        cur.execute(SQLprojects)
-        list_projects = cur.fetchall()
-
-        list_projects_qgis = []
-        if len(list_projects) >= 1:
-            for ProjectName in list_projects:
-                SQLProjectsQgis = """SELECT name, metadata, content FROM """ + '"' + ProjectName[0] + '"."' + ProjectName[1] + '"'
-                cur.execute(SQLProjectsQgis)
-                list_projects_qgis = cur.fetchall()
-                for Project in list_projects_qgis:
-                    self.tableWidget.setRowCount(i + 1)
-                    itemIcon = QTableWidgetItem()
-                    icon = QIcon()
-                    icon.addPixmap(QtGui.QPixmap(resources_path('icons', 'mIconQgis.svg')), QIcon.Mode(0), QIcon.State(1))
-                    itemIcon.setIcon(icon)
-                    self.tableWidget.setItem(i, 0, itemIcon)
-
-                    item = QTableWidgetItem('qgis')
-                    self.tableWidget.setItem(i, 1, item)
-
-                    item = QTableWidgetItem(ProjectName[0])
-                    self.tableWidget.setItem(i, 2, item)
-
-                    item = QTableWidgetItem(Project[0])
-                    self.tableWidget.setItem(i, 3, item)
-
-                    i = i + 1
-
+            self.tableWidget.setItem(i,2,item)
+            i=i+1
         self.tableWidget.setColumnWidth(0, 20)
-        self.tableWidget.setColumnWidth(1, 70)
+        self.tableWidget.setColumnWidth(1, 300)
         self.tableWidget.setColumnWidth(2, 300)
-        self.tableWidget.setColumnWidth(3, 300)
-        self.tableWidget.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table"])
-
+        self.tableWidget.setHorizontalHeaderLabels(["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
-        # svgTake = (selected_items[2].tableWidget().cellWidget(0,0))
-        new_item_text = selected_items[3].text()
+        new_item_text = selected_items[2].text()
 
         if not self.item_already_exists(new_item_text):
             self.tableWidget_2.insertRow(selected_row)
 
             for column in range(self.tableWidget.columnCount()):
                 cloned_item = selected_items[column].clone()
-                self.tableWidget_2.setHorizontalHeaderLabels(["Type", "Code", "Schema", "Table"])
-                self.tableWidget_2.setColumnCount(4)
+                self.tableWidget_2.setHorizontalHeaderLabels(["Code","Schema", "Table"])
+                self.tableWidget_2.setColumnCount(3)
                 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(0, 50)
+            self.tableWidget_2.setColumnWidth(1, 300)
             self.tableWidget_2.setColumnWidth(2, 300)
-            self.tableWidget_2.setColumnWidth(3, 300)
+
 
     def item_already_exists(self, new_item_text):
         # Assuming you want to compare items in the first column for uniqueness
-        existing_items = self.tableWidget_2.findItems(new_item_text, QtCore.Qt.MatchFlag(0))
+        existing_items = self.tableWidget_2.findItems(new_item_text, QtCore.Qt.MatchExactly)
+
         # 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.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
-            if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
+                                                    QMessageBox.Yes | QMessageBox.No)
+            if self.QMBquestion == QMessageBox.Yes:
                 self.chargement_flux()
 
-            if self.QMBquestion == QMessageBox.StandardButton(0x00001000):
+            if self.QMBquestion == QMessageBox.No:
                 print("Annulation du chargement des couches")
 
         if self.tableWidget_2.rowCount() <= 5:
             self.chargement_flux()
 
-    """
-    def openPostGIS(self, schema, table):
-        uri = QgsDataSourceUri()
-        uri.setConnection(host, port, sigdb, user, mdp)
-
-        if (schema + '.' + table) in LRasterList:
-            uri.setDataSource(schema, table, "rast")
-            uri.setKeyColumn('rid')
-            uri.setSrid('2154')
-            layer = QgsRasterLayer(uri.uri(), table, "postgresraster")
-        else:
-            uri.setDataSource(schema, table, "geom")
-            uri.setKeyColumn('gid')
-            uri.setSrid('2154')
-            layer = QgsVectorLayer(uri.uri(), table, "postgres")
-        # Ajout de la couche au canevas QGIS
-        QgsProject.instance().addMapLayer(layer)
-    """
-
     def chargement_flux(self):
+
         managerAU = QgsApplication.authManager()
-        managerAU.availableAuthMethodConfigs().keys()
+        k = managerAU.availableAuthMethodConfigs().keys()
 
         def REQUEST(type):
             switcher = {
@@ -461,110 +272,61 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             }
             return switcher.get(type, "nothing")
 
-        # def displayOnWindows(type, uri, name):
-        #    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';"""
-
-        cur.execute(SQLextension)
-        count_extension = cur.fetchall()[0][0]
-
-        if count_extension == 1:
-            cur.execute(SQLloadRaster)
-            list_raster = cur.fetchall()
-        else:
-            list_raster = []
-
-        RasterList = []
-        for rasterFind in list_raster:
-            RasterList.append(rasterFind[0])
+        def displayOnWindows(type, uri, name):
+            p = []
 
         for row in range(0, self.tableWidget_2.rowCount()):
-            color_rgba_db = 855030089
-            color_rgba_droit = 851150528
-            # print(self.tableWidget_2.item(row, 1).background().color().rgba())
-            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:
-                # supression de la partie de l'url après le point d'interrogation
+                ## supression de la partie de l'url après le point d'interrogation
                 if dbtype == sigdb:
-                    code = self.tableWidget_2.item(row, 1).text()
-                    schema = '_' + code + '_' + self.tableWidget_2.item(row, 2).text()
+                    code = self.tableWidget_2.item(row,0).text()
+                    schema = '_'+code+'_'+self.tableWidget_2.item(row,1).text()
                     if code == 'travaux' or code == 'agregation':
-                        schema = self.tableWidget_2.item(row, 2).text()
-                        table = self.tableWidget_2.item(row, 3).text()
-                    elif code == '00':
-                        table = self.tableWidget_2.item(row, 3).text()
-                    else:
-                        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]
+                        schema = self.tableWidget_2.item(row,1).text()
+                    table = self.tableWidget_2.item(row,2).text()#.split("?", 1)[0]
+                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]
                 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
-                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)
-                elif code == 'qgis':
-                    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")
-                    uri.setKeyColumn('gid')
+                uri.setConnection(host ,port ,dbtype ,user ,mdp)
 
-                    # Chargement de la couche PostGIS
-                    geom_type = 'SELECT right(st_geometrytype(geom),-3) as a FROM ' + schema + '.' + table + ' GROUP BY a'
-                    try:
-                        cur.execute(geom_type)
-                        list_typegeom = cur.fetchall()
-                        UndefinedTable = True
-                    except psycopg2.errors.UndefinedTable:
-                        print("Error table name")
-                        list_typegeom = ''
-                        UndefinedTable = False
-                    if len(list_typegeom) > 1:
-                        for typegeom in list_typegeom:
-                            if typegeom[0] == 'MultiPolygon':
-                                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:
-                        if UndefinedTable:
+                # 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()
+                print(len(list_typegeom))
+                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:
-                            self.QMBquestion = QMessageBox.question(iface.mainWindow(), u"Attention !", "La couche «" + str(self.tableWidget_2.item(row, 1).text()) + ' ' + str(self.tableWidget_2.item(row, 2).text()) + "» semble ne pas avoir le même nom dans la BD, merci de contacter votre administrateur pour régler le problème !", QMessageBox.StandardButton(0x00004000))
-            else:
-                self.QMBquestion = QMessageBox.question(iface.mainWindow(), u"Attention !", "La couche «" + str(self.tableWidget_2.item(row, 1).text()) + ' ' + str(self.tableWidget_2.item(row, 2).text()) + "» ne ce trouve pas dans cette BD !", QMessageBox.StandardButton(0x00004000))
+                else:
+                    layer = QgsVectorLayer(uri.uri(), table, "postgres")
+                    # Ajout de la couche au canevas QGIS
+                    QgsProject.instance().addMapLayer(layer)
 
     def combobox_custom(self):
         if dbtype == sigdb:
-            self.toolButton.setEnabled(1)
             self.comboBox.clear()
             self.comboBox.addItem("toutes les catégories")
             self.comboBox.addItem('00')
@@ -575,21 +337,17 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             self.comboBox.addItem('69')
             self.comboBox.addItem('agregation')
             self.comboBox.addItem('travaux')
-            self.comboBox.addItem('qgis')
             self.comboBox.addItem('form')
         if dbtype == refdb:
-            self.toolButton.setEnabled(0)
-            custom_list = schemaname_distinct
+            custom_list=schemaname_distinct
             cur.execute(custom_list)
             list_schema = cur.fetchall()
             self.comboBox.clear()
             self.comboBox.addItem("toutes les catégories")
             for baxval in list_schema:
                 self.comboBox.addItem(baxval[0])
-
     def filtre_dynamique(self, filter_text):
-        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)
@@ -598,71 +356,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                 if not match:
                     break
 
-    def getCanevas(self):
-        poly = iface.mapCanvas().extent()
-        geom = (str(poly.xMinimum()) + ',' + str(poly.yMinimum()) + ',' + str(poly.xMaximum()) + ',' + str(poly.yMaximum()))
+    def popup(self):
 
-        SQL_GEOM_CONTOUR = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_contour" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
-        SQL_GEOM_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_habitat" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
-        SQL_GEOM_EU_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_eu_habitat" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
-        SQL_GEOM_TRAVAUX_PREVUS_LIGNE = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_ligne" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
-        SQL_GEOM_TRAVAUX_PREVUS_POINT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_point" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
-        SQL_GEOM_TRAVAUX_PREVUS_POLY = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_poly" WHERE st_intersects(geom,ST_MakeEnvelope(""" + geom + ",2154)) ORDER BY tname"
-
-        cur.execute(SQL_GEOM_CONTOUR)
-        TableContour = cur.fetchall()
-        cur.execute(SQL_GEOM_HABITAT)
-        TableHabitat = cur.fetchall()
-        cur.execute(SQL_GEOM_EU_HABITAT)
-        TableEuHabitat = cur.fetchall()
-        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_LIGNE)
-        TableTravauxLigne = cur.fetchall()
-        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_POINT)
-        TableTravauxPoint = cur.fetchall()
-        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_POLY)
-        TableTravauxPoly = cur.fetchall()
-
-        TableHaveGeom = sorted(TableContour + TableHabitat + TableEuHabitat + TableTravauxLigne + TableTravauxPoint + TableTravauxPoly)
-        row_count = 0
-        self.tableWidget.setRowCount(0)
-        for e in TableHaveGeom:
-            cur.execute("""SELECT DISTINCT count(*) FROM pg_catalog.pg_tables WHERE schemaname LIKE '""" + e[0] + """' AND tablename LIKE '""" + e[1] + """';""")
-            TableSomme = cur.fetchall()[0][0]
-
-            if e[0][1:3] != 'fo':
-                DepName = QTableWidgetItem(e[0][1:3])
-                SchemaName = QTableWidgetItem(e[0][4:])
-            else:
-                DepName = QTableWidgetItem('form')
-                SchemaName = QTableWidgetItem(e[0][6:])
-            TableName = QTableWidgetItem(e[1][len(e[0]) + 1:])
-            self.tableWidget.insertRow(row_count)
-
-            itemIcon = QTableWidgetItem()
-            icon = QIcon()
-            icon.addPixmap(QtGui.QPixmap(resources_path('icons', 'mIconVecteur.svg')), QIcon.Mode(0), QIcon.State(1))
-            itemIcon.setIcon(icon)
-
-            self.tableWidget.setItem(row_count, 0, itemIcon)
-            self.tableWidget.setItem(row_count, 1, DepName)
-            self.tableWidget.setItem(row_count, 2, SchemaName)
-            self.tableWidget.setItem(row_count, 3, TableName)
-            if TableSomme == 0:
-                for j in range(self.tableWidget.columnCount()):
-                    self.tableWidget.item(row_count, j).setBackground(QtGui.QColor(246, 185, 73, 50))
-                    self.tableWidget.item(row_count, j).setToolTip('Couche dans une autre BD !')
-            row_count = row_count + 1
-        if self.lineEdit.text() != 'Recherche par mots-clés':
-            self.filtre_dynamique(self.lineEdit.text())
-
-    def SwitchGeom(self, vargeom):
-        new_object = '['
-        obj = vargeom['coordinates'][0][0]
-        for obj_X in obj:
-            new_object = new_object + '[' + str(obj_X[1]) + ',' + str(obj_X[0]) + '],'
-        new_object = new_object[:-1] + ']'
-        return (new_object)
-
-    # def popup(self):
-        # self.dialog = Popup()  # +++ - self
-        # self.dialog.text_edit.show()
+        self.dialog = Popup()  # +++ - self
+        self.dialog.text_edit.show()

CenRa_FLUX/issues.py

@@ -1,31 +1,54 @@
 import os
-# from qgis.gui import *
+plugin_dir = os.path.dirname(__file__)
+end_find = plugin_dir.rfind('\\')+1
 
-from qgis.core import QgsSettings
-from qgis.PyQt.QtWidgets import QDialog
+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.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):
+
     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)
 
@@ -39,32 +62,27 @@ class CenRa_Issues(QDialog, EDITOR_CLASS):
         statu_autre = self.check_autre.isChecked()
 
         statu = []
-        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 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 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=0, duration=20)
+            iface.messageBar().pushMessage("Envoyer :", "Votre messages à bien été envoyer.", level=Qgis.Success, duration=20)
             self.close()
         elif code == 422:
-            iface.messageBar().pushMessage("Erreur :", "Erreur dans le contenu du messages.", level=2, duration=20)
+            iface.messageBar().pushMessage("Erreur :", "Erreur dans le contenu du messages.", level=Qgis.Critical, duration=20)
         elif code == 423:
-            iface.messageBar().pushMessage("Erreur :", "Pas de sujet sélectionné.", level=2, duration=20)
+            iface.messageBar().pushMessage("Erreur :", "Pas de sujet sélectionné.", level=Qgis.Critical, duration=20)
         elif code == 404:
-            iface.messageBar().pushMessage("Missing :", "Le serveur de messagerie est injoignable.", level=1, duration=20)
+            iface.messageBar().pushMessage("Missing :", "Le serveur de messagerie est injoignable.", level=Qgis.Warning, duration=20)

CenRa_FLUX/metadata.txt

@@ -5,9 +5,8 @@
 [general]
 name=CenRa_FLUX
 qgisMinimumVersion=3.0
-supportsQt6=True
 description=Permet d'ouvrire une table dans la base PostGis
-version=3.15
+version=2.1
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -19,6 +18,7 @@ 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>15/12/2025 - Version 3.15: </h3> - information visuel des droit d access a la donnee sur tout les base.</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>
+changelog=<h1>CenRA_FLUX:</h1></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,3 +45,4 @@ deprecated=False
 
 # If the plugin can run on QGIS Server.
 server=False
+

CenRa_FLUX/tools/HubToTea.py

@@ -1,8 +1,7 @@
 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'
 
@@ -19,4 +18,4 @@ def gitea():
 
     # Write the file out again
     with open(file_url, 'w') as file:
-        file.write(filedata)
+        file.write(filedata)

CenRa_FLUX/tools/PythonSQL.py

@@ -0,0 +1,185 @@
+import sys
+import socket
+import os
+IPAddr=socket.gethostbyname(socket.gethostname())
+print(IPAddr)
+if IPAddr[0:11] == "100.100.100": #4269
+    host = "100.100.100.11"
+    port = "5432"
+    dbname = "sig4269"
+    sigdb="sig4269"
+    refdb="ref_geo4269"
+    password = "McVities"
+if IPAddr[0:9] == "192.168.0": #01
+    host = "192.168.0.201"
+    port = "5432"
+    dbname = "sig01"
+    sigdb="sig01"
+    refdb="ref_geo01"
+    password = "McVities"
+if IPAddr[0:9] == "192.168.1": #0726
+    host = "192.168.1.201"
+    port = "5432"
+    dbname = "sig0726"
+    sigdb="sig0726"
+    refdb="ref_geo0726"
+    password = "McVities"
+if sys.platform == 'linux':
+    os_user = os.environ['USER']
+else:
+    os_user = os.environ['USERNAME']
+if os_user == 'STAGE':
+    os_user='stage'
+if os_user == 'Administrateur':
+    os_user = 'stage'
+
+schemaname_distinct="""SELECT DISTINCT schemaname from pg_catalog.pg_tables
+                            WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
+                            order by schemaname;"""
+schemaname_list_ref="""SELECT schemaname,tablename from pg_catalog.pg_tables
+          WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'
+          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_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_FLUX/tools/icons/mIconQgis.svg

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
-<polygon fill="#EE7913" points="68.613,69.625 86.891,69.625 71.697,54.625 52.613,54.625 52.613,72.746 68.613,88.548 "/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="402.5244" y1="-220.8706" x2="400.6479" y2="-97.5023" gradientTransform="matrix(1 0 0 -1 -300.5195 -92.5547)">
-	<stop  offset="0" style="stop-color:#589632"/>
-	<stop  offset="1" style="stop-color:#93B023"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1_)" points="126.613,109.057 94.488,77.625 76.613,77.625 76.613,96.033 107.143,126.625 
-	126.613,126.625 "/>
-<polygon fill="#F0E64A" points="76.613,77.625 94.488,77.625 86.891,69.625 68.613,69.625 68.613,88.548 76.613,96.033 "/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="365.4619" y1="-221.1455" x2="363.5923" y2="-98.227" gradientTransform="matrix(1 0 0 -1 -300.5195 -92.5547)">
-	<stop  offset="0" style="stop-color:#589632"/>
-	<stop  offset="1" style="stop-color:#93B023"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M68.923,101.552c-1.165,0.242-1.769,0.157-4.685,0.157c-20.866,0-38.612-17.158-38.612-39.406
-	c0-22.248,17.551-39.027,38.612-39.027s37.833,16.78,37.833,39.027c0,3.619-0.451,7.099-1.284,10.398L120.1,92.012
-	c4.979-8.726,7.765-18.869,7.765-29.857c0-34.289-27.363-59.963-64.016-59.963C27.363,2.191,0,27.696,0,62.154
-	c0,34.625,27.363,60.638,63.848,60.638c9.417,0,16.069-1.469,23.042-3.761L68.923,101.552z"/>
-<polygon opacity="0.15" fill="#FFFFFF" enable-background="new    " points="53.083,54.625 71.697,54.625 126.613,109.057 
-	126.613,126.625 "/>
-</svg>

CenRa_FLUX/tools/icons/mIconRaster.svg

@@ -1,230 +0,0 @@
-<?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

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

CenRa_FLUX/tools/resources.py

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
+ <resources>
+ </resources>
  <widget class="QDialog" name="Dialog">
   <property name="enabled">
    <bool>true</bool>
@@ -63,8 +65,8 @@
   <widget class="QLabel" name="label_3">
    <property name="geometry">
     <rect>
-     <x>345</x>
-     <y>10</y>
+     <x>350</x>
+     <y>20</y>
      <width>221</width>
      <height>71</height>
     </rect>
@@ -73,7 +75,7 @@
     <string/>
    </property>
    <property name="pixmap">
-    <pixmap>:/plugins/CenRa_FLUX/logo.jpg</pixmap>
+    <pixmap resource="resources.qrc">:/plugins/CenRa_FLUX/logo.jpg</pixmap>
    </property>
    <property name="scaledContents">
     <bool>true</bool>
@@ -137,7 +139,7 @@
     <string/>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="resources.qrc">
      <normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</iconset>
    </property>
    <property name="iconSize">
@@ -160,7 +162,7 @@
     <string/>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="resources.qrc">
      <normaloff>:/plugins/CenRa_FLUX/arrow-up.png</normaloff>:/plugins/CenRa_FLUX/arrow-up.png</iconset>
    </property>
    <property name="iconSize">
@@ -235,18 +237,6 @@
     <string>Flux sélectionné(s) à charger :</string>
    </property>
   </widget>
-  <zorder>label_3</zorder>
-  <zorder>comboBox</zorder>
-  <zorder>comboBox_2</zorder>
-  <zorder>pushButton_2</zorder>
-  <zorder>tableWidget</zorder>
-  <zorder>tableWidget_2</zorder>
-  <zorder>commandLinkButton</zorder>
-  <zorder>commandLinkButton_2</zorder>
-  <zorder>lineEdit</zorder>
-  <zorder>label</zorder>
-  <zorder>label_2</zorder>
  </widget>
- <resources/>
  <connections/>
 </ui>

CenRa_FLUX/tools/ui/CenRa_Flux_base.ui

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

CenRa_FLUX/tools/ui/CenRa_about_form.ui

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

CenRa_Metabase/CenRa_Metabase.py

@@ -1,217 +1,220 @@
-__copyright__ = "Copyright 2021, 3Liz"
-__license__ = "GPL version 3"
-__email__ = "info@3liz.org"
-
-
-from qgis.core import QgsApplication
-from qgis.PyQt.QtCore import Qt, QUrl, QSettings
-from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtWidgets import QAction
-from qgis.utils import iface
-import qgis
-
-# include <QSettings>
-'''
-from pg_metadata.connection_manager import (
-    store_connections,
-    validate_connections_names,
-)
-
-
-from pg_metadata.locator import LocatorFilter
-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,
-    pyperclip,
-    resources_path,
-    maj_verif,
-)
-pyperclip()
-from .dock import CenRa_Metabase
-from .editor import Metabase_Editor
-
-# from CenRa_Metabase.issues import CenRa_Issues
-
-
-class PgMetadata:
-    def __init__(self):
-        """ Constructor. """
-        self.dock = None
-        self.editor = None
-#        self.issues = None
-        self.provider = None
-        self.locator_filter = None
-        self.dock_action = None
-        self.help_action = None
-        plugin_dir = os.path.dirname(__file__)
-        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')
-        s = QSettings()
-        versionUse = s.value("metadata/version", 1, type=str)
-        if str(versionUse) != str(version):
-            s.setValue("metadata/version", str(version))
-            print(versionUse, version)
-            self.open_about_dialog()
-#        setup_logger('pg_metadata')
-
-        # locale, file_path = setup_translation(
-        #    folder=plugin_path("i18n"), file_pattern="CenRa_Metabase_{}.qm")
-        # 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)
-
-    # noinspection PyPep8Naming
-    def initGui(self):
-        """ Build the plugin GUI. """
-        # self.initProcessing()
-
-        # self.check_invalid_connection_names()
-
-        self.toolBar = iface.addToolBar("CenRa_Metabase")
-        self.toolBar.setObjectName("CenRa_Metabase")
-
-        icon = QIcon(resources_path('icons', 'icon.png'))
-        icon2 = QIcon(resources_path('icons', 'icon_2.png'))
-
-        # Open the online help
-        self.help_action = QAction(icon, 'CenRa_Metabase', iface.mainWindow())
-        iface.pluginHelpMenu().addAction(self.help_action)
-        self.help_action.triggered.connect(self.open_help)
-        if not self.editor:
-            self.editor = Metabase_Editor()
-
-            self.editor_action = QAction(icon2, 'CenRa_Metabase', None)
-            self.toolBar.addAction(self.editor_action)
-            self.editor_action.triggered.connect(self.open_editor)
-
-        if not self.dock:
-            self.dock = CenRa_Metabase()
-            iface.addDockWidget(Qt.DockWidgetArea(0x2), self.dock)
-
-            # Open/close the dock from plugin menu
-            self.dock_action = QAction(icon, 'CenRa_Metabase', iface.mainWindow())
-            iface.pluginMenu().addAction(self.dock_action)
-            self.dock_action.triggered.connect(self.open_dock)
-#        if not self.issues:
-#            self.issues = CenRa_Issues()
-
-
-#            self.issues_action = QAction(icon, 'CenRa_Metabase',None)
-#            self.toolBar.addAction(self.issues_action)
-#            self.issues_action.triggered.connect(self.open_issues)
-    '''
-        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 = MetabaseAboutDialog(iface)
-        dialog.exec()
-
-    def open_help():
-        """ Open the online help. """
-        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
-
-    def open_dock(self):
-        """ Open the dock. """
-        self.dock.show()
-        self.dock.raise_()
-
-    def open_editor(self):
-        self.editor.show()
-        self.editor.raise_()
-
-#    def open_issues(self):
-#        self.issues.show()
-#        self.issues.raise_()
-
-    def unload(self):
-        """ Unload the plugin. """
-        # if self.editor:
-        # iface.removePluginMenu('CenRa_Metabase',self.editor_action)
-        # self.editor.removeToolBarIcon(self.editor_action)
-
-        if self.dock:
-            iface.removeDockWidget(self.dock)
-            self.dock.deleteLater()
-
-        if self.provider:
-            QgsApplication.processingRegistry().removeProvider(self.provider)
-            del self.provider
-
-        if self.locator_filter:
-            iface.deregisterLocatorFilter(self.locator_filter)
-            del self.locator_filter
-
-        if self.help_action:
-            iface.pluginHelpMenu().removeAction(self.help_action)
-            del self.help_action
-
-        if self.dock_action:
-            iface.pluginMenu().removeAction(self.dock_action)
-            del self.dock_action
-
-    @staticmethod
-    def run_tests(pattern='test_*.py', package=None):
-        """Run the test inside QGIS."""
-        try:
-            from pathlib import Path
-
-            from pg_metadata.qgis_plugin_tools.infrastructure.test_runner import (
-                test_package,
-            )
-            if package is None:
-                package = '{}.__init__'.format(Path(__file__).parent.name)
-            test_package(package, pattern)
-        except (AttributeError, ModuleNotFoundError):
-            message = 'Could not load tests. Are you using a production package?'
-            print(message) # NOQA
+__copyright__ = "Copyright 2021, 3Liz"
+__license__ = "GPL version 3"
+__email__ = "info@3liz.org"
+
+
+from qgis.core import QgsApplication
+from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl
+from qgis.PyQt.QtGui import QDesktopServices, QIcon
+from qgis.PyQt.QtWidgets import QAction, QMessageBox
+from qgis.utils import iface
+import qgis
+
+
+#include <QSettings>
+'''
+from pg_metadata.connection_manager import (
+    store_connections,
+    validate_connections_names,
+)
+
+
+from pg_metadata.locator import LocatorFilter
+from pg_metadata.processing.provider import PgMetadataProvider
+from pg_metadata.qgis_plugin_tools.tools.custom_logging import setup_logger
+'''
+import os
+from .tools.resources import (
+    plugin_path,
+    resources_path,
+    maj_verif,
+)
+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 *
+
+
+
+class PgMetadata:
+    def __init__(self):
+        """ Constructor. """
+        self.dock = None
+        self.editor = None
+#        self.issues = None
+        self.provider = None
+        self.locator_filter = None
+        self.dock_action = None
+        self.help_action = None
+        plugin_dir = os.path.dirname(__file__)
+        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')
+        s = QSettings()
+        versionUse = s.value("metadata/version", 1, type=str)
+        if str(versionUse) != str(version) :
+            s.setValue("metadata/version", str(version))
+            print(versionUse,version)
+            self.open_about_dialog()
+#        setup_logger('pg_metadata')
+
+        #locale, file_path = setup_translation(
+        #    folder=plugin_path("i18n"), file_pattern="CenRa_Metabase_{}.qm")
+        #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)
+
+    # noinspection PyPep8Naming
+    def initGui(self):
+        """ Build the plugin GUI. """
+        #self.initProcessing()
+
+        #self.check_invalid_connection_names()
+
+        self.toolBar = iface.addToolBar("CenRa_Metabase")
+        self.toolBar.setObjectName("CenRa_Metabase")
+
+        icon = QIcon(resources_path('icons', 'icon.png'))
+        icon2 = QIcon(resources_path('icons', 'icon_2.png'))
+
+        # Open the online help
+        self.help_action = QAction(icon, 'CenRa_Metabase', iface.mainWindow())
+        iface.pluginHelpMenu().addAction(self.help_action)
+        self.help_action.triggered.connect(self.open_help)
+        if not self.editor:
+            self.editor = Metabase_Editor()
+
+
+            self.editor_action = QAction(icon2, 'CenRa_Metabase',None)
+            self.toolBar.addAction(self.editor_action)
+            self.editor_action.triggered.connect(self.open_editor)
+
+        if not self.dock:
+            self.dock = CenRa_Metabase()
+            iface.addDockWidget(Qt.RightDockWidgetArea, self.dock)
+
+            # Open/close the dock from plugin menu
+            self.dock_action = QAction(icon, 'CenRa_Metabase', iface.mainWindow())
+            iface.pluginMenu().addAction(self.dock_action)
+            self.dock_action.triggered.connect(self.open_dock)
+#        if not self.issues:
+#            self.issues = CenRa_Issues()
+
+
+#            self.issues_action = QAction(icon, 'CenRa_Metabase',None)
+#            self.toolBar.addAction(self.issues_action)
+#            self.issues_action.triggered.connect(self.open_issues)
+    '''
+        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 = MetabaseAboutDialog(iface)
+        dialog.exec_()
+    def open_help():
+        """ Open the online help. """
+        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
+
+    def open_dock(self):
+        """ Open the dock. """
+        self.dock.show()
+        self.dock.raise_()
+
+    def open_editor(self):
+        self.editor.show()
+        self.editor.raise_()
+
+#    def open_issues(self):
+#        self.issues.show()
+#        self.issues.raise_()
+
+    def unload(self):
+        """ Unload the plugin. """
+        if self.editor:
+            iface.removePluginMenu('CenRa_Metabase',self.editor_action)
+            #self.editor.removeToolBarIcon(self.editor_action)
+
+
+
+        if self.dock:
+            iface.removeDockWidget(self.dock)
+            self.dock.deleteLater()
+
+        if self.provider:
+            QgsApplication.processingRegistry().removeProvider(self.provider)
+            del self.provider
+
+        if self.locator_filter:
+            iface.deregisterLocatorFilter(self.locator_filter)
+            del self.locator_filter
+
+        if self.dock_action:
+            iface.pluginMenu().removeAction(self.dock_action)
+            del self.dock_action
+
+        if self.help_action:
+            iface.pluginHelpMenu().removeAction(self.help_action)
+            del self.help_action
+
+    @staticmethod
+    def run_tests(pattern='test_*.py', package=None):
+        """Run the test inside QGIS."""
+        try:
+            from pathlib import Path
+
+            from pg_metadata.qgis_plugin_tools.infrastructure.test_runner import (
+                test_package,
+            )
+            if package is None:
+                package = '{}.__init__'.format(Path(__file__).parent.name)
+            test_package(package, pattern)
+        except (AttributeError, ModuleNotFoundError):
+            message = 'Could not load tests. Are you using a production package?'
+            print(message) # NOQA

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,7 +12,7 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType(
     os.path.join(
         str(Path(__file__).resolve().parent),
         'tools/ui',
-        'CenRa_about_form.ui'
+        'CenRa_Metabase_about_form.ui'
     )
 )
 
@@ -43,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

@@ -1,453 +1,488 @@
-"""Dock file."""
-
-__copyright__ = 'Copyright 2020, 3Liz'
-__license__ = 'GPL version 3'
-__email__ = 'info@3liz.org'
-
-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.core import (
-    QgsApplication,
-    QgsProviderRegistry,
-    QgsSettings,
-)
-from qgis.PyQt.QtCore import QLocale, QUrl
-from qgis.PyQt.QtGui import QDesktopServices, QIcon
-from qgis.PyQt.QtPrintSupport import QPrinter
-# from qgis.PyQt.QtWebKitWidgets import QWebPage
-from qgis.PyQt.QtWidgets import (
-    QAction,
-    QDockWidget,
-    QFileDialog,
-    QMenu,
-    QToolButton,
-)
-from qgis.utils import iface
-import qgis
-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')
-
-
-class Format(namedtuple('Format', ['label', 'ext'])):
-    """ Format available for exporting metadata. """
-    pass
-
-
-class OutputFormats(Format, Enum):
-    """ Output format for a metadata sheet. """
-    PDF = Format(label='PDF', ext='pdf')
-    HTML = Format(label='HTML', ext='html')
-    DCAT = Format(label='DCAT', ext='xml')
-
-
-class CenRa_Metabase(QDockWidget, DOCK_CLASS):
-
-    def __init__(self, parent=None):
-        _ = parent
-        super().__init__()
-        self.setupUi(self)
-        self.settings = QgsSettings()
-
-        self.current_datasource_uri = None
-        self.current_connection = None
-
-        # self.viewer.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
-        # self.viewer.page().linkClicked.connect(self.open_link)
-
-        # Help button
-        self.external_help.setText('')
-        self.external_help.setIcon(QIcon(QgsApplication.iconPath('mActionHelpContents.svg')))
-        self.external_help.clicked.connect(self.open_external_help)
-
-        # Flat table button
-        self.flatten_dataset_table.setText('')
-        # 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)
-
-        # Settings menu
-        self.config.setAutoRaise(True)
-        # self.config.setToolTip(tr("Settings"))
-        self.config.setPopupMode(QToolButton.ToolButtonPopupMode(2))
-        self.config.setIcon(QgsApplication.getThemeIcon("/mActionOptions.svg"))
-
-        self.auto_open_dock_action = QAction(
-            ("Dommage, cette option n'existe pas encore."),
-            iface.mainWindow())
-        self.auto_open_dock_action.setCheckable(True)
-        self.auto_open_dock_action.setChecked(
-            self.settings.value("pgmetadata/auto_open_dock", True, type=bool)
-        )
-        self.auto_open_dock_action.triggered.connect(self.save_auto_open_dock)
-        menu = QMenu()
-        menu.addAction(self.auto_open_dock_action)
-        self.config.setMenu(menu)
-
-        # Setting PDF/HTML menu
-        self.save_button.setAutoRaise(True)
-        # 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(
-            ('Enregistrer en PDF') + '…',
-            iface.mainWindow())
-        self.save_as_pdf.triggered.connect(partial(self.export_dock_content, OutputFormats.PDF))
-
-        self.save_as_html = QAction(
-            ('Enregistrer en HTML') + '…',
-            iface.mainWindow())
-        self.save_as_html.triggered.connect(partial(self.export_dock_content, OutputFormats.HTML))
-        self.save_as_dcat = QAction(
-            ('Enregistrer en DCAT') + '…',
-            iface.mainWindow())
-        self.save_as_dcat.triggered.connect(partial(self.export_dock_content, OutputFormats.DCAT))
-
-        self.menu_save = QMenu()
-        self.menu_save.addAction(self.save_as_pdf)
-        self.menu_save.addAction(self.save_as_html)
-        self.menu_save.addAction(self.save_as_dcat)
-        self.save_button.setMenu(self.menu_save)
-        self.save_button.setEnabled(False)
-
-        self.metadata = QgsProviderRegistry.instance().providerMetadata('postgres')
-
-        # Display message in the dock
-        # 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 ValueError:
-            # qgis.utils.plugins['CenRa_METABASE'].initGui()
-            qgis.utils.plugins['CenRa_METABASE'].unload()
-            # self.default_html_content_not_pg_layer()
-
-        if iface.activeLayer():
-            layer = iface.activeLayer()
-            iface.layerTreeView().setCurrentLayer(None)
-            iface.layerTreeView().setCurrentLayer(layer)
-
-    def export_dock_content(self, output_format: OutputFormats):
-        """ Export the current displayed metadata sheet to the given format. """
-        layer_name = iface.activeLayer().name()
-
-        file_path = os.path.join(
-            os.environ['USERPROFILE'],
-            'Desktop\\{name}.{ext}'.format(name=layer_name, ext=output_format.ext)
-        )
-        output_file = QFileDialog.getSaveFileName(
-            self,
-            ("Enregistrer en {format}").format(format=output_format.label),
-            file_path,
-            "{label} (*.{ext})".format(
-                label=output_format.label,
-                ext=output_format.ext,
-            )
-        )
-        if output_file[0] == '':
-            return
-
-        self.settings.setValue("UI/lastFileNameWidgetDir", os.path.dirname(output_file[0]))
-
-        output_file_path = output_file[0]
-        parent_folder = str(Path(output_file_path).parent)
-
-        if output_format == OutputFormats.PDF:
-            printer = QPrinter()
-            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(
-                ("Export PDF"),
-                (
-                    "The metadata has been exported as PDF successfully in "
-                    "<a href=\"{}\">{}</a>").format(parent_folder, output_file_path)
-            )
-
-        elif output_format in [OutputFormats.HTML, OutputFormats.DCAT]:
-            if output_format == OutputFormats.HTML:
-                data_str = self.viewer.page().currentFrame().toHtml()
-            else:
-                layer = iface.activeLayer()
-                uri = layer.dataProvider().uri()
-                dataall = self.sql_info(uri)
-                data = self.sql_to_xml(dataall)
-
-                with open(resources_path('xml', 'dcat.xml'), encoding='utf8') as xml_file:
-                    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:
-                file_writer.write(data_str)
-            iface.messageBar().pushSuccess(
-                ("Export") + ' ' + output_format.label,
-                (
-                    "The metadata has been exported as {format} successfully in "
-                    "<a href=\"{folder}\">{path}</a>").format(
-                    format=output_format.label, folder=parent_folder, path=output_file_path)
-            )
-
-    def save_auto_open_dock(self):
-        """ Save settings about the dock. """
-        self.settings.setValue("pgmetadata/auto_open_dock", self.auto_open_dock_action.isChecked())
-
-    def sql_to_xml(self, dataall):
-        distribution = ''
-        for y in dataall[1]:
-            distribution = distribution + ('<dcat:distribution>' + '<dcat:Distribution>' + '<dct:title>{data}</dct:title>'.format(data=y[0]) + '<dcat:downloadURL>{data}</dcat:downloadURL>'.format(data=y[1]) + '<dcat:mediaType>{data}</dcat:mediaType>'.format(data=y[2]) + '<dct:format>{data}</dct:format>'.format(data=y[3]) + '<dct:bytesize>{data}</dct:bytesize>'.format(data=y[4]) + '</dcat:Distribution>' + '</dcat:distribution>')
-        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])]]
-
-        return data_str
-
-    @staticmethod
-    def sql_for_layer(uri, output_format: OutputFormats):
-        """ Get the SQL query for a given layer and output format. """
-        locale = QgsSettings().value("locale/userLocale", QLocale().name())
-        locale = locale.split('_')[0].lower()
-
-        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)
-        else:
-            raise NotImplementedError('Output format is not yet implemented.')
-
-        return sql
-
-    def layer_changed(self, layer):
-        """ When the layer has changed in the legend, we must check this new layer. """
-        self.current_datasource_uri = None
-        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. """
-        '''
-        connections, message = connections_list()
-        if not connections:
-            LOGGER.critical(message)
-            self.set_html_content('PgMetadata', message)
-            return
-
-        if len(connections) > 1:
-            dialog = QInputDialog()
-            dialog.setComboBoxItems(connections)
-            dialog.setWindowTitle(tr("Database"))
-            dialog.setLabelText(tr("Choose the database to add the catalog"))
-            if not dialog.exec_():
-                return
-            connection_name = dialog.textValue()
-        else:
-            connection_name = connections[0]
-
-        metadata = QgsProviderRegistry.instance().providerMetadata('postgres')
-        connection = metadata.findConnection(connection_name)
-
-        locale = QgsSettings().value("locale/userLocale", QLocale().name())
-        locale = locale.split('_')[0].lower()
-
-        uri = QgsDataSourceUri(connection.uri())
-        uri.setTable(f'(SELECT * FROM pgmetadata.export_datasets_as_flat_table(\'{locale}\'))')
-        uri.setKeyColumn('uid')
-
-        layer = QgsVectorLayer(uri.uri(), '{} - {}'.format(tr("Catalog"), connection_name), 'postgres')
-        QgsProject.instance().addMapLayer(layer)
-        '''
-
-    @staticmethod
-    def open_external_help():
-        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
-
-    @staticmethod
-    def open_link(url):
-        QDesktopServices.openUrl(url)
-
-    def set_html_content(self, title=None, body=None):
-        """ Set the content in the dock. """
-        # 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 += '<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>'
-        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:
-            html += body
-
-        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)
-
-    def ce_trouve_dans_psql(self, layer):
-        try:
-            uri = layer.dataProvider().uri()
-        except AttributeError:
-            self.default_html_content_not_pg_layer()
-            self.save_button.setEnabled(False)
-            uri = ''
-        if uri != '':
-            if not uri.table():
-                layertype = layer.providerType().lower()
-                if layertype == 'wms' or layertype == 'wfs':
-                    self.set_html_to_wms(layer)
-                else:
-                    self.default_html_content_not_pg_layer()
-                self.save_button.setEnabled(False)
-            else:
-                data_count = self.sql_check(uri)
-                # 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.save_button.setEnabled(True)
-
-    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()]
-
-        body += '<div><h3>Identification</h3><table class="table table-condensed">'
-        body += '<tr><th>Titre</th><td>{data[4]}</td></tr>'.format(data=data)
-        body += '<tr><th>Description</th><td>{data[5]}</td></tr>'.format(data=data)
-        body += '<tr><th>Categories</th><td>{data}</td></tr>'.format(data=(", ".join(str(x) for x in data[6])))
-        body += '<tr><th>Thèmes</th><td>{data}</td></tr>'.format(data=(", ".join(str(x) for x in data[24])))
-        body += '<tr><th>Mots-clés</th><td>{data[7]}</td></tr>'.format(data=data)
-        body += '<tr><th>Dernier mise à jour</th><td>{data[23]}</td></tr>'.format(data=data)
-        body += '<tr><th>Langue</th><td>{data[26]}</td></tr>'.format(data=data)
-        body += '</table></div>'
-
-        body += '<div><h3>Properties spatial</h3><table class="table table-condensed">'
-        body += '<tr><th>Niveau</th><td>{data[8]}</td></tr>'.format(data=data)
-        body += '<tr><th>Echelle minimum</th><td>{data[9]}</td></tr>'.format(data=data)
-        body += '<tr><th>Echelle maximum</th><td>{data[10]}</td></tr>'.format(data=data)
-        body += '<tr><th>Nombre d\'entités </th><td>{data[15]}</td></tr>'.format(data=data)
-        body += '<tr><th>Type de géométrie</th><td>{data[16]}</td></tr>'.format(data=data)
-        body += '<tr><th>Nom de projection</th><td>{data[17]}</td></tr>'.format(data=data)
-        body += '<tr><th>ID de projection</th><td>{data[18]}</td></tr>'.format(data=data)
-        body += '<tr><th>Emprise</th><td>{data[28]}</td></tr>'.format(data=data)
-        body += '</table></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)
-        body += '<tr><th>Fréquence de mise à jour</th><td>{data[12]}</td></tr>'.format(data=data)
-        body += '<tr><th>Licence</th><td>{data[13]}</td></tr>'.format(data=data)
-        body += '<tr><th>Licence attribué</th><td>{data[25]}</td></tr>'.format(data=data)
-        body += '<tr><th>Restriction</th><td>{data[14]}</td></tr>'.format(data=data)
-        body += '</table></div>'
-
-        body += '<div><h3>Lien</h3><table class="table table-condensed table-striped table-bordered">'
-        body += '<tr><th>Type</th><th>URL</th><th>Type MIME</th><th>Format</th><th>Taille</th></tr>'
-        for value_url in data_url:
-            body += '<tr><td>{value_url[0]}</td><td>{value_url[1]}</td><td>{value_url[2]}</td><td>{value_url[3]}</td><td>{value_url[4]}</td></tr>'.format(value_url=value_url)
-        body += '</table></div>'
-        '''
-        body += '<div><h3>Liste des champs</h3><table class="table table-condensed table-striped table-bordered">'
-        for collonne in data_collonne:
-            body += '<tr><th>{collonne}</th><td>{defini}</td></tr>'.format(collonne=collonne,defini='')
-        body += '</table></div>'
-        '''
-        body += '<div><h3>Contacts</h3><table class="table table-condensed table-striped table-bordered">'
-        body += '<tr><th>Rôle</th><th>Nom</th><th>Organisation</th><th>Email</th><th>Télèphone</th></tr>'
-        for value_contact in data_contact:
-            body += '<tr><td>{value_contact[0]}</td><td>{value_contact[1]}</td><td>{value_contact[2]}</td><td>{value_contact[3]}</td><td>{value_contact[4]}</td></tr>'.format(value_contact=value_contact)
-        body += '</table></div>'
-
-        body += '<div><h3>Metadata</h3><table class="table table-condensed">'
-        body += '<tr><th>Table</th><td>{data[2]}</td></tr>'.format(data=data)
-        body += '<tr><th>Schema</th><td>{data[3]}</td></tr>'.format(data=data)
-        body += '<tr><th>Date de création</th><td>{data[20]}</td></tr>'.format(data=data)
-        body += '<tr><th>Date de modification</th><td>{data[21]}</td></tr>'.format(data=data)
-        body += '<tr><th>Encodage</th><td>{data[27]}</td></tr>'.format(data=data)
-        body += '<tr><th>UUID</th><td>{data[1]}</td></tr>'.format(data=data)
-        body += '</table></div>'
-
-        self.set_html_content(
-            layer.name(), body)
-
-    def set_html_to_wms(self, layer):
-        self.set_html_content(
-            'CenRa Metadata', (layer.htmlMetadata()))
-
-    def default_html_content_not_pg_layer(self):
-        """ When it's not a PostgreSQL layer. """
-        self.set_html_content(
-            'CenRa Metadata', ('Vous devez cliquer sur une couche dans la légende qui est stockée dans PostgreSQL.'))
-
-    def default_html_content_not_metadata(self):
-        self.set_html_content(
-            'CenRa Metadata', ('La couche ne contien pas de métadonnée.'))
-
-    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 + """';"""
-
-        cur.execute(sql_count)
-        data_count = cur.fetchall()
-        cur.close()
-        return data_count[0][0]
-
-    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 + """';"""
-        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 + """';"""
-        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 + """';"""
-        cur.execute(sql_findcontact)
-        data_contact = cur.fetchall()
-        cur.close()
-        return data_general[0], data_url, data_contact
+"""Dock file."""
+
+__copyright__ = 'Copyright 2020, 3Liz'
+__license__ = 'GPL version 3'
+__email__ = 'info@3liz.org'
+
+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.core import (
+    NULL,
+    QgsApplication,
+    QgsDataSourceUri,
+    QgsProject,
+    QgsProviderConnectionException,
+    QgsProviderRegistry,
+    QgsRasterLayer,
+    QgsSettings,
+    QgsVectorLayer,
+)
+from qgis.PyQt.QtCore import QLocale, QUrl
+from qgis.PyQt.QtGui import QDesktopServices, QIcon
+from qgis.PyQt.QtPrintSupport import QPrinter
+from qgis.PyQt.QtWebKitWidgets import QWebPage
+from qgis.PyQt.QtWidgets import (
+    QDialog,
+    QAction,
+    QDockWidget,
+    QFileDialog,
+    QInputDialog,
+    QMenu,
+    QToolButton,
+)
+from qgis.gui import *
+from qgis.utils import iface
+'''
+from pg_metadata.connection_manager import (
+    check_pgmetadata_is_installed,
+    connections_list,
+    settings_connections_names,
+)
+'''
+
+from .tools.resources import (
+    load_ui,
+    resources_path,
+    login_base,
+)
+
+DOCK_CLASS = load_ui('CenRa_Metabase_dockwidget_base.ui')
+LOGGER = logging.getLogger('CenRa_Metabase')
+
+
+class Format(namedtuple('Format', ['label', 'ext'])):
+    """ Format available for exporting metadata. """
+    pass
+
+
+class OutputFormats(Format, Enum):
+    """ Output format for a metadata sheet. """
+    PDF = Format(label='PDF', ext='pdf')
+    HTML = Format(label='HTML', ext='html')
+    DCAT = Format(label='DCAT', ext='xml')
+
+
+class CenRa_Metabase(QDockWidget, DOCK_CLASS):
+
+    def __init__(self, parent=None):
+        _ = parent
+        super().__init__()
+        self.setupUi(self)
+        self.settings = QgsSettings()
+
+        self.current_datasource_uri = None
+        self.current_connection = None
+
+        self.viewer.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
+        self.viewer.page().linkClicked.connect(self.open_link)
+
+        # Help button
+        self.external_help.setText('')
+        self.external_help.setIcon(QIcon(QgsApplication.iconPath('mActionHelpContents.svg')))
+        self.external_help.clicked.connect(self.open_external_help)
+
+        # Flat table button
+        self.flatten_dataset_table.setText('')
+        #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)
+
+        # Settings menu
+        self.config.setAutoRaise(True)
+        #self.config.setToolTip(tr("Settings"))
+        self.config.setPopupMode(QToolButton.InstantPopup)
+        self.config.setIcon(QgsApplication.getThemeIcon("/mActionOptions.svg"))
+
+        self.auto_open_dock_action = QAction(
+            ("Dommage, cette option n'existe pas encore."),
+            iface.mainWindow())
+        self.auto_open_dock_action.setCheckable(True)
+        self.auto_open_dock_action.setChecked(
+            self.settings.value("pgmetadata/auto_open_dock", True, type=bool)
+        )
+        self.auto_open_dock_action.triggered.connect(self.save_auto_open_dock)
+        menu = QMenu()
+        menu.addAction(self.auto_open_dock_action)
+        self.config.setMenu(menu)
+
+        # 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.setIcon(QIcon(QgsApplication.iconPath('mActionFileSave.svg')))
+
+        self.save_as_pdf = QAction(
+            ('Enregistrer en PDF') + '…',
+            iface.mainWindow())
+        self.save_as_pdf.triggered.connect(partial(self.export_dock_content, OutputFormats.PDF))
+
+        self.save_as_html = QAction(
+            ('Enregistrer en HTML') + '…',
+            iface.mainWindow())
+        self.save_as_html.triggered.connect(partial(self.export_dock_content, OutputFormats.HTML))
+        self.save_as_dcat = QAction(
+            ('Enregistrer en DCAT') + '…',
+            iface.mainWindow())
+        self.save_as_dcat.triggered.connect(partial(self.export_dock_content, OutputFormats.DCAT))
+
+        self.menu_save = QMenu()
+        self.menu_save.addAction(self.save_as_pdf)
+        self.menu_save.addAction(self.save_as_html)
+        self.menu_save.addAction(self.save_as_dcat)
+        self.save_button.setMenu(self.menu_save)
+        self.save_button.setEnabled(False)
+
+        self.metadata = QgsProviderRegistry.instance().providerMetadata('postgres')
+
+        # Display message in the dock
+        #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)
+
+        if iface.activeLayer():
+            layer=iface.activeLayer()
+            iface.layerTreeView().setCurrentLayer(None)
+            iface.layerTreeView().setCurrentLayer(layer)
+
+    def export_dock_content(self, output_format: OutputFormats):
+        """ Export the current displayed metadata sheet to the given format. """
+        layer_name = iface.activeLayer().name()
+
+        file_path = os.path.join(
+            os.environ['USERPROFILE'],
+            'Desktop\\{name}.{ext}'.format(name=layer_name, ext=output_format.ext)
+        )
+        output_file = QFileDialog.getSaveFileName(
+            self,
+            ("Enregistrer en {format}").format(format=output_format.label),
+            file_path,
+            "{label} (*.{ext})".format(
+                label=output_format.label,
+                ext=output_format.ext,
+            )
+        )
+        if output_file[0] == '':
+            return
+
+        self.settings.setValue("UI/lastFileNameWidgetDir", os.path.dirname(output_file[0]))
+
+        output_file_path = output_file[0]
+        parent_folder = str(Path(output_file_path).parent)
+
+        if output_format == OutputFormats.PDF:
+            printer = QPrinter()
+            printer.setOutputFormat(QPrinter.PdfFormat)
+            printer.setPageMargins(20, 20, 20, 20, QPrinter.Millimeter)
+            printer.setOutputFileName(output_file_path)
+            self.viewer.print(printer)
+            iface.messageBar().pushSuccess(
+                ("Export PDF"),
+                (
+                    "The metadata has been exported as PDF successfully in "
+                    "<a href=\"{}\">{}</a>").format(parent_folder, output_file_path)
+            )
+
+        elif output_format in [OutputFormats.HTML,OutputFormats.DCAT]:
+            if output_format == OutputFormats.HTML:
+                data_str = self.viewer.page().currentFrame().toHtml()
+            else:
+                layer = iface.activeLayer()
+                uri = layer.dataProvider().uri()
+                dataall = self.sql_info(uri)
+                data = self.sql_to_xml(dataall)
+
+                with open(resources_path('xml', 'dcat.xml'), encoding='utf8') as xml_file:
+                    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:
+                file_writer.write(data_str)
+            iface.messageBar().pushSuccess(
+                ("Export") + ' ' + output_format.label,
+                (
+                    "The metadata has been exported as {format} successfully in "
+                    "<a href=\"{folder}\">{path}</a>").format(
+                    format=output_format.label, folder=parent_folder, path=output_file_path)
+            )
+
+    def save_auto_open_dock(self):
+        """ Save settings about the dock. """
+        self.settings.setValue("pgmetadata/auto_open_dock", self.auto_open_dock_action.isChecked())
+    def sql_to_xml(self,dataall):
+        distribution=''
+        for y in dataall[1]:
+            distribution = distribution + (
+            '<dcat:distribution>'+
+            '<dcat:Distribution>'+
+            '<dct:title>{data}</dct:title>'.format(data=y[0])+
+            '<dcat:downloadURL>{data}</dcat:downloadURL>'.format(data=y[1])+
+            '<dcat:mediaType>{data}</dcat:mediaType>'.format(data=y[2])+
+            '<dct:format>{data}</dct:format>'.format(data=y[3])+
+            '<dct:bytesize>{data}</dct:bytesize>'.format(data=y[4])+
+            '</dcat:Distribution>'+
+            '</dcat:distribution>')
+        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])]]
+
+        return data_str
+
+    @staticmethod
+    def sql_for_layer(uri, output_format: OutputFormats):
+        """ Get the SQL query for a given layer and output format. """
+        locale = QgsSettings().value("locale/userLocale", QLocale().name())
+        locale = locale.split('_')[0].lower()
+
+        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)
+        else:
+            raise NotImplementedError('Output format is not yet implemented.')
+
+        return sql
+
+    def layer_changed(self, layer):
+        """ When the layer has changed in the legend, we must check this new layer. """
+        self.current_datasource_uri = None
+        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. """
+        '''
+        connections, message = connections_list()
+        if not connections:
+            LOGGER.critical(message)
+            self.set_html_content('PgMetadata', message)
+            return
+
+        if len(connections) > 1:
+            dialog = QInputDialog()
+            dialog.setComboBoxItems(connections)
+            dialog.setWindowTitle(tr("Database"))
+            dialog.setLabelText(tr("Choose the database to add the catalog"))
+            if not dialog.exec_():
+                return
+            connection_name = dialog.textValue()
+        else:
+            connection_name = connections[0]
+
+        metadata = QgsProviderRegistry.instance().providerMetadata('postgres')
+        connection = metadata.findConnection(connection_name)
+
+        locale = QgsSettings().value("locale/userLocale", QLocale().name())
+        locale = locale.split('_')[0].lower()
+
+        uri = QgsDataSourceUri(connection.uri())
+        uri.setTable(f'(SELECT * FROM pgmetadata.export_datasets_as_flat_table(\'{locale}\'))')
+        uri.setKeyColumn('uid')
+
+        layer = QgsVectorLayer(uri.uri(), '{} - {}'.format(tr("Catalog"), connection_name), 'postgres')
+        QgsProject.instance().addMapLayer(layer)
+        '''
+
+    @staticmethod
+    def open_external_help():
+        QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
+
+    @staticmethod
+    def open_link(url):
+        QDesktopServices.openUrl(url)
+
+    def set_html_content(self, title=None, body=None):
+        """ Set the content in the dock. """
+        #link_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 += '<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>'
+        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:
+            html += body
+
+        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)
+
+    def ce_trouve_dans_psql(self,layer):
+        try:
+            uri = layer.dataProvider().uri()
+        except:
+            self.default_html_content_not_pg_layer()
+            self.save_button.setEnabled(False)
+            uri=''
+        if uri != '':
+            if not uri.table():
+                layertype = layer.providerType().lower()
+                if layertype == 'wms' or layertype == 'wfs':
+                    self.set_html_to_wms(layer)
+                else:
+                    self.default_html_content_not_pg_layer()
+                self.save_button.setEnabled(False)
+            else:
+                data_count = self.sql_check(uri)
+                #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.save_button.setEnabled(True)
+
+    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()]
+
+        body += '<div><h3>Identification</h3><table class="table table-condensed">'
+        body += '<tr><th>Titre</th><td>{data[4]}</td></tr>'.format(data=data)
+        body += '<tr><th>Description</th><td>{data[5]}</td></tr>'.format(data=data)
+        body += '<tr><th>Categories</th><td>{data}</td></tr>'.format(data=(", ".join(str(x) for x in data[6])))
+        body += '<tr><th>Thèmes</th><td>{data}</td></tr>'.format(data=(", ".join(str(x) for x in data[24])))
+        body += '<tr><th>Mots-clés</th><td>{data[7]}</td></tr>'.format(data=data)
+        body += '<tr><th>Dernier mise à jour</th><td>{data[23]}</td></tr>'.format(data=data)
+        body += '<tr><th>Langue</th><td>{data[26]}</td></tr>'.format(data=data)
+        body += '</table></div>'
+
+        body += '<div><h3>Properties spatial</h3><table class="table table-condensed">'
+        body += '<tr><th>Niveau</th><td>{data[8]}</td></tr>'.format(data=data)
+        body += '<tr><th>Echelle minimum</th><td>{data[9]}</td></tr>'.format(data=data)
+        body += '<tr><th>Echelle maximum</th><td>{data[10]}</td></tr>'.format(data=data)
+        body += '<tr><th>Nombre d\'entités </th><td>{data[15]}</td></tr>'.format(data=data)
+        body += '<tr><th>Type de géométrie</th><td>{data[16]}</td></tr>'.format(data=data)
+        body += '<tr><th>Nom de projection</th><td>{data[17]}</td></tr>'.format(data=data)
+        body += '<tr><th>ID de projection</th><td>{data[18]}</td></tr>'.format(data=data)
+        body += '<tr><th>Emprise</th><td>{data[28]}</td></tr>'.format(data=data)
+        body += '</table></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)
+        body += '<tr><th>Fréquence de mise à jour</th><td>{data[12]}</td></tr>'.format(data=data)
+        body += '<tr><th>Licence</th><td>{data[13]}</td></tr>'.format(data=data)
+        body += '<tr><th>Licence attribué</th><td>{data[25]}</td></tr>'.format(data=data)
+        body += '<tr><th>Restriction</th><td>{data[14]}</td></tr>'.format(data=data)
+        body += '</table></div>'
+
+        body += '<div><h3>Lien</h3><table class="table table-condensed table-striped table-bordered">'
+        body += '<tr><th>Type</th><th>URL</th><th>Type MIME</th><th>Format</th><th>Taille</th></tr>'
+        for value_url in data_url:
+            body += '<tr><td>{value_url[0]}</td><td>{value_url[1]}</td><td>{value_url[2]}</td><td>{value_url[3]}</td><td>{value_url[4]}</td></tr>'.format(value_url=value_url)
+        body += '</table></div>'
+        '''
+        body += '<div><h3>Liste des champs</h3><table class="table table-condensed table-striped table-bordered">'
+        for collonne in data_collonne:
+            body += '<tr><th>{collonne}</th><td>{defini}</td></tr>'.format(collonne=collonne,defini='')
+        body += '</table></div>'
+        '''
+        body += '<div><h3>Contacts</h3><table class="table table-condensed table-striped table-bordered">'
+        body += '<tr><th>Rôle</th><th>Nom</th><th>Organisation</th><th>Email</th><th>Télèphone</th></tr>'
+        for value_contact in data_contact:
+            body += '<tr><td>{value_contact[0]}</td><td>{value_contact[1]}</td><td>{value_contact[2]}</td><td>{value_contact[3]}</td><td>{value_contact[4]}</td></tr>'.format(value_contact=value_contact)
+        body += '</table></div>'
+
+        body += '<div><h3>Metadata</h3><table class="table table-condensed">'
+        body += '<tr><th>Table</th><td>{data[2]}</td></tr>'.format(data=data)
+        body += '<tr><th>Schema</th><td>{data[3]}</td></tr>'.format(data=data)
+        body += '<tr><th>Date de création</th><td>{data[20]}</td></tr>'.format(data=data)
+        body += '<tr><th>Date de modification</th><td>{data[21]}</td></tr>'.format(data=data)
+        body += '<tr><th>Encodage</th><td>{data[27]}</td></tr>'.format(data=data)
+        body += '<tr><th>UUID</th><td>{data[1]}</td></tr>'.format(data=data)
+        body += '</table></div>'
+
+        self.set_html_content(
+            layer.name(), body)
+
+    def set_html_to_wms(self,layer):
+        self.set_html_content(
+        'CenRa Metadata',(layer.htmlMetadata()))
+    def default_html_content_not_pg_layer(self):
+        """ When it's not a PostgreSQL layer. """
+        self.set_html_content(
+            'CenRa Metadata', ('Vous devez cliquer sur une couche dans la légende qui est stockée dans PostgreSQL.'))
+    def default_html_content_not_metadata(self):
+        self.set_html_content(
+            'CenRa Metadata', ('La couche ne contien pas de métadonnée.'))
+
+    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+"""';"""
+
+        cur.execute(sql_count)
+        data_count = cur.fetchall()
+        cur.close()
+        return data_count[0][0]
+
+    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+"""';"""
+        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+"""';"""
+        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+"""';"""
+        cur.execute(sql_findcontact)
+        data_contact = cur.fetchall()
+        cur.close()
+        return data_general[0],data_url,data_contact
+

CenRa_Metabase/issues.py

@@ -1,89 +1,89 @@
-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 (
-    NULL,
-    QgsApplication,
-    QgsDataSourceUri,
-    QgsProject,
-    QgsProviderConnectionException,
-    QgsProviderRegistry,
-    QgsRasterLayer,
-    QgsSettings,
-    QgsVectorLayer,
-    QgsGeometry,
-)
-from qgis.PyQt.QtWidgets import (
-    QDialog,
-    QAction,
-    QDockWidget,
-    QFileDialog,
-    QInputDialog,
-    QMenu,
-    QToolButton,
-    QTableWidget, 
-    QTableWidgetItem,
-)
-from qgis.utils import iface
-
-
-from .tools.resources import (
-    load_ui,
-    resources_path,
-    send_issues,
-)
-
-EDITOR_CLASS = load_ui('CenRa_IssuesSend.ui')
-
-class CenRa_Issues(QDialog, EDITOR_CLASS):
-
-    def __init__(self, parent=None):
-        _ = parent
-        super().__init__()
-        self.setupUi(self)
-        self.settings = QgsSettings()
-
-        #place connect here
-        self.annuler_button.clicked.connect(self.close)
-        self.ok_button.clicked.connect(self.run_sendissues)
-
-    def run_sendissues(self):
-        text_titre = self.titre_line.text()
-        text_message = self.messages_plain.toPlainText()
-        statu_bug = self.check_bug.isChecked()
-        statu_aide = self.check_aide.isChecked()
-        statu_question = self.check_question.isChecked()
-        statu_amelioration = self.check_amelioration.isChecked()
-        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 len(statu) >= 1:
-            import qgis
-            url = qgis.utils.pluginMetadata(NAME,'tracker')
-            print(text_message)
-            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)
-            self.close()
-        elif code == 422:
-            iface.messageBar().pushMessage("Erreur :", "Erreur dans le contenu du messages.", level=Qgis.Critical, duration=20)
-        elif code == 423:
-            iface.messageBar().pushMessage("Erreur :", "Pas de sujet sélectionné.", level=Qgis.Critical, duration=20)
-        elif code == 404:
-            iface.messageBar().pushMessage("Missing :", "Le serveur de messagerie est injoignable.", level=Qgis.Warning, duration=20)
+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 (
+    NULL,
+    QgsApplication,
+    QgsDataSourceUri,
+    QgsProject,
+    QgsProviderConnectionException,
+    QgsProviderRegistry,
+    QgsRasterLayer,
+    QgsSettings,
+    QgsVectorLayer,
+    QgsGeometry,
+)
+from qgis.PyQt.QtWidgets import (
+    QDialog,
+    QAction,
+    QDockWidget,
+    QFileDialog,
+    QInputDialog,
+    QMenu,
+    QToolButton,
+    QTableWidget, 
+    QTableWidgetItem,
+)
+from qgis.utils import iface
+
+
+from .tools.resources import (
+    load_ui,
+    resources_path,
+    send_issues,
+)
+
+EDITOR_CLASS = load_ui('CenRa_IssuesSend.ui')
+
+class CenRa_Issues(QDialog, EDITOR_CLASS):
+
+    def __init__(self, parent=None):
+        _ = parent
+        super().__init__()
+        self.setupUi(self)
+        self.settings = QgsSettings()
+
+        #place connect here
+        self.annuler_button.clicked.connect(self.close)
+        self.ok_button.clicked.connect(self.run_sendissues)
+
+    def run_sendissues(self):
+        text_titre = self.titre_line.text()
+        text_message = self.messages_plain.toPlainText()
+        statu_bug = self.check_bug.isChecked()
+        statu_aide = self.check_aide.isChecked()
+        statu_question = self.check_question.isChecked()
+        statu_amelioration = self.check_amelioration.isChecked()
+        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 len(statu) >= 1:
+            import qgis
+            url = qgis.utils.pluginMetadata(NAME,'tracker')
+            print(text_message)
+            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)
+            self.close()
+        elif code == 422:
+            iface.messageBar().pushMessage("Erreur :", "Erreur dans le contenu du messages.", level=Qgis.Critical, duration=20)
+        elif code == 423:
+            iface.messageBar().pushMessage("Erreur :", "Pas de sujet sélectionné.", level=Qgis.Critical, duration=20)
+        elif code == 404:
+            iface.messageBar().pushMessage("Missing :", "Le serveur de messagerie est injoignable.", level=Qgis.Warning, duration=20)

CenRa_Metabase/metadata.txt

@@ -1,49 +1,48 @@
-# This file contains metadata for your plugin.
-
-# This file should be included when you package your plugin.# Mandatory items:
-
-[general]
-name=CenRa_Metabase
-qgisMinimumVersion=3.0
-supportsQt6=True
-description=CenRa_METABASE
-version=0.3.1
-author=Conservatoire d'Espaces Naturels de Rhône-Alpes
-email=si_besoin@cen-rhonealpes.fr
-
-about=Permet de saisire et de visualisé les information lier à la metadonné d'une couche ce trouvent sur PostgreSQL
-
-repository=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS
-homepage=https://plateformesig.cenra-outils.org/
-tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
-# End of mandatory metadata
-
-# Recommended items:
-
-hasProcessingProvider=no
-# Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_METABASE:</h2></br><p><h3>30/07/2025 - Version 0.3.1: </h3> - Correctife de bug.</p></br><p><h3>19/05/2025 - Version 0.3.0: </h3> - Compatible PyQt5 et PyQt6</p></br><p><h3>09/04/2025 - Version 0.2.3: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 0.2.2: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 0.2.1: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.2.0: </h3> - Deployment sur serveur SIG.</p></br><p><h3>07/01/2025 - Version 0.1.6: </h3> - ByPass du certif ssl ci erreur</p></br><p><h3>19/12/2024 - Version 0.1.5: </h3> - Fix les problem de lenteur qu'en la base est down.</p></br><p><h3>12/12/2024 - Version 0.1.4: </h3> - Crash Fix .</p></br><p><h3>08/10/2024 - Version 0.1.3: </h3> - Lecture de métadonnée des flux WMS/WFS.</p></br><p><h3>07/10/2024 - Version 0.1.2: </h3> - Correctif de bug.</p></br><p><h3>03/10/2024 - Version 0.1.1: </h3> - Remonte la fênetre dans la pille.</p></br><p><h3>26/08/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_Metabase </p>
-
-# Tags are comma separated with spaces allowed
-tags=python
-
-
-category=Plugins
-icon=icon.png
-# experimental flag
-experimental=True
-
-# deprecated flag (applies to the whole plugin, not just a single version)
-deprecated=False
-
-# Since QGIS 3.8, a comma separated list of plugins to be installed
-# (or upgraded) can be specified.
-# Check the documentation for more information.
-# plugin_dependencies=
-
-Category of the plugin: Raster, Vector, Database or Web
-# category=cenra,database,metadata
-
-# If the plugin can run on QGIS Server.
-server=False
-
+# This file contains metadata for your plugin.
+
+# This file should be included when you package your plugin.# Mandatory items:
+
+[general]
+name=CenRa_Metabase
+qgisMinimumVersion=3.0
+description=CenRa_METABASE
+version=1.3
+author=Conservatoire d'Espaces Naturels de Rhône-Alpes
+email=si_besoin@cen-rhonealpes.fr
+
+about=Permet de saisire et de visualisé les information lier à la metadonné d'une couche ce trouvent sur PostgreSQL
+
+repository=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS
+homepage=https://plateformesig.cenra-outils.org/
+tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
+# End of mandatory metadata
+
+# Recommended items:
+
+hasProcessingProvider=no
+# Uncomment the following line and add your changelog:
+changelog=<h2>CenRa_Metabase:</h2></br><p><h3>08/10/2024 - Version 1.3: </h3> - Lecture de métadonnée des flux WMS/WFS.</p></br><p><h3>07/10/2024 - Version 1.2: </h3> - Correctif de bug.</p></br><p><h3>03/10/2024 - Version 1.1: </h3> - Remonte la fênetre dans la pille.</p></br><p><h3>26/08/2024 - Version 1.0: </h3> - Lancement du plugin CenRa_Metabase </p></br>
+
+# Tags are comma separated with spaces allowed
+tags=python
+
+
+category=Plugins
+icon=icon.png
+# experimental flag
+experimental=True
+
+# deprecated flag (applies to the whole plugin, not just a single version)
+deprecated=False
+
+# Since QGIS 3.8, a comma separated list of plugins to be installed
+# (or upgraded) can be specified.
+# Check the documentation for more information.
+# plugin_dependencies=
+
+Category of the plugin: Raster, Vector, Database or Web
+# category=cenra,database,metadata
+
+# If the plugin can run on QGIS Server.
+server=False
+

CenRa_Metabase/tools/PythonSQL.py

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