Refs #6473. Changed the way the sequential dialog is opened.

mantidproject · Dec 13, 2013 · b28b209 · b28b209
1 parent cc81dc1
commit b28b209
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MuonAnalysis.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MuonAnalysis.h
@@ -214,6 +214,8 @@ private slots:
   /// Saves the value of the widget which called the slot
   void saveWidgetValue();
 
+  /// Opens a sequential fit dialog
+  void openSequentialFitDialog();
 
 private:
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp
@@ -28,6 +28,7 @@
 #include "MantidQtCustomInterfaces/MuonAnalysisResultTableTab.h"
 #include "MantidQtMantidWidgets/FitPropertyBrowser.h"
 #include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h"
+#include "MantidQtMantidWidgets/MuonSequentialFitDialog.h"
 
 #include <Poco/File.h>
 #include <Poco/Path.h>
@@ -148,6 +149,8 @@ void MuonAnalysis::initLayout()
   }
 
   m_uiForm.fitBrowser->init();
+  connect( m_uiForm.fitBrowser, SIGNAL(sequentialFitRequested()), 
+           this, SLOT(openSequentialFitDialog()) );
 
   // alow appending files
   m_uiForm.mwRunFiles->allowMultipleFiles(true);
@@ -3678,5 +3681,15 @@ void MuonAnalysis::setGrouping(ITableWorkspace_sptr detGroupingTable)
   updateFrontAndCombo();
 }
 
+/**
+ * Opens a sequential fit dialog.
+ */
+void MuonAnalysis::openSequentialFitDialog()
+{
+  MuonSequentialFitDialog* dialog = new MuonSequentialFitDialog(m_uiForm.fitBrowser, loadAlg);
+  dialog->exec();
+
+}
+
 }//namespace MantidQT
 }//namespace CustomInterfaces
diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/MuonFitPropertyBrowser.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/MuonFitPropertyBrowser.h
@@ -50,6 +50,9 @@ public slots:
   /// Open sequential fit dialog
   virtual void sequentialFit();
 
+signals:
+  /// Emitted when sequential fit is requested by user
+  void sequentialFitRequested();
 
 protected:
   virtual void showEvent(QShowEvent* e);

diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp
@@ -1,5 +1,4 @@
 #include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h"
-#include "MantidQtMantidWidgets/MuonSequentialFitDialog.h"
 #include "MantidQtMantidWidgets/PropertyHandler.h"
 #include "MantidAPI/FunctionFactory.h"
 
@@ -316,8 +315,7 @@ void MuonFitPropertyBrowser::fit()
  */
 void MuonFitPropertyBrowser::sequentialFit()
 {
-  MuonSequentialFitDialog* dialog = new MuonSequentialFitDialog(this);
-  dialog->exec();
+  emit sequentialFitRequested();
 }
 
 /**
@@ -346,6 +344,5 @@ bool MuonFitPropertyBrowser::isWorkspaceValid(Mantid::API::Workspace_sptr ws)con
     return false;
 }
 
-
 } // MantidQt
 } // API