refs #6271. Enable palette changing on all presenters.

mantidproject · Jan 11, 2013 · b257093 · b257093
1 parent 8e875d2
commit b257093
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 2 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/CompositePeaksPresenter.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/CompositePeaksPresenter.h
@@ -38,13 +38,19 @@ namespace MantidQt
       void clear();
       /// Get references to all presented workspaces.
       SetPeaksWorkspaces presentedWorkspaces() const;
+      /// Change the foreground representation for the peaks of this workspace
+      void setForegroundColour(boost::shared_ptr<const Mantid::API::IPeaksWorkspace> ws, Colour);
+      /// Change the background representation for the peaks of this workspace
+      void setBackgroundColour(boost::shared_ptr<const Mantid::API::IPeaksWorkspace> ws, Colour);
     private:
       /// Default behaviour 
       PeaksPresenter_sptr m_default;
       /// Subject presenters.
       std::set<PeaksPresenter_sptr> m_subjects;
       /// Use default
       bool useDefault() const { return m_subjects.size() == 0; }
+      void setForegroundColour(const Colour){/*Do nothing*/}
+      void setBackgroundColour(const Colour){/*Do nothing*/}
     };
   }
 }

diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/NullPeaksPresenter.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/NullPeaksPresenter.h
@@ -20,6 +20,8 @@ namespace MantidQt
       virtual bool changeShownDim(){return false;}
       virtual bool isLabelOfFreeAxis(const std::string&) const {return false;}
       SetPeaksWorkspaces presentedWorkspaces() const{SetPeaksWorkspaces empty; return empty;}
+      void setForegroundColour(const Colour){/*Do nothing*/}
+      void setBackgroundColour(const Colour){/*Do nothing*/}
     };
 
   }

diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/PeaksPresenter.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/PeaksPresenter.h
@@ -42,6 +42,8 @@ namespace SliceViewer
     virtual bool changeShownDim() = 0;
     virtual bool isLabelOfFreeAxis(const std::string& label) const = 0;
     virtual SetPeaksWorkspaces presentedWorkspaces() const = 0;
+    virtual void setForegroundColour(const Colour) = 0;
+    virtual void setBackgroundColour(const Colour) = 0;
   };
 
 

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/CompositePeaksPresenter.cpp b/Code/Mantid/MantidQt/SliceViewer/src/CompositePeaksPresenter.cpp
@@ -129,5 +129,43 @@ namespace MantidQt
       }
       return allWorkspaces;
     }
+
+    /**
+    Set the foreground colour of the peaks.
+    @ workspace containing the peaks to re-colour
+    @ colour to use for re-colouring
+    */
+    void CompositePeaksPresenter::setForegroundColour(boost::shared_ptr<const Mantid::API::IPeaksWorkspace> ws, Colour colour)
+    {
+      for(auto it = m_subjects.begin(); it != m_subjects.end(); ++it)
+      {
+        auto workspacesOfSubject = (*it)->presentedWorkspaces();
+        auto iteratorFound =  workspacesOfSubject.find(ws);
+        if(iteratorFound != workspacesOfSubject.end())
+        {
+          (*it)->setForegroundColour(colour);
+          break;
+        }
+      }
+    }
+
+    /**
+    Set the background colour of the peaks.
+    @ workspace containing the peaks to re-colour
+    @ colour to use for re-colouring
+    */
+    void CompositePeaksPresenter::setBackgroundColour(boost::shared_ptr<const Mantid::API::IPeaksWorkspace> ws, Colour colour)
+    {
+      for(auto it = m_subjects.begin(); it != m_subjects.end(); ++it)
+      {
+        auto workspacesOfSubject = (*it)->presentedWorkspaces();
+        auto iteratorFound =  workspacesOfSubject.find(ws);
+        if(iteratorFound != workspacesOfSubject.end())
+        {
+          (*it)->setBackgroundColour(colour);
+          break;
+        }
+      }
+    }
   }
 }
diff --git a/Code/Mantid/MantidQt/SliceViewer/src/ConcretePeaksPresenter.cpp b/Code/Mantid/MantidQt/SliceViewer/src/ConcretePeaksPresenter.cpp
@@ -183,7 +183,7 @@ namespace SliceViewer
   }
 
   /**
-  Request that each owned view makes iteself visible.
+  Request that each owned view makes its self visible.
   */
   void ConcretePeaksPresenter::showAll()
   {
@@ -198,7 +198,7 @@ namespace SliceViewer
   }
 
   /**
-  Request that each owned view makes iteself  NOT visible.
+  Request that each owned view makes its self  NOT visible.
   */
   void ConcretePeaksPresenter::hideAll()
   {

diff --git a/Code/Mantid/MantidQt/SliceViewer/test/CompositePeaksPresenterTest.h b/Code/Mantid/MantidQt/SliceViewer/test/CompositePeaksPresenterTest.h
@@ -273,6 +273,8 @@ class CompositePeaksPresenterTest : public CxxTest::TestSuite
     TS_ASSERT_THROWS(presenter.addPeaksPresenter( boost::make_shared<MockPeaksPresenter>()), std::invalid_argument);
   }
 
+
+
 };
 
 #endif
diff --git a/Code/Mantid/MantidQt/SliceViewer/test/MockObjects.h b/Code/Mantid/MantidQt/SliceViewer/test/MockObjects.h
@@ -30,6 +30,8 @@ namespace
     MOCK_METHOD0(changeShownDim, bool());
     MOCK_CONST_METHOD1(isLabelOfFreeAxis, bool(const std::string&));
     MOCK_CONST_METHOD0(presentedWorkspaces, SetPeaksWorkspaces());
+    MOCK_METHOD1(setForegroundColour, void(const Colour));
+    MOCK_METHOD1(setBackgroundColour, void(const Colour));
     ~MockPeaksPresenter(){}
   };
 

diff --git a/Code/Mantid/MantidQt/SliceViewer/test/NullPeaksPresenterTest.h b/Code/Mantid/MantidQt/SliceViewer/test/NullPeaksPresenterTest.h
@@ -56,6 +56,18 @@ class NullPeaksPresenterTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS(0, workspaces.size());
   }
 
+  void test_setForegroundColour_does_nothing()
+  {
+    NullPeaksPresenter presenter;
+    TS_ASSERT_THROWS_NOTHING(presenter.setForegroundColour(Colour::Black));
+  }
+
+  void test_setBackgroundColour_does_nothing()
+  {
+    NullPeaksPresenter presenter;
+    TS_ASSERT_THROWS_NOTHING(presenter.setBackgroundColour(Colour::Black));
+  }
+
 };
 
 #endif