Skip to content
Snippets Groups Projects
Commit fd6d1393 authored by Matthew Andrew's avatar Matthew Andrew
Browse files

Added in phasequad option Re #25585

parent bf8dcbd3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector.ui
+ 109
− 71
View file @ fd6d1393
......@@ -13,85 +13,123 @@
<property name="windowTitle">
<string>Data Selection</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="4" colspan="2">
<layout class="QGridLayout" name="list_selector_layout"/>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="run_line_edit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>Run selection</string>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="">
<layout class="QGridLayout" name="list_selector_layout"/>
</widget>
<widget class="QWidget" name="">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLineEdit" name="run_line_edit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>Run selection</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="group_pair_line_edit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="placeholderText">
<string>Group &amp; Pair selection</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="time_domain_combo">
<property name="enabled">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>Time Domain</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="period_combo">
<property name="enabled">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>All</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QCheckBox" name="phase_quad_checkbox">
<property name="text">
<string>Show PhaseQuad</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="group_pair_line_edit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="placeholderText">
<string>Group &amp; Pair selection</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QComboBox" name="time_domain_combo">
<property name="enabled">
<bool>false</bool>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item>
<property name="text">
<string>Time Domain</string>
</property>
<widget class="QPushButton" name="select_button">
<property name="text">
<string>Select</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</widget>
</item>
<item row="3" column="2">
<widget class="QComboBox" name="period_combo">
<property name="enabled">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>All</string>
</property>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>318</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="select_button">
<property name="text">
<string>Select</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="cancel_button">
<property name="text">
<string>Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
<item>
<widget class="QPushButton" name="cancel_button">
<property name="text">
<string>Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
......
scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py
+ 12
− 3
View file @ fd6d1393
......@@ -23,7 +23,6 @@ class WorkspaceSelectorView(QtWidgets.QDialog, ui_workspace_selector):
self.instrument = instrument
self.context = context
self.rebin = not fit_to_raw
self.phasequad = True
self.groups_and_pairs = 'All'
self.runs = 'All'
......@@ -35,13 +34,16 @@ class WorkspaceSelectorView(QtWidgets.QDialog, ui_workspace_selector):
self.list_selector_layout.addWidget(self.list_selector_widget, 0, 1, 4, 1)
self.list_selector_layout.setContentsMargins(0, 0, 0, 0)
self.list_selector_presenter = ListSelectorPresenter(self.list_selector_widget, self.get_workspace_list())
self.update_list()
self.list_selector_presenter.update_view_from_model()
self.group_pair_line_edit.editingFinished.connect(self.handle_group_pair_selection_changed)
self.run_line_edit.editingFinished.connect(self.handle_run_edit_changed)
self.phase_quad_checkbox.stateChanged.connect(self.handle_phase_quad_changed)
def get_workspace_list(self):
filtered_list = self.context.get_names_of_workspaces_to_fit(runs=self.runs, group_and_pair=self.groups_and_pairs, phasequad=self.phasequad, rebin=self.rebin)
filtered_list = self.context.get_names_of_workspaces_to_fit(runs='All', group_and_pair='All', phasequad=True,
rebin=self.rebin)
filtered_list = [item for item in filtered_list if item not in self.current_workspaces]
......@@ -57,7 +59,7 @@ class WorkspaceSelectorView(QtWidgets.QDialog, ui_workspace_selector):
filtered_list = self.context.get_names_of_workspaces_to_fit(runs=self.runs,
group_and_pair=self.groups_and_pairs,
phasequad=self.phasequad, rebin=self.rebin)
excluded_list = self.context.get_names_of_workspaces_to_fit(runs='All', group_and_pair='All', phasequad=self.phasequad,
excluded_list = self.context.get_names_of_workspaces_to_fit(runs='All', group_and_pair='All', phasequad=True,
rebin=self.rebin)
excluded_list = [item for item in excluded_list if item not in filtered_list]
......@@ -82,6 +84,9 @@ class WorkspaceSelectorView(QtWidgets.QDialog, ui_workspace_selector):
self.update_list()
def handle_phase_quad_changed(self):
self.update_list()
def update_list(self):
workspace_list = self.get_exclusion_list()
self.list_selector_presenter.update_filter_list(workspace_list)
......@@ -89,6 +94,10 @@ class WorkspaceSelectorView(QtWidgets.QDialog, ui_workspace_selector):
def get_selected_list(self):
return self.list_selector_presenter.get_selected_items()
@property
def phasequad(self):
return self.phase_quad_checkbox.isChecked()
@staticmethod
def get_selected_data(current_runs, instrument, current_workspaces, fit_to_raw, context, parent):
dialog = WorkspaceSelectorView(current_runs, instrument, current_workspaces, fit_to_raw, context, parent)
......
scripts/Muon/GUI/Common/help_widget/help_widget_view.py
+ 0
− 3
View file @ fd6d1393
......@@ -16,9 +16,6 @@ class HelpWidgetView(QtWidgets.QWidget):
self.setup_interface_layout()
if not PYQT4:
self.interface_manager = InterfaceManager()
def setup_interface_layout(self):
self.setObjectName("HelpWidget")
self.resize(500, 100)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment