diff --git a/main.py b/main.py index 5ba468ac519219f95d6f3a717cdc451578b28623..8c38bac08c7919583dc65a05a3b49ac82ac8661e 100644 --- a/main.py +++ b/main.py @@ -6,8 +6,9 @@ from pymeasure.experiment import unique_filename from pymeasure.experiment import Results from pymeasure.display.Qt import QtWidgets -from src.classes.ui import UIWindown -from src.classes.controltab import ControlTab +from src.ui.mainui import UIWindown +from src.ui.controltab import ControlTab +from src.ui.livetab import LiveTab from src.procedures import B_Sweep, X_Sweep, Y_Sweep @@ -23,7 +24,7 @@ class MainWindow(UIWindown): displays=['acq_time', 'freq'], x_axis='Iteration', y_axis='Voltage', - widget_list=tuple([ControlTab("Manual control")]), + widget_list=(ControlTab("Manual control"), LiveTab("Live values")), directory_input=True ) self.setWindowTitle('Mini MOKE') diff --git a/src/classes/controltab.py b/src/ui/controltab.py similarity index 100% rename from src/classes/controltab.py rename to src/ui/controltab.py diff --git a/src/ui/livetab.py b/src/ui/livetab.py new file mode 100644 index 0000000000000000000000000000000000000000..457d4e55f8eee8bd969d942194fe4fedfd6b1969 --- /dev/null +++ b/src/ui/livetab.py @@ -0,0 +1,15 @@ +from PyQt5 import QtWidgets +from pymeasure.display.widgets import TabWidget + +class LiveTab(TabWidget, QtWidgets.QWidget): + + def __init__(self, name, parent=None): + super().__init__(parent) + self.name = name + + layout = QtWidgets.QGridLayout() + + self.y_label = QtWidgets.QLabel("Y Position:") + layout.addWidget(self.y_label, 0, 0) + + self.setLayout(layout) \ No newline at end of file diff --git a/src/classes/ui.py b/src/ui/mainui.py similarity index 99% rename from src/classes/ui.py rename to src/ui/mainui.py index 4b6aab3591b8f409fbcc29551aa227aa0c6aeb18..d4c0db8ca0a6d4a3c35f9a04c76ee3fa3db41ef3 100644 --- a/src/classes/ui.py +++ b/src/ui/mainui.py @@ -18,7 +18,7 @@ from pymeasure.display.widgets import ( ) from pymeasure.experiment import Results, Procedure -from .logger import log, StatusBarHandler +from ..classes.logger import log, StatusBarHandler class UIWindowBase(QtWidgets.QMainWindow): def __init__(self,