diff --git a/MantidQt/CustomInterfaces/CMakeLists.txt b/MantidQt/CustomInterfaces/CMakeLists.txt index bb9cf4f74244ba68b25f9ff6dac050cd8e16b454..f51c5258d86a87e8903454f93ac608675621db5f 100644 --- a/MantidQt/CustomInterfaces/CMakeLists.txt +++ b/MantidQt/CustomInterfaces/CMakeLists.txt @@ -339,6 +339,7 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/DataComparison.ui inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtGUI.ui inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabCalib.ui inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui + inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabPreproc.ui inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabSettings.ui inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.ui inc/MantidQtCustomInterfaces/Indirect/ApplyPaalmanPings.ui diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabPreproc.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabPreproc.ui new file mode 100644 index 0000000000000000000000000000000000000000..354d630ce6153cc9c26a8f9fea48f15722beb474 --- /dev/null +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabPreproc.ui @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>EnggDiffractionQtTabPreproc</class> + <widget class="QWidget" name="EnggDiffractionQtTabPreproc"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>615</width> + <height>562</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0" colspan="2"> + <layout class="QHBoxLayout" name="horizontalLayout_9"> + <item> + <widget class="QLabel" name="label_cropped_run_num"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>98</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="MantidQt::MantidWidgets::MWRunFiles" name="lineEdit_cropped_run_num" native="true"> + <property name="text" stdset="0"> + <string/> + </property> + <property name="readOnly" stdset="0"> + <bool>false</bool> + </property> + <property name="label" stdset="0"> + <string>Run #:</string> + </property> + <property name="multipleFiles" stdset="0"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + <item row="1" column="0"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Regular time binning:</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>381</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Time bin:</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QDoubleSpinBox" name="doubleSpinBox"> + <property name="decimals"> + <number>6</number> + </property> + <property name="singleStep"> + <double>0.000001000000000</double> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="pushButton_rebin_time"> + <property name="text"> + <string>Rebin</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>443</width> + <height>21</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Multi-period data:</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <spacer name="horizontalSpacer_4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>342</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Number of periods:</string> + </property> + </widget> + </item> + <item row="0" column="2" rowspan="2"> + <widget class="QSpinBox" name="spinBox"/> + </item> + <item row="1" column="0" rowspan="2"> + <spacer name="horizontalSpacer_5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>342</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Pulses per period:</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QSpinBox" name="spinBox_2"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>999999999</number> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>468</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="2"> + <widget class="QPushButton" name="pushButton_rebin_multiperiod"> + <property name="text"> + <string>Rebin</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="3" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>291</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>MantidQt::MantidWidgets::MWRunFiles</class> + <extends>QWidget</extends> + <header>MantidQtMantidWidgets/MWRunFiles.h</header> + </customwidget> + </customwidgets> + <resources/> + <connections/> +</ui> diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h index 9851de0babe5aa91be5c0e7563942c7af1f3d67b..e805912432ca33a82e97a03376fba8fa99f8d5b1 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h @@ -9,6 +9,7 @@ #include "ui_EnggDiffractionQtGUI.h" #include "ui_EnggDiffractionQtTabCalib.h" #include "ui_EnggDiffractionQtTabFocus.h" +#include "ui_EnggDiffractionQtTabPreproc.h" #include "ui_EnggDiffractionQtTabSettings.h" #include <boost/scoped_ptr.hpp> @@ -197,6 +198,7 @@ private: // but they could be separate dialogs, widgets, etc. Ui::EnggDiffractionQtTabCalib m_uiTabCalib; Ui::EnggDiffractionQtTabFocus m_uiTabFocus; + Ui::EnggDiffractionQtTabPreproc m_uiTabPreproc; Ui::EnggDiffractionQtTabSettings m_uiTabSettings; /// instrument selected (ENGIN-X, etc.) diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp index c1ae8b3b96fb66acceae1cfbb2c78a7c1ad6c6d8..161ccdc7c568b88abad54569ba10f9b68480933a 100644 --- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp +++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp @@ -72,6 +72,10 @@ void EnggDiffractionViewQtGUI::initLayout() { m_uiTabFocus.setupUi(wFocus); m_ui.tabMain->addTab(wFocus, QString("Focus")); + QWidget *wPreproc = new QWidget(m_ui.tabMain); + m_uiTabPreproc.setupUi(wPreproc); + m_ui.tabMain->addTab(wPreproc, QString("Pre-processing")); + QWidget *wSettings = new QWidget(m_ui.tabMain); m_uiTabSettings.setupUi(wSettings); m_ui.tabMain->addTab(wSettings, QString("Settings"));