Skip to content
Snippets Groups Projects
Commit a16e2be4 authored by esarrey's avatar esarrey
Browse files

Add tab and restructuration

parent 6de780e9
No related branches found
No related tags found
No related merge requests found
...@@ -6,8 +6,9 @@ from pymeasure.experiment import unique_filename ...@@ -6,8 +6,9 @@ from pymeasure.experiment import unique_filename
from pymeasure.experiment import Results from pymeasure.experiment import Results
from pymeasure.display.Qt import QtWidgets from pymeasure.display.Qt import QtWidgets
from src.classes.ui import UIWindown from src.ui.mainui import UIWindown
from src.classes.controltab import ControlTab from src.ui.controltab import ControlTab
from src.ui.livetab import LiveTab
from src.procedures import B_Sweep, X_Sweep, Y_Sweep from src.procedures import B_Sweep, X_Sweep, Y_Sweep
...@@ -23,7 +24,7 @@ class MainWindow(UIWindown): ...@@ -23,7 +24,7 @@ class MainWindow(UIWindown):
displays=['acq_time', 'freq'], displays=['acq_time', 'freq'],
x_axis='Iteration', x_axis='Iteration',
y_axis='Voltage', y_axis='Voltage',
widget_list=tuple([ControlTab("Manual control")]), widget_list=(ControlTab("Manual control"), LiveTab("Live values")),
directory_input=True directory_input=True
) )
self.setWindowTitle('Mini MOKE') self.setWindowTitle('Mini MOKE')
......
File moved
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
...@@ -18,7 +18,7 @@ from pymeasure.display.widgets import ( ...@@ -18,7 +18,7 @@ from pymeasure.display.widgets import (
) )
from pymeasure.experiment import Results, Procedure from pymeasure.experiment import Results, Procedure
from .logger import log, StatusBarHandler from ..classes.logger import log, StatusBarHandler
class UIWindowBase(QtWidgets.QMainWindow): class UIWindowBase(QtWidgets.QMainWindow):
def __init__(self, def __init__(self,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment