Add context menu options to set the distribution status.

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

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp b/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
@@ -10098,8 +10098,23 @@ 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()));
+  QAction *noNorm = new QAction(tr("N&one"), &normalization);
+  noNorm->setCheckable(true);
+  connect(noNorm, SIGNAL(activated()), ag, SLOT(noNormalization()));
+  normalization.addAction(noNorm);
+
+  QAction *binNorm = new QAction(tr("&Bin Width"), &normalization);
+  binNorm->setCheckable(true);
+  connect(binNorm, SIGNAL(activated()), ag, SLOT(binWidthNormalization()));
+  normalization.addAction(binNorm);
+
+  QActionGroup *normalizationActions = new QActionGroup(this);
+  normalizationActions->setExclusive(true);
+  normalizationActions->addAction(noNorm);
+  normalizationActions->addAction(binNorm);
+
+  noNorm->setChecked(!ag->isDistribution());
+  binNorm->setChecked(ag->isDistribution());
   cm.insertItem(tr("&Normalization"), &normalization);
 
   cm.insertSeparator();

diff --git a/Code/Mantid/MantidPlot/src/Graph.h b/Code/Mantid/MantidPlot/src/Graph.h
@@ -203,7 +203,8 @@ public slots:
   void binWidthNormalization();
 
   // Are MantidCurves plotted as distributions in this Graph
-  bool isDistribution()const{return m_isDistribution;}
+  bool isDistribution() const { return m_isDistribution; }
+  void setDistribution(const bool on) { m_isDistribution = on; }
 
 
   //! Accessor method for #d_plot.

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
@@ -3136,6 +3136,7 @@ MultiLayer* MantidUI::plot1D(const QMultiMap<QString,int>& toPlot, bool spectrum
 
   // Try to add curves to the plot
   Graph *g = ml->activeGraph();
+  g->setDistribution(plotAsDistribution);
   MantidMatrixCurve::IndexDir indexType = (spectrumPlot) ? MantidMatrixCurve::Spectrum : MantidMatrixCurve::Bin;
   MantidMatrixCurve* firstCurve(NULL);
   for(QMultiMap<QString,int>::const_iterator it=toPlot.begin();it!=toPlot.end();++it)