Add normalization options to graph context menu.

Refs #10639
mantidproject · Nov 28, 2014 · ea5a9a1 · ea5a9a1
1 parent 5fa1580
commit ea5a9a1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp b/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
@@ -10054,6 +10054,7 @@ void ApplicationWindow::showGraphContextMenu()
 
   QMenu axes(this);
   QMenu colour(this);
+  QMenu normalization(this);
   QMenu exports(this);
   QMenu copy(this);
   QMenu prints(this);
@@ -10097,6 +10098,10 @@ void ApplicationWindow::showGraphContextMenu()
   colour.insertItem(tr("&Linear"), ag, SLOT(linColor()));
   cm.insertItem(tr("&Color Bar"), &colour);
 
+  normalization.insertItem(tr("N&one"), ag,SLOT(noNormalization()));
+  normalization.insertItem(tr("&Bin Width"), ag, SLOT(binWidthNormalization()));
+  cm.insertItem(tr("&Normalization"), &normalization);
+
   cm.insertSeparator();
   copy.insertItem(tr("&Layer"), this, SLOT(copyActiveLayer()));
   copy.insertItem(tr("&Window"), plot, SLOT(copyAllLayers()));

diff --git a/Code/Mantid/MantidPlot/src/Graph.cpp b/Code/Mantid/MantidPlot/src/Graph.cpp
@@ -5978,7 +5978,33 @@ void Graph::enableFixedAspectRatio(bool on)
   }
 #else
   UNUSED_ARG(on)
-#endif
+    #endif
+}
+
+/**
+ * Turn off any normalization
+ */
+void Graph::noNormalization()
+{
+  if(!m_isDistribution) return; // Nothing to do
+
+  m_isDistribution = false;
+  updateDataCurves();
+  d_plot->updateAxes();
+  notifyChanges();
+}
+
+/**
+ * Turn on normalization by bin width if it is appropriate
+ */
+void Graph::binWidthNormalization()
+{
+  if(m_isDistribution) return; // Nothing to do
+
+  m_isDistribution = true;
+  updateDataCurves();
+  d_plot->updateAxes();
+  notifyChanges();
 }
 
 void Graph::setWaterfallXOffset(int offset)
@@ -6089,7 +6115,11 @@ void Graph::updateDataCurves()
     if (DataCurve *c = dynamic_cast<DataCurve*>(pc))
       c->loadData();
     else if (MantidMatrixCurve *mc = dynamic_cast<MantidMatrixCurve*>(pc))
+    {
+      mc->setDrawAsDistribution(m_isDistribution);
+      mc->invalidateBoundingRect();
       mc->loadData();
+    }
   }
   QApplication::restoreOverrideCursor();
 }

diff --git a/Code/Mantid/MantidPlot/src/Graph.h b/Code/Mantid/MantidPlot/src/Graph.h
@@ -198,9 +198,13 @@ public slots:
   void enablePanningMagnifier(bool on = true);
   bool isFixedAspectRatioEnabled();
   void enableFixedAspectRatio(bool on);
+
+  void noNormalization();
+  void binWidthNormalization();
+
   // Are MantidCurves plotted as distributions in this Graph
   bool isDistribution()const{return m_isDistribution;}
-	
+
 
   //! Accessor method for #d_plot.
   Plot* plotWidget(){return d_plot;};