Skip to content

Commit a753dc7

Browse files
author
Axel Hörteborn
committed
Updated to 2.15
1 parent 664531d commit a753dc7

49 files changed

Lines changed: 248 additions & 417 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎GeoDataFarm.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
sys.path.append('/usr/lib/qgis')
3535
sys.path.append('/usr/share/qgis/python/plugins')
3636
from qgis.core import QgsApplication
37-
from PyQt5 import QtGui
37+
3838
from qgis.PyQt.QtCore import QSettings, QTranslator, qVersion, QCoreApplication
3939
from qgis.PyQt.QtWidgets import QAction, QMessageBox, QApplication, QListWidgetItem
40-
from qgis.PyQt.QtGui import QIcon, QImage
40+
from qgis.PyQt.QtGui import QIcon, QImage, QPixmap
4141
from psycopg2 import IntegrityError
4242
import os
4343

@@ -490,7 +490,7 @@ def run(self: Self, test_mode: bool=False) -> None:
490490
# Create the dock_widget (after translation) and keep reference
491491
self.dock_widget = GeoDataFarmDockWidget()
492492
img = QImage(icon_path)
493-
pimg = QtGui.QPixmap.fromImage(img).scaled(91, 91,
493+
pimg = QPixmap.fromImage(img).scaled(91, 91,
494494
QtCore.Qt.KeepAspectRatio)
495495
self.dock_widget.LIcon.setPixmap(pimg)
496496
if self.get_database_connection():

‎GeoDataFarm_dockwidget.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import os
2626

27-
from PyQt5 import QtWidgets, uic
27+
from qgis.PyQt import QtWidgets, uic
2828
from qgis.PyQt.QtCore import pyqtSignal
2929

3030
FORM_CLASS, _ = uic.loadUiType(os.path.join(

‎database_scripts/mean_analyse.py‎

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
import copy
1010
import traceback
1111
import time
12-
from PyQt5 import QtCore, QtWidgets, QtGui
13-
from qgis.PyQt.QtWidgets import QMessageBox, QTableWidgetItem
12+
from qgis.PyQt.QtCore import Qt, QSize
13+
from qgis.PyQt.QtGui import QStandardItem, QStandardItemModel, QBrush, QColor
14+
15+
from qgis.PyQt.QtWidgets import (QMessageBox, QWidget, QButtonGroup, QLabel, QLineEdit,
16+
QRadioButton, QCheckBox, QGroupBox, QComboBox, QVBoxLayout)
1417
from ..widgets.run_analyse import RunAnalyseDialog
1518
from ..support_scripts.__init__ import isfloat, isint, TR
1619
from ..support_scripts.add_field import AddField
@@ -48,8 +51,8 @@ def __init__(self: Self, parent_widget, tables_to_analyse: list[list[str]]) -> N
4851
self.tables = tables_to_analyse
4952
self.cb = []
5053
self.harvest_tbls = {}
51-
self.scrollWidget = QtWidgets.QWidget()
52-
self.radio_group = QtWidgets.QButtonGroup()
54+
self.scrollWidget = QWidget()
55+
self.radio_group = QButtonGroup()
5356
self.overlapping_tables = {}
5457
self.layout_dict = {}
5558
self.top_right_panel = []
@@ -280,8 +283,8 @@ def _set_checkbox_layout(self, qbox, analyse_params, col, nbr):
280283
281284
"""
282285
if None in analyse_params['distinct_values']:
283-
QtWidgets.QLabel('Include No Data:', qbox).move(380, 15)
284-
cb_none = QtWidgets.QCheckBox('', qbox)
286+
QLabel('Include No Data:', qbox).move(380, 15)
287+
cb_none = QCheckBox('', qbox)
285288
cb_none.move(434, 34)
286289
cb_none.setChecked(True)
287290
analyse_params['distinct_values'].remove(None)
@@ -294,24 +297,24 @@ def _set_checkbox_layout(self, qbox, analyse_params, col, nbr):
294297
self.layout_dict[col]['checked'] = []
295298
self.layout_dict[col]['checked_items'] = []
296299
names = analyse_params['distinct_values']
297-
model = QtGui.QStandardItemModel(len(names), 1)
298-
firstItem = QtGui.QStandardItem("---- Select ----")
299-
firstItem.setBackground(QtGui.QBrush(QtGui.QColor(200, 200, 200)))
300+
model = QStandardItemModel(len(names), 1)
301+
firstItem = QStandardItem("---- Select ----")
302+
firstItem.setBackground(QBrush(QColor(200, 200, 200)))
300303
firstItem.setSelectable(False)
301304
model.setItem(0, 0, firstItem)
302305
name_text = ''
303306
for i, name in enumerate(names):
304-
item = QtGui.QStandardItem(name)
307+
item = QStandardItem(name)
305308
name_text += name + ' '
306309
item.setFlags(
307-
QtCore.Qt.ItemIsUserCheckable | QtCore.Qt.ItemIsEnabled)
308-
item.setData(QtCore.Qt.Checked, QtCore.Qt.CheckStateRole)
310+
Qt.ItemFlag.ItemIsUserCheckable | Qt.ItemFlag.ItemIsEnabled)
311+
item.setData(Qt.CheckState.Checked, Qt.ItemDataRole.CheckStateRole)
309312
self.layout_dict[col]['checked'].append(name)
310313
self.layout_dict[col]['checked_items'].append(item)
311314
model.setItem(i + 1, 0, item)
312-
param_label = QtWidgets.QLabel(name_text, self.top_right_panel[nbr])
315+
param_label = QLabel(name_text, self.top_right_panel[nbr])
313316
param_label.move(10, 20)
314-
QComb = QtWidgets.QComboBox(qbox)
317+
QComb = QComboBox(qbox)
315318
QComb.setModel(model)
316319
QComb.move(83, 34)
317320
self.layout_dict[col]['model'] = model
@@ -331,8 +334,8 @@ def _set_number_layout(self, qbox, analyse_params, col, nbr):
331334
332335
"""
333336
if None in analyse_params['distinct_values']:
334-
QtWidgets.QLabel('Include No Data:', qbox).move(380, 15)
335-
cb_none = QtWidgets.QCheckBox('', qbox)
337+
QLabel('Include No Data:', qbox).move(380, 15)
338+
cb_none = QCheckBox('', qbox)
336339
cb_none.move(434, 34)
337340
cb_none.setChecked(True)
338341
analyse_params['distinct_values'].remove(None)
@@ -341,17 +344,17 @@ def _set_number_layout(self, qbox, analyse_params, col, nbr):
341344
self.layout_dict[col]['None'] = False
342345
if len(analyse_params['distinct_values']) == 0:
343346
analyse_params['distinct_values'] = [0, 1]
344-
QtWidgets.QLabel('Min:', qbox).move(93, 34)
345-
min_value = QtWidgets.QLineEdit(str(np.nanmin(analyse_params['distinct_values'])), qbox)
347+
QLabel('Min:', qbox).move(93, 34)
348+
min_value = QLineEdit(str(np.nanmin(analyse_params['distinct_values'])), qbox)
346349
min_value.move(118, 32)
347350
min_value.setFixedWidth(80)
348-
org_min = QtWidgets.QLabel('({v})'.format(v=str(np.nanmin(analyse_params['distinct_values']))), qbox)
351+
org_min = QLabel('({v})'.format(v=str(np.nanmin(analyse_params['distinct_values']))), qbox)
349352
org_min.move(120, 15)
350-
QtWidgets.QLabel('Max:', qbox).move(263, 34)
351-
max_value = QtWidgets.QLineEdit(str(np.nanmax(analyse_params['distinct_values'])), qbox)
353+
QLabel('Max:', qbox).move(263, 34)
354+
max_value = QLineEdit(str(np.nanmax(analyse_params['distinct_values'])), qbox)
352355
max_value.move(295, 32)
353356
max_value.setFixedWidth(80)
354-
org_max = QtWidgets.QLabel('({v})'.format(v=str(np.nanmax(analyse_params['distinct_values']))), qbox)
357+
org_max = QLabel('({v})'.format(v=str(np.nanmax(analyse_params['distinct_values']))), qbox)
355358
org_max.move(292, 15)
356359
self.layout_dict[col]['type'] = 'max_min'
357360
self.layout_dict[col]['min'] = np.nanmin(analyse_params['distinct_values'])
@@ -361,11 +364,11 @@ def _set_number_layout(self, qbox, analyse_params, col, nbr):
361364
self.layout_dict[col]['max_text'] = max_value
362365
self.layout_dict[col]['max_label_text'] = org_max
363366
if isfloat(max_value.text()):
364-
param_label = QtWidgets.QLabel('Min: ' + str(
367+
param_label = QLabel('Min: ' + str(
365368
round(float(min_value.text()), 2)) + ' Max: ' + str(
366369
round(float(max_value.text()), 2)), self.top_right_panel[nbr])
367370
else:
368-
param_label = QtWidgets.QLabel(
371+
param_label = QLabel(
369372
'Min: ' + str(min_value.text()) + ' Max: ' + str(
370373
max_value.text()), self.top_right_panel[nbr])
371374
param_label.move(10, 20)
@@ -400,11 +403,11 @@ def _update_layout(self, analyse_params, col):
400403
if name in name_text:
401404
continue
402405
i += 1
403-
item = QtGui.QStandardItem(name)
406+
item = QStandardItem(name)
404407
name_text += name + ' '
405408
item.setFlags(
406-
QtCore.Qt.ItemIsUserCheckable | QtCore.Qt.ItemIsEnabled)
407-
item.setData(QtCore.Qt.Checked, QtCore.Qt.CheckStateRole)
409+
Qt.ItemFlag.ItemIsUserCheckable | Qt.ItemFlag.ItemIsEnabled)
410+
item.setData(Qt.CheckState.Checked, Qt.ItemDataRole.CheckStateRole)
408411
self.layout_dict[col]['checked'].append(name)
409412
self.layout_dict[col]['checked_items'].append(item)
410413
model.setItem(i, 0, item)
@@ -422,9 +425,9 @@ def default_layout(self):
422425
'blue', 'red', 'green', 'blue', 'red', 'green', 'blue', 'red']
423426
#for key in mplib_colors.cnames.keys():
424427
# colors.append(key)
425-
scroll_area_layout = QtWidgets.QVBoxLayout()
426-
constraint_area = QtWidgets.QWidget()
427-
constraint_layout = QtWidgets.QVBoxLayout()
428+
scroll_area_layout = QVBoxLayout()
429+
constraint_area = QWidget()
430+
constraint_layout = QVBoxLayout()
428431
first_radio = True
429432
harvest_nbr = 0
430433
nbr = -1
@@ -471,23 +474,23 @@ def default_layout(self):
471474
self.layout_dict[table['index_col']]['harvest'].append(
472475
self.overlapping_tables[key]['ha'])
473476
## set top right data basic data
474-
self.top_right_panel.append(QtWidgets.QGroupBox())
475-
self.top_right_panel[nbr].setMinimumSize(QtCore.QSize(30, 35))
477+
self.top_right_panel.append(QGroupBox())
478+
self.top_right_panel[nbr].setMinimumSize(QSize(30, 35))
476479
self.top_right_panel[nbr].setStyleSheet("border:0px;")
477-
param_label = QtWidgets.QLabel(table['index_col'].replace('_', ' '), self.top_right_panel[nbr])
480+
param_label = QLabel(table['index_col'].replace('_', ' '), self.top_right_panel[nbr])
478481
param_label.move(10, 5)
479482
constraint_layout.addWidget(self.top_right_panel[nbr])
480483

481484
## Set bottom group basic data
482-
qbox = QtWidgets.QGroupBox()
485+
qbox = QGroupBox()
483486
qbox.setTitle(table['index_col'].replace('_', ' '))
484-
qbox.setMinimumSize(QtCore.QSize(100, 55))
487+
qbox.setMinimumSize(QSize(100, 55))
485488
qbox.setStyleSheet('QWidget{color:' + colors[nbr] + '}')
486489
scroll_area_layout.addWidget(qbox)
487-
QtWidgets.QLabel('Show:', qbox).move(10, 15)
488-
QtWidgets.QLabel('Limit:', qbox).move(50, 34)
490+
QLabel('Show:', qbox).move(10, 15)
491+
QLabel('Limit:', qbox).move(50, 34)
489492

490-
self.cb.append(QtWidgets.QRadioButton('', qbox))
493+
self.cb.append(QRadioButton('', qbox))
491494
if first_radio:
492495
self.cb[nbr].setChecked(True)
493496
first_radio = False
@@ -764,12 +767,12 @@ def plot_data(self, result, values):
764767
self.canvas = FigureCanvas(fig)
765768
self.dlg.mplvl.addWidget(self.canvas)
766769
self.canvas.draw()
767-
model = QtGui.QStandardItemModel()
770+
model = QStandardItemModel()
768771
model.setRowCount(len(filtered_data[0]))
769772
model.setColumnCount(3)
770-
model.setHorizontalHeaderItem(0, QtGui.QStandardItem(self.column_investigated.replace('_', ' ')))
771-
model.setHorizontalHeaderItem(1, QtGui.QStandardItem(self.tr('Average yield')))
772-
model.setHorizontalHeaderItem(2, QtGui.QStandardItem(self.tr('Yield samples')))
773+
model.setHorizontalHeaderItem(0, QStandardItem(self.column_investigated.replace('_', ' ')))
774+
model.setHorizontalHeaderItem(1, QStandardItem(self.tr('Average yield')))
775+
model.setHorizontalHeaderItem(2, QStandardItem(self.tr('Yield samples')))
773776
for i, m_yield in enumerate(filtered_data[0]):
774777
try:
775778
current_value = filtered_data[1][i].replace("'", "")
@@ -780,11 +783,11 @@ def plot_data(self, result, values):
780783
current_value = filtered_data[1][i]
781784
current_count = filtered_data[2][i]
782785
m_yield = round(m_yield, 2)
783-
item1 = QtGui.QStandardItem()
786+
item1 = QStandardItem()
784787
item1.setText(str(current_value))
785-
item2 = QtGui.QStandardItem()
788+
item2 = QStandardItem()
786789
item2.setText(str(m_yield))
787-
item3 = QtGui.QStandardItem()
790+
item3 = QStandardItem()
788791
item3.setText(str(current_count))
789792
model.setItem(i, 0, item1)
790793
model.setItem(i, 1, item2)

‎database_scripts/table_managment.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from typing import Self
2-
from PyQt5 import QtCore
2+
from qgis.PyQt.QtCore import Qt, QCoreApplication
33
from qgis.core import QgsTask
44
from qgis.PyQt.QtWidgets import QInputDialog, QMessageBox, QListWidgetItem, QPushButton
55
# Import the code for the dialog
@@ -138,15 +138,15 @@ def retrieve_params(self):
138138
if param_name[:3] == '...':
139139
continue
140140
item_name = str(param_name)
141-
testcase_name = QtCore.QCoreApplication.translate("qadashboard", item_name, None)
141+
testcase_name = QCoreApplication.translate("qadashboard", item_name, None)
142142
item = QListWidgetItem(testcase_name, self.TMD.SAParams)
143-
item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
143+
item.setFlags(item.flags() | Qt.ItemFlag.ItemIsUserCheckable)
144144
if param_name in checked_params:
145-
item.setCheckState(QtCore.Qt.Checked)
145+
item.setCheckState(Qt.CheckState.Checked)
146146
else:
147-
item.setCheckState(QtCore.Qt.Unchecked)
147+
item.setCheckState(Qt.CheckState.Unchecked)
148148
self.params_in_list += 1
149-
self.params_in_table = self.TMD.SAParams.findItems('', QtCore.Qt.MatchContains)
149+
self.params_in_table = self.TMD.SAParams.findItems('', Qt.MatchFlag.MatchContains)
150150

151151
def save_table(self):
152152
"""Updates the attribute indexes that are checked in the list widget"""
@@ -232,12 +232,12 @@ def update_table_list(self: Self) -> None:
232232
if str(name) in ['harrowing_manual', 'plowing_manual', 'manual']:
233233
continue
234234
item_name = schema + '.' + str(name)
235-
testcase_name = QtCore.QCoreApplication.translate("qadashboard", item_name, None)
235+
testcase_name = QCoreApplication.translate("qadashboard", item_name, None)
236236
item = QListWidgetItem(testcase_name, self.TMD.SATables)
237-
item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
238-
item.setCheckState(QtCore.Qt.Unchecked)
237+
item.setFlags(item.flags() | Qt.ItemFlag.ItemIsUserCheckable)
238+
item.setCheckState(Qt.CheckState.Unchecked)
239239
self.tables_in_db += 1
240-
self.items_in_table = self.TMD.SATables.findItems('', QtCore.Qt.MatchContains)
240+
self.items_in_table = self.TMD.SATables.findItems('', Qt.MatchFlag.MatchContains)
241241

242242
def remove_table_from_db(self: Self) -> None:
243243
"""Removes the selected tables from the database"""
@@ -258,7 +258,7 @@ def remove_table_from_db(self: Self) -> None:
258258
qIndex = self.TMD.SATables.indexFromItem(item)
259259
model.removeRow(qIndex.row())
260260
self.tables_in_db -= 1
261-
self.items_in_table = self.TMD.SATables.findItems('', QtCore.Qt.MatchContains)
261+
self.items_in_table = self.TMD.SATables.findItems('', Qt.MatchFlag.MatchContains)
262262

263263
def make_rows(self: Self) -> None:
264264
suc, s_table = self.check_multiple()

‎import_data/convert_harvest_to_area.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import webbrowser
22
from qgis.core import QgsTask
33
import traceback
4-
from PyQt5 import QtCore
4+
from qgis.PyQt.QtCore import Qt
55
from qgis.PyQt.QtWidgets import (QTableWidgetItem, QFileDialog, QAbstractItemView, QMessageBox)
66
import re
77
import math
@@ -151,18 +151,18 @@ def set_column_list(self):
151151
self.IIHD.TWColumnNames.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
152152
for i, row in enumerate(heading_row):
153153
item1 = QTableWidgetItem(row)
154-
item1.setFlags(xor(item1.flags(), QtCore.Qt.ItemIsEditable))
154+
item1.setFlags(xor(item1.flags(), Qt.ItemFlag.ItemIsEditable))
155155
item2 = QTableWidgetItem(second_row[i])
156-
item2.setFlags(xor(item2.flags(), QtCore.Qt.ItemIsEditable))
156+
item2.setFlags(xor(item2.flags(), Qt.ItemFlag.ItemIsEditable))
157157
self.combo.append(RadioComboBox())
158158
for nr, t in enumerate(combo_box_options):
159159
self.combo[i].addItem(t)
160160
item = self.combo[i].model().item(nr, 0)
161161
if self.col_types[i] == nr:
162-
item.setCheckState(QtCore.Qt.Checked)
162+
item.setCheckState(Qt.CheckState.Checked)
163163
self.combo[i].setCurrentIndex(nr)
164164
else:
165-
item.setCheckState(QtCore.Qt.Unchecked)
165+
item.setCheckState(Qt.CheckState.Unchecked)
166166
self.combo[i].currentTextChanged.connect(self.change_col_type)
167167
self.IIHD.TWColumnNames.setItem(i, 0, item1)
168168
self.IIHD.TWColumnNames.setItem(i, 1, item2)

‎import_data/handle_input_shp_data.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__author__ = 'Axel Horteborn'
22
from qgis.core import QgsTask
3-
from PyQt5 import QtCore
3+
from qgis.PyQt.QtCore import Qt, QDate
44
import traceback
55
from qgis.PyQt.QtWidgets import (QTableWidgetItem, QFileDialog, QAbstractItemView,
66
QMessageBox)
@@ -118,9 +118,9 @@ def get_columns_names(self):
118118
QAbstractItemView.SelectionBehavior.SelectRows)
119119
for i, row in enumerate(self.col_names):
120120
item1 = QTableWidgetItem(row)
121-
item1.setFlags(xor(item1.flags(), QtCore.Qt.ItemIsEditable))
121+
item1.setFlags(xor(item1.flags(), Qt.ItemFlag.ItemIsEditable))
122122
item2 = QTableWidgetItem(str(second_row[i]))
123-
item2.setFlags(xor(item2.flags(), QtCore.Qt.ItemIsEditable))
123+
item2.setFlags(xor(item2.flags(), Qt.ItemFlag.ItemIsEditable))
124124
self.ISD.TWColumnNames.setItem(i, 0, item1)
125125
self.ISD.TWColumnNames.setItem(i, 1, item2)
126126
self.column_count = i
@@ -144,7 +144,7 @@ def add_to_param_list(self):
144144
row_count += 1
145145
self.ISD.TWtoParam.setRowCount(row_count)
146146
item1 = QTableWidgetItem(item)
147-
item1.setFlags(xor(item1.flags(), QtCore.Qt.ItemIsEditable))
147+
item1.setFlags(xor(item1.flags(), Qt.ItemFlag.ItemIsEditable))
148148
self.ISD.TWtoParam.setItem(i, 0, item1)
149149
self.param_row_count = row_count
150150
self.ISD.pButContinue.setEnabled(True)
@@ -485,7 +485,7 @@ def reset_input_handler_widget(self):
485485
self.ISD.TWtoParam.setRowCount(0)
486486
self.ISD.pButContinue.setEnabled(False)
487487
self.ISD.RBDateOnly.setEnabled(False)
488-
self.ISD.DE.setDate(QtCore.QDate.fromString('2000-01-01', 'yyyy-MM-dd'))
488+
self.ISD.DE.setDate(QDate.fromString('2000-01-01', 'yyyy-MM-dd'))
489489
self.ISD.ComBDate.clear()
490490
self.ISD.pButInsertDataIntoDB.setEnabled(False)
491491
self.ISD.param_row_count = 0

0 commit comments

Comments
 (0)