Add Sqw to other Bayes tabs

Restruct to RES where needed Refs #10454
mantidproject · Nov 21, 2014 · 2a3d96d · 2a3d96d
1 parent 61ea633
commit 2a3d96d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui
@@ -43,11 +43,13 @@
        <property name="workspaceSuffixes" stdset="0">
         <stringlist>
          <string>_res</string>
+         <string>_sqw</string>
         </stringlist>
        </property>
        <property name="fileBrowserSuffixes" stdset="0">
         <stringlist>
          <string>_res.nxs</string>
+         <string>_sqw.nxs</string>
         </stringlist>
        </property>
        <property name="showLoad">
@@ -79,11 +81,13 @@
        <property name="workspaceSuffixes" stdset="0">
         <stringlist>
          <string>_red</string>
+         <string>_sqw</string>
         </stringlist>
        </property>
        <property name="fileBrowserSuffixes" stdset="0">
         <stringlist>
-         <string>*_red.nxs</string>
+         <string>_red.nxs</string>
+         <string>_sqw.nxs</string>
         </stringlist>
        </property>
       </widget>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui
@@ -37,11 +37,13 @@
        <property name="workspaceSuffixes" stdset="0">
         <stringlist>
          <string>_red</string>
+         <string>_sqw</string>
         </stringlist>
        </property>
        <property name="fileBrowserSuffixes" stdset="0">
         <stringlist>
          <string>_red.nxs</string>
+         <string>_sqw.nxs</string>
         </stringlist>
        </property>
       </widget>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp
@@ -92,6 +92,17 @@ namespace MantidQt
 				return false;
 			}
 
+			QString program = m_uiForm.cbProgram->currentText();
+      if(program == "Stretched Exponential")
+      {
+			  QString resName = m_uiForm.dsResolution->getCurrentDataName();
+        if(!resName.endsWith("_res"))
+        {
+          emit showMessageBox("Stretched Exponential program can only be used with a resolution file.");
+          return false;
+        }
+      }
+
 			return true;
 		}