Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Scene2DViewport/MeasureCommands.h @ 1571:85e117739eca
cppcheck
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Sep 2020 17:46:39 +0200 |
parents | 244ad1e4e76a |
children | 8563ea5d8ae4 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2DViewport/MeasureCommands.h Mon Sep 21 14:50:26 2020 +0200 +++ b/OrthancStone/Sources/Scene2DViewport/MeasureCommands.h Mon Sep 21 17:46:39 2020 +0200 @@ -34,62 +34,69 @@ { class MeasureCommand : public boost::noncopyable { - public: - MeasureCommand(boost::shared_ptr<IViewport> viewport) : viewport_(viewport) - {} - virtual void Undo() = 0; - virtual void Redo() = 0; - - virtual ~MeasureCommand() {}; - protected: boost::shared_ptr<IViewport> viewport_; + + public: + explicit MeasureCommand(boost::shared_ptr<IViewport> viewport) : + viewport_(viewport) + { + } + + virtual ~MeasureCommand() + { + } + + virtual void Undo() = 0; + + virtual void Redo() = 0; }; + class CreateMeasureCommand : public MeasureCommand { - public: - CreateMeasureCommand(boost::shared_ptr<IViewport> viewport); - virtual ~CreateMeasureCommand(); - virtual void Undo() ORTHANC_OVERRIDE; - virtual void Redo() ORTHANC_OVERRIDE; private: /** Must be implemented by the subclasses that create the actual tool */ virtual boost::shared_ptr<MeasureTool> GetMeasureTool() = 0; + + public: + explicit CreateMeasureCommand(boost::shared_ptr<IViewport> viewport); + + virtual ~CreateMeasureCommand(); + + virtual void Undo() ORTHANC_OVERRIDE; + + virtual void Redo() ORTHANC_OVERRIDE; }; + class EditMeasureCommand : public MeasureCommand { - public: - EditMeasureCommand(boost::shared_ptr<MeasureTool> measureTool, boost::shared_ptr<IViewport> viewport); - virtual ~EditMeasureCommand(); - virtual void Undo() ORTHANC_OVERRIDE; - virtual void Redo() ORTHANC_OVERRIDE; - - /** This memento is the original object state */ - boost::shared_ptr<MeasureToolMemento> mementoOriginal_; - private: /** Must be implemented by the subclasses that edit the actual tool */ virtual boost::shared_ptr<MeasureTool> GetMeasureTool() = 0; protected: - /** This memento is updated by the subclasses upon modifications */ boost::shared_ptr<MeasureToolMemento> mementoModified_; + + public: + EditMeasureCommand(boost::shared_ptr<MeasureTool> measureTool, + boost::shared_ptr<IViewport> viewport); + + virtual ~EditMeasureCommand(); + + virtual void Undo() ORTHANC_OVERRIDE; + + virtual void Redo() ORTHANC_OVERRIDE; + + /** This memento is the original object state */ + boost::shared_ptr<MeasureToolMemento> mementoOriginal_; }; + class DeleteMeasureCommand : public MeasureCommand { - public: - DeleteMeasureCommand(boost::shared_ptr<MeasureTool> measureTool, boost::shared_ptr<IViewport> viewport); - virtual ~DeleteMeasureCommand(); - virtual void Undo() ORTHANC_OVERRIDE; - virtual void Redo() ORTHANC_OVERRIDE; - - /** This memento is the original object state */ - boost::shared_ptr<MeasureToolMemento> mementoOriginal_; - private: /** Must be implemented by the subclasses that edit the actual tool */ virtual boost::shared_ptr<MeasureTool> GetMeasureTool() @@ -100,9 +107,21 @@ boost::shared_ptr<MeasureTool> measureTool_; protected: - /** This memento is updated by the subclasses upon modifications */ boost::shared_ptr<MeasureToolMemento> mementoModified_; + + public: + DeleteMeasureCommand(boost::shared_ptr<MeasureTool> measureTool, + boost::shared_ptr<IViewport> viewport); + + virtual ~DeleteMeasureCommand(); + + virtual void Undo() ORTHANC_OVERRIDE; + + virtual void Redo() ORTHANC_OVERRIDE; + + /** This memento is the original object state */ + boost::shared_ptr<MeasureToolMemento> mementoOriginal_; }; }