diff --git a/.pylintrc b/.pylintrc index 5137539..3988b97 100644 --- a/.pylintrc +++ b/.pylintrc @@ -12,4 +12,4 @@ disable=W0614,C0410,C0321,C0111,I0011,C0103 # allow ls for list good-names=_,a,b,c,dt,db,e,f,fn,fd,i,j,k,v,kv,kw,l,m,n,ls,t,t0,t1,t2,t3,w,h,x,y,z,it,op [MASTER] -extension-pkg-whitelist=PyQt6 +extension-pkg-allow-list=PyQt6.QtWidgets,PyQt6.QtGui,PyQt6.QtCore diff --git a/src/NanoVNASaver/Charts/Frequency.py b/src/NanoVNASaver/Charts/Frequency.py index f9a2bd9..87eb11f 100644 --- a/src/NanoVNASaver/Charts/Frequency.py +++ b/src/NanoVNASaver/Charts/Frequency.py @@ -239,7 +239,7 @@ class FrequencyChart(Chart): else: self.y_action_automatic.setChecked(True) - self.menu.exec_(event.globalPos()) + self.menu.exec(event.globalPos()) def setFixedSpan(self, fixed_span: bool): self.fixedSpan = fixed_span diff --git a/src/NanoVNASaver/Charts/Smith.py b/src/NanoVNASaver/Charts/Smith.py index c37e842..5d96069 100644 --- a/src/NanoVNASaver/Charts/Smith.py +++ b/src/NanoVNASaver/Charts/Smith.py @@ -160,6 +160,6 @@ class SmithChart(SquareChart): qp.drawEllipse(QtCore.QPoint(center_x, center_y), r, r) qp.drawText( QtCore.QRect(center_x - 50, center_y - 4 + r, 100, 20), - QtCore.Qt.AlignCenter, + QtCore.Qt.AlignmentFlag.AlignCenter, f"{swr}", ) diff --git a/src/NanoVNASaver/Defaults.py b/src/NanoVNASaver/Defaults.py index 89caec1..e7c32ec 100644 --- a/src/NanoVNASaver/Defaults.py +++ b/src/NanoVNASaver/Defaults.py @@ -21,7 +21,6 @@ import dataclasses as DC import logging from ast import literal_eval -from PyQt6 import QtCore from PyQt6.QtCore import QSettings, QByteArray from PyQt6.QtGui import QColor, QColorConstants diff --git a/src/NanoVNASaver/NanoVNASaver.py b/src/NanoVNASaver/NanoVNASaver.py index 6f912bc..005540e 100644 --- a/src/NanoVNASaver/NanoVNASaver.py +++ b/src/NanoVNASaver/NanoVNASaver.py @@ -23,6 +23,7 @@ import threading from time import strftime, localtime from PyQt6 import QtWidgets, QtCore, QtGui +from PyQt6.QtWidgets import QWidget from NanoVNASaver import Defaults from .Windows import ( @@ -78,7 +79,7 @@ from .About import VERSION logger = logging.getLogger(__name__) -class NanoVNASaver(QtWidgets.QWidget): +class NanoVNASaver(QWidget): version = VERSION dataAvailable = QtCore.pyqtSignal() scaleFactor = 1 @@ -160,7 +161,7 @@ class NanoVNASaver(QtWidgets.QWidget): QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding, ) - widget = QtWidgets.QWidget() + widget = QWidget() widget.setLayout(layout) scrollarea.setWidget(widget) @@ -248,7 +249,7 @@ class NanoVNASaver(QtWidgets.QWidget): right_column = QtWidgets.QVBoxLayout() right_column.addLayout(self.charts_layout) self.marker_frame.setHidden(Defaults.cfg.gui.markers_hidden) - chart_widget = QtWidgets.QWidget() + chart_widget = QWidget() chart_widget.setLayout(right_column) self.splitter = QtWidgets.QSplitter() self.splitter.addWidget(self.marker_frame) @@ -301,7 +302,7 @@ class NanoVNASaver(QtWidgets.QWidget): scroll2.setWidgetResizable(True) scroll2.setVisible(True) - widget2 = QtWidgets.QWidget() + widget2 = QWidget() widget2.setLayout(self.marker_data_layout) scroll2.setWidget(widget2) self.marker_column.addWidget(scroll2) diff --git a/src/NanoVNASaver/Settings/Bands.py b/src/NanoVNASaver/Settings/Bands.py index 8242cbe..9f74a04 100644 --- a/src/NanoVNASaver/Settings/Bands.py +++ b/src/NanoVNASaver/Settings/Bands.py @@ -157,7 +157,7 @@ class BandsModel(QtCore.QAbstractTableModel): | Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable ) - super().flags(index) + return super().flags(index) def setColor(self, color): self.color = color