diff --git a/bec_widgets/utils/rpc_server.py b/bec_widgets/utils/rpc_server.py index 7c0217f1..25fd0cca 100644 --- a/bec_widgets/utils/rpc_server.py +++ b/bec_widgets/utils/rpc_server.py @@ -14,8 +14,8 @@ from qtpy.QtCore import Qt, QTimer from qtpy.QtWidgets import QWidget from redis.exceptions import RedisError -from bec_widgets.utils.bec_dispatcher import BECDispatcher from bec_widgets.utils.bec_connector import BECConnector +from bec_widgets.utils.bec_dispatcher import BECDispatcher from bec_widgets.utils.container_utils import WidgetContainerUtils from bec_widgets.utils.error_popups import ErrorPopupUtility from bec_widgets.utils.rpc_register import RPCRegister diff --git a/bec_widgets/widgets/containers/main_window/main_window.py b/bec_widgets/widgets/containers/main_window/main_window.py index acc2f5b1..0d3713a0 100644 --- a/bec_widgets/widgets/containers/main_window/main_window.py +++ b/bec_widgets/widgets/containers/main_window/main_window.py @@ -18,10 +18,10 @@ from qtpy.QtWidgets import ( ) import bec_widgets -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.colors import apply_theme from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.widgets.containers.main_window.addons.hover_widget import HoverWidget from bec_widgets.widgets.containers.main_window.addons.notification_center.notification_banner import ( BECNotificationBroker, diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py index 1fb5e757..41e6ae62 100644 --- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py +++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py @@ -11,9 +11,9 @@ from qtpy.QtCore import Qt, Signal from qtpy.QtGui import QDoubleValidator from qtpy.QtWidgets import QDoubleSpinBox -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.colors import apply_theme, get_accent_colors from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import ( DeviceUpdateUIComponents, PositionerBoxBase, diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py index b77beb4d..83bb73e1 100644 --- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py +++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py @@ -12,9 +12,9 @@ from qtpy.QtCore import Signal from qtpy.QtGui import QDoubleValidator from qtpy.QtWidgets import QDoubleSpinBox -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.colors import apply_theme from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import ( DeviceUpdateUIComponents, PositionerBoxBase, diff --git a/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py b/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py index 956c068b..f6111927 100644 --- a/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py +++ b/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py @@ -5,10 +5,10 @@ from bec_lib.logger import bec_logger from qtpy.QtCore import Signal from qtpy.QtWidgets import QPushButton, QSizePolicy, QTreeWidgetItem, QVBoxLayout, QWidget -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.colors import get_accent_colors from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.ui_loader import UILoader logger = bec_logger.logger diff --git a/bec_widgets/widgets/plots/heatmap/heatmap.py b/bec_widgets/widgets/plots/heatmap/heatmap.py index e22cedf5..7dd6ff4d 100644 --- a/bec_widgets/widgets/plots/heatmap/heatmap.py +++ b/bec_widgets/widgets/plots/heatmap/heatmap.py @@ -19,8 +19,8 @@ from scipy.interpolate import ( from scipy.spatial import cKDTree from toolz import partition -from bec_widgets.utils.colors import Colors from bec_widgets.utils.bec_connector import ConnectionConfig +from bec_widgets.utils.colors import Colors from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.settings_dialog import SettingsDialog from bec_widgets.utils.toolbars.actions import MaterialIconAction diff --git a/bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py b/bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py index 5fd26353..dd60a38f 100644 --- a/bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py +++ b/bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py @@ -4,9 +4,9 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget +from bec_widgets.utils.ui_loader import UILoader class HeatmapSettings(SettingWidget): diff --git a/bec_widgets/widgets/plots/motor_map/motor_map.py b/bec_widgets/widgets/plots/motor_map/motor_map.py index 248434fe..32c3d151 100644 --- a/bec_widgets/widgets/plots/motor_map/motor_map.py +++ b/bec_widgets/widgets/plots/motor_map/motor_map.py @@ -11,8 +11,7 @@ from qtpy.QtGui import QColor from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget from bec_widgets.utils.bec_connector import ConnectionConfig -from bec_widgets.utils.colors import Colors -from bec_widgets.utils.colors import apply_theme +from bec_widgets.utils.colors import Colors, apply_theme from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.settings_dialog import SettingsDialog from bec_widgets.utils.toolbars.toolbar import MaterialIconAction diff --git a/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py b/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py index 284e2815..e67aecaf 100644 --- a/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py +++ b/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py @@ -2,9 +2,9 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py b/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py index 399bcc2c..707a96a6 100644 --- a/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py +++ b/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py @@ -2,9 +2,9 @@ import os from qtpy.QtWidgets import QVBoxLayout, QWidget -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/plot_base.py b/bec_widgets/widgets/plots/plot_base.py index b90e95c4..f2041a90 100644 --- a/bec_widgets/widgets/plots/plot_base.py +++ b/bec_widgets/widgets/plots/plot_base.py @@ -9,9 +9,9 @@ from qtpy.QtCore import QPoint, QPointF, Qt, Signal from qtpy.QtWidgets import QHBoxLayout, QLabel, QMainWindow, QVBoxLayout, QWidget from bec_widgets.utils.bec_connector import ConnectionConfig +from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.crosshair import Crosshair from bec_widgets.utils.entry_validator import EntryValidator -from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.fps_counter import FPSCounter from bec_widgets.utils.plot_indicator_items import BECArrowItem, BECTickItem diff --git a/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py index 82d0d295..b08fd168 100644 --- a/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py +++ b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py @@ -2,9 +2,9 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget +from bec_widgets.utils.ui_loader import UILoader class ScatterCurveSettings(SettingWidget): diff --git a/bec_widgets/widgets/plots/setting_menus/axis_settings.py b/bec_widgets/widgets/plots/setting_menus/axis_settings.py index f2adee32..655adceb 100644 --- a/bec_widgets/widgets/plots/setting_menus/axis_settings.py +++ b/bec_widgets/widgets/plots/setting_menus/axis_settings.py @@ -2,9 +2,9 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py index d11f1094..3f73677e 100644 --- a/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py +++ b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py @@ -51,9 +51,9 @@ from qtpy.QtWidgets import ( from bec_widgets import SafeSlot from bec_widgets.utils.bec_connector import ConnectionConfig -from bec_widgets.utils.entry_validator import EntryValidator from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.colors import Colors +from bec_widgets.utils.entry_validator import EntryValidator from bec_widgets.utils.toolbars.actions import WidgetAction from bec_widgets.utils.toolbars.bundles import ToolbarBundle from bec_widgets.utils.toolbars.toolbar import MaterialIconAction, ModularToolBar diff --git a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py index e17e2578..e427caa4 100644 --- a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py +++ b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py @@ -6,8 +6,8 @@ from bec_lib.logger import bec_logger from qtpy.QtCore import QPointF, QSize, Qt from qtpy.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget -from bec_widgets.utils.colors import Colors from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.colors import Colors from bec_widgets.utils.error_popups import SafeProperty from bec_widgets.utils.settings_dialog import SettingsDialog from bec_widgets.utils.toolbars.actions import MaterialIconAction diff --git a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py index 9e072239..d5abfc00 100644 --- a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py +++ b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py @@ -19,9 +19,9 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.widgets.progress.ring_progress_bar.ring import Ring from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget diff --git a/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py b/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py index 161e2e95..0c30acbf 100644 --- a/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py +++ b/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py @@ -3,8 +3,8 @@ from qtpy import QtCore, QtGui from qtpy.QtCore import Property, Signal, Slot from qtpy.QtWidgets import QSizePolicy, QVBoxLayout, QWidget -from bec_widgets.utils.colors import Colors from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.colors import Colors class RoundedColorMapButton(ColorMapButton): diff --git a/tests/unit_tests/test_color_utils.py b/tests/unit_tests/test_color_utils.py index 0e1e5751..fc68acb6 100644 --- a/tests/unit_tests/test_color_utils.py +++ b/tests/unit_tests/test_color_utils.py @@ -5,9 +5,8 @@ from qtpy.QtGui import QColor from qtpy.QtWidgets import QVBoxLayout, QWidget from bec_widgets.utils.bec_connector import ConnectionConfig -from bec_widgets.utils.colors import Colors from bec_widgets.utils.bec_widget import BECWidget -from bec_widgets.utils.colors import apply_theme +from bec_widgets.utils.colors import Colors, apply_theme from bec_widgets.widgets.plots.waveform.curve import CurveConfig from tests.unit_tests.client_mocks import mocked_client from tests.unit_tests.conftest import create_widget