From 2b86721f79ef9a018c50ad199c6cd2b0f7d98d51 Mon Sep 17 00:00:00 2001
From: Russell Taylor <taylorrj@ornl.gov>
Date: Thu, 24 May 2012 10:14:17 -0400
Subject: [PATCH] Re #5339. Remove IMDWorkspace_sptr member variable.
It's only used in 1 method, so can be a local variable. As it was,
it was keeping a deleted workspace alive unnecessarily.
---
.../SliceViewer/inc/MantidQtSliceViewer/LinePlotOptions.h | 3 ---
Code/Mantid/MantidQt/SliceViewer/src/LinePlotOptions.cpp | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/LinePlotOptions.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/LinePlotOptions.h
index 5d54824bbb1..39dea2d86f0 100644
--- a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/LinePlotOptions.h
+++ b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/LinePlotOptions.h
@@ -42,9 +42,6 @@ private:
/// Vector of the various plot axis radio buttons
QVector<QRadioButton *> m_radPlots;
- /// Original workspace (gives the dimensions to plot);
- Mantid::API::IMDWorkspace_sptr m_originalWs;
-
/// Chosen plot X-axis
int m_plotAxis;
diff --git a/Code/Mantid/MantidQt/SliceViewer/src/LinePlotOptions.cpp b/Code/Mantid/MantidQt/SliceViewer/src/LinePlotOptions.cpp
index 08cc23e9a95..79d02742944 100644
--- a/Code/Mantid/MantidQt/SliceViewer/src/LinePlotOptions.cpp
+++ b/Code/Mantid/MantidQt/SliceViewer/src/LinePlotOptions.cpp
@@ -54,10 +54,10 @@ void LinePlotOptions::addPlotRadioButton(const std::string & text, const std::st
void LinePlotOptions::setOriginalWorkspace(Mantid::API::IMDWorkspace_sptr ws)
{
if (!ws) return;
- m_originalWs = ws;
- for (size_t d=0; d<(m_originalWs->getNumDims()); d++)
+
+ for (size_t d=0; d<(ws->getNumDims()); d++)
{
- IMDDimension_const_sptr dim = m_originalWs->getDimension(d);
+ IMDDimension_const_sptr dim = ws->getDimension(d);
std::string text = dim->getName();
std::string tooltip = "Use the "+dim->getName()+" dimension as the X plot axis.";
const bool bIntegrated = dim->getIsIntegrated();
--
GitLab