Renamed ISIS specific interfaces

Refs #11158
mantidproject · Feb 23, 2015 · 0f9090b · 0f9090b
1 parent cab91d0
commit 0f9090b
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 104 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -12,12 +12,9 @@ set ( SRC_FILES
 	src/Indirect/IDATab.cpp
   src/Indirect/IndirectBayes.cpp
 	src/Indirect/IndirectBayesTab.cpp
-	src/Indirect/IndirectCalibration.cpp
-	src/Indirect/IndirectConvertToEnergy.cpp
 	src/Indirect/IndirectDataAnalysis.cpp
 	src/Indirect/IndirectDataReduction.cpp
 	src/Indirect/IndirectDataReductionTab.cpp
-	src/Indirect/IndirectDiagnostics.cpp
 	src/Indirect/IndirectDiffractionReduction.cpp
   src/Indirect/IndirectLoadILL.cpp
 	src/Indirect/IndirectMolDyn.cpp
@@ -32,6 +29,9 @@ set ( SRC_FILES
 	src/Indirect/IndirectToolsTab.cpp
   src/Indirect/IndirectTransmission.cpp
   src/Indirect/IndirectTransmissionCalc.cpp
+  src/Indirect/ISISCalibration.cpp
+  src/Indirect/ISISDiagnostics.cpp
+  src/Indirect/ISISEnergyTransfer.cpp
 	src/Indirect/JumpFit.cpp
 	src/Indirect/MSDFit.cpp
 	src/Indirect/Quasi.cpp
@@ -91,12 +91,9 @@ set ( INC_FILES
 	inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
 	inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h
 	inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h
-	inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h
-	inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h
 	inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
 	inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
  	inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h
-	inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h
 	inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h
   inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h
 	inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h
@@ -116,6 +113,9 @@ set ( INC_FILES
 	inc/MantidQtCustomInterfaces/Indirect/Quasi.h
 	inc/MantidQtCustomInterfaces/Indirect/ResNorm.h
 	inc/MantidQtCustomInterfaces/Indirect/Stretch.h
+  inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h
+  inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h
+  inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h
 	inc/MantidQtCustomInterfaces/IReflPresenter.h
 	inc/MantidQtCustomInterfaces/IReflSearcher.h
 	inc/MantidQtCustomInterfaces/MantidEV.h
@@ -178,12 +178,9 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
                 inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
                 inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h
                 inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h
-                inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h
-                inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h
                 inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
                 inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
                 inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h
-                inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h
                 inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h
                 inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h
                 inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h
@@ -203,6 +200,9 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
                 inc/MantidQtCustomInterfaces/Indirect/Quasi.h
                 inc/MantidQtCustomInterfaces/Indirect/ResNorm.h
                 inc/MantidQtCustomInterfaces/Indirect/Stretch.h
+                inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h
+                inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h
+                inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h
                 inc/MantidQtCustomInterfaces/MultiDatasetFit.h
                 inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingPresenter.h
                 inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.h
@@ -243,11 +243,8 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/AddWorkspace.ui
                inc/MantidQtCustomInterfaces/Indirect/Fury.ui
                inc/MantidQtCustomInterfaces/Indirect/FuryFit.ui
                inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.ui
-               inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.ui
-               inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.ui
                inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui
                inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.ui
-               inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.ui
                inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui
                inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.ui
                inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.ui
@@ -264,6 +261,9 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/AddWorkspace.ui
                inc/MantidQtCustomInterfaces/Indirect/Quasi.ui
                inc/MantidQtCustomInterfaces/Indirect/ResNorm.ui
                inc/MantidQtCustomInterfaces/Indirect/Stretch.ui
+               inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.ui
+               inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.ui
+               inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui
                inc/MantidQtCustomInterfaces/MultiDatasetFit.ui
                inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.ui
                inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui

diff --git a/...Interfaces/Indirect/IndirectCalibration.h → ...stomInterfaces/Indirect/ISISCalibration.h b/...Interfaces/Indirect/IndirectCalibration.h → ...stomInterfaces/Indirect/ISISCalibration.h
@@ -1,16 +1,17 @@
-#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_
-#define MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_
+#ifndef MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_
+#define MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_
 
 #include "IndirectDataReductionTab.h"
-#include "ui_IndirectCalibration.h"
+#include "ui_ISISCalibration.h"
 #include "MantidKernel/System.h"
 #include "MantidQtCustomInterfaces/UserInputValidator.h"
 
 namespace MantidQt
 {
 namespace CustomInterfaces
 {
-  /** IndirectCalibration
+  /** ISISCalibration
+    Handles vanadium run calibration for ISIS instruments.
 
     @author Dan Nixon
     @date 23/07/2014
@@ -35,13 +36,13 @@ namespace CustomInterfaces
     File change history is stored at: <https://github.com/mantidproject/mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
-  class DLLExport IndirectCalibration : public IndirectDataReductionTab
+  class DLLExport ISISCalibration : public IndirectDataReductionTab
   {
     Q_OBJECT
 
   public:
-    IndirectCalibration(IndirectDataReduction * idrUI, QWidget * parent = 0);
-    virtual ~IndirectCalibration();
+    ISISCalibration(IndirectDataReduction * idrUI, QWidget * parent = 0);
+    virtual ~ISISCalibration();
 
     virtual void setup();
     virtual void run();
@@ -64,11 +65,11 @@ namespace CustomInterfaces
   private:
     void createRESfile(const QString& file);
 
-    Ui::IndirectCalibration m_uiForm;
+    Ui::ISISCalibration m_uiForm;
     QString m_lastCalPlotFilename;
 
   };
 } // namespace CustomInterfaces
 } // namespace Mantid
 
-#endif //MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_
+#endif //MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_
diff --git a/...nterfaces/Indirect/IndirectCalibration.ui → ...tomInterfaces/Indirect/ISISCalibration.ui b/...nterfaces/Indirect/IndirectCalibration.ui → ...tomInterfaces/Indirect/ISISCalibration.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>IndirectCalibration</class>
- <widget class="QWidget" name="IndirectCalibration">
+ <class>ISISCalibration</class>
+ <widget class="QWidget" name="ISISCalibration">
   <property name="geometry">
    <rect>
     <x>0</x>

diff --git a/...Interfaces/Indirect/IndirectDiagnostics.h → ...stomInterfaces/Indirect/ISISDiagnostics.h b/...Interfaces/Indirect/IndirectDiagnostics.h → ...stomInterfaces/Indirect/ISISDiagnostics.h
@@ -1,8 +1,8 @@
-#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H_
-#define MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H_
+#ifndef MANTIDQTCUSTOMINTERFACES_ISISDIAGNOSTICS_H_
+#define MANTIDQTCUSTOMINTERFACES_ISISDIAGNOSTICS_H_
 
 #include "IndirectDataReductionTab.h"
-#include "ui_IndirectDiagnostics.h"
+#include "ui_ISISDiagnostics.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/System.h"
 
@@ -28,7 +28,8 @@ namespace MantidQt
 {
 namespace CustomInterfaces
 {
-  /** IndirectDiagnostics
+  /** ISISDiagnostics
+    Handles time integration diagnostics for ISIS instruments.
 
     @author Dan Nixon
     @date 23/07/2014
@@ -53,13 +54,13 @@ namespace CustomInterfaces
     File change history is stored at: <https://github.com/mantidproject/mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
-  class DLLExport IndirectDiagnostics : public IndirectDataReductionTab
+  class DLLExport ISISDiagnostics : public IndirectDataReductionTab
   {
     Q_OBJECT
 
   public:
-    IndirectDiagnostics(IndirectDataReduction * idrUI, QWidget * parent = 0);
-    virtual ~IndirectDiagnostics();
+    ISISDiagnostics(IndirectDataReduction * idrUI, QWidget * parent = 0);
+    virtual ~ISISDiagnostics();
 
     virtual void setup();
     virtual void run();
@@ -79,11 +80,11 @@ namespace CustomInterfaces
     void pbRunFinished(); //< Called when the FileFinder has finished finding the files.
 
   private:
-    Ui::IndirectDiagnostics m_uiForm;
+    Ui::ISISDiagnostics m_uiForm;
     QString m_lastDiagFilename;
 
   };
 } // namespace CustomInterfaces
 } // namespace Mantid
 
-#endif //MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H__
+#endif //MANTIDQTCUSTOMINTERFACES_ISISDIAGNOSTICS_H_
diff --git a/...nterfaces/Indirect/IndirectDiagnostics.ui → ...tomInterfaces/Indirect/ISISDiagnostics.ui b/...nterfaces/Indirect/IndirectDiagnostics.ui → ...tomInterfaces/Indirect/ISISDiagnostics.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>IndirectDiagnostics</class>
- <widget class="QWidget" name="IndirectDiagnostics">
+ <class>ISISDiagnostics</class>
+ <widget class="QWidget" name="ISISDiagnostics">
   <property name="geometry">
    <rect>
     <x>0</x>

diff --git a/...rfaces/Indirect/IndirectConvertToEnergy.h → ...mInterfaces/Indirect/ISISEnergyTransfer.h b/...rfaces/Indirect/IndirectConvertToEnergy.h → ...mInterfaces/Indirect/ISISEnergyTransfer.h
@@ -1,16 +1,17 @@
-#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_
-#define MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_
+#ifndef MANTIDQTCUSTOMINTERFACES_ISISENERGYTRANSFER_H_
+#define MANTIDQTCUSTOMINTERFACES_ISISENERGYTRANSFER_H_
 
 #include "IndirectDataReductionTab.h"
-#include "ui_IndirectConvertToEnergy.h"
+#include "ui_ISISEnergyTransfer.h"
 #include "MantidKernel/System.h"
 #include "MantidQtCustomInterfaces/Background.h"
 
 namespace MantidQt
 {
 namespace CustomInterfaces
 {
-  /** IndirectConvertToEnergy
+  /** ISISEnergyTransfer
+    Handles an energy transfer reduction for ISIS instruments.
 
     @author Dan Nixon
     @date 23/07/2014
@@ -35,13 +36,13 @@ namespace CustomInterfaces
     File change history is stored at: <https://github.com/mantidproject/mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
-  class DLLExport IndirectConvertToEnergy : public IndirectDataReductionTab
+  class DLLExport ISISEnergyTransfer : public IndirectDataReductionTab
   {
     Q_OBJECT
 
   public:
-    IndirectConvertToEnergy(IndirectDataReduction * idrUI, QWidget * parent = 0);
-    virtual ~IndirectConvertToEnergy();
+    ISISEnergyTransfer(IndirectDataReduction * idrUI, QWidget * parent = 0);
+    virtual ~ISISEnergyTransfer();
 
     virtual void setup();
     virtual void run();
@@ -60,7 +61,7 @@ namespace CustomInterfaces
     void plotRawComplete(bool error); //< Called when the Plot Raw algorithmm chain completes
 
   private:
-    Ui::IndirectConvertToEnergy m_uiForm;
+    Ui::ISISEnergyTransfer m_uiForm;
 
     QString createMapFile(const QString& groupType); ///< create the mapping file with which to group results
     std::vector<std::string> getSaveFormats(); ///< get a vector of save formats
@@ -69,4 +70,4 @@ namespace CustomInterfaces
 } // namespace CustomInterfaces
 } // namespace Mantid
 
-#endif //MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_
+#endif //MANTIDQTCUSTOMINTERFACES_ISISENERGYTRANSFER_H_
diff --git a/...faces/Indirect/IndirectConvertToEnergy.ui → ...Interfaces/Indirect/ISISEnergyTransfer.ui b/...faces/Indirect/IndirectConvertToEnergy.ui → ...Interfaces/Indirect/ISISEnergyTransfer.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>IndirectConvertToEnergy</class>
- <widget class="QWidget" name="IndirectConvertToEnergy">
+ <class>ISISEnergyTransfer</class>
+ <widget class="QWidget" name="ISISEnergyTransfer">
   <property name="geometry">
    <rect>
     <x>0</x>