CEN-RA/Plugin_QGIS
4
1
Fork 1
Code Issues Pull Requests Actions Packages Projects 1 Releases 42 Wiki Activity

flake8 and Qt6 fix

Browse Source
This commit is contained in:
tlaveille
2025-07-30 09:57:09 +02:00
parent 6c1af3c61c
commit 36de24532a
6 changed files with 44 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CenRa_AUTOMAP/style_invoke.py
+23 -77
View File
@@ -1,95 +1,41 @@
import logging
import os
from collections import namedtuple
from enum import Enum
from functools import partial
from pathlib import Path
from xml.dom.minidom import parseString
from qgis.gui import *
import qgis
from importlib import import_module
# from qgis.gui import *
from qgis.core import (
NULL,
QgsApplication,
QgsScaleBarSettings,
QgsDataSourceUri,
QgsProject,
QgsProviderConnectionException,
QgsProviderRegistry,
QgsRasterLayer,
QgsSettings,
QgsVectorLayer,
QgsGeometry,
QgsPrintLayout,
QgsReadWriteContext,
QgsLayoutItemMap,
QgsLayoutItemPage,
QgsLayoutSize,
QgsUnitTypes,
QgsLayoutPoint,
QgsLayoutItemLabel,
QgsLayoutItemPicture,
QgsLayoutItemLegend,
QgsLegendStyle,
QgsLayoutItemScaleBar,
QgsLayerTreeGroup,
QgsCoordinateReferenceSystem,
QgsCoordinateTransform,
QgsLayerTree,
QgsLayoutTableColumn,
QgsRectangle,
QgsLayoutItemMapOverviewStack,
QgsMapThemeCollection,
)
from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime, Qt
from qgis.PyQt.QtGui import QDesktopServices, QIcon, QColor, QFont, QMovie
from qgis.PyQt.QtPrintSupport import QPrinter
from qgis.PyQt.QtCore import QSettings
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtWidgets import (
QDockWidget,
QAction,
QMessageBox,
QPushButton,
QDockWidget,
QFileDialog,
QInputDialog,
QMenu,
QToolButton,
QTableWidget,
QTableWidgetItem,
QVBoxLayout,
)
import psycopg2
try:
from PyQt5.QtCore import QSettings
from PyQt5 import QtGui
from PyQt5 import QtWidgets
except:
from PyQt6.QtCore import QSettings
from PyQt6 import QtGui
from PyQt6 import QtWidgets
from qgis.PyQt.QtXml import QDomDocument
from qgis.utils import iface
import glob
try:
from qgis.PyQt.QtXml import QDomDocument
try:
Enabled = True
from .tools.StyleLayer import *
except:
from .tools.StyleLayer import host, port, dbname, os_user
except ValueError:
Enabled = False
from .tools.resources import (
load_ui,
resources_path,
send_issues,
# send_issues,
)
from .issues import CenRa_Issues
# from .issues import CenRa_Issues
from datetime import date
# from datetime import date
EDITOR_CLASS = load_ui('CenRa_AutoMapStyle_base.ui')
LOGGER = logging.getLogger('CenRa_AutoMapStyle')
class AutoMap_Style(QDockWidget, EDITOR_CLASS):
class AutoMap_Style(QDockWidget, EDITOR_CLASS):
def __init__(self, parent=None):
_ = parent
super().__init__()
@@ -97,7 +43,7 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
self.settings = QgsSettings()
self.s = QSettings()
self.toolButton.setIcon(QtGui.QIcon(resources_path('icons','loader.png')))
self.toolButton.setIcon(QIcon(resources_path('icons', 'loader.png')))
self.loadComboBox()
self.toolButton.clicked.connect(self.loadStyle)
@@ -118,7 +64,7 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
def loginfo(self):
InputDialog = QInputDialog()
mdp = InputDialog.getText(None,'Foncier','Mot de pass base foncier:')
mdp = InputDialog.getText(None, 'Foncier', 'Mot de pass base foncier:')
return mdp
def loadAdministratif(self):
@@ -129,24 +75,24 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
mdp = self.loginfo()[0]
if mdp != '':
# couche = [['_form_power_rename','_form_power_rename_contour_2025'],['_42_bois_du_roy','_42_bois_du_roy_habitat_2021']]
couche = [['administratif','departements2024','gid'],['administratif','v_communes','id']]
couche = [['administratif', 'departements2024', 'gid'], ['administratif', 'v_communes', 'id']]
for schema_table in couche:
schema = schema_table[0]
table = schema_table[1]
key = schema_table[2]
uri = QgsDataSourceUri()
uri.setConnection(host ,port ,dbname ,os_user ,mdp)
uri.setConnection(host, port, dbname, os_user, mdp)
# nom du schéma à remplacer: "hydrographie" à supprimer et mettre "couches_collaboratives" lorsqu'on aura regroupé les couches à modifier dans un même schéma
uri.setDataSource(schema, table, "geom")
uri.setKeyColumn(key)
layer = QgsVectorLayer(uri.uri(), table, "postgres")
if layer.isValid() == True:
if layer.isValid() is True:
layerName = layer.name()
listStyle = layer.listStylesInDatabase()
try:
StyleExist = True
indexStyle = (listStyle[2].index(layerName))
except:
except ValueError:
StyleExist = False
if StyleExist:
StyleId = (listStyle[1][indexStyle])
@@ -171,23 +117,23 @@ class AutoMap_Style(QDockWidget, EDITOR_CLASS):
mdp = self.loginfo()[0]
if mdp != '':
# couche = [['_form_power_rename','_form_power_rename_contour_2025'],['_42_bois_du_roy','_42_bois_du_roy_habitat_2021']]
couche = [['sites','v_sites_parcelles'],['sites','v_sites'],['inventaires','suivi_zh'],['inventaires','suivi_ps']]
couche = [['sites', 'v_sites_parcelles'], ['sites', 'v_sites'], ['inventaires', 'suivi_zh'], ['inventaires', 'suivi_ps']]
for schema_table in couche:
schema = schema_table[0]
table = schema_table[1]
uri = QgsDataSourceUri()
uri.setConnection(host ,port ,dbname ,os_user ,mdp)
uri.setConnection(host, port, dbname, os_user, mdp)
# nom du schéma à remplacer: "hydrographie" à supprimer et mettre "couches_collaboratives" lorsqu'on aura regroupé les couches à modifier dans un même schéma
uri.setDataSource(schema, table, "geom")
uri.setKeyColumn('gid')
layer = QgsVectorLayer(uri.uri(), table, "postgres")
if layer.isValid() == True:
if layer.isValid() is True:
layerName = layer.name()
listStyle = layer.listStylesInDatabase()
try:
StyleExist = True
indexStyle = (listStyle[2].index(layerName))
except:
except ValueError:
StyleExist = False
if StyleExist:
StyleId = (listStyle[1][indexStyle])