Add validation to single fit options

Refs #10626
mantidproject · Nov 25, 2014 · f34bc8e · f34bc8e
1 parent 08e6624
commit f34bc8e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
@@ -146,6 +146,7 @@ namespace IDA
   {
     if ( m_cfInputWS == NULL )
     {
+      g_log.error("No workspace loaded");
       return;
     }
 
@@ -774,6 +775,9 @@ namespace IDA
 
   void ConvFit::singleFit()
   {
+    if(!validate())
+      return;
+
     plotInput();
 
     if ( m_curves["CFDataCurve"] == NULL )

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/FuryFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/FuryFit.cpp
@@ -526,6 +526,9 @@ namespace IDA
 
   void FuryFit::singleFit()
   {
+    if(!validate())
+      return;
+
     // First create the function
     auto function = createFunction();
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MSDFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MSDFit.cpp
@@ -88,6 +88,9 @@ namespace IDA
 
   void MSDFit::singleFit()
   {
+    if(!validate())
+      return;
+
     QString pyInput =
       "from IndirectDataAnalysis import msdfit\n"
       "startX = " + QString::number(m_dblManager->value(m_properties["Start"])) +"\n"