diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflLegacyTransferStrategy.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflLegacyTransferStrategy.h index 56f80e8afe0ee066efe192baef0bac6655928863..4d259ed13943b00b1ebd0bf9faa2c91f57458ae5 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflLegacyTransferStrategy.h +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflLegacyTransferStrategy.h @@ -35,7 +35,7 @@ namespace MantidQt { public: virtual std::vector<std::map<std::string, std::string>> - transferRuns(const SearchResultMap &searchResults, + transferRuns(SearchResultMap &searchResults, Mantid::Kernel::ProgressBase &progress); virtual ReflLegacyTransferStrategy *clone() const; diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMeasureTransferStrategy.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMeasureTransferStrategy.h index 8efeb1fce2517fa4a0f8818a19c301eb69ab7338..87b6ae6ba251c6606e707bc9d08adcd419a1e118 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMeasureTransferStrategy.h +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMeasureTransferStrategy.h @@ -57,7 +57,7 @@ public: ReflMeasureTransferStrategy(const ReflMeasureTransferStrategy &other); virtual std::vector<std::map<std::string, std::string>> - transferRuns(const SearchResultMap &searchResults, + transferRuns(SearchResultMap &searchResults, Mantid::Kernel::ProgressBase &progress); virtual ReflMeasureTransferStrategy *clone() const; diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflTransferStrategy.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflTransferStrategy.h index 63ae6168664d6e19e1e2192c9fc80f1d792c4fdb..9aa46b128cd47e3575b7c895214f6c6519789b5d 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflTransferStrategy.h +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflTransferStrategy.h @@ -25,6 +25,7 @@ namespace MantidQt : description(desc), location(loc) {} std::string description; std::string location; + std::string issues; }; /// Helper typdef for map of SearchResults keyed by run @@ -67,7 +68,7 @@ namespace MantidQt * for those columns */ virtual std::vector<std::map<std::string, std::string>> - transferRuns(const SearchResultMap &searchResults, + transferRuns(SearchResultMap &searchResults, Mantid::Kernel::ProgressBase &progress) = 0; /** diff --git a/MantidQt/CustomInterfaces/src/ReflLegacyTransferStrategy.cpp b/MantidQt/CustomInterfaces/src/ReflLegacyTransferStrategy.cpp index 0be6a9dd31cc30157ef3bd5a05cb45c6a422ca75..00ae00f823f4972f570d83a8f8e74da8b4ea4564 100644 --- a/MantidQt/CustomInterfaces/src/ReflLegacyTransferStrategy.cpp +++ b/MantidQt/CustomInterfaces/src/ReflLegacyTransferStrategy.cpp @@ -10,8 +10,7 @@ namespace MantidQt namespace CustomInterfaces { std::vector<std::map<std::string, std::string>> - ReflLegacyTransferStrategy::transferRuns( - const SearchResultMap &searchResults, + ReflLegacyTransferStrategy::transferRuns(SearchResultMap &searchResults, Mantid::Kernel::ProgressBase &progress) { /* * If the descriptions are the same except for theta: same group, different rows. diff --git a/MantidQt/CustomInterfaces/src/ReflMeasureTransferStrategy.cpp b/MantidQt/CustomInterfaces/src/ReflMeasureTransferStrategy.cpp index 15e655a239eb4543bedfd5aa8acb4e5b7b6afeba..9254ac0cb871fa9b0f9a3bf3bfd3cd519445e960 100644 --- a/MantidQt/CustomInterfaces/src/ReflMeasureTransferStrategy.cpp +++ b/MantidQt/CustomInterfaces/src/ReflMeasureTransferStrategy.cpp @@ -40,7 +40,7 @@ ReflMeasureTransferStrategy::~ReflMeasureTransferStrategy() {} std::vector<std::map<std::string, std::string>> MantidQt::CustomInterfaces::ReflMeasureTransferStrategy::transferRuns( - const SearchResultMap &searchResults, + SearchResultMap &searchResults, Mantid::Kernel::ProgressBase &progress) { typedef std::vector<Measurement> VecSameMeasurement; @@ -69,6 +69,9 @@ MantidQt::CustomInterfaces::ReflMeasureTransferStrategy::transferRuns( mapOfMeasurements[metaData.id()].push_back(metaData); } } + else{ + it->second.issues = metaData.whyUnuseable(); + } // Obtaining metadata could take time. progress.report(); diff --git a/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h b/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h index 95cca9b968dbb75df6de9292a75c0a53befae7f9..e46cdabfc0b55c3157194c7a69c4bf7626ebf209 100644 --- a/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h +++ b/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h @@ -214,7 +214,7 @@ public: MockProgressBase progress; // Nothing obtained. No progress to report. - EXPECT_CALL(progress, doReport(_)).Times(Exactly(0)); + EXPECT_CALL(progress, doReport(_)).Times(Exactly(1)); ReflMeasureTransferStrategy strategy( std::move(std::unique_ptr<MockICatalogInfo>(mockCatInfo)),