diff --git a/scripts/Interface/ui/sans_isis/beam_centre.ui b/scripts/Interface/ui/sans_isis/beam_centre.ui
index c38ae4ba5be4b5d1d3e677973bff66d9605d943d..ae1be56d767a90e5e80c7670e6d2ab38c2632c5b 100644
--- a/scripts/Interface/ui/sans_isis/beam_centre.ui
+++ b/scripts/Interface/ui/sans_isis/beam_centre.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1015</width>
- <height>649</height>
+ <height>709</height>
</rect>
</property>
<property name="windowTitle">
@@ -310,6 +310,26 @@
</item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>lab_pos_1_line_edit</tabstop>
+ <tabstop>lab_pos_2_line_edit</tabstop>
+ <tabstop>hab_pos_1_line_edit</tabstop>
+ <tabstop>hab_pos_2_line_edit</tabstop>
+ <tabstop>component_combo_box</tabstop>
+ <tabstop>update_lab_check_box</tabstop>
+ <tabstop>update_hab_check_box</tabstop>
+ <tabstop>r_min_line_edit</tabstop>
+ <tabstop>r_max_line_edit</tabstop>
+ <tabstop>q_min_line_edit</tabstop>
+ <tabstop>q_max_line_edit</tabstop>
+ <tabstop>max_iterations_line_edit</tabstop>
+ <tabstop>tolerance_line_edit</tabstop>
+ <tabstop>verbose_check_box</tabstop>
+ <tabstop>COM_check_box</tabstop>
+ <tabstop>left_right_check_box</tabstop>
+ <tabstop>up_down_check_box</tabstop>
+ <tabstop>run_button</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
diff --git a/scripts/Interface/ui/sans_isis/diagnostics_page.ui b/scripts/Interface/ui/sans_isis/diagnostics_page.ui
index 4dac19dd279a70d916152ff52eaef463e52fca5e..d99f39cab1d5e92bc71f014b0730f464eb115341 100644
--- a/scripts/Interface/ui/sans_isis/diagnostics_page.ui
+++ b/scripts/Interface/ui/sans_isis/diagnostics_page.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>695</width>
- <height>252</height>
+ <height>297</height>
</rect>
</property>
<property name="windowTitle">
@@ -58,6 +58,9 @@
</item>
<item row="0" column="2">
<widget class="QPushButton" name="browse_button">
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="text">
<string>Browse</string>
</property>
@@ -133,6 +136,9 @@
</item>
<item row="2" column="0">
<widget class="QPushButton" name="time_button">
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="text">
<string>Time Integral</string>
</property>
@@ -146,6 +152,9 @@
</item>
<item row="0" column="0">
<widget class="QPushButton" name="horizontal_button">
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="text">
<string>Horizontal Integral</string>
</property>
@@ -160,6 +169,9 @@
</item>
<item row="1" column="0">
<widget class="QPushButton" name="vertical_button">
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="text">
<string>Vertical Integral</string>
</property>
@@ -239,6 +251,21 @@
</item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>run_input_line_edit</tabstop>
+ <tabstop>browse_button</tabstop>
+ <tabstop>detector_combo_box</tabstop>
+ <tabstop>period_line_edit</tabstop>
+ <tabstop>horizontal_button</tabstop>
+ <tabstop>horizontal_range_line_edit</tabstop>
+ <tabstop>horizontal_mask_check_box</tabstop>
+ <tabstop>vertical_button</tabstop>
+ <tabstop>vertical_range_line_edit</tabstop>
+ <tabstop>vertical_mask_check_box</tabstop>
+ <tabstop>time_button</tabstop>
+ <tabstop>time_range_line_edit</tabstop>
+ <tabstop>time_mask_checkbox</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui b/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui
index cf23f0c13b51d3afdfd115cc463fa649135f7f6f..c66860f6e5af37dda591a98e44ff6c0397b81507 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui
@@ -95,7 +95,7 @@ QGroupBox::title {
<item>
<widget class="QStackedWidget" name="main_stacked_widget">
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="run_page">
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -626,7 +626,7 @@ QGroupBox::title {
<item>
<widget class="QGroupBox" name="slice_event_group_box">
<property name="toolTip">
- <string><html><head/><body><p>In the case of data which was measured in event-mode, it is possible to perform time-of-flight slices of the data and reduce these separately.</p><p>Input can be:</p><p>-<span style=" font-style:italic;"> start:step:stop</span> specifies time slices from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop </span>value in steps of <span style=" font-style:italic;">step</span></p><p>- <span style=" font-style:italic;">start-stop </span>which specifies a time slice from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop</span> value</p><p>- <span style=" font-style:italic;">&gt;start</span> specifies a slice from the <span style=" font-style:italic;">start </span>value to the end of the data set</p><p>- <span style=" font-style:italic;">&lt;stop</span> specifes a slcie from teh start of the data set to the <span style=" font-style:italic;">stop </span>value</p><p>In addition it is possible to concatenate these specifications useing comma-separation. An example is:</p><p><span style=" font-style:italic;">5-10,12:2:16,20-30</span></p></body></html></string>
+ <string><html><head/><body><p>In the case of data which was measured in event-mode, it is possible to perform time-of-flight slices of the data and reduce these separately.</p><p>Input can be:</p><p>-<span style=" font-style:italic;"> start:step:stop</span> specifies time slices from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop </span>value in steps of <span style=" font-style:italic;">step</span></p><p>- <span style=" font-style:italic;">start-stop </span>which specifies a time slice from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop</span> value</p><p>- <span style=" font-style:italic;">&gt;start</span> specifies a slice from the <span style=" font-style:italic;">start </span>value to the end of the data set</p><p>- <span style=" font-style:italic;">&lt;stop</span> specifes a slice from the start of the data set to the <span style=" font-style:italic;">stop </span>value</p><p>In addition it is possible to concatenate these specifications useing comma-separation. An example is:</p><p><span style=" font-style:italic;">5-10,12:2:16,20-30</span></p></body></html></string>
</property>
<property name="title">
<string>Event Slice</string>
@@ -912,7 +912,7 @@ QGroupBox::title {
<string><html><head/><body><p>Spectrum number of the incident monitor which is used for monitor normalization.</p></body></html></string>
</property>
<property name="text">
- <string>Incidient monitor</string>
+ <string>Incident monitor</string>
</property>
</widget>
</item>
@@ -1054,7 +1054,7 @@ QGroupBox::title {
<item row="4" column="2">
<widget class="QLineEdit" name="transmission_mn_shift_line_edit">
<property name="toolTip">
- <string><html><head/><body><p>An option shift of the M4 monitor.</p></body></html></string>
+ <string><html><head/><body><p>Distance between beamstop monitor and detector.</p></body></html></string>
</property>
</widget>
</item>
@@ -1568,7 +1568,7 @@ QGroupBox::title {
</sizepolicy>
</property>
<property name="toolTip">
- <string><html><head/><body><p>Settings concerning the wavelength binning when dat a is transformed from time-of-flight to wavlength units.</p></body></html></string>
+ <string><html><head/><body><p>Settings concerning the wavelength binning when data is transformed from time-of-flight to wavelength units.</p></body></html></string>
</property>
<property name="title">
<string>Wavelength</string>
@@ -1626,7 +1626,7 @@ QGroupBox::title {
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="toolTip">
- <string><html><head/><body><p>It is possible to perform wavelength slices of the data and reduce these separately.</p><p>Input can be:</p><p>-<span style=" font-style:italic;"> start:step:stop</span> specifies time slices from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop </span>value in steps of <span style=" font-style:italic;">step</span></p><p>- <span style=" font-style:italic;">start-stop </span>which specifies a time slice from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop</span> value</p><p>- <span style=" font-style:italic;">&gt;start</span> specifies a slice from the <span style=" font-style:italic;">start </span>value to the end of the data set</p><p>- <span style=" font-style:italic;">&lt;stop</span> specifes a slcie from teh start of the data set to the <span style=" font-style:italic;">stop </span>value</p><p>In addition it is possible to concatenate these specifications useing comma-separation. An example is:</p><p><span style=" font-style:italic;">5-10,12:2:16,20-30</span></p><p>A reduction will always be done between the maximum and minimum wavelengths of a given set.</p></body></html></string>
+ <string><html><head/><body><p>It is possible to perform wavelength slices of the data and reduce these separately.</p><p>Input can be:</p><p>-<span style=" font-style:italic;"> start:step:stop</span> specifies wavelength slices from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop </span>value in steps of <span style=" font-style:italic;">step</span></p><p>- <span style=" font-style:italic;">start-stop </span>which specifies a wavelength slice from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop</span> value</p><p>- <span style=" font-style:italic;">&gt;start</span> specifies a slice from the <span style=" font-style:italic;">start </span>value to the end of the data set</p><p>- <span style=" font-style:italic;">&lt;stop</span> specifes a slice from the start of the data set to the <span style=" font-style:italic;">stop </span>value</p><p>In addition it is possible to concatenate these specifications useing comma-separation. An example is:</p><p><span style=" font-style:italic;">5-10,12:2:16,20-30</span></p><p>A reduction will always be done between the maximum and minimum wavelengths of a given set.</p></body></html></string>
</property>
<property name="text">
<string>Ranges [Ã…]</string>
@@ -1879,12 +1879,12 @@ QGroupBox::title {
</property>
<item>
<property name="text">
- <string>Circular</string>
+ <string>Pinhole</string>
</property>
</item>
<item>
<property name="text">
- <string>Rectangular</string>
+ <string>Slit</string>
</property>
</item>
</widget>
@@ -1899,7 +1899,7 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="3" column="4">
+ <item row="3" column="2">
<widget class="QLabel" name="q_resolution_sample_a_label">
<property name="toolTip">
<string><html><head/><body><p>Diameter of a circular sample aperature.</p></body></html></string>
@@ -1916,7 +1916,7 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="2" column="4">
+ <item row="2" column="2">
<widget class="QLabel" name="q_resolution_sample_w_label">
<property name="toolTip">
<string><html><head/><body><p>Width of a rectangular sample aperature.</p></body></html></string>
@@ -1926,14 +1926,14 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="2" column="5">
+ <item row="2" column="3">
<widget class="QLineEdit" name="q_resolution_sample_w_line_edit">
<property name="toolTip">
<string><html><head/><body><p>Width of a rectangular sample aperature.</p></body></html></string>
</property>
</widget>
</item>
- <item row="6" column="0">
+ <item row="5" column="0">
<widget class="QLabel" name="q_resolution_collimation_length_label">
<property name="toolTip">
<string><html><head/><body><p>The collimation length.</p></body></html></string>
@@ -1943,7 +1943,7 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="6" column="4">
+ <item row="5" column="2">
<widget class="QLabel" name="q_resolution_delta_r_label">
<property name="toolTip">
<string><html><head/><body><p>Delta r.</p></body></html></string>
@@ -1953,21 +1953,21 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="7" column="1" colspan="4">
+ <item row="6" column="1" colspan="2">
<widget class="QLineEdit" name="q_resolution_moderator_file_line_edit">
<property name="toolTip">
<string><html><head/><body><p>Path to the moderator file.</p></body></html></string>
</property>
</widget>
</item>
- <item row="7" column="5">
+ <item row="6" column="3">
<widget class="QPushButton" name="q_resolution_moderator_file_push_button">
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
- <item row="7" column="0">
+ <item row="6" column="0">
<widget class="QLabel" name="q_resolution_moderator_file_label">
<property name="toolTip">
<string><html><head/><body><p>Path to the moderator file.</p></body></html></string>
@@ -1977,24 +1977,24 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="6" column="1">
+ <item row="5" column="1">
<widget class="QLineEdit" name="q_resolution_collimation_length_line_edit">
<property name="toolTip">
<string><html><head/><body><p>The collimation length.</p></body></html></string>
</property>
</widget>
</item>
- <item row="6" column="5">
+ <item row="5" column="3">
<widget class="QLineEdit" name="q_resolution_delta_r_line_edit">
<property name="toolTip">
<string><html><head/><body><p>Delta r.</p></body></html></string>
</property>
</widget>
</item>
- <item row="5" column="0" colspan="6">
- <widget class="Line" name="line_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="3" column="3">
+ <widget class="QLineEdit" name="q_resolution_sample_a_line_edit">
+ <property name="toolTip">
+ <string><html><head/><body><p>Diameter of a circular sample aperature.</p></body></html></string>
</property>
</widget>
</item>
@@ -2005,10 +2005,10 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="3" column="5">
- <widget class="QLineEdit" name="q_resolution_sample_a_line_edit">
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="q_resolution_source_w_line_edit">
<property name="toolTip">
- <string><html><head/><body><p>Diameter of a circular sample aperature.</p></body></html></string>
+ <string><html><head/><body><p>Width of a rectangular source aperature.</p></body></html></string>
</property>
</widget>
</item>
@@ -2022,10 +2022,10 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="q_resolution_source_w_line_edit">
+ <item row="1" column="3">
+ <widget class="QLineEdit" name="q_resolution_sample_h_line_edit">
<property name="toolTip">
- <string><html><head/><body><p>Width of a rectangular source aperature.</p></body></html></string>
+ <string><html><head/><body><p>Height of a rectangular sample aperature.</p></body></html></string>
</property>
</widget>
</item>
@@ -2039,14 +2039,7 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="1" column="5">
- <widget class="QLineEdit" name="q_resolution_sample_h_line_edit">
- <property name="toolTip">
- <string><html><head/><body><p>Height of a rectangular sample aperature.</p></body></html></string>
- </property>
- </widget>
- </item>
- <item row="1" column="4">
+ <item row="1" column="2">
<widget class="QLabel" name="q_resolution_sample_h_label">
<property name="toolTip">
<string><html><head/><body><p>Height of a rectangular sample aperature.</p></body></html></string>
@@ -2056,13 +2049,6 @@ QGroupBox::title {
</property>
</widget>
</item>
- <item row="1" column="2" rowspan="3">
- <widget class="Line" name="line_7">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -2158,11 +2144,12 @@ QGroupBox::title {
</customwidget>
</customwidgets>
<tabstops>
- <tabstop>tab_choice_list</tabstop>
- <tabstop>batch_button</tabstop>
+ <tabstop>instrument_combo_box</tabstop>
+ <tabstop>manage_directories_button</tabstop>
<tabstop>user_file_button</tabstop>
- <tabstop>batch_line_edit</tabstop>
- <tabstop>user_file_line_edit</tabstop>
+ <tabstop>batch_button</tabstop>
+ <tabstop>process_button</tabstop>
+ <tabstop>multi_period_check_box</tabstop>
<tabstop>reduction_dimensionality_1D</tabstop>
<tabstop>reduction_dimensionality_2D</tabstop>
<tabstop>output_mode_memory_radio_button</tabstop>
@@ -2173,7 +2160,8 @@ QGroupBox::title {
<tabstop>rkh_checkbox</tabstop>
<tabstop>save_zero_error_free</tabstop>
<tabstop>use_optimizations_checkbox</tabstop>
- <tabstop>settings_tab_widget</tabstop>
+ <tabstop>plot_results_checkbox</tabstop>
+ <tabstop>help_button</tabstop>
<tabstop>reduction_mode_combo_box</tabstop>
<tabstop>merged_scale_line_edit</tabstop>
<tabstop>merged_shift_line_edit</tabstop>
@@ -2187,19 +2175,12 @@ QGroupBox::title {
<tabstop>slice_event_line_edit</tabstop>
<tabstop>event_binning_group_box</tabstop>
<tabstop>event_binning_line_edit</tabstop>
- <tabstop>wavelength_min_line_edit</tabstop>
- <tabstop>wavelength_max_line_edit</tabstop>
<tabstop>absolute_scale_line_edit</tabstop>
<tabstop>geometry_combo_box</tabstop>
<tabstop>height_line_edit</tabstop>
<tabstop>width_line_edit</tabstop>
<tabstop>thickness_line_edit</tabstop>
<tabstop>z_offset_line_edit</tabstop>
- <tabstop>phi_limit_min_line_edit</tabstop>
- <tabstop>phi_limit_max_line_edit</tabstop>
- <tabstop>phi_limit_use_mirror_check_box</tabstop>
- <tabstop>radius_limit_min_line_edit</tabstop>
- <tabstop>radius_limit_max_line_edit</tabstop>
<tabstop>mask_file_input_line_edit</tabstop>
<tabstop>mask_file_browse_push_button</tabstop>
<tabstop>mask_file_add_push_button</tabstop>
@@ -2222,6 +2203,7 @@ QGroupBox::title {
<tabstop>fit_sample_wavelength_combo_box</tabstop>
<tabstop>fit_sample_wavelength_min_line_edit</tabstop>
<tabstop>fit_sample_wavelength_max_line_edit</tabstop>
+ <tabstop>show_transmission_view</tabstop>
<tabstop>fit_can_use_fit_check_box</tabstop>
<tabstop>fit_can_fit_type_combo_box</tabstop>
<tabstop>fit_can_polynomial_order_spin_box</tabstop>
@@ -2229,13 +2211,25 @@ QGroupBox::title {
<tabstop>fit_can_wavelength_min_line_edit</tabstop>
<tabstop>fit_can_wavelength_max_line_edit</tabstop>
<tabstop>pixel_adjustment_det_1_line_edit</tabstop>
- <tabstop>pixel_adjustment_det_2_line_edit</tabstop>
<tabstop>pixel_adjustment_det_1_push_button</tabstop>
+ <tabstop>pixel_adjustment_det_2_line_edit</tabstop>
<tabstop>pixel_adjustment_det_2_push_button</tabstop>
<tabstop>wavelength_adjustment_det_1_line_edit</tabstop>
- <tabstop>wavelength_adjustment_det_2_line_edit</tabstop>
<tabstop>wavelength_adjustment_det_1_push_button</tabstop>
+ <tabstop>wavelength_adjustment_det_2_line_edit</tabstop>
<tabstop>wavelength_adjustment_det_2_push_button</tabstop>
+ <tabstop>radius_limit_min_line_edit</tabstop>
+ <tabstop>radius_limit_max_line_edit</tabstop>
+ <tabstop>phi_limit_min_line_edit</tabstop>
+ <tabstop>phi_limit_max_line_edit</tabstop>
+ <tabstop>phi_limit_use_mirror_check_box</tabstop>
+ <tabstop>wavelength_min_line_edit</tabstop>
+ <tabstop>wavelength_max_line_edit</tabstop>
+ <tabstop>wavelength_slices_line_edit</tabstop>
+ <tabstop>wavelength_step_line_edit</tabstop>
+ <tabstop>wavelength_step_type_combo_box</tabstop>
+ <tabstop>r_cut_line_edit</tabstop>
+ <tabstop>w_cut_line_edit</tabstop>
<tabstop>q_1d_min_line_edit</tabstop>
<tabstop>q_1d_max_line_edit</tabstop>
<tabstop>q_1d_step_line_edit</tabstop>
@@ -2245,8 +2239,8 @@ QGroupBox::title {
<tabstop>q_xy_step_type_combo_box</tabstop>
<tabstop>gravity_group_box</tabstop>
<tabstop>gravity_extra_length_line_edit</tabstop>
- <tabstop>q_resolution_shape_combo_box</tabstop>
<tabstop>q_resolution_group_box</tabstop>
+ <tabstop>q_resolution_shape_combo_box</tabstop>
<tabstop>q_resolution_source_h_line_edit</tabstop>
<tabstop>q_resolution_source_w_line_edit</tabstop>
<tabstop>q_resolution_source_a_line_edit</tabstop>
@@ -2257,6 +2251,10 @@ QGroupBox::title {
<tabstop>q_resolution_delta_r_line_edit</tabstop>
<tabstop>q_resolution_moderator_file_line_edit</tabstop>
<tabstop>q_resolution_moderator_file_push_button</tabstop>
+ <tabstop>settings_tab_widget</tabstop>
+ <tabstop>user_file_line_edit</tabstop>
+ <tabstop>tab_choice_list</tabstop>
+ <tabstop>batch_line_edit</tabstop>
</tabstops>
<resources/>
<connections/>