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

Plugin PyQt5 and PyQt6 compatible & CenRa_Copie bug fix

Browse Source
This commit is contained in:
tlaveille
2025-05-19 14:00:58 +02:00
parent 3b0758ea5c
commit 3ef37aa696
37 changed files with 434 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CenRa_SICEN/forms/CenRa_about_form.ui
+3 -18
View File
@@ -29,9 +29,6 @@
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
@@ -41,7 +38,7 @@
<x>0</x>
<y>0</y>
<width>453</width>
<height>547</height>
<height>570</height>
</rect>
</property>
<widget class="QGroupBox" name="groupBox">
@@ -56,7 +53,7 @@
<property name="title">
<string>DevLog</string>
</property>
<widget class="QWebView" name="viewer" native="true">
<widget class="QTextBrowser" name="viewer">
<property name="geometry">
<rect>
<x>10</x>
@@ -65,11 +62,6 @@
<height>511</height>
</rect>
</property>
<property name="url" stdset="0">
<url>
<string>about:blank</string>
</url>
</property>
</widget>
</widget>
</widget>
@@ -78,19 +70,12 @@
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QWebView</class>
<extends>QWidget</extends>
<header location="global">QtWebKitWidgets/QWebView</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
CenRa_SICEN/metadata.txt
+1
View File
@@ -11,6 +11,7 @@
[general]
name=CenRa SICEN
qgisMinimumVersion=3.0
supportsQt6=True
description=Filtre des données saisies dans SICEN et export d'une liste d'espèces.
version=1.11
author=Conservatoire d'Espaces Naturels de Rhône-Alpes
CenRa_SICEN/resources_rc.py
+4 -3
View File
@@ -5,9 +5,10 @@
# Created by: The Resource Compiler for PyQt5 (Qt v5.15.2)
#
# WARNING! All changes made in this file will be lost!
from PyQt5 import QtCore
try:
from PyQt5 import QtCore
except:
from PyQt6 import QtCore
qt_resource_data = b"\
\x00\x00\x0d\x89\
\x89\
CenRa_SICEN/sicen.py
+8 -4
View File
@@ -32,8 +32,12 @@ from qgis.utils import iface"""
from builtins import str
from builtins import object
import os
from PyQt5.QtCore import *
from PyQt5.QtGui import *
try:
from PyQt5.QtCore import *
from PyQt5.QtGui import *
except:
from PyQt6.QtCore import *
from PyQt6.QtGui import *
from qgis.PyQt import uic
from qgis.core import *
from qgis.core import QgsDataSourceUri, QgsWkbTypes, QgsLayerTreeGroup, QgsLayerTreeLayer
@@ -152,7 +156,7 @@ class SICEN(object):
def open_about_dialog(self):
dialog = AboutDialog(self.iface)
dialog.exec_()
dialog.exec()
def unload(self):
# Remove the plugin menu item and icon
@@ -265,7 +269,7 @@ class SICEN(object):
# show the dialog
self.dlg.show()
# Run the dialog event loop
result = self.dlg.exec_()
result = self.dlg.exec()
# See if OK was pressed
if result == 1:
CenRa_SICEN/ui_sicen.py
+41 -41
View File
@@ -33,8 +33,8 @@ class Ui_SICEN(object):
SICEN.resize(592, 556)
self.buttonBox = QDialogButtonBox(SICEN)
self.buttonBox.setGeometry(QtCore.QRect(390, 520, 161, 32))
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok)
#self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton(0x00400000)|QDialogButtonBox.StandardButton(0x00000400))
self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
self.Titre = QLabel(SICEN)
self.Titre.setGeometry(QtCore.QRect(110, 10, 331, 31))
@@ -46,8 +46,8 @@ class Ui_SICEN(object):
self.Titre.setObjectName(_fromUtf8("Titre"))
self.Emprise = QTabWidget(SICEN)
self.Emprise.setGeometry(QtCore.QRect(10, 80, 571, 431))
self.Emprise.setTabPosition(QTabWidget.North)
self.Emprise.setTabShape(QTabWidget.Rounded)
self.Emprise.setTabPosition(QTabWidget.TabPosition(0))
self.Emprise.setTabShape(QTabWidget.TabShape(0))
self.Emprise.setObjectName(_fromUtf8("Emprise"))
self.tab_2 = QWidget()
self.tab_2.setObjectName(_fromUtf8("tab_2"))
@@ -57,7 +57,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.groupBox_4.setFont(font)
self.groupBox_4.setAlignment(QtCore.Qt.AlignCenter)
self.groupBox_4.setAlignment(QtCore.Qt.Alignment(5))
self.groupBox_4.setObjectName(_fromUtf8("groupBox_4"))
self.gridLayoutWidget_5 = QWidget(self.groupBox_4)
self.gridLayoutWidget_5.setGeometry(QtCore.QRect(10, 20, 521, 51))
@@ -99,7 +99,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.groupBox_5.setFont(font)
self.groupBox_5.setAlignment(QtCore.Qt.AlignCenter)
self.groupBox_5.setAlignment(QtCore.Qt.Alignment(5))
self.groupBox_5.setObjectName(_fromUtf8("groupBox_5"))
self.gridLayoutWidget_6 = QWidget(self.groupBox_5)
self.gridLayoutWidget_6.setGeometry(QtCore.QRect(10, 20, 521, 41))
@@ -113,7 +113,7 @@ class Ui_SICEN(object):
font.setItalic(True)
font.setWeight(50)
self.label.setFont(font)
self.label.setAlignment(QtCore.Qt.AlignCenter)
self.label.setAlignment(QtCore.Qt.Alignment(5))
self.label.setObjectName(_fromUtf8("label"))
self.gridLayout_6.addWidget(self.label, 0, 0, 1, 1)
self.label_2 = QLabel(self.gridLayoutWidget_6)
@@ -122,7 +122,7 @@ class Ui_SICEN(object):
font.setItalic(True)
font.setWeight(50)
self.label_2.setFont(font)
self.label_2.setAlignment(QtCore.Qt.AlignCenter)
self.label_2.setAlignment(QtCore.Qt.Alignment(5))
self.label_2.setObjectName(_fromUtf8("label_2"))
self.gridLayout_6.addWidget(self.label_2, 0, 1, 1, 1)
self.nom_com_1 = QComboBox(self.gridLayoutWidget_6)
@@ -147,7 +147,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.groupBox_7.setFont(font)
self.groupBox_7.setAlignment(QtCore.Qt.AlignCenter)
self.groupBox_7.setAlignment(QtCore.Qt.Alignment(5))
self.groupBox_7.setObjectName(_fromUtf8("groupBox_7"))
self.gridLayoutWidget_8 = QWidget(self.groupBox_7)
self.gridLayoutWidget_8.setGeometry(QtCore.QRect(10, 20, 520, 191))
@@ -161,7 +161,7 @@ class Ui_SICEN(object):
font.setItalic(True)
font.setWeight(50)
self.label_3.setFont(font)
self.label_3.setAlignment(QtCore.Qt.AlignCenter)
self.label_3.setAlignment(QtCore.Qt.Alignment(5))
self.label_3.setObjectName(_fromUtf8("label_3"))
self.gridLayout_8.addWidget(self.label_3, 0, 0, 1, 1)
self.label_4 = QLabel(self.gridLayoutWidget_8)
@@ -170,7 +170,7 @@ class Ui_SICEN(object):
font.setItalic(True)
font.setWeight(50)
self.label_4.setFont(font)
self.label_4.setAlignment(QtCore.Qt.AlignCenter)
self.label_4.setAlignment(QtCore.Qt.Alignment(5))
self.label_4.setObjectName(_fromUtf8("label_4"))
self.gridLayout_8.addWidget(self.label_4, 0, 1, 1, 1)
self.date_min = QCalendarWidget(self.gridLayoutWidget_8)
@@ -188,7 +188,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.groupBox_8.setFont(font)
self.groupBox_8.setAlignment(QtCore.Qt.AlignCenter)
self.groupBox_8.setAlignment(QtCore.Qt.Alignment(5))
self.groupBox_8.setObjectName(_fromUtf8("groupBox_8"))
self.gridLayoutWidget_9 = QWidget(self.groupBox_8)
self.gridLayoutWidget_9.setGeometry(QtCore.QRect(10, 20, 491, 21))
@@ -202,7 +202,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.Animalia.setFont(font)
self.Animalia.setLayoutDirection(QtCore.Qt.RightToLeft)
self.Animalia.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.Animalia.setObjectName(_fromUtf8("Animalia"))
self.gridLayout_9.addWidget(self.Animalia, 0, 0, 1, 1)
self.Plantae = QCheckBox(self.gridLayoutWidget_9)
@@ -226,8 +226,8 @@ class Ui_SICEN(object):
font.setItalic(True)
font.setWeight(50)
self.label_6.setFont(font)
self.label_6.setLayoutDirection(QtCore.Qt.LeftToRight)
self.label_6.setAlignment(QtCore.Qt.AlignCenter)
self.label_6.setLayoutDirection(QtCore.Qt.LayoutDirection(0))
self.label_6.setAlignment(QtCore.Qt.Alignment(5))
self.label_6.setObjectName(_fromUtf8("label_6"))
self.gridLayout_11.addWidget(self.label_6, 4, 0, 1, 1)
self.nom_vern = QComboBox(self.gridLayoutWidget_10)
@@ -245,7 +245,7 @@ class Ui_SICEN(object):
font.setItalic(True)
font.setWeight(50)
self.label_5.setFont(font)
self.label_5.setAlignment(QtCore.Qt.AlignCenter)
self.label_5.setAlignment(QtCore.Qt.Alignment(5))
self.label_5.setObjectName(_fromUtf8("label_5"))
self.gridLayout_11.addWidget(self.label_5, 2, 0, 1, 1)
self.nom_complet = QComboBox(self.gridLayoutWidget_10)
@@ -271,7 +271,7 @@ class Ui_SICEN(object):
font.setItalic(True)
font.setWeight(50)
self.label_13.setFont(font)
self.label_13.setAlignment(QtCore.Qt.AlignCenter)
self.label_13.setAlignment(QtCore.Qt.Alignment(5))
self.label_13.setObjectName(_fromUtf8("label_13"))
self.gridLayout_11.addWidget(self.label_13, 0, 0, 1, 1)
self.Emprise.addTab(self.tab, _fromUtf8(""))
@@ -279,8 +279,8 @@ class Ui_SICEN(object):
self.tab_3.setObjectName(_fromUtf8("tab_3"))
self.protections = QToolBox(self.tab_3)
self.protections.setGeometry(QtCore.QRect(10, 10, 511, 391))
self.protections.setFrameShape(QFrame.NoFrame)
self.protections.setFrameShadow(QFrame.Plain)
self.protections.setFrameShape(QFrame.Shape(0))
self.protections.setFrameShadow(QFrame.Shadow(0x0010))
self.protections.setLineWidth(1)
self.protections.setObjectName(_fromUtf8("protections"))
self.page_2 = QWidget()
@@ -292,7 +292,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.groupBox.setFont(font)
self.groupBox.setAlignment(QtCore.Qt.AlignCenter)
self.groupBox.setAlignment(QtCore.Qt.Alignment(5))
self.groupBox.setObjectName(_fromUtf8("groupBox"))
self.gridLayoutWidget_2 = QWidget(self.groupBox)
self.gridLayoutWidget_2.setGeometry(QtCore.QRect(10, 20, 491, 88))
@@ -306,7 +306,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.LRD_38.setFont(font)
self.LRD_38.setLayoutDirection(QtCore.Qt.RightToLeft)
self.LRD_38.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.LRD_38.setObjectName(_fromUtf8("LRD_38"))
self.gridLayout_2.addWidget(self.LRD_38, 3, 0, 1, 1)
self.LRD_01 = QCheckBox(self.gridLayoutWidget_2)
@@ -314,7 +314,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.LRD_01.setFont(font)
self.LRD_01.setLayoutDirection(QtCore.Qt.RightToLeft)
self.LRD_01.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.LRD_01.setObjectName(_fromUtf8("LRD_01"))
self.gridLayout_2.addWidget(self.LRD_01, 0, 0, 1, 1)
self.LRD_07 = QCheckBox(self.gridLayoutWidget_2)
@@ -322,7 +322,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.LRD_07.setFont(font)
self.LRD_07.setLayoutDirection(QtCore.Qt.RightToLeft)
self.LRD_07.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.LRD_07.setObjectName(_fromUtf8("LRD_07"))
self.gridLayout_2.addWidget(self.LRD_07, 1, 0, 1, 1)
self.LRD_26 = QCheckBox(self.gridLayoutWidget_2)
@@ -330,7 +330,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.LRD_26.setFont(font)
self.LRD_26.setLayoutDirection(QtCore.Qt.RightToLeft)
self.LRD_26.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.LRD_26.setObjectName(_fromUtf8("LRD_26"))
self.gridLayout_2.addWidget(self.LRD_26, 2, 0, 1, 1)
self.LRD_42 = QCheckBox(self.gridLayoutWidget_2)
@@ -367,7 +367,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.groupBox_2.setFont(font)
self.groupBox_2.setAlignment(QtCore.Qt.AlignCenter)
self.groupBox_2.setAlignment(QtCore.Qt.Alignment(5))
self.groupBox_2.setObjectName(_fromUtf8("groupBox_2"))
self.gridLayoutWidget_3 = QWidget(self.groupBox_2)
self.gridLayoutWidget_3.setGeometry(QtCore.QRect(10, 20, 491, 42))
@@ -381,7 +381,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.LRR_Flore.setFont(font)
self.LRR_Flore.setLayoutDirection(QtCore.Qt.RightToLeft)
self.LRR_Flore.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.LRR_Flore.setObjectName(_fromUtf8("LRR_Flore"))
self.gridLayout_3.addWidget(self.LRR_Flore, 0, 0, 1, 1)
self.LRR_Oiseaux = QCheckBox(self.gridLayoutWidget_3)
@@ -389,7 +389,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.LRR_Oiseaux.setFont(font)
self.LRR_Oiseaux.setLayoutDirection(QtCore.Qt.RightToLeft)
self.LRR_Oiseaux.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.LRR_Oiseaux.setObjectName(_fromUtf8("LRR_Oiseaux"))
self.gridLayout_3.addWidget(self.LRR_Oiseaux, 1, 0, 1, 1)
self.LRR_Autre = QCheckBox(self.gridLayoutWidget_3)
@@ -405,7 +405,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.groupBox_3.setFont(font)
self.groupBox_3.setAlignment(QtCore.Qt.AlignCenter)
self.groupBox_3.setAlignment(QtCore.Qt.Alignment(5))
self.groupBox_3.setObjectName(_fromUtf8("groupBox_3"))
self.gridLayoutWidget_4 = QWidget(self.groupBox_3)
self.gridLayoutWidget_4.setGeometry(QtCore.QRect(10, 20, 491, 42))
@@ -426,7 +426,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.LRN_Flore.setFont(font)
self.LRN_Flore.setLayoutDirection(QtCore.Qt.RightToLeft)
self.LRN_Flore.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.LRN_Flore.setObjectName(_fromUtf8("LRN_Flore"))
self.gridLayout_4.addWidget(self.LRN_Flore, 0, 0, 1, 1)
self.LRN_Oiseaux = QCheckBox(self.gridLayoutWidget_4)
@@ -434,7 +434,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.LRN_Oiseaux.setFont(font)
self.LRN_Oiseaux.setLayoutDirection(QtCore.Qt.RightToLeft)
self.LRN_Oiseaux.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.LRN_Oiseaux.setObjectName(_fromUtf8("LRN_Oiseaux"))
self.gridLayout_4.addWidget(self.LRN_Oiseaux, 1, 0, 1, 1)
self.LRN_Ortho = QCheckBox(self.gridLayoutWidget_4)
@@ -456,7 +456,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.UICN.setFont(font)
self.UICN.setLayoutDirection(QtCore.Qt.RightToLeft)
self.UICN.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.UICN.setObjectName(_fromUtf8("UICN"))
self.gridLayout_12.addWidget(self.UICN, 0, 0, 1, 1)
self.LRE = QCheckBox(self.gridLayoutWidget_11)
@@ -485,19 +485,19 @@ class Ui_SICEN(object):
self.gridLayout.setHorizontalSpacing(50)
self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
self.PATRI38 = QCheckBox(self.gridLayoutWidget)
self.PATRI38.setLayoutDirection(QtCore.Qt.RightToLeft)
self.PATRI38.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.PATRI38.setObjectName(_fromUtf8("PATRI38"))
self.gridLayout.addWidget(self.PATRI38, 3, 0, 1, 1)
self.PATRI01 = QCheckBox(self.gridLayoutWidget)
self.PATRI01.setLayoutDirection(QtCore.Qt.RightToLeft)
self.PATRI01.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.PATRI01.setObjectName(_fromUtf8("PATRI01"))
self.gridLayout.addWidget(self.PATRI01, 0, 0, 1, 1)
self.PATRI07 = QCheckBox(self.gridLayoutWidget)
self.PATRI07.setLayoutDirection(QtCore.Qt.RightToLeft)
self.PATRI07.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.PATRI07.setObjectName(_fromUtf8("PATRI07"))
self.gridLayout.addWidget(self.PATRI07, 1, 0, 1, 1)
self.PATRI26 = QCheckBox(self.gridLayoutWidget)
self.PATRI26.setLayoutDirection(QtCore.Qt.RightToLeft)
self.PATRI26.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.PATRI26.setObjectName(_fromUtf8("PATRI26"))
self.gridLayout.addWidget(self.PATRI26, 2, 0, 1, 1)
self.PATRI42 = QCheckBox(self.gridLayoutWidget)
@@ -529,7 +529,7 @@ class Ui_SICEN(object):
font.setBold(True)
font.setWeight(75)
self.groupBox_6.setFont(font)
self.groupBox_6.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
self.groupBox_6.setAlignment(QtCore.Qt.AlignmentFlag(0x0001)|QtCore.Qt.AlignmentFlag(0x0001)|QtCore.Qt.AlignmentFlag(0x0080))
self.groupBox_6.setObjectName(_fromUtf8("groupBox_6"))
self.gridLayoutWidget_7 = QWidget(self.groupBox_6)
self.gridLayoutWidget_7.setGeometry(QtCore.QRect(10, 20, 491, 21))
@@ -550,7 +550,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.PD_38.setFont(font)
self.PD_38.setLayoutDirection(QtCore.Qt.RightToLeft)
self.PD_38.setLayoutDirection(QtCore.Qt.LayoutDirection(1))
self.PD_38.setObjectName(_fromUtf8("PD_38"))
self.gridLayout_7.addWidget(self.PD_38, 0, 0, 1, 1)
self.PR = QCheckBox(self.page_3)
@@ -604,14 +604,14 @@ class Ui_SICEN(object):
self.label_12.setObjectName(_fromUtf8("label_12"))
self.gridLayout_10.addWidget(self.label_12, 1, 1, 1, 1)
self.buffer = QLineEdit(self.gridLayoutWidget_12)
sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
sizePolicy = QSizePolicy(QSizePolicy.Policy(4), QSizePolicy.Policy(0))
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.buffer.sizePolicy().hasHeightForWidth())
self.buffer.setSizePolicy(sizePolicy)
self.buffer.setMaximumSize(QtCore.QSize(100, 16777215))
self.buffer.setInputMethodHints(QtCore.Qt.ImhPreferNumbers)
self.buffer.setAlignment(QtCore.Qt.AlignCenter)
self.buffer.setInputMethodHints(QtCore.Qt.InputMethodHint(0x8))
self.buffer.setAlignment(QtCore.Qt.Alignment(5))
self.buffer.setObjectName(_fromUtf8("buffer"))
self.gridLayout_10.addWidget(self.buffer, 2, 2, 1, 1)
self.label_8 = QLabel(self.gridLayoutWidget_12)
@@ -664,7 +664,7 @@ class Ui_SICEN(object):
font.setBold(False)
font.setWeight(50)
self.bouton_geom.setFont(font)
self.bouton_geom.setLayoutDirection(QtCore.Qt.LeftToRight)
self.bouton_geom.setLayoutDirection(QtCore.Qt.LayoutDirection(0))
self.bouton_geom.setText(_fromUtf8(""))
self.bouton_geom.setIconSize(QtCore.QSize(20, 20))
self.bouton_geom.setObjectName(_fromUtf8("bouton_geom"))