From ec865f0908bca20a5124f8e1e43b0e854c7e0b83 Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Fri, 4 Mar 2016 09:46:15 +0000
Subject: [PATCH] spectrumIds replaced with SpectrumNos in remaining files
refs #15529
---
.../EnggDiffractionViewQtGUI.cpp | 28 +++++++++----------
.../interfaces/Engineering_Diffraction.rst | 8 +++---
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
index a16a16237c3..4bc00399f99 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
@@ -131,13 +131,13 @@ void EnggDiffractionViewQtGUI::doSetupTabCalib() {
connect(m_uiTabCalib.comboBox_calib_cropped_bank_name,
SIGNAL(currentIndexChanged(int)), this,
- SLOT(calibSpecIdChanged(int)));
+ SLOT(calibspecNoChanged(int)));
connect(m_uiTabCalib.lineEdit_new_ceria_num, SIGNAL(fileTextChanged(QString)),
this, SLOT(updateCroppedCalibRun()));
connect(m_uiTabCalib.comboBox_calib_cropped_bank_name,
- SIGNAL(currentIndexChanged(int)), this, SLOT(enableSpecIds()));
+ SIGNAL(currentIndexChanged(int)), this, SLOT(enableSpecNos()));
enableCalibrateAndFocusActions(true);
}
@@ -260,7 +260,7 @@ void EnggDiffractionViewQtGUI::readSettings() {
m_uiTabCalib.comboBox_calib_cropped_bank_name->setCurrentIndex(0);
- m_uiTabCalib.lineEdit_cropped_spec_ids->setText(
+ m_uiTabCalib.lineEdit_cropped_spec_nos->setText(
qs.value("user-params-calib-cropped-spectrum-nos", "").toString());
m_uiTabCalib.lineEdit_cropped_customise_bank_name->setText(
@@ -286,7 +286,7 @@ void EnggDiffractionViewQtGUI::readSettings() {
m_uiTabFocus.lineEdit_cropped_run_num->setUserInput(
qs.value("user-params-focus-cropped-runno", "").toString());
- m_uiTabFocus.lineEdit_cropped_spec_ids->setText(
+ m_uiTabFocus.lineEdit_cropped_spec_nos->setText(
qs.value("user-params-focus-cropped-spectrum-nos", "").toString());
m_uiTabFocus.lineEdit_texture_run_num->setUserInput(
@@ -376,7 +376,7 @@ void EnggDiffractionViewQtGUI::saveSettings() const {
m_uiTabCalib.groupBox_calib_cropped->isChecked());
qs.setValue("user-params-calib-cropped-spectrum-nos",
- m_uiTabCalib.lineEdit_cropped_spec_ids->text());
+ m_uiTabCalib.lineEdit_cropped_spec_nos->text());
qs.setValue("user-params-calib-cropped-customise-name",
m_uiTabCalib.lineEdit_cropped_customise_bank_name->text());
@@ -398,7 +398,7 @@ void EnggDiffractionViewQtGUI::saveSettings() const {
qs.setValue("user-params-focus-cropped-runno",
m_uiTabFocus.lineEdit_cropped_run_num->getText());
qs.setValue("user-params-focus-cropped-spectrum-nos",
- m_uiTabFocus.lineEdit_cropped_spec_ids->text());
+ m_uiTabFocus.lineEdit_cropped_spec_nos->text());
qs.setValue("user-params-focus-texture-runno",
m_uiTabFocus.lineEdit_texture_run_num->getText());
@@ -665,7 +665,7 @@ void EnggDiffractionViewQtGUI::resetFocus() {
m_uiTabFocus.checkBox_focus_bank2->setChecked(true);
m_uiTabFocus.lineEdit_cropped_run_num->setText("");
- m_uiTabFocus.lineEdit_cropped_spec_ids->setText("");
+ m_uiTabFocus.lineEdit_cropped_spec_nos->setText("");
m_uiTabFocus.groupBox_cropped->setChecked(false);
m_uiTabFocus.groupBox_texture->setChecked(false);
@@ -928,8 +928,8 @@ std::vector<bool> EnggDiffractionViewQtGUI::focusingBanks() const {
return res;
}
-std::string EnggDiffractionViewQtGUI::focusingCroppedSpectrumIDs() const {
- return m_uiTabFocus.lineEdit_cropped_spec_ids->text().toStdString();
+std::string EnggDiffractionViewQtGUI::focusingCroppedSpectrumNos() const {
+ return m_uiTabFocus.lineEdit_cropped_spec_nos->text().toStdString();
}
std::string EnggDiffractionViewQtGUI::focusingTextureGroupingFile() const {
@@ -961,25 +961,25 @@ void EnggDiffractionViewQtGUI::updateCroppedCalibRun() {
m_uiTabCalib.lineEdit_cropped_run_num->setText(ceria);
}
-void EnggDiffractionViewQtGUI::calibSpecIdChanged(int /*idx*/) {
+void EnggDiffractionViewQtGUI::calibspecNoChanged(int /*idx*/) {
QComboBox *BankName = m_uiTabCalib.comboBox_calib_cropped_bank_name;
if (!BankName)
return;
m_currentCropCalibBankName = BankName->currentIndex();
}
-void EnggDiffractionViewQtGUI::enableSpecIds() {
+void EnggDiffractionViewQtGUI::enableSpecNos() {
if (m_currentCropCalibBankName == 0) {
- m_uiTabCalib.lineEdit_cropped_spec_ids->setEnabled(true);
+ m_uiTabCalib.lineEdit_cropped_spec_nos->setEnabled(true);
m_uiTabCalib.lineEdit_cropped_customise_bank_name->setEnabled(true);
} else {
- m_uiTabCalib.lineEdit_cropped_spec_ids->setDisabled(true);
+ m_uiTabCalib.lineEdit_cropped_spec_nos->setDisabled(true);
m_uiTabCalib.lineEdit_cropped_customise_bank_name->setDisabled(true);
}
}
std::string EnggDiffractionViewQtGUI::currentCalibSpecNos() const {
- return m_uiTabCalib.lineEdit_cropped_spec_ids->text().toStdString();
+ return m_uiTabCalib.lineEdit_cropped_spec_nos->text().toStdString();
}
std::string EnggDiffractionViewQtGUI::currentCalibCustomisedBankName() const {
diff --git a/docs/source/interfaces/Engineering_Diffraction.rst b/docs/source/interfaces/Engineering_Diffraction.rst
index 7bbc5eac798..ac665362c32 100644
--- a/docs/source/interfaces/Engineering_Diffraction.rst
+++ b/docs/source/interfaces/Engineering_Diffraction.rst
@@ -51,7 +51,7 @@ generate a new calibration file (which becomes the new current
calibration).
With the help of Cropped Calibration user can also calibrate according
-to bank or by setting the SpectrumIDs once the Cropped Calibration group
+to bank or by setting the SpectrumNumbers once the Cropped Calibration group
box has been enabled.
The plot Calibrated Workspace check-box will enable user to plot
@@ -85,10 +85,10 @@ Bank Name:
respectively. However the Bank Name drop down list is set to
"Enable Spectrum-IDs" by default. This option cannot be used together
with Spectrum IDs, as they overlap. For the convenience of users, the
- GUI will only enable SpectrumIDs and Customise Bank Name text-fields
+ GUI will only enable SpectrumNumbers and Customise Bank Name text-fields
when Bank Name drop down list is set to "Enable Spectrum-IDs"
-SpectrumIDs:
+SpectrumNumbers:
This parameter is only required when Cropped Calibration is being
carried out, the parameter will set the spectrum numbers of the
detectors, that should be considered in the calibration while all
@@ -98,7 +98,7 @@ SpectrumIDs:
Customise Bank Name:
This parameter is only required when Cropped Calibration is being
- carried out with SpectrumIDs, the parameter will set the workspace
+ carried out with SpectrumNumbers, the parameter will set the workspace
and .his file name according to this Bank Name provided by the user.
However if the user does not provide a personalised name, the
interface will use "cropped" as a default bank name.
--
GitLab