From 888702f97746df2fd9602ab4acdc55b5266dbc3d Mon Sep 17 00:00:00 2001
From: Samuel Jones <samjones714@gmail.com>
Date: Fri, 17 Aug 2018 10:49:41 +0100
Subject: [PATCH] Re #23280 Initial Commit
---
Framework/API/inc/MantidAPI/Workspace.h | 1 +
Framework/API/inc/MantidAPI/WorkspaceGroup.h | 1 +
Framework/API/test/MatrixWorkspaceTest.h | 5 +++++
Framework/API/test/WorkspaceGroupTest.h | 5 +++++
4 files changed, 12 insertions(+)
diff --git a/Framework/API/inc/MantidAPI/Workspace.h b/Framework/API/inc/MantidAPI/Workspace.h
index c777780aec4..8b6c0a0366c 100644
--- a/Framework/API/inc/MantidAPI/Workspace.h
+++ b/Framework/API/inc/MantidAPI/Workspace.h
@@ -89,6 +89,7 @@ public:
const std::string &getComment() const;
const std::string &getName() const override;
bool isDirty(const int n = 1) const;
+ virtual bool isGroup() const { return false; }
/// Get the footprint in memory in bytes.
virtual size_t getMemorySize() const = 0;
/// Returns the memory footprint in sensible units
diff --git a/Framework/API/inc/MantidAPI/WorkspaceGroup.h b/Framework/API/inc/MantidAPI/WorkspaceGroup.h
index bd9dbf8a5b7..3b2f6b99335 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceGroup.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceGroup.h
@@ -82,6 +82,7 @@ public:
void removeItem(const size_t index);
/// Remove all names from the group but do not touch the ADS
void removeAll();
+ bool isGroup() const override { return true; }
/// This method returns true if the group is empty (no member workspace)
bool isEmpty() const;
bool areNamesSimilar() const;
diff --git a/Framework/API/test/MatrixWorkspaceTest.h b/Framework/API/test/MatrixWorkspaceTest.h
index 73a74dc9f39..7ad7a039749 100644
--- a/Framework/API/test/MatrixWorkspaceTest.h
+++ b/Framework/API/test/MatrixWorkspaceTest.h
@@ -2036,6 +2036,11 @@ public:
ws->hasOrientedLattice(), false);
}
+ void test_isGroup() {
+ boost::shared_ptr<MatrixWorkspace> ws(makeWorkspaceWithDetectors(3, 1));
+ TS_ASSERT_EQUALS(ws->isGroup(), false);
+ }
+
private:
WorkspaceTester m_workspace;
WorkspaceTester m_workspaceSans;
diff --git a/Framework/API/test/WorkspaceGroupTest.h b/Framework/API/test/WorkspaceGroupTest.h
index 5d70069b2a6..9f33eab56ef 100644
--- a/Framework/API/test/WorkspaceGroupTest.h
+++ b/Framework/API/test/WorkspaceGroupTest.h
@@ -347,6 +347,11 @@ public:
TS_ASSERT(group->isMultiperiod());
}
+ void test_isGroup() {
+ WorkspaceGroup_sptr group = makeGroup();
+ TS_ASSERT_EQUALS(group->isGroup(), true);
+ }
+
void test_isInGroup() {
WorkspaceGroup_sptr group = makeGroup();
auto ws1 = group->getItem(1);
--
GitLab