Compare commits

..
3 Commits
Author SHA1 Message Date
tlaveille 7df08ae02a flake8 postgis 2025-07-29 13:35:11 +02:00
tlaveille 133e785568 flake8 automap 2025-07-29 10:53:30 +02:00
tlaveille 9b7ab9ab15 3.5 flux 2025-07-29 10:24:51 +02:00
13 changed files with 656 additions and 718 deletions
+3 -36
View File
@@ -4,9 +4,9 @@ __email__ = "info@3liz.org"
from qgis.core import QgsApplication from qgis.core import QgsApplication
from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl from qgis.PyQt.QtCore import Qt, QUrl
from qgis.PyQt.QtGui import QDesktopServices, QIcon from qgis.PyQt.QtGui import QDesktopServices, QIcon
from qgis.PyQt.QtWidgets import QAction, QMessageBox from qgis.PyQt.QtWidgets import QAction
from qgis.utils import iface from qgis.utils import iface
import qgis import qgis
@@ -25,6 +25,7 @@ from pg_metadata.qgis_plugin_tools.tools.custom_logging import setup_logger
''' '''
import os import os
from qgis.PyQt.QtCore import QSettings from qgis.PyQt.QtCore import QSettings
from .about_form import AboutDialog
from .tools.resources import ( from .tools.resources import (
# plugin_path, # plugin_path,
resources_path, resources_path,
@@ -35,7 +36,6 @@ pyperclip()
from .canvas_editor import AutoMap_Editor from .canvas_editor import AutoMap_Editor
from .style_invoke import AutoMap_Style from .style_invoke import AutoMap_Style
from .about_form import AboutDialog
class PgAutoMap: class PgAutoMap:
@@ -88,39 +88,6 @@ class PgAutoMap:
if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement': if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
iface.addDockWidget(Qt.DockWidgetArea(0x1), self.style_dock) iface.addDockWidget(Qt.DockWidgetArea(0x1), self.style_dock)
'''
if not self.locator_filter:
self.locator_filter = LocatorFilter(iface)
iface.registerLocatorFilter(self.locator_filter)
@staticmethod
def check_invalid_connection_names():
""" Check for invalid connection names in the QgsSettings. """
valid, invalid = validate_connections_names()
n_invalid = len(invalid)
if n_invalid == 0:
return
invalid_text = ', '.join(invalid)
msg = QMessageBox()
msg.setIcon(QMessageBox.Warning)
msg.setWindowTitle(tr('PgMetadata: Database connection(s) not available'))
msg.setText(tr(
f'{n_invalid} connection(s) listed in PgMetadata’s settings are invalid or '
f'no longer available: {invalid_text}'))
msg.setInformativeText(tr(
'Do you want to remove these connection(s) from the PgMetadata settings? '
'(You can also do this later with the “Set Connections” tool.)'))
msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
clicked = msg.exec()
if clicked == QMessageBox.Yes:
iface.messageBar().pushSuccess('PgMetadata', tr(f'{n_invalid} invalid connection(s) removed.'))
store_connections(valid)
if clicked == QMessageBox.No:
iface.messageBar().pushInfo('PgMetadata', tr(f'Keeping {n_invalid} invalid connections.'))
'''
def open_about_dialog(self): def open_about_dialog(self):
""" """
About dialog About dialog
+2 -2
View File
@@ -3,7 +3,7 @@ import os.path
from pathlib import Path from pathlib import Path
from qgis.PyQt import uic from qgis.PyQt import uic
from qgis.PyQt.QtGui import QPixmap # from qgis.PyQt.QtGui import QPixmap
from qgis.PyQt.QtWidgets import QDialog from qgis.PyQt.QtWidgets import QDialog
from .tools.resources import devlog from .tools.resources import devlog
@@ -43,4 +43,4 @@ class AboutDialog(QDialog, ABOUT_FORM_CLASS):
Run some actions when Run some actions when
the user closes the dialog the user closes the dialog
""" """
self.close() self.close()
+11 -49
View File
@@ -1,79 +1,41 @@
import logging import logging
import os import os
from collections import namedtuple
from enum import Enum
from functools import partial
from pathlib import Path
from xml.dom.minidom import parseString
from qgis.gui import *
import qgis
from importlib import import_module
from qgis.core import ( from qgis.core import (
NULL, QgsScaleBarSettings,
QgsApplication,
QgsScaleBarSettings,
QgsDataSourceUri,
QgsProject, QgsProject,
QgsProviderConnectionException,
QgsProviderRegistry,
QgsRasterLayer, QgsRasterLayer,
QgsSettings, QgsSettings,
QgsVectorLayer, QgsVectorLayer,
QgsGeometry,
QgsPrintLayout, QgsPrintLayout,
QgsReadWriteContext, QgsReadWriteContext,
QgsLayoutItemMap, QgsLayoutItemMap,
QgsLayoutItemPage, QgsLayoutItemPage,
QgsLayoutSize,
QgsUnitTypes, QgsUnitTypes,
QgsLayoutPoint,
QgsLayoutItemLabel, QgsLayoutItemLabel,
QgsLayoutItemPicture, QgsLayoutItemPicture,
QgsLayoutItemLegend, QgsLayoutItemLegend,
QgsLegendStyle, QgsLegendStyle,
QgsLayoutItemScaleBar, QgsLayoutItemScaleBar,
QgsLayerTreeGroup, QgsLayerTreeGroup,
QgsCoordinateReferenceSystem,
QgsCoordinateTransform,
QgsLayerTree,
QgsLayoutTableColumn,
QgsRectangle, QgsRectangle,
QgsLayoutItemMapOverviewStack,
) )
from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime, Qt from qgis.PyQt.QtCore import Qt
from qgis.PyQt.QtGui import QDesktopServices, QIcon, QColor, QFont, QMovie from qgis.PyQt.QtGui import QColor, QFont
from qgis.PyQt.QtPrintSupport import QPrinter
# from qgis.PyQt.QtWebKitWidgets import QWebPage
from qgis.PyQt.QtWidgets import ( from qgis.PyQt.QtWidgets import (
QDialog, QDialog,
QAction,
QMessageBox, QMessageBox,
QPushButton, QPushButton,
QDockWidget,
QFileDialog, QFileDialog,
QInputDialog,
QMenu,
QToolButton,
QTableWidget,
QTableWidgetItem,
QVBoxLayout,
) )
from qgis.PyQt.QtCore import QSettings from qgis.PyQt.QtCore import QSettings
from qgis.PyQt import QtGui, QtWidgets from qgis.PyQt import QtGui
from qgis.PyQt.QtXml import QDomDocument from qgis.PyQt.QtXml import QDomDocument
from qgis.utils import iface from qgis.utils import iface
import glob import glob
from .tools.resources import ( from .tools.resources import (
load_ui, load_ui,
resources_path, resources_path,
# send_issues,
) )
from .issues import CenRa_Issues
from datetime import date from datetime import date
EDITOR_CLASS = load_ui('CenRa_AutoMap_base.ui') EDITOR_CLASS = load_ui('CenRa_AutoMap_base.ui')
@@ -210,11 +172,11 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
self.mComboBox_4.clear() self.mComboBox_4.clear()
logo_library = [] logo_library = []
custome_bibliotech = glob.glob(self.s.value("automap/logoteck", 1, type=str) + '*.*') custome_bibliotech = glob.glob(self.s.value("automap/logoteck", 1, type=str) + '*.*')
for l, logo_x in enumerate(custome_bibliotech): for number, logo_x in enumerate(custome_bibliotech):
logo_library.append(' ' + os.path.basename(logo_x)) logo_library.append(' ' + os.path.basename(logo_x))
bibliotech = glob.glob(resources_path("logo_library", "*.png")) bibliotech = glob.glob(resources_path("logo_library", "*.png"))
for l, logo_x in enumerate(bibliotech): for number, logo_x in enumerate(bibliotech):
logo_library.append(os.path.basename(logo_x)) logo_library.append(os.path.basename(logo_x))
self.mComboBox_4.addItems(sorted(logo_library)) self.mComboBox_4.addItems(sorted(logo_library))
@@ -452,13 +414,13 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
layout_name = self.comboBox_7.currentText() layout_name = self.comboBox_7.currentText()
else: else:
layout_name = self.lineEdit_2.text() 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: with open(os.path.join(os.getcwd(), filename), 'r') as f:
self.layout = QgsPrintLayout(project) self.layout = QgsPrintLayout(project)
self.layout.initializeDefaults() self.layout.initializeDefaults()
myAtlas = self.layout.atlas() # myAtlas = self.layout.atlas()
template_content = f.read() template_content = f.read()
doc = QDomDocument() doc = QDomDocument()
doc.setContent(template_content) doc.setContent(template_content)
@@ -466,7 +428,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
try: try:
cutLayout = layout_name.index("") cutLayout = layout_name.index("")
except: except ValueError:
cutLayout = 0 cutLayout = 0
if cutLayout >= 1: if cutLayout >= 1:
@@ -782,7 +744,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
# if self.radioButton_12.isChecked() != 1: # if self.radioButton_12.isChecked() != 1:
if self.QMBquestion == QMessageBox.StandardButton(0x00004000): if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
project.layoutManager().removeLayout(existing_layout) project.layoutManager().removeLayout(existing_layout)
result = project.layoutManager().addLayout(self.layout) # result = project.layoutManager().addLayout(self.layout)
elif self.QMBquestion != QMessageBox.StandardButton(0x00010000): elif self.QMBquestion != QMessageBox.StandardButton(0x00010000):
LayoutCOUNT = 0 LayoutCOUNT = 0
arrayManager = [] arrayManager = []
@@ -817,7 +779,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
else: else:
TryMessage = False TryMessage = False
del self.QMBquestion del self.QMBquestion
except: except ValueError:
TryMessage = True TryMessage = True
if TryMessage is True: if TryMessage is True:
+1 -2
View File
@@ -11,7 +11,7 @@ from qgis.utils import iface
import qgis import qgis
# include <QSettings> # include <QSettings>
from .about_form import AboutDialog
import os import os
from .tools.resources import ( from .tools.resources import (
pyperclip, pyperclip,
@@ -21,7 +21,6 @@ from .tools.resources import (
pyperclip() pyperclip()
from .flux_editor import Flux_Editor from .flux_editor import Flux_Editor
from .about_form import AboutDialog
class PgFlux: class PgFlux:
+2 -2
View File
@@ -7,7 +7,7 @@ name=CenRa_FLUX
qgisMinimumVersion=3.0 qgisMinimumVersion=3.0
supportsQt6=True supportsQt6=True
description=Permet d'ouvrire une table dans la base PostGis description=Permet d'ouvrire une table dans la base PostGis
version=3.4 version=3.5
author=Conservatoire d'Espaces Naturels de Rhône-Alpes author=Conservatoire d'Espaces Naturels de Rhône-Alpes
email=si_besoin@cen-rhonealpes.fr email=si_besoin@cen-rhonealpes.fr
@@ -32,7 +32,7 @@ icon=icon.png
# experimental flag # experimental flag
experimental=False experimental=False
changelog=<h2>CenRa_FLUX:</h2></br><p><h3>23/07/2025 - Version 3.4: </h3> - Ouverture raster dans la base SIG.</p></br><p><h3>23/07/2025 - Version 3.3: </h3> - Optimisation des chargement.</p></br><p><h3>22/07/2025 - Version 3.2: </h3> - Visualisation des format raster et vecteur dans REF.</p></br><p><h3>21/07/2025 - Version 3.1: </h3> - Bug fix pour l'ouverture de plus de 5 couches.</p></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6.</p></br><p><h3>09/04/2025 - Version 2.9: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>07/04/2025 - Version 2.7: </h3> - mode debug.</p></br><p><h3>03/04/2025 - Version 2.6: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 2.5: </h3> - Visualisation distincte des couches ne se trouvant pas dans l'antenne.</p></br><p><h3>13/02/2025 - Version 2.4: </h3> - Ajoute redimensionnement et déplacement mollette.</p></br><p><h3>05/02/2025 - Version 2.3: </h3> - Bouton de visualisation des couches se trouvent uniquement dans le canva de la carte.</p></br><p><h3>07/01/2025 - Version 2.2: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.1:</h3> - Correctif de bug.</br> - Evolution de la limit de 3 à 5. </br></p></br><p><h3>22/10/2024 - Version 2.0:</h3> - Reformatage du code.</br></p></br><p><h3>03/10/2024 - Version 1.14:</h3> - Remonte la fênetre dans la pille.</br></p><p><h3>13/09/2024 - Version 1.13:</h3>- MAJ sur le lien du changelog</br>- Bug-fix: Ouvre MultiPolygone et Polygon séparément.</p></br><p><h3>10/09/2024 - Version 1.11:</h3>- Ouverture de table contenant plusieurs géométries.</p></br><p><h3>26/08/2024 - Version 1.10:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p> changelog=<h2>CenRa_FLUX:</h2></br><p><h3>29/07/2025 - Version 3.5: </h3> - Bug fix sur les donnee raster.</p></br><p><h3>23/07/2025 - Version 3.4: </h3> - Ouverture raster dans la base SIG.</p></br><p><h3>23/07/2025 - Version 3.3: </h3> - Optimisation des chargement.</p></br><p><h3>22/07/2025 - Version 3.2: </h3> - Visualisation des format raster et vecteur dans REF.</p></br><p><h3>21/07/2025 - Version 3.1: </h3> - Bug fix pour l'ouverture de plus de 5 couches.</p></br><p><h3>19/05/2025 - Version 3.0: </h3> - Compatible PyQt5 et PyQt6.</p></br><p><h3>09/04/2025 - Version 2.9: </h3> - Correctif bug en TT.</p></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>07/04/2025 - Version 2.7: </h3> - mode debug.</p></br><p><h3>03/04/2025 - Version 2.6: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 2.5: </h3> - Visualisation distincte des couches ne se trouvant pas dans l'antenne.</p></br><p><h3>13/02/2025 - Version 2.4: </h3> - Ajoute redimensionnement et déplacement mollette.</p></br><p><h3>05/02/2025 - Version 2.3: </h3> - Bouton de visualisation des couches se trouvent uniquement dans le canva de la carte.</p></br><p><h3>07/01/2025 - Version 2.2: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.1:</h3> - Correctif de bug.</br> - Evolution de la limit de 3 à 5. </br></p></br><p><h3>22/10/2024 - Version 2.0:</h3> - Reformatage du code.</br></p></br><p><h3>03/10/2024 - Version 1.14:</h3> - Remonte la fênetre dans la pille.</br></p><p><h3>13/09/2024 - Version 1.13:</h3>- MAJ sur le lien du changelog</br>- Bug-fix: Ouvre MultiPolygone et Polygon séparément.</p></br><p><h3>10/09/2024 - Version 1.11:</h3>- Ouverture de table contenant plusieurs géométries.</p></br><p><h3>26/08/2024 - Version 1.10:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
# deprecated flag (applies to the whole plugin, not just a single version) # deprecated flag (applies to the whole plugin, not just a single version)
deprecated=False deprecated=False
+22 -21
View File
@@ -4,19 +4,21 @@ __email__ = "info@3liz.org"
from qgis.core import QgsApplication from qgis.core import QgsApplication
from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator, QUrl from qgis.PyQt.QtCore import QUrl
from qgis.PyQt.QtGui import QDesktopServices, QIcon from qgis.PyQt.QtGui import QDesktopServices, QIcon
from qgis.PyQt.QtWidgets import QAction, QMessageBox from qgis.PyQt.QtWidgets import QAction
from qgis.utils import iface from qgis.utils import iface
import qgis import qgis
#include <QSettings> # include <QSettings>
import socket import socket
import os import os
from qgis.PyQt.QtCore import QSettings
from .about_form import AboutDialog
from .tools.resources import ( from .tools.resources import (
plugin_path, # plugin_path,
pyperclip, pyperclip,
resources_path, resources_path,
maj_verif, maj_verif,
@@ -26,12 +28,10 @@ pyperclip()
from .postgis_editor import Postgis_Editor from .postgis_editor import Postgis_Editor
from .postgis_creator import Postgis_Creator from .postgis_creator import Postgis_Creator
from .postgis_rename import Postgis_Rename from .postgis_rename import Postgis_Rename
from .about_form import AboutDialog
from qgis.PyQt.QtCore import *
IPAddr=socket.gethostbyname(socket.gethostname()) IPAddr = socket.gethostbyname(socket.gethostname())
class PgPostgis: class PgPostgis:
def __init__(self): def __init__(self):
@@ -45,18 +45,18 @@ class PgPostgis:
self.dock_action = None self.dock_action = None
self.help_action = None self.help_action = None
plugin_dir = os.path.dirname(__file__) plugin_dir = os.path.dirname(__file__)
end_find = plugin_dir.rfind('\\')+1 end_find = plugin_dir.rfind('\\') + 1
global NAME global NAME
NAME = plugin_dir[end_find:] NAME = plugin_dir[end_find:]
maj_verif(NAME) maj_verif(NAME)
# Display About window on first use # Display About window on first use
version = qgis.utils.pluginMetadata('CenRa_POSTGIS','version') version = qgis.utils.pluginMetadata('CenRa_POSTGIS', 'version')
s = QSettings() s = QSettings()
versionUse = s.value("postgis/version", 1, type=str) versionUse = s.value("postgis/version", 1, type=str)
if str(versionUse) != str(version) : if str(versionUse) != str(version):
s.setValue("postgis/version", str(version)) s.setValue("postgis/version", str(version))
print(versionUse,version) print(versionUse, version)
self.open_about_dialog() self.open_about_dialog()
def initGui(self): def initGui(self):
@@ -76,29 +76,29 @@ class PgPostgis:
if not self.action_creator: if not self.action_creator:
self.action_creator = Postgis_Creator() self.action_creator = Postgis_Creator()
self.postgis_creator = QAction(icon, 'dossier_creator',None) self.postgis_creator = QAction(icon, 'dossier_creator', None)
self.toolBar.addAction(self.postgis_creator) self.toolBar.addAction(self.postgis_creator)
self.postgis_creator.triggered.connect(self.open_creator) self.postgis_creator.triggered.connect(self.open_creator)
self.postgis_creator.setEnabled(False) self.postgis_creator.setEnabled(False)
if os.access('N:/',os.R_OK): if os.access('N:/', os.R_OK):
self.postgis_creator.setEnabled(True) self.postgis_creator.setEnabled(True)
if not self.action_editor: if not self.action_editor:
self.action_editor = Postgis_Editor() self.action_editor = Postgis_Editor()
self.postgis_editor = QAction(icon2, 'dossier_editor',None) self.postgis_editor = QAction(icon2, 'dossier_editor', None)
self.toolBar.addAction(self.postgis_editor) self.toolBar.addAction(self.postgis_editor)
self.postgis_editor.triggered.connect(self.open_editor) self.postgis_editor.triggered.connect(self.open_editor)
self.postgis_editor.setEnabled(False) self.postgis_editor.setEnabled(False)
if os.access('N:/',os.R_OK): if os.access('N:/', os.R_OK):
self.postgis_editor.setEnabled(True) self.postgis_editor.setEnabled(True)
if not self.action_rename: if not self.action_rename:
self.action_rename = Postgis_Rename() self.action_rename = Postgis_Rename()
self.postgis_rename = QAction(icon3, 'dossier_rename',None) self.postgis_rename = QAction(icon3, 'dossier_rename', None)
self.toolBar.addAction(self.postgis_rename) self.toolBar.addAction(self.postgis_rename)
self.postgis_rename.triggered.connect(self.open_rename) self.postgis_rename.triggered.connect(self.open_rename)
@@ -112,7 +112,7 @@ class PgPostgis:
self.postgis_rename.setVisible(0) self.postgis_rename.setVisible(0)
self.postgis_rename.setEnabled(False) self.postgis_rename.setEnabled(False)
if os.access('N:/',os.R_OK): if os.access('N:/', os.R_OK):
self.postgis_rename.setEnabled(True) self.postgis_rename.setEnabled(True)
def open_about_dialog(self): def open_about_dialog(self):
@@ -121,6 +121,7 @@ class PgPostgis:
""" """
dialog = AboutDialog(iface) dialog = AboutDialog(iface)
dialog.exec() dialog.exec()
def open_help(): def open_help():
""" Open the online help. """ """ Open the online help. """
QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/')) QDesktopServices.openUrl(QUrl('https://plateformesig.cenra-outils.org/'))
@@ -140,11 +141,11 @@ class PgPostgis:
def unload(self): def unload(self):
""" Unload the plugin. """ """ Unload the plugin. """
if self.action_editor: if self.action_editor:
iface.removePluginMenu('CenRa_Postgis',self.postgis_editor) iface.removePluginMenu('CenRa_Postgis', self.postgis_editor)
if self.action_creator: if self.action_creator:
iface.removePluginMenu('CenRa_Postgis',self.postgis_creator) iface.removePluginMenu('CenRa_Postgis', self.postgis_creator)
if self.action_rename: if self.action_rename:
iface.removePluginMenu('CenRa_Postgis',self.postgis_rename) iface.removePluginMenu('CenRa_Postgis', self.postgis_rename)
if self.provider: if self.provider:
QgsApplication.processingRegistry().removeProvider(self.provider) QgsApplication.processingRegistry().removeProvider(self.provider)
+1 -1
View File
@@ -43,4 +43,4 @@ class AboutDialog(QDialog, ABOUT_FORM_CLASS):
Run some actions when Run some actions when
the user closes the dialog the user closes the dialog
""" """
self.close() self.close()
+38 -39
View File
@@ -2,57 +2,57 @@
from __future__ import absolute_import from __future__ import absolute_import
# Import the PyQt and QGIS libraries # Import the PyQt and QGIS libraries
from builtins import next # from builtins import next
from builtins import str # from builtins import str
from builtins import object # from builtins import object
import qgis # import qgis
from qgis.PyQt.QtCore import QSettings from qgis.PyQt.QtCore import QSettings
from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog,QMessageBox from qgis.PyQt.QtWidgets import QDialog, QMessageBox
from qgis.PyQt.QtGui import QIcon # from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import * # from qgis.PyQt.QtCore import *
from qgis.PyQt.QtGui import * # from qgis.PyQt.QtGui import *
from qgis.PyQt import QtGui from qgis.PyQt import QtGui
from qgis.core import * # from qgis.core import *
from qgis.core import QgsDataSourceUri from qgis.core import QgsSettings
try: try:
from .tools.PythonSQL import login_base from .tools.PythonSQL import login_base
except: except ValueError:
print('Pas de fichier PythonSQL') print('Pas de fichier PythonSQL')
from .tools.SQLRequet import * # from .tools.SQLRequet import *
from .tools.resources import ( from .tools.resources import (
load_ui, load_ui,
resources_path, resources_path,
send_issues, # send_issues,
create_vierge, create_vierge,
create_contour, create_contour,
create_travaux, create_travaux,
create_habita create_habita
) )
from .issues import CenRa_Issues # from .issues import CenRa_Issues
from qgis.utils import iface from qgis.utils import iface
import os.path # import os.path
import webbrowser, os # import webbrowser, os
import psycopg2 # import psycopg2
import psycopg2.extras # import psycopg2.extras
import base64 # import base64
EDITOR_CLASS = load_ui('CenRa_Postgis_base.ui') EDITOR_CLASS = load_ui('CenRa_Postgis_base.ui')
class Postgis_Creator(QDialog, EDITOR_CLASS):
class Postgis_Creator(QDialog, EDITOR_CLASS):
def __init__(self, parent=None): def __init__(self, parent=None):
_ = parent _ = parent
super().__init__() super().__init__()
self.setupUi(self) self.setupUi(self)
self.settings = QgsSettings() self.settings = QgsSettings()
self.s = QSettings() self.s = QSettings()
self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png'))) self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
self.iface = iface self.iface = iface
# run method that performs all the real work # run method that performs all the real work
@@ -64,23 +64,23 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
result = self.exec() result = self.exec()
# See if OK was pressed # See if OK was pressed
if result == 1: if result == 1:
# **********************************Debut_script****************************************
#**********************************Debut_script**************************************** # Creation du schema pour le nouveau site
### Creation du schema pour le nouveau site
if self.at.isChecked(): if self.at.isChecked():
schema = "_" + self.dept.currentText() + "_at_" + self.nom.text().lower() # Ajout de "_" pour eviter pb de numero en premier caractere # Ajout de "_" pour eviter pb de numero en premier caractere
else : schema = "_" + self.dept.currentText() + "_at_" + self.nom.text().lower()
schema = "_" + self.dept.currentText() + "_" + self.nom.text().lower() # Ajout de "_" pour eviter pb de numero en premier caractere else:
# Ajout de "_" pour eviter pb de numero en premier caractere
schema = "_" + self.dept.currentText() + "_" + self.nom.text().lower()
if self.nom.text() == "" or self.nom.text() == "NULL": if self.nom.text() == "" or self.nom.text() == "NULL":
QMessageBox.warning(None, "Oups :", "Veuillez renseigner un nom de dossier.") QMessageBox.warning(None, "Oups :", "Veuillez renseigner un nom de dossier.")
return return
ch = [u"à", u"À", u"â", u"Â", u"ä", u"Ä", u"å", u"Å", u"ç", u"Ç", u"é", u"É", u"è", u"È", u"ê", u"Ê", u"ë", u"Ë", u"î", u"Î", u"ï", u"Ï", u"ô", u"Ô", u"ö", u"Ö", u"ù", u"Ù", u"û", u"Û", u"ü", u"Ü", u"ÿ", u"Ÿ", u"'", u"-", u" "] ch = [u"à", u"À", u"â", u"Â", u"ä", u"Ä", u"å", u"Å", u"ç", u"Ç", u"é", u"É", u"è", u"È", u"ê", u"Ê", u"ë", u"Ë", u"î", u"Î", u"ï", u"Ï", u"ô", u"Ô", u"ö", u"Ö", u"ù", u"Ù", u"û", u"Û", u"ü", u"Ü", u"ÿ", u"Ÿ", u"'", u"-", u" "]
for car in ch : for car in ch:
if self.nom.text().find(car) != -1 : if self.nom.text().find(car) != - 1:
QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.nom.text().lower() ) QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.nom.text().lower())
return return
account = login_base("account") account = login_base("account")
user = account[0] user = account[0]
@@ -92,19 +92,18 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
con = account[8] con = account[8]
SQL_schema = "CREATE SCHEMA " + schema + ";" SQL_schema = "CREATE SCHEMA " + schema + ";"
SQL_GRANT_SCHEMA="GRANT CREATE, USAGE ON SCHEMA "+schema+" TO grp_qgis; GRANT CREATE, USAGE ON SCHEMA "+schema+" TO grp_sig;" SQL_GRANT_SCHEMA = "GRANT CREATE, USAGE ON SCHEMA " + schema + " TO grp_qgis; GRANT CREATE, USAGE ON SCHEMA " + schema + " TO grp_sig;"
if self.couche_contour.isChecked() or self.couche_habitat.isChecked() or self.couche_travaux_prevus.isChecked() or self.couche_vierge.isChecked(): if self.couche_contour.isChecked() or self.couche_habitat.isChecked() or self.couche_travaux_prevus.isChecked() or self.couche_vierge.isChecked():
cur.execute(SQL_schema) cur.execute(SQL_schema)
cur.execute(SQL_GRANT_SCHEMA) cur.execute(SQL_GRANT_SCHEMA)
else: else:
iface.messageBar().pushMessage("POSTGRESQL :", "Pas de couche sélectionnée, création refusée.", level=Qgis.Warning, duration=30) iface.messageBar().pushMessage("POSTGRESQL :", "Pas de couche sélectionnée, création refusée.", level=1, duration=30)
create_contour(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
create_travaux(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
create_vierge(self,schema,cur,con,host ,port ,dbname ,user ,mdp)
create_contour(self, schema, cur, con, host, port, dbname, user, mdp)
create_habita(self, schema, cur, con, host, port, dbname, user, mdp)
create_travaux(self, schema, cur, con, host, port, dbname, user, mdp)
create_vierge(self, schema, cur, con, host, port, dbname, user, mdp)
con.close() con.close()
pass pass
+29 -31
View File
@@ -4,57 +4,55 @@ from __future__ import absolute_import
# Import the PyQt and QGIS libraries # Import the PyQt and QGIS libraries
from builtins import next from builtins import next
from builtins import str from builtins import str
from builtins import object # from builtins import object
import qgis # import qgis
from qgis.PyQt.QtCore import QSettings from qgis.PyQt.QtCore import QSettings
from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog from qgis.PyQt.QtWidgets import QDialog, QMessageBox
from qgis.PyQt.QtGui import QIcon # from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import *
from qgis.PyQt.QtGui import *
from qgis.PyQt import QtGui from qgis.PyQt import QtGui
from qgis.core import * # from qgis.core import *
from qgis.core import QgsDataSourceUri from qgis.core import QgsSettings
try: try:
from .tools.PythonSQL import login_base from .tools.PythonSQL import login_base
except: except ValueError:
print('Pas de fichier PythonSQL') print('Pas de fichier PythonSQL')
from .tools.SQLRequet import * # from .tools.SQLRequet import *
from .tools.resources import ( from .tools.resources import (
load_ui, load_ui,
resources_path, resources_path,
send_issues, # send_issues,
create_vierge, create_vierge,
create_contour, create_contour,
create_travaux, create_travaux,
create_habita create_habita
) )
from .issues import CenRa_Issues # from .issues import CenRa_Issues
import os.path # import os.path
import webbrowser, os # import webbrowser
import psycopg2 # import psycopg2
import psycopg2.extras # import psycopg2.extras
import base64 # import base64
from qgis.utils import iface from qgis.utils import iface
EDITOR_CLASS = load_ui('CenRa_PostgisTable_base.ui') EDITOR_CLASS = load_ui('CenRa_PostgisTable_base.ui')
class Postgis_Editor(QDialog, EDITOR_CLASS):
class Postgis_Editor(QDialog, EDITOR_CLASS):
def __init__(self, parent=None): def __init__(self, parent=None):
_ = parent _ = parent
super().__init__() super().__init__()
self.setupUi(self) self.setupUi(self)
self.settings = QgsSettings() self.settings = QgsSettings()
self.s = QSettings() self.s = QSettings()
self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png'))) self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
self.iface = iface self.iface = iface
### Outil Ajout de nouvelles couche a un dossier # Outil Ajout de nouvelles couche a un dossier
def raise_(self): def raise_(self):
self.activateWindow() self.activateWindow()
account = login_base("account") account = login_base("account")
@@ -65,13 +63,12 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
dbname = account[4] dbname = account[4]
cur = account[7] cur = account[7]
con = account[8] con = account[8]
# Creation de la liste des schemas de la base de donnees # Creation de la liste des schemas de la base de donnees
SQL = """WITH list_schema AS ( SQL = """WITH list_schema AS (
select schemaname,'sig' as group from pg_catalog.pg_tables select schemaname,'sig' as group from pg_catalog.pg_tables
where schemaname ~ E'^_(0|1|2|3|4|6|7|f)' where schemaname ~ E'^_(0|1|2|3|4|6|7|f)'
group by schemaname group by schemaname
order by schemaname) order by schemaname)
select string_agg(schemaname,',') select string_agg(schemaname,',')
from list_schema from list_schema
group by "group";""" group by "group";"""
@@ -79,14 +76,15 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
cur.execute(SQL) cur.execute(SQL)
list_brut = str(next(cur)) list_brut = str(next(cur))
list = list_brut [2:-2] list = list_brut[2:-2]
listItems = list.split(",") listItems = list.split(",")
con.close() con.close()
self.schema.clear() self.schema.clear()
self.schema.addItems(listItems) self.schema.addItems(listItems)
self.schema.setCurrentIndex(-1) # Pour ne pas commencer la liste au premier schema # Pour ne pas commencer la liste au premier schema
self.schema.setCurrentIndex(-1)
# show the dialog # show the dialog
self.show() self.show()
@@ -94,7 +92,7 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
result = self.exec() result = self.exec()
# See if OK was pressed # See if OK was pressed
if result == 1: if result == 1:
#******************************debut script********************************* # ******************************debut script*********************************
account = login_base("account") account = login_base("account")
user = account[0] user = account[0]
mdp = account[1] mdp = account[1]
@@ -104,16 +102,16 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
cur = account[7] cur = account[7]
con = account[8] con = account[8]
if self.schema.currentIndex() == -1 : if self.schema.currentIndex() == - 1:
QMessageBox.warning(None, "Oups :", "Veuillez choisir un nom de dossier.") QMessageBox.warning(None, "Oups :", "Veuillez choisir un nom de dossier.")
return return
schema = self.schema.currentText() schema = self.schema.currentText()
create_contour(self,schema,cur,con,host ,port ,dbname ,user ,mdp) create_contour(self, schema, cur, con, host, port, dbname, user, mdp)
create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp) create_habita(self, schema, cur, con, host, port, dbname, user, mdp)
create_travaux(self,schema,cur,con,host ,port ,dbname ,user ,mdp) create_travaux(self, schema, cur, con, host, port, dbname, user, mdp)
create_vierge(self,schema,cur,con,host ,port ,dbname ,user ,mdp) create_vierge(self, schema, cur, con, host, port, dbname, user, mdp)
con.close() con.close()
pass pass
+56 -60
View File
@@ -2,43 +2,39 @@
from __future__ import absolute_import from __future__ import absolute_import
# Import the PyQt and QGIS libraries # Import the PyQt and QGIS libraries
from builtins import next # from builtins import next
from builtins import str from builtins import str
from builtins import object # from builtins import object
import qgis # import qgis
from qgis.PyQt.QtCore import QSettings from qgis.PyQt.QtCore import QSettings
from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog, QMessageBox,QDialogButtonBox from qgis.PyQt.QtWidgets import QDialog, QMessageBox, QDialogButtonBox
from qgis.PyQt.QtGui import QIcon # from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import * # from qgis.PyQt.QtCore import *
from qgis.PyQt.QtGui import * # from qgis.PyQt.QtGui import *
from qgis.PyQt import QtGui from qgis.PyQt import QtGui
from qgis.core import * # from qgis.core import *
from qgis.core import QgsDataSourceUri from qgis.core import QgsSettings, QgsDataSourceUri, QgsProject
try: try:
from .tools.PythonSQL import login_base from .tools.PythonSQL import login_base
except: except ValueError:
print('Pas de fichier PythonSQL') print('Pas de fichier PythonSQL')
from .tools.SQLRequet import * # from .tools.SQLRequet import *
from .tools.resources import ( from .tools.resources import (
load_ui, load_ui,
resources_path, resources_path,
send_issues, # send_issues,
create_vierge,
create_contour,
create_travaux,
create_habita
) )
from .issues import CenRa_Issues # from .issues import CenRa_Issues
import os.path # import os.path
import webbrowser, os # import webbrowser
import psycopg2 # import psycopg2
import psycopg2.extras # import psycopg2.extras
import base64 # import base64
from qgis.utils import iface from qgis.utils import iface
EDITOR_CLASS = load_ui('CenRa_PostgisRename_base.ui') EDITOR_CLASS = load_ui('CenRa_PostgisRename_base.ui')
@@ -52,22 +48,24 @@ try:
dbname = account[4] dbname = account[4]
cur = account[7] cur = account[7]
con = account[8] con = account[8]
except: except ValueError:
print('') print('')
class Postgis_Rename(QDialog, EDITOR_CLASS):
class Postgis_Rename(QDialog, EDITOR_CLASS):
def __init__(self, parent=None): def __init__(self, parent=None):
_ = parent _ = parent
super().__init__() super().__init__()
self.setupUi(self) self.setupUi(self)
self.settings = QgsSettings() self.settings = QgsSettings()
self.s = QSettings() self.s = QSettings()
self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png'))) self.setWindowIcon(QtGui.QIcon(resources_path('icons', 'icon.png')))
self.iface = iface self.iface = iface
self.schema.currentIndexChanged.connect(self.Test) self.schema.currentIndexChanged.connect(self.Test)
self.buttonBox.accepted.connect(self.msgBox) self.buttonBox.accepted.connect(self.msgBox)
### Outil Ajout de nouvelles couche a un dossier # Outil Ajout de nouvelles couche a un dossier
def raise_(self): def raise_(self):
self.activateWindow() self.activateWindow()
self.groupBox_3.hide() self.groupBox_3.hide()
@@ -82,7 +80,7 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
self.schema.addItems(['']) self.schema.addItems([''])
for Schema in AllSchema: for Schema in AllSchema:
self.schema.addItems(Schema) self.schema.addItems(Schema)
self.departement.addItems(['','01','07','26','42','69','form']) self.departement.addItems(['', '01', '07', '26', '42', '69', 'form'])
if last_value_schema != '': if last_value_schema != '':
self.schema.setCurrentIndex(self.schema.findText(last_value_schema)) self.schema.setCurrentIndex(self.schema.findText(last_value_schema))
if last_value_departement != '': if last_value_departement != '':
@@ -92,27 +90,27 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
oldSchema = self.schema.currentText() oldSchema = self.schema.currentText()
if oldSchema != '': if oldSchema != '':
allIsGood = 0 allIsGood = 0
GET_COUNT_LEFT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE left(table_name,"+str(len(oldSchema))+") AND table_schema LIKE '"+oldSchema+"';" GET_COUNT_LEFT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE left(table_name," + str(len(oldSchema)) + ") AND table_schema LIKE '" + oldSchema + "';"
GET_COUNT_TOT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE '"+oldSchema+"';" GET_COUNT_TOT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE '" + oldSchema + "';"
cur.execute(GET_COUNT_TOT) cur.execute(GET_COUNT_TOT)
CountTot = cur.fetchall()[0] CountTot = cur.fetchall()[0]
cur.execute(GET_COUNT_LEFT) cur.execute(GET_COUNT_LEFT)
CountLeft = cur.fetchall()[0] CountLeft = cur.fetchall()[0]
if CountLeft[0] == CountTot[0]: if CountLeft[0] == CountTot[0]:
allIsGood = allIsGood+1 allIsGood = allIsGood + 1
self.couche.setChecked(1) self.couche.setChecked(1)
else: else:
self.couche.setChecked(0) self.couche.setChecked(0)
GET_GRANTEE_PRIVILEGE = "SELECT DISTINCT count(*) FROM information_schema.role_table_grants WHERE table_schema LIKE '"+oldSchema+"' AND grantee LIKE 'grp_qgis' AND privilege_type LIKE 'UPDATE';" GET_GRANTEE_PRIVILEGE = "SELECT DISTINCT count(*) FROM information_schema.role_table_grants WHERE table_schema LIKE '" + oldSchema + "' AND grantee LIKE 'grp_qgis' AND privilege_type LIKE 'UPDATE';"
cur.execute(GET_GRANTEE_PRIVILEGE) cur.execute(GET_GRANTEE_PRIVILEGE)
CountPrivilege = cur.fetchall()[0] CountPrivilege = cur.fetchall()[0]
if CountTot[0] == CountPrivilege[0]: if CountTot[0] == CountPrivilege[0]:
allIsGood = allIsGood+1 allIsGood = allIsGood + 1
self.compte.setChecked(1) self.compte.setChecked(1)
else: else:
self.compte.setChecked(0) self.compte.setChecked(0)
@@ -149,52 +147,50 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
def updateName(self): def updateName(self):
if self.departement.currentText() != '': if self.departement.currentText() != '':
oldTableName = self.old_name.text() oldTableName = self.old_name.text()
newTableName = ((self.new_name.text()).lower()).replace(' ','_') newTableName = ((self.new_name.text()).lower()).replace(' ', '_')
newPrefixSchema = '_'+self.departement.currentText()+'_' newPrefixSchema = '_' + self.departement.currentText() + '_'
if self.schema.currentText()[:6] == '_form_': if self.schema.currentText()[:6] == '_form_':
oldPrefixSchema = self.schema.currentText()[:6] oldPrefixSchema = self.schema.currentText()[:6]
if (self.schema.currentText()[6:9]) == "at_": if (self.schema.currentText()[6:9]) == "at_":
oldPrefixSchema=oldPrefixSchema+'at_' oldPrefixSchema = oldPrefixSchema + 'at_'
else: else:
oldPrefixSchema = self.schema.currentText()[:4] oldPrefixSchema = self.schema.currentText()[:4]
if (self.schema.currentText()[4:7]) == 'at_': if (self.schema.currentText()[4:7]) == 'at_':
oldPrefixSchema=oldPrefixSchema+'at_' oldPrefixSchema = oldPrefixSchema + 'at_'
if self.animation.isChecked(): if self.animation.isChecked():
newPrefixSchema=newPrefixSchema+'at_' newPrefixSchema = newPrefixSchema + 'at_'
oldSchemaName = oldPrefixSchema+oldTableName oldSchemaName = oldPrefixSchema + oldTableName
newSchemaName = newPrefixSchema+newTableName newSchemaName = newPrefixSchema + newTableName
if oldSchemaName != newSchemaName: if oldSchemaName != newSchemaName:
global AllSQLrun global AllSQLrun
allSQLrun='' allSQLrun = ''
SQL_UPDATE = """UPDATE public.layer_styles SET f_table_schema = '"""+newSchemaName+"""',f_table_name = replace(replace(f_table_name,'"""+oldTableName+"""','"""+newTableName+"""'),'"""+oldPrefixSchema+"""','"""+newPrefixSchema+"""') WHERE f_table_schema LIKE '"""+oldSchemaName+"""';""" SQL_UPDATE = """UPDATE public.layer_styles SET f_table_schema = '""" + newSchemaName + """',f_table_name = replace(replace(f_table_name,'""" + oldTableName + """','""" + newTableName + """'),'""" + oldPrefixSchema + """','""" + newPrefixSchema + """') WHERE f_table_schema LIKE '""" + oldSchemaName + """';"""
allSQLrun = allSQLrun+SQL_UPDATE allSQLrun = allSQLrun + SQL_UPDATE
cur.execute(SQL_UPDATE) cur.execute(SQL_UPDATE)
SQL_GET_TABLE_RENAME = """SELECT table_name,replace(replace(table_name,'"""+oldTableName+"""','"""+newTableName+"""'),'"""+oldPrefixSchema+"""','"""+newPrefixSchema+"""') from information_schema.tables WHERE table_schema LIKE '"""+oldSchemaName+"""';""" SQL_GET_TABLE_RENAME = """SELECT table_name,replace(replace(table_name,'""" + oldTableName + """','""" + newTableName + """'),'""" + oldPrefixSchema + """','""" + newPrefixSchema + """') from information_schema.tables WHERE table_schema LIKE '""" + oldSchemaName + """';"""
cur.execute(SQL_GET_TABLE_RENAME) cur.execute(SQL_GET_TABLE_RENAME)
allTableRename = cur.fetchall() allTableRename = cur.fetchall()
allTableList = [] allTableList = []
for TableRename in allTableRename: for TableRename in allTableRename:
oldTable = TableRename[0] oldTable = TableRename[0]
newTable = TableRename[1] newTable = TableRename[1]
allTableList.append([oldTable,newSchemaName,newTable]) allTableList.append([oldTable, newSchemaName, newTable])
SQL_RENAME_TABLE = """ALTER TABLE """+oldSchemaName+'.'+oldTable+""" RENAME TO """+newTable+""";""" SQL_RENAME_TABLE = """ALTER TABLE """ + oldSchemaName + '.' + oldTable + """ RENAME TO """ + newTable + """;"""
allSQLrun = allSQLrun+SQL_RENAME_TABLE allSQLrun = allSQLrun + SQL_RENAME_TABLE
cur.execute(SQL_RENAME_TABLE) cur.execute(SQL_RENAME_TABLE)
SQL_RENAME_SCHEMA = 'ALTER SCHEMA '+oldSchemaName+' RENAME TO '+newSchemaName SQL_RENAME_SCHEMA = 'ALTER SCHEMA ' + oldSchemaName + ' RENAME TO ' + newSchemaName
allSQLrun = allSQLrun+SQL_RENAME_SCHEMA allSQLrun = allSQLrun + SQL_RENAME_SCHEMA
cur.execute(SQL_RENAME_SCHEMA) cur.execute(SQL_RENAME_SCHEMA)
#print(allSQLrun)
con.commit() con.commit()
for LayerOpen in allTableList: for LayerOpen in allTableList:
self.UnloadLoadLayers(LayerOpen[0],LayerOpen[1],LayerOpen[2]) self.UnloadLoadLayers(LayerOpen[0], LayerOpen[1], LayerOpen[2])
def UnloadLoadLayers(self, OldName, NewSchema, NewTable):
def UnloadLoadLayers(self,OldName,NewSchema,NewTable):
allLayers = (QgsProject.instance().mapLayers().values()) allLayers = (QgsProject.instance().mapLayers().values())
listLayers = [] listLayers = []
listLayersName = [] listLayersName = []
@@ -210,10 +206,10 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
host = QgsDataSourceUri(provider.dataSourceUri()).host() host = QgsDataSourceUri(provider.dataSourceUri()).host()
port = QgsDataSourceUri(provider.dataSourceUri()).port() port = QgsDataSourceUri(provider.dataSourceUri()).port()
### Affichage de la table # Affichage de la table
uri = QgsDataSourceUri() uri = QgsDataSourceUri()
# set host name, port, database name, username and password # set host name, port, database name, username and password
uri.setConnection(host ,port ,dbname ,user ,mdp) uri.setConnection(host, port, dbname, user, mdp)
# set database schema, table name, geometry column and optionaly subset (WHERE clause) # set database schema, table name, geometry column and optionaly subset (WHERE clause)
uri.setDataSource(NewSchema, NewTable, 'geom') uri.setDataSource(NewSchema, NewTable, 'geom')
QgsProject.instance().removeMapLayer(layer.id()) QgsProject.instance().removeMapLayer(layer.id())
@@ -224,16 +220,16 @@ class Postgis_Rename(QDialog, EDITOR_CLASS):
self.QMBquestion.setWindowTitle(u"Attention !") self.QMBquestion.setWindowTitle(u"Attention !")
self.QMBquestion.setIcon(QMessageBox.Icon.Warning) self.QMBquestion.setIcon(QMessageBox.Icon.Warning)
self.QMBquestion.setText("Attention, le renommage de dossier PostGIS peut engendrer des pertes de liaisons avec des projets QGIS !") self.QMBquestion.setText("Attention, le renommage de dossier PostGIS peut engendrer des pertes de liaisons avec des projets QGIS !")
self.QMBquestion.setStandardButtons(QMessageBox.StandardButton(0x00004000)|QMessageBox.StandardButton(0x00010000)) self.QMBquestion.setStandardButtons(QMessageBox.StandardButton(0x00004000) | QMessageBox.StandardButton(0x00010000))
if self.new_name.text() != '': if self.new_name.text() != '':
error_caracteres = 0 error_caracteres = 0
for caracteres in ch : for caracteres in ch:
if self.new_name.text().find(caracteres) != -1 : if self.new_name.text().find(caracteres) != - 1:
error_caracteres = 1 error_caracteres = 1
if error_caracteres == 0: if error_caracteres == 0:
self.QMBquestion = self.QMBquestion.exec() self.QMBquestion = self.QMBquestion.exec()
else: else:
QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.new_name.text().lower() ) QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.new_name.text().lower())
else: else:
QMessageBox.warning(None, "Oups :", "Votre projet doit avoire un nom !") QMessageBox.warning(None, "Oups :", "Votre projet doit avoire un nom !")
if self.QMBquestion == QMessageBox.StandardButton(0x00004000): if self.QMBquestion == QMessageBox.StandardButton(0x00004000):
+4 -4
View File
@@ -1,7 +1,7 @@
geom = "geom" 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_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_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_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_viergePolygone = """(gid serial NOT NULL, commentaire text, surface_m2 double precision, surface_ha double precision, geom geometry(MultiPolygon,2154))"""
@@ -10,7 +10,7 @@ champ_viergePoint = """(gid serial NOT NULL, commentaire text, x_wgs84 double pr
champ_habitat = """(gid serial NOT NULL, cd_cb_01 text, lb_cb97_fr_01 text, occupation_01 integer, cd_cb_02 text, lb_cb97_fr_02 text, occupation_02 integer, cd_cb_03 text, lb_cb97_fr_03 text, occupation_03 integer, milieu_code text, milieu_libelle text, surface_m2 double precision, surface_ha double precision, commentaire text, date_creation date, date_maj date, geom geometry(MultiPolygon,2154))""" champ_habitat = """(gid serial NOT NULL, cd_cb_01 text, lb_cb97_fr_01 text, occupation_01 integer, cd_cb_02 text, lb_cb97_fr_02 text, occupation_02 integer, cd_cb_03 text, lb_cb97_fr_03 text, occupation_03 integer, milieu_code text, milieu_libelle text, surface_m2 double precision, surface_ha double precision, commentaire text, date_creation date, date_maj date, geom geometry(MultiPolygon,2154))"""
champ_contour="""(gid serial NOT NULL, date_creation date, date_maj date, utilisateur character varying, dept character(2), nom character varying, surface_m2 double precision, surface_ha double precision, type_site character varying, type_milieu character varying, date_premier_pg integer, date_debut_pg integer, date_fin_pg integer, referent character varying, gestion_deleguee character varying, terrain_militaire character(3), ens character(3), zh character(3), adapt_pmr character(3), inform character(3), guide character(3), ouverture_public character(3), obs character(3), anim character(3), n2000_anim character(3), contrat_n2000_conseil character(3), n2000_op character(3), contrat_n2000_benef character(3), contrat_agri character(3), bc_habitat integer, bc_amphibien integer, bc_coleoptere integer, bc_crustace integer, bc_mammifere integer, bc_chiroptere integer, bc_mollusque integer, bc_odonate integer, bc_oiseau integer, bc_orthoptere integer, bc_poisson integer, bc_reptile integer, bc_rhopalocere integer, bc_heterocere integer, bc_autre_invertebre integer, bc_flore integer, bc_bryophyte integer, bc_champignon integer, suiv_analyse_sol character(3), suiv_piezo character(3), suiv_climat character(3), suiv_topo character(3), suiv_habitat character(3), suiv_amphibien character(3), suiv_coleoptere character(3), suiv_crustace character(3), suiv_mammifere character(3), suiv_chiroptere character(3), suiv_mollusque character(3), suiv_odonate character(3), suiv_oiseau character(3), suiv_orthoptere character(3), suiv_poisson character(3), suiv_reptile character(3), suiv_rhopalocere character(3), suiv_heterocere character(3), suiv_autre_invertebre character(3), suiv_flore character(3), suiv_bryophyte character(3), suiv_champignon character(3), suiv_analyse_eau character(3), suiv_phenologie character(3), suiv_frequentation character(3), suiv_paysager character(3), suiv_autre character(3), commentaire text, geom geometry(MultiPolygon,2154)) champ_contour = """(gid serial NOT NULL, date_creation date, date_maj date, utilisateur character varying, dept character(2), nom character varying, surface_m2 double precision, surface_ha double precision, type_site character varying, type_milieu character varying, date_premier_pg integer, date_debut_pg integer, date_fin_pg integer, referent character varying, gestion_deleguee character varying, terrain_militaire character(3), ens character(3), zh character(3), adapt_pmr character(3), inform character(3), guide character(3), ouverture_public character(3), obs character(3), anim character(3), n2000_anim character(3), contrat_n2000_conseil character(3), n2000_op character(3), contrat_n2000_benef character(3), contrat_agri character(3), bc_habitat integer, bc_amphibien integer, bc_coleoptere integer, bc_crustace integer, bc_mammifere integer, bc_chiroptere integer, bc_mollusque integer, bc_odonate integer, bc_oiseau integer, bc_orthoptere integer, bc_poisson integer, bc_reptile integer, bc_rhopalocere integer, bc_heterocere integer, bc_autre_invertebre integer, bc_flore integer, bc_bryophyte integer, bc_champignon integer, suiv_analyse_sol character(3), suiv_piezo character(3), suiv_climat character(3), suiv_topo character(3), suiv_habitat character(3), suiv_amphibien character(3), suiv_coleoptere character(3), suiv_crustace character(3), suiv_mammifere character(3), suiv_chiroptere character(3), suiv_mollusque character(3), suiv_odonate character(3), suiv_oiseau character(3), suiv_orthoptere character(3), suiv_poisson character(3), suiv_reptile character(3), suiv_rhopalocere character(3), suiv_heterocere character(3), suiv_autre_invertebre character(3), suiv_flore character(3), suiv_bryophyte character(3), suiv_champignon character(3), suiv_analyse_eau character(3), suiv_phenologie character(3), suiv_frequentation character(3), suiv_paysager character(3), suiv_autre character(3), commentaire text, geom geometry(MultiPolygon,2154))
""" """
champ_vegethab_point = """( champ_vegethab_point = """(
@@ -138,4 +138,4 @@ champ_vegethab_multipolygon = """(
class_name character varying(254) COLLATE pg_catalog."default", class_name character varying(254) COLLATE pg_catalog."default",
geom geometry(MultiPolygon,2154) geom geometry(MultiPolygon,2154)
) )
""" """
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -50,9 +50,9 @@
<tags>cenra,sicen</tags> <tags>cenra,sicen</tags>
</pyqgis_plugin> </pyqgis_plugin>
<pyqgis_plugin name="CenRa_FLUX" version="3.4"> <pyqgis_plugin name="CenRa_FLUX" version="3.5">
<description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description> <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
<version>3.4</version> <version>3.5</version>
<qgis_minimum_version>3.16</qgis_minimum_version> <qgis_minimum_version>3.16</qgis_minimum_version>
<homepage>https://plateformesig.cenra-outils.org/</homepage> <homepage>https://plateformesig.cenra-outils.org/</homepage>
<file_name>CenRa_FLUX.zip</file_name> <file_name>CenRa_FLUX.zip</file_name>
@@ -61,7 +61,7 @@
<download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_FLUX.zip</download_url> <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_FLUX.zip</download_url>
<uploaded_by>CEN-Rhone-Alpes</uploaded_by> <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
<create_date>2024-02-06</create_date> <create_date>2024-02-06</create_date>
<update_date>2025-07-23</update_date> <update_date>2025-07-29</update_date>
<experimental>False</experimental> <experimental>False</experimental>
<deprecated>False</deprecated> <deprecated>False</deprecated>
<tags>cenra,flux</tags> <tags>cenra,flux</tags>