Skip to content
Snippets Groups Projects
Commit 964b0053 authored by Owen Arnold's avatar Owen Arnold
Browse files

refs #13989. Push issues upwards.

We need to be able to push issues back up to the caller.
parent c6794b3f
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,7 @@ namespace MantidQt ...@@ -35,7 +35,7 @@ namespace MantidQt
{ {
public: public:
virtual std::vector<std::map<std::string, std::string>> virtual std::vector<std::map<std::string, std::string>>
transferRuns(const SearchResultMap &searchResults, transferRuns(SearchResultMap &searchResults,
Mantid::Kernel::ProgressBase &progress); Mantid::Kernel::ProgressBase &progress);
virtual ReflLegacyTransferStrategy *clone() const; virtual ReflLegacyTransferStrategy *clone() const;
......
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
ReflMeasureTransferStrategy(const ReflMeasureTransferStrategy &other); ReflMeasureTransferStrategy(const ReflMeasureTransferStrategy &other);
virtual std::vector<std::map<std::string, std::string>> virtual std::vector<std::map<std::string, std::string>>
transferRuns(const SearchResultMap &searchResults, transferRuns(SearchResultMap &searchResults,
Mantid::Kernel::ProgressBase &progress); Mantid::Kernel::ProgressBase &progress);
virtual ReflMeasureTransferStrategy *clone() const; virtual ReflMeasureTransferStrategy *clone() const;
......
...@@ -25,6 +25,7 @@ namespace MantidQt ...@@ -25,6 +25,7 @@ namespace MantidQt
: description(desc), location(loc) {} : description(desc), location(loc) {}
std::string description; std::string description;
std::string location; std::string location;
std::string issues;
}; };
/// Helper typdef for map of SearchResults keyed by run /// Helper typdef for map of SearchResults keyed by run
...@@ -67,7 +68,7 @@ namespace MantidQt ...@@ -67,7 +68,7 @@ namespace MantidQt
* for those columns * for those columns
*/ */
virtual std::vector<std::map<std::string, std::string>> virtual std::vector<std::map<std::string, std::string>>
transferRuns(const SearchResultMap &searchResults, transferRuns(SearchResultMap &searchResults,
Mantid::Kernel::ProgressBase &progress) = 0; Mantid::Kernel::ProgressBase &progress) = 0;
/** /**
......
...@@ -10,8 +10,7 @@ namespace MantidQt ...@@ -10,8 +10,7 @@ namespace MantidQt
namespace CustomInterfaces namespace CustomInterfaces
{ {
std::vector<std::map<std::string, std::string>> std::vector<std::map<std::string, std::string>>
ReflLegacyTransferStrategy::transferRuns( ReflLegacyTransferStrategy::transferRuns(SearchResultMap &searchResults,
const SearchResultMap &searchResults,
Mantid::Kernel::ProgressBase &progress) { Mantid::Kernel::ProgressBase &progress) {
/* /*
* If the descriptions are the same except for theta: same group, different rows. * If the descriptions are the same except for theta: same group, different rows.
......
...@@ -40,7 +40,7 @@ ReflMeasureTransferStrategy::~ReflMeasureTransferStrategy() {} ...@@ -40,7 +40,7 @@ ReflMeasureTransferStrategy::~ReflMeasureTransferStrategy() {}
std::vector<std::map<std::string, std::string>> std::vector<std::map<std::string, std::string>>
MantidQt::CustomInterfaces::ReflMeasureTransferStrategy::transferRuns( MantidQt::CustomInterfaces::ReflMeasureTransferStrategy::transferRuns(
const SearchResultMap &searchResults, SearchResultMap &searchResults,
Mantid::Kernel::ProgressBase &progress) { Mantid::Kernel::ProgressBase &progress) {
typedef std::vector<Measurement> VecSameMeasurement; typedef std::vector<Measurement> VecSameMeasurement;
...@@ -69,6 +69,9 @@ MantidQt::CustomInterfaces::ReflMeasureTransferStrategy::transferRuns( ...@@ -69,6 +69,9 @@ MantidQt::CustomInterfaces::ReflMeasureTransferStrategy::transferRuns(
mapOfMeasurements[metaData.id()].push_back(metaData); mapOfMeasurements[metaData.id()].push_back(metaData);
} }
} }
else{
it->second.issues = metaData.whyUnuseable();
}
// Obtaining metadata could take time. // Obtaining metadata could take time.
progress.report(); progress.report();
......
...@@ -214,7 +214,7 @@ public: ...@@ -214,7 +214,7 @@ public:
MockProgressBase progress; MockProgressBase progress;
// Nothing obtained. No progress to report. // Nothing obtained. No progress to report.
EXPECT_CALL(progress, doReport(_)).Times(Exactly(0)); EXPECT_CALL(progress, doReport(_)).Times(Exactly(1));
ReflMeasureTransferStrategy strategy( ReflMeasureTransferStrategy strategy(
std::move(std::unique_ptr<MockICatalogInfo>(mockCatInfo)), std::move(std::unique_ptr<MockICatalogInfo>(mockCatInfo)),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment