From d3f696f3675babfcc5ce223129b10da4285a41f6 Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Wed, 14 Oct 2015 16:00:34 +0100
Subject: [PATCH] MWRunFile applied for the run number(s) on Engg::Focus tab
Refs #13854
---
.../EnggDiffractionQtTabFocus.ui | 97 ++++++++++++-------
.../EnggDiffractionViewQtGUI.cpp | 12 +--
2 files changed, 67 insertions(+), 42 deletions(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui
index cef0dcd26c9..b6f46a4ab6b 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui
@@ -20,30 +20,6 @@
<string>Focus run</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="2" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>238</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_focus">
- <property name="text">
- <string>Focus</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@@ -113,12 +89,36 @@
</item>
</layout>
</item>
+ <item row="2" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>238</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_focus">
+ <property name="text">
+ <string>Focus</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_run_num">
<property name="text">
- <string>Run #:</string>
+ <string/>
</property>
</widget>
</item>
@@ -136,13 +136,19 @@
</spacer>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_run_num">
- <property name="text">
+ <widget class="MantidQt::MantidWidgets::MWRunFiles" name="lineEdit_run_num" native="true">
+ <property name="text" stdset="0">
<string/>
</property>
- <property name="readOnly">
+ <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>
@@ -161,7 +167,7 @@
<item>
<widget class="QLabel" name="label_cropped_run_num">
<property name="text">
- <string>Run #:</string>
+ <string/>
</property>
</widget>
</item>
@@ -179,13 +185,19 @@
</spacer>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_cropped_run_num">
- <property name="text">
+ <widget class="MantidQt::MantidWidgets::MWRunFiles" name="lineEdit_cropped_run_num" native="true">
+ <property name="text" stdset="0">
<string/>
</property>
- <property name="readOnly">
+ <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>
@@ -262,7 +274,7 @@
<item>
<widget class="QLabel" name="label_texture_run_num">
<property name="text">
- <string>Run #:</string>
+ <string/>
</property>
</widget>
</item>
@@ -280,13 +292,19 @@
</spacer>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_texture_run_num">
- <property name="text">
+ <widget class="MantidQt::MantidWidgets::MWRunFiles" name="lineEdit_texture_run_num" native="true">
+ <property name="text" stdset="0">
<string/>
</property>
- <property name="readOnly">
+ <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>
@@ -521,6 +539,13 @@
</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/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
index bdb998da054..4ada2e4080d 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
@@ -288,7 +288,7 @@ void EnggDiffractionViewQtGUI::saveSettings() const {
m_uiTabCalib.lineEdit_new_ceria_num->getText());
// user params - focusing
- qs.setValue("user-params-focus-runno", m_uiTabFocus.lineEdit_run_num->text());
+ qs.setValue("user-params-focus-runno", m_uiTabFocus.lineEdit_run_num->getText());
qs.beginWriteArray("user-params-focus-bank_i");
qs.setArrayIndex(0);
@@ -298,12 +298,12 @@ void EnggDiffractionViewQtGUI::saveSettings() const {
qs.endArray();
qs.setValue("user-params-focus-cropped-runno",
- m_uiTabFocus.lineEdit_cropped_run_num->text());
+ m_uiTabFocus.lineEdit_cropped_run_num->getText());
qs.setValue("user-params-focus-cropped-spectrum-nos",
m_uiTabFocus.lineEdit_cropped_spec_ids->text());
qs.setValue("user-params-focus-texture-runno",
- m_uiTabFocus.lineEdit_texture_run_num->text());
+ m_uiTabFocus.lineEdit_texture_run_num->getText());
qs.setValue("user-params-focus-texture-detector-grouping-file",
m_uiTabFocus.lineEdit_texture_grouping_file->text());
@@ -676,15 +676,15 @@ void EnggDiffractionViewQtGUI::browseTextureDetGroupingFile() {
}
std::string EnggDiffractionViewQtGUI::focusingRunNo() const {
- return m_uiTabFocus.lineEdit_run_num->text().toStdString();
+ return m_uiTabFocus.lineEdit_run_num->getText().toStdString();
}
std::string EnggDiffractionViewQtGUI::focusingCroppedRunNo() const {
- return m_uiTabFocus.lineEdit_cropped_run_num->text().toStdString();
+ return m_uiTabFocus.lineEdit_cropped_run_num->getText().toStdString();
}
std::string EnggDiffractionViewQtGUI::focusingTextureRunNo() const {
- return m_uiTabFocus.lineEdit_texture_run_num->text().toStdString();
+ return m_uiTabFocus.lineEdit_texture_run_num->getText().toStdString();
}
std::string EnggDiffractionViewQtGUI::focusingDir() const {
--
GitLab