Skip to content

Commit 9deb5a8

Browse files
committed
Add tooltip that clarifies how the label will be appended
1 parent 2cd3054 commit 9deb5a8

File tree

5 files changed

+9
-53
lines changed

5 files changed

+9
-53
lines changed

docs/source/fitting/fitfunctions/TeixeiraWaterIqtFT.rst

Lines changed: 0 additions & 46 deletions
This file was deleted.

qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferPresenter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ using namespace MantidQt::CustomInterfaces::InterfaceUtils;
3232
namespace {
3333
constexpr auto REDUCTION_ALG_NAME = "ISISIndirectEnergyTransfer";
3434
constexpr auto PLOT_PREPROCESS_ALG_NAME = "GroupDetectors";
35-
std::vector<std::string> SUFFIXES = {"_Reduced"};
35+
const std::vector<std::string> SUFFIXES = {"_Reduced"};
3636

3737
enum class AlgorithmType { REDUCTION, PLOT_RAW_PREPROCESS };
3838

qt/scientific_interfaces/Indirect/test/Reduction/ISISEnergyTransferModelTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ class ISISEnergyTransferModelTest : public CxxTest::TestSuite {
307307
std::string inputFiles("1234, 1235");
308308
std::string outputName = m_model->getOutputGroupName(instData, inputFiles);
309309

310-
TS_ASSERT_EQUALS(outputName, "instrument1234, 1235_analyser_reflection_Reduced");
310+
TS_ASSERT_EQUALS(outputName, "instrument1234, 1235_analyserreflection_Reduced");
311311
}
312312

313313
void test_energyTransferAlgorithm() {

qt/widgets/spectroscopy/src/OutputWidget/OutputNameView.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ void OutputNameView::hideOutputNameBox() const {
4444
m_uiForm.lbName->hide();
4545
m_uiForm.lbOutput->hide();
4646
m_uiForm.lbWarning->hide();
47+
m_uiForm.leLabel->setToolTip(QString::fromStdString(
48+
"This label will be appended to each reduced output workspace name including the group workspace name"));
4749
}
4850

4951
void OutputNameView::notifyUpdateOutputLabel() { m_presenter->handleUpdateOutputLabel(); }

qt/widgets/spectroscopy/test/OutputWidget/OutputNamePresenterTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ class OutputNamePresenterTest : public CxxTest::TestSuite {
5050
m_presenter->generateWarningLabel();
5151
}
5252

53-
void test_enable_editing() {
54-
EXPECT_CALL(*m_view, enableLabelEditor()).Times(1);
55-
m_presenter->enableEditing();
56-
}
57-
5853
void test_get_current_label() {
5954
EXPECT_CALL(*m_view, getCurrentLabel()).Times(1);
6055
m_presenter->getCurrentLabel();
6156
}
6257

58+
void test_hide_output_name_box() {
59+
EXPECT_CALL(*m_view, hideOutputNameBox()).Times(1);
60+
m_presenter->hideOutputNameBox();
61+
}
62+
6363
void test_label_warning_message_if_workspace_does_not_exists_on_ads() {
6464
auto textColor = "color: darkGreen";
6565
auto text = "Unused name, new workspace will be created";

0 commit comments

Comments
 (0)