Refs #3882 handle inf in color scale

by limiting the scale to finite numbers.
mantidproject · Nov 9, 2011 · 54b7294 · 54b7294
1 parent 44c8fba
commit 54b7294
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.h
@@ -18,6 +18,7 @@
 #include <qwt_scale_widget.h>
 #include <vector>
 #include "MantidQtAPI/MantidColorMap.h"
+#include "MantidAPI/IMDIterator.h"
 
 
 class EXPORT_OPT_MANTIDQT_SLICEVIEWER SliceViewer : public QWidget
@@ -55,6 +56,7 @@ public slots:
   void updateDisplay(bool resetAxes = false);
   void updateDimensionSliceWidgets();
   void resetAxis(int axis, Mantid::Geometry::IMDDimension_const_sptr dim);
+  QwtDoubleInterval getRange(Mantid::API::IMDIterator * it);
 
   void findRangeFull();
   void findRangeSlice();
@@ -116,6 +118,8 @@ public slots:
   QMenu * m_menuColorOptions;
   QMenu * m_menuView;
 
+  /// Cached double for infinity
+  double m_inf;
 };
 
 #endif // SLICEVIEWER_H
diff --git a/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp b/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp
@@ -27,6 +27,7 @@
 #include <sstream>
 #include <vector>
 #include <qfiledialog.h>
+#include <limits>
 
 using namespace Mantid;
 using namespace Mantid::Kernel;
@@ -43,6 +44,8 @@ SliceViewer::SliceViewer(QWidget *parent)
 {
 	ui.setupUi(this);
 
+	m_inf = std::numeric_limits<double>::infinity();
+
 	// Create the plot
   m_spectLayout = new QHBoxLayout(ui.frmPlot);
 	m_plot = new QwtPlot();
@@ -462,7 +465,7 @@ void SliceViewer::resetAxis(int axis, Mantid::Geometry::IMDDimension_const_sptr
  * @param it :: IMDIterator of what to find
  * @return the min/max range, or 0-1.0 if not found
  */
-QwtDoubleInterval getRange(IMDIterator * it)
+QwtDoubleInterval SliceViewer::getRange(IMDIterator * it)
 {
   if (!it)
     return QwtDoubleInterval(0., 1.0);
@@ -474,8 +477,12 @@ QwtDoubleInterval getRange(IMDIterator * it)
   do
   {
     double signal = it->getNormalizedSignal();
-    if (signal > 0 && signal < minSignal) minSignal = signal;
-    if (signal > maxSignal) maxSignal = signal;
+    // Skip any 'infs' as it screws up the color scale
+    if (signal != m_inf)
+    {
+      if (signal > 0 && signal < minSignal) minSignal = signal;
+      if (signal > maxSignal) maxSignal = signal;
+    }
   } while (it->next());
 
   if (minSignal == DBL_MAX)