update presenter for last view updates, re #12610

mantidproject · Aug 4, 2015 · 915d5dc · 915d5dc
1 parent a97f9ab
commit 915d5dc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -105,6 +105,7 @@ set ( INC_FILES
   inc/MantidQtCustomInterfaces/DllConfig.h
   inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
   inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionView.h
+  inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffCalibSettings.h
   inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
   inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
   inc/MantidQtCustomInterfaces/Homer.h

diff --git a/.../CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h b/.../CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 File change history is stored at: <https://github.com/mantidproject/mantid>
 Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL EnggDiffractionPresenter
+class EnggDiffractionPresenter
     : public IEnggDiffractionPresenter {
 
 public:
@@ -58,6 +58,7 @@ class MANTIDQT_CUSTOMINTERFACES_DLL EnggDiffractionPresenter
   void processLoadExistingCalib();
   void processCalcCalib();
   void processLogMsg();
+  void processInstChange();
   void processShutDown();
 
 private:

diff --git a/...CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h b/...CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
@@ -42,6 +42,7 @@ class IEnggDiffractionPresenter {
     LoadExistingCalib,     ///< Load a calibration already availble on disk
     CalcCalib,             ///< Calculate a (new) calibration
     LogMsg,                ///< need to send a message to the Mantid log system
+    InstrumentChange,      ///< Instrument selection updated
     ShutDown               ///< closing the interface
   };
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
@@ -11,6 +11,10 @@ using namespace MantidQt::CustomInterfaces;
 namespace MantidQt {
 namespace CustomInterfaces {
 
+namespace {
+Mantid::Kernel::Logger g_log("EngineeringDiffractionGUI");
+}
+
 EnggDiffractionPresenter::EnggDiffractionPresenter(IEnggDiffractionView *view)
     : m_view(view) /*, m_model(new EnggDiffractionModel()), */ {
   if (!m_view) {
@@ -52,6 +56,9 @@ void EnggDiffractionPresenter::notify(
     processLogMsg();
     break;
 
+  case IEnggDiffractionPresenter::InstrumentChange:
+    processInstChange();
+
   case IEnggDiffractionPresenter::ShutDown:
     processShutDown();
     break;
@@ -61,7 +68,7 @@ void EnggDiffractionPresenter::notify(
 void EnggDiffractionPresenter::processStart() {
   std::vector<std::string> msgs = m_view->logMsgs();
   for (size_t i = 0; i < msgs.size(); i++) {
-    //m_model->logMsg(msgs[i]);
+    g_log.information() << msgs[i] << std::endl;
   }
 }
 
@@ -71,6 +78,10 @@ void EnggDiffractionPresenter::processCalcCalib() {}
 
 void EnggDiffractionPresenter::processLogMsg() {}
 
+void EnggDiffractionPresenter::processInstChange() {
+  g_log.error() << "Changing instrument is not supported!" << std::endl;
+}
+
 void EnggDiffractionPresenter::processShutDown() {
   m_view->saveSettings();
   cleanup();