From 884eef8d41d0fd9e21c3b63643c3e8d667c28335 Mon Sep 17 00:00:00 2001
From: Peter Parker <peter.parker@stfc.ac.uk>
Date: Fri, 20 Jun 2014 10:33:14 +0100
Subject: [PATCH] Refs #9710. Fix unit label.
Manually overwrite our own label at the end of the reduction.
Fix PolotAxis so that if the YUnitLabel of an axis has been set, then that
should be displayed in plots instead of any other unit settings.
---
Code/Mantid/MantidQt/API/src/PlotAxis.cpp | 6 ++++++
Code/Mantid/scripts/SANS/ISISCommandInterface.py | 2 ++
2 files changed, 8 insertions(+)
diff --git a/Code/Mantid/MantidQt/API/src/PlotAxis.cpp b/Code/Mantid/MantidQt/API/src/PlotAxis.cpp
index bc26fc37d7c..2aedc81ffc7 100644
--- a/Code/Mantid/MantidQt/API/src/PlotAxis.cpp
+++ b/Code/Mantid/MantidQt/API/src/PlotAxis.cpp
@@ -90,6 +90,12 @@ namespace MantidQt
*/
void PlotAxis::titleFromYData(const Mantid::API::MatrixWorkspace &workspace)
{
+ if( !workspace.YUnitLabel().empty() )
+ {
+ m_title = QString::fromStdString(workspace.YUnitLabel());
+ return;
+ }
+
m_title = QString::fromStdString(workspace.YUnit());
if(workspace.isDistribution() && workspace.axes() > 0 && workspace.getAxis(0)->unit())
{
diff --git a/Code/Mantid/scripts/SANS/ISISCommandInterface.py b/Code/Mantid/scripts/SANS/ISISCommandInterface.py
index e97760b78fe..c9f9c8cf9d5 100644
--- a/Code/Mantid/scripts/SANS/ISISCommandInterface.py
+++ b/Code/Mantid/scripts/SANS/ISISCommandInterface.py
@@ -536,6 +536,8 @@ def WavRangeReduction(wav_start=None, wav_end=None, full_trans_wav=None, name_su
if resetSetup:
_refresh_singleton()
+
+ mtd[retWSname].setYUnitLabel("I(q) (cm-1)")
return retWSname
--
GitLab