Refs #3779. Implement a plot option to bring up the parameter table.

By right-clicking on a plot, with the peak picker tool attached, the user should be able to select "Get Parameters" which opens up the table of values.
mantidproject · Dec 8, 2011 · 6f4571b · 6f4571b
1 parent 46afa3b
commit 6f4571b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp b/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
@@ -7664,7 +7664,7 @@ void ApplicationWindow::selectMultiPeak(bool showFitPropertyBrowser)
     if (g->validCurvesDataSize())
     {
       //Called when setting up usual peakPickerTool
-      PeakPickerTool* ppicker = new PeakPickerTool(g, mantidUI->fitFunctionBrowser(), showFitPropertyBrowser);
+      PeakPickerTool* ppicker = new PeakPickerTool(g, mantidUI->fitFunctionBrowser(), mantidUI, showFitPropertyBrowser);
       g->setActiveTool(ppicker);
       connect(plot,SIGNAL(windowStateChanged(Qt::WindowStates, Qt::WindowStates)),ppicker,SLOT(windowStateChanged(Qt::WindowStates, Qt::WindowStates)));
     }
@@ -16498,7 +16498,7 @@ void ApplicationWindow::runConnectFitting(MantidQt::MantidWidgets::FitPropertyBr
           foreach(Graph *g, layers)
           {
             // Go through and set up the PeakPickerTool for the new graph
-            PeakPickerTool* ppicker = new PeakPickerTool(g, fpb);
+            PeakPickerTool* ppicker = new PeakPickerTool(g, fpb, mantidUI, true);
             g->setActiveTool(ppicker);
           }
         }     

diff --git a/Code/Mantid/MantidPlot/src/Mantid/PeakPickerTool.cpp b/Code/Mantid/MantidPlot/src/Mantid/PeakPickerTool.cpp
@@ -16,13 +16,16 @@
 #include <QAction>
 #include <QMenu>
 #include <QInputDialog>
+#include <QMessageBox>
 
 #include <iostream>
 
-PeakPickerTool::PeakPickerTool(Graph *graph, MantidQt::MantidWidgets::FitPropertyBrowser *fitPropertyBrowser, bool showFitPropertyBrowser) : //MantidUI *mantidUI) :
+PeakPickerTool::PeakPickerTool(Graph *graph, MantidQt::MantidWidgets::FitPropertyBrowser *fitPropertyBrowser, MantidUI *mantidUI, bool showFitPropertyBrowser) :
 QwtPlotPicker(graph->plotWidget()->canvas()),
 PlotToolInterface(graph),
-m_fitPropertyBrowser(fitPropertyBrowser),m_wsName(),m_spec(),m_init(false), //m_current(0),
+m_fitPropertyBrowser(fitPropertyBrowser),
+m_mantidUI(mantidUI),
+m_wsName(),m_spec(),m_init(false), //m_current(0),
 m_width_set(true),m_width(0),m_addingPeak(false),m_resetting(false)
 {
   d_graph->plotWidget()->canvas()->setCursor(Qt::pointingHandCursor);
@@ -734,6 +737,12 @@ void PeakPickerTool::prepareContextMenu(QMenu& menu)
 
   menu.addSeparator();
 
+  action = new QAction("Get Parameters", this);
+  connect(action, SIGNAL(triggered()), this, SLOT(getParameters()));
+  menu.addAction(action);
+
+  menu.addSeparator();
+
   if (m_fitPropertyBrowser->isFitEnabled())
   {
     action = new QAction("Fit",this);
@@ -1021,6 +1030,24 @@ void PeakPickerTool::resetRange()
   d_graph->replot();
 }
 
+
+/**
+* Checks whether there is a parameters file attached to the plot. 
+* If so, it opens up that parameters table.
+*/
+void PeakPickerTool::getParameters()
+{
+  QString parameterWs = m_wsName + "_Parameters";
+  if (Mantid::API::AnalysisDataService::Instance().doesExist(parameterWs.toStdString() ) )
+  {
+    m_mantidUI->importWorkspace(parameterWs);
+  }
+  else
+  {
+    QMessageBox::information(m_fitPropertyBrowser, "Mantid - Warning", "No parameter file with the name \"" + parameterWs + "\" found.");
+  }
+}
+
 void PeakPickerTool::modifiedGraph()
 {
 }

diff --git a/Code/Mantid/MantidPlot/src/Mantid/PeakPickerTool.h b/Code/Mantid/MantidPlot/src/Mantid/PeakPickerTool.h
@@ -77,7 +77,7 @@ class PeakPickerTool : public QwtPlotPicker, public PlotToolInterface, public Qw
   Q_OBJECT
 public:
   /// Constructor
-  PeakPickerTool(Graph *graph, MantidQt::MantidWidgets::FitPropertyBrowser *fitPropertyBrowser, bool showFitPropertyBrowser=true); //MantidUI *mantidUI);
+  PeakPickerTool(Graph *graph, MantidQt::MantidWidgets::FitPropertyBrowser *fitPropertyBrowser, MantidUI *mantidUI, bool showFitPropertyBrowser=true);
   /// Destructor
   ~PeakPickerTool();
   /// Runtime type identifier
@@ -131,6 +131,8 @@ private slots:
 
   void resetRange();
 
+  void getParameters();
+
 private:
   void plotFitFunction(MantidQt::MantidWidgets::PropertyHandler* h);
   void replot(MantidQt::MantidWidgets::PropertyHandler* h) const;
@@ -185,6 +187,8 @@ private slots:
   /// Creates a pointer to fitPropertyBrowser
   MantidQt::MantidWidgets::FitPropertyBrowser* m_fitPropertyBrowser;
 
+  MantidUI *m_mantidUI;
+
   /// Workspace name
   QString m_wsName;
   /// Spectrum index