Merge branch 'master' into feature/10246_Fix_os10.9_clang_failed_tests

mantidproject · Sep 23, 2014 · e678582 · e678582
2 parents 82d930d + 0e7ad92
commit e678582
Show file tree

Hide file tree

Showing 10 changed files with 1,033 additions and 744 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/Stitch1DMany.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/Stitch1DMany.h
@@ -35,15 +35,9 @@ namespace Mantid
     {
     public:
       /// Default constructor
-      Stitch1DMany()
-      {
-      }
-      ;
+      Stitch1DMany() : m_numWorkspaces(0), m_manualScaleFactor(1.0), m_scaleRHSWorkspace(true), m_useManualScaleFactor(false) {};
       /// Destructor
-      virtual ~Stitch1DMany()
-      {
-      }
-      ;
+      virtual ~Stitch1DMany() {};
       /// Algorithm's name for identification. @see Algorithm::name
       virtual const std::string name() const
       {

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h
@@ -57,12 +57,19 @@ namespace MantidQt
       virtual void giveUserWarning(std::string prompt, std::string title);
       virtual void giveUserCritical(std::string prompt, std::string title);
 
+      //Set the status of the progress bar
+      virtual void setProgressRange(int min, int max);
+      virtual void setProgress(int progress);
+
       //Accessor methods
       virtual std::vector<size_t> getSelectedRowIndexes() const;
+      virtual std::string getSearchInstrument() const;
+      virtual std::string getProcessInstrument() const;
 
     private:
       //initialise the interface
       virtual void initLayout();
+      virtual void setInstrumentList(const std::vector<std::string>& instruments);
       //the presenter
       boost::scoped_ptr<IReflPresenter> m_presenter;
       //the interface
@@ -76,6 +83,7 @@ namespace MantidQt
       void addRowButton();
       void deleteRowButton();
       void processButton();
+      void groupRowsButton();
     };
 
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h
@@ -49,15 +49,22 @@ namespace MantidQt
       virtual void giveUserWarning(std::string prompt, std::string title) = 0;
       virtual void giveUserCritical(std::string prompt, std::string title) = 0;
 
+      //Set the status of the progress bar
+      virtual void setProgressRange(int min, int max) = 0;
+      virtual void setProgress(int progress) = 0;
+
       //Accessor methods
       virtual std::vector<size_t> getSelectedRowIndexes() const = 0;
+      virtual std::string getSearchInstrument() const = 0;
+      virtual std::string getProcessInstrument() const = 0;
 
       static const int NoFlags       = 0;
       static const int SaveFlag      = 1;
       static const int SaveAsFlag    = 2;
       static const int AddRowFlag    = 3;
       static const int DeleteRowFlag = 4;
       static const int ProcessFlag   = 5;
+      static const int GroupRowsFlag = 6;
     };
   }
 }

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainViewPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainViewPresenter.h
@@ -53,28 +53,37 @@ namespace MantidQt
       virtual void load();
       //process selected rows
       virtual void process();
+      //fetch a run
+      Mantid::API::Workspace_sptr fetchRun(const std::string& run, const std::string& instrument);
       //make a transmission workspace name
-      std::string makeTransWSName(const std::string& transString);
+      std::string makeTransWSName(const std::string& transString) const;
       //make a transmission workspace
       Mantid::API::MatrixWorkspace_sptr makeTransWS(const std::string& transString);
+      //Validate a row
+      void validateRow(size_t rowNo) const;
       //Process a row
       void processRow(size_t rowNo);
+      //Stitch some rows
+      void stitchRows(std::vector<size_t> rows);
       //add row(s) to the model
       virtual void addRow();
       //delete row(s) from the model
       virtual void deleteRow();
+      //group selected rows together
+      virtual void groupRows();
       //virtual save methods
       virtual void save() = 0;
       virtual void saveAs() = 0;
 
-      static const int COL_RUNS;
-      static const int COL_ANGLE;
-      static const int COL_TRANSMISSION;
-      static const int COL_QMIN;
-      static const int COL_QMAX;
-      static const int COL_DQQ;
-      static const int COL_SCALE;
-      static const int COL_GROUP;
+    public:
+      static const int COL_RUNS         = 0;
+      static const int COL_ANGLE        = 1;
+      static const int COL_TRANSMISSION = 2;
+      static const int COL_QMIN         = 3;
+      static const int COL_QMAX         = 4;
+      static const int COL_DQQ          = 5;
+      static const int COL_SCALE        = 6;
+      static const int COL_GROUP        = 7;
     };
   }
 }