From 37b9c30f12ae0ce441a152999ac1764b3d5be2fc Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 18 Dec 2024 10:16:50 +0300 Subject: [PATCH] =?UTF-8?q?chore:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC?= =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controller/mediator.py | 4 +++- src/controller/monitor.py | 2 -- src/controller/passportFormer.py | 2 +- src/gui/mainGui.py | 2 +- src/gui/plotter.py | 2 +- src/gui/reportGui.py | 1 - src/gui/settings_window.py | 7 ++++--- src/utils/base/base.py | 3 +-- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/controller/mediator.py b/src/controller/mediator.py index 7965d99..eaae327 100644 --- a/src/controller/mediator.py +++ b/src/controller/mediator.py @@ -3,7 +3,9 @@ import pandas as pd from typing import Union from PyQt5.QtWidgets import QWidget -from utils.base.base import BaseMediator, BaseDirectoryMonitor, BaseDataConverter, BasePlotWidget, BasePointPassportFormer +from utils.base.base import (BaseMediator, BaseDirectoryMonitor, + BaseDataConverter, BasePlotWidget, + BasePointPassportFormer) class Mediator(BaseMediator): diff --git a/src/controller/monitor.py b/src/controller/monitor.py index c30c446..75ab892 100644 --- a/src/controller/monitor.py +++ b/src/controller/monitor.py @@ -1,6 +1,4 @@ -from time import sleep import os - from loguru import logger from utils.base.base import BaseDirectoryMonitor diff --git a/src/controller/passportFormer.py b/src/controller/passportFormer.py index 8eaa96b..13fb1ae 100644 --- a/src/controller/passportFormer.py +++ b/src/controller/passportFormer.py @@ -1,6 +1,6 @@ -from utils.base.base import BasePointPassportFormer, BaseIdealDataBuilder import pandas as pd +from utils.base.base import BasePointPassportFormer, BaseIdealDataBuilder class idealDataBuilder(BaseIdealDataBuilder): diff --git a/src/gui/mainGui.py b/src/gui/mainGui.py index a50a127..850a325 100644 --- a/src/gui/mainGui.py +++ b/src/gui/mainGui.py @@ -1,8 +1,8 @@ from datetime import datetime as dt from typing import Optional - from PyQt5 import QtWidgets from PyQt5.QtCore import Qt + from utils.base.base import BaseMainWindow, BaseController from gui.settings_window import settingsWindow from gui.reportGui import ReportSettings diff --git a/src/gui/plotter.py b/src/gui/plotter.py index 4b51da3..5aed23c 100644 --- a/src/gui/plotter.py +++ b/src/gui/plotter.py @@ -1,7 +1,7 @@ -import pandas as pd from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QGraphicsRectItem import copy import pyqtgraph as pg +import pandas as pd from typing import Optional, Any from utils.base.base import BasePlotWidget diff --git a/src/gui/reportGui.py b/src/gui/reportGui.py index c4ccf49..f05b202 100644 --- a/src/gui/reportGui.py +++ b/src/gui/reportGui.py @@ -2,7 +2,6 @@ import pyqtgraph as pg from pyqtgraph.parametertree import Parameter, ParameterTree from typing import Union from PyQt5 import QtWidgets -from PyQt5.QtCore import Qt class ReportSettings(QtWidgets.QWidget): diff --git a/src/gui/settings_window.py b/src/gui/settings_window.py index 37b8d9f..416fad3 100644 --- a/src/gui/settings_window.py +++ b/src/gui/settings_window.py @@ -1,7 +1,8 @@ from typing import Callable, Optional, Any -from PyQt5.QtWidgets import ( - QWidget, QPushButton, QLineEdit, QHBoxLayout, QVBoxLayout, QLabel, QTableWidget, QTableWidgetItem -) +from PyQt5.QtWidgets import (QWidget, QPushButton, + QLineEdit, QHBoxLayout, + QVBoxLayout, QLabel, + QTableWidget, QTableWidgetItem) from PyQt5.QtGui import QIntValidator from utils.json_tools import read_json, write_json diff --git a/src/utils/base/base.py b/src/utils/base/base.py index f793c71..54bb002 100644 --- a/src/utils/base/base.py +++ b/src/utils/base/base.py @@ -5,9 +5,8 @@ from typing import Optional, Union, Any from cachetools import LRUCache import pandas as pd -from PyQt5.QtCore import QThread, QObject, QTimer +from PyQt5.QtCore import QObject, QTimer from PyQt5.QtWidgets import QWidget, QTabWidget -from PyQt5.QtOpenGL import QGLWidget from OptAlgorithm import OptAlgorithm import numpy as np import pyqtgraph as pg