nqrduck/nqrduck-measurement
1
0
Fork 0
Code Issues 10 Pull requests Projects Releases Packages Wiki Activity Actions

Improved scaling of name LineEdit.

Browse source
This commit is contained in:
jupfi 2024-05-16 15:23:57 +02:00
parent 0cd3f915f8
commit 136e9ab90b
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/nqrduck_measurement/view.py
View file

@ -165,7 +165,7 @@ class MeasurementView(ModuleView):
try: try:
if self.module.model.displayed_measurement is None: if self.module.model.displayed_measurement is None:
logger.debug("No measurement data to display. Clearing plotter.") logger.debug("No measurement data to display. Clearing plotter.")
if self.module.model.view_mode == self.module.model.FFT_VIEW: if self.module.model.view_mode == self.module.model.FFT_VIEW:
self.change_to_fft_view() self.change_to_fft_view()
else: else:
@ -174,7 +174,7 @@ class MeasurementView(ModuleView):
self._ui_form.plotter.canvas.draw() self._ui_form.plotter.canvas.draw()
return return
if self.module.model.view_mode == self.module.model.FFT_VIEW: if self.module.model.view_mode == self.module.model.FFT_VIEW:
self.change_to_fft_view() self.change_to_fft_view()
y = self.module.model.displayed_measurement.fdy y = self.module.model.displayed_measurement.fdy
@ -302,13 +302,13 @@ class MeasurementView(ModuleView):
edit_button = QPushButton() edit_button = QPushButton()
edit_button.setIcon(Logos.Pen12x12()) edit_button.setIcon(Logos.Pen12x12())
edit_button.setFixedWidth(edit_button.iconSize().width()) edit_button.setFixedWidth(edit_button.iconSize().width())
edit_button.clicked.connect( edit_button.clicked.connect(lambda: self.show_measurement_edit(measurement))
lambda: self.show_measurement_edit(measurement)
)
name_button = QPushButton() name_button = QPushButton()
name_button.clicked.connect( name_button.clicked.connect(
partial(self.module.controller.change_displayed_measurement, measurement) partial(
self.module.controller.change_displayed_measurement, measurement
)
) )
# Not sure if this is pretty # Not sure if this is pretty
@ -365,8 +365,6 @@ class MeasurementView(ModuleView):
else: else:
logger.debug("Measurement edit canceled.") logger.debug("Measurement edit canceled.")
class MeasurementDialog(QDialog): class MeasurementDialog(QDialog):
"""This Dialog is shown when the measurement is started and therefore blocks the main window. """This Dialog is shown when the measurement is started and therefore blocks the main window.
@ -410,15 +408,17 @@ class MeasurementView(ModuleView):
class MeasurementEdit(QDialog): class MeasurementEdit(QDialog):
"""This dialog is displayed when the measurement edit button is clicked. """This dialog is displayed when the measurement edit button is clicked.
It allows the user to edit the measurement parameters (e.g. name, ...) It allows the user to edit the measurement parameters (e.g. name, ...)
""" """
def __init__(self, measurement, parent = None) -> None: def __init__(self, measurement, parent=None) -> None:
"""Initialize the dialog.""" """Initialize the dialog."""
super().__init__(parent) super().__init__(parent)
self.setParent(parent) self.setParent(parent)
self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
logger.debug("Edit measurement dialog started.") logger.debug("Edit measurement dialog started.")
self.measurement = measurement self.measurement = measurement
@ -427,12 +427,13 @@ class MeasurementView(ModuleView):
self.layout = QVBoxLayout(self) self.layout = QVBoxLayout(self)
self.setLayout(self.layout) self.setLayout(self.layout)
self.name_layout = QHBoxLayout() self.name_layout = QHBoxLayout()
self.name_label = QLabel("Name:") self.name_label = QLabel("Name:")
self.name_edit = QLineEdit() self.name_edit = QLineEdit(measurement.name)
self.name_edit.setText(measurement.name) font_metrics = self.name_edit.fontMetrics()
self.name_edit.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred) self.name_edit.setFixedWidth(
font_metrics.horizontalAdvance(self.name_edit.text()) + 10
)
self.name_edit.adjustSize() self.name_edit.adjustSize()
self.name_layout.addWidget(self.name_label) self.name_layout.addWidget(self.name_label)