Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate pulse and train FOM filters #217

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Separate pulse and train FOM filters #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions extra_foam/gui/ctrl_widgets/filter_ctrl_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,22 @@ class FomFilterCtrlWidget(_AbstractGroupBoxCtrlWidget):
})
_analysis_types_inv = invert_dict(_analysis_types)

_N_FILTERS = 2
_N_TRAIN_FILTERS = 1

def __init__(self, *args, **kwargs):
super().__init__("FOM filter setup", *args, **kwargs)

self._analysis_type_cb = QComboBox()
self._analysis_type_cb.addItems(self._analysis_types.keys())
self._fom_range_le = SmartBoundaryLineEdit("-Inf, Inf")
self._analysis_type_cbs = []
self._fom_range_les = []
for _ in range(self._N_FILTERS):
cb = QComboBox()
cb.addItems(self._analysis_types.keys())
self._analysis_type_cbs.append(cb)
self._fom_range_les.append(SmartBoundaryLineEdit("-Inf, Inf"))

self._pulse_resolved_cb = QCheckBox("Pulse resolved")
if self._pulse_resolved:
self._pulse_resolved_cb.setChecked(True)
else:
self._pulse_resolved_cb.setChecked(False)
self._pulse_resolved_cb.setEnabled(False)
if not self._pulse_resolved:
pass

self.initUI()
self.initConnections()
Expand All @@ -52,11 +55,16 @@ def initUI(self):
layout = QGridLayout()
AR = Qt.AlignRight

layout.addWidget(QLabel("Analysis type: "), 0, 0, AR)
layout.addWidget(self._analysis_type_cb, 0, 1)
layout.addWidget(QLabel("Fom range: "), 0, 2, AR)
layout.addWidget(self._fom_range_le, 0, 3)
layout.addWidget(self._pulse_resolved_cb, 0, 4)
for i, (cb, le) in enumerate(zip(self._analysis_type_cbs,
self._fom_range_les)):
if i < self._N_TRAIN_FILTERS:
layout.addWidget(QLabel(f"By train - "), i, 0, AR)
else:
layout.addWidget(QLabel(f"By pulse - "), i, 0, AR)
layout.addWidget(QLabel("Analysis type: "), i, 1, AR)
layout.addWidget(cb, i, 2)
layout.addWidget(QLabel("Fom range: "), i, 3, AR)
layout.addWidget(le, i, 4)

self.setLayout(layout)

Expand All @@ -69,23 +77,23 @@ def initConnections(self):
self._analysis_types[x]))
self._fom_range_le.value_changed_sgn.connect(
mediator.onFomFilterRangeChange)
self._pulse_resolved_cb.toggled.connect(
mediator.onFomFilterPulseResolvedChange)

def updateMetaData(self):
"""Overload."""
self._analysis_type_cb.currentTextChanged.emit(
self._analysis_type_cb.currentText())
self._fom_range_le.returnPressed.emit()
self._pulse_resolved_cb.toggled.emit(
self._pulse_resolved_cb.isChecked())
return True
# self._analysis_type_cb.currentTextChanged.emit(
# self._analysis_type_cb.currentText())
# self._fom_range_le.returnPressed.emit()
# self._pulse_resolved_cb.toggled.emit(
# self._pulse_resolved_cb.isChecked())
# return True
pass

def loadMetaData(self):
"""Override."""
cfg = self._meta.hget_all(mt.FOM_FILTER_PROC)
self._analysis_type_cb.setCurrentText(
self._analysis_types_inv[int(cfg["analysis_type"])])
self._fom_range_le.setText(cfg["fom_range"][1:-1])
if self._pulse_resolved:
self._pulse_resolved_cb.setChecked(cfg["pulse_resolved"] == 'True')
# cfg = self._meta.hget_all(mt.FOM_FILTER_PROC)
# self._analysis_type_cb.setCurrentText(
# self._analysis_types_inv[int(cfg["analysis_type"])])
# self._fom_range_le.setText(cfg["fom_range"][1:-1])
# if self._pulse_resolved:
# self._pulse_resolved_cb.setChecked(cfg["pulse_resolved"] == 'True')
pass
3 changes: 0 additions & 3 deletions extra_foam/gui/mediator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,6 @@ def onFomFilterAnalysisTypeChange(self, value: IntEnum):
def onFomFilterRangeChange(self, value: tuple):
self._meta.hset(mt.FOM_FILTER_PROC, "fom_range", str(value))

def onFomFilterPulseResolvedChange(self, value: bool):
self._meta.hset(mt.FOM_FILTER_PROC, "pulse_resolved", str(value))

def onItMaWindowChange(self, value: int):
self._meta.hset(mt.IMAGE_TRANSFORM_PROC, "ma_window", value)

Expand Down