update functions in command execution, update objects, update annotations, fixes #10, fixes #11

Author: chriamue

source/annotatorlib/include/AnnotatorLib/Commands/AdjustNeighbors.h

@@ -23,9 +23,9 @@ class ANNOTATORLIB_API AdjustNeighbors : public Command {
 
   ~AdjustNeighbors() {}
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
  protected:
   std::shared_ptr<Object> object;

source/annotatorlib/include/AnnotatorLib/Commands/CleanSession.h

@@ -18,9 +18,9 @@ class ANNOTATORLIB_API CleanSession : public Command {
 
   ~CleanSession() {}
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
  protected:
   std::shared_ptr<Session> session;

source/annotatorlib/include/AnnotatorLib/Commands/Command.h

@@ -3,13 +3,15 @@
 #define ANNOTATOR_ANNOTATORLIB_COMMANDS_COMMAND_H
 
 /************************************************************
- Annotation class header
+ Annotation command header
  ************************************************************/
 #include <AnnotatorLib/annotatorlib_api.h>
 #include <vector>
 
 namespace AnnotatorLib {
 
+class Session;
+
 namespace Commands {
 
 /************************************************************/
@@ -20,10 +22,24 @@ class ANNOTATORLIB_API Command {
  public:
   virtual ~Command() {}
 
-  virtual bool execute() = 0;
+  /**
+ * @brief execute
+ * Let the command make its execution.
+ * @param session
+ * The session that can be informed about changes.
+ * @return
+ */
+  virtual bool execute(Session *informSession = 0) = 0;
 
-  virtual bool undo() = 0;
+  /**
+ * @brief undo
+ * Let the command undo its execution.
+ * @param session
+ * The session that can be informed about changes.
+ * @return
+ */
+  virtual bool undo(Session *informSession = 0) = 0;
 };
-}
-}
+}  // of namespace Commands
+}  // of namespace AnnotatorLib
 #endif

source/annotatorlib/include/AnnotatorLib/Commands/CompressObject.h

@@ -24,9 +24,9 @@ class ANNOTATORLIB_API CompressObject : public Command {
 
   ~CompressObject() { removed_annotations.clear(); }
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
   shared_ptr<Object> getObject() { return obj; }
 

source/annotatorlib/include/AnnotatorLib/Commands/CompressSession.h

@@ -24,9 +24,9 @@ class ANNOTATORLIB_API CompressSession : public Command {
 
   ~CompressSession() { removed_annotations.clear(); }
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
  protected:
   std::shared_ptr<Session> session;

source/annotatorlib/include/AnnotatorLib/Commands/NewAnnotation.h

@@ -36,9 +36,9 @@ class ANNOTATORLIB_API NewAnnotation : public Command {
 
   ~NewAnnotation() {}
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
   shared_ptr<Annotation> getAnnotation();
   bool newObjectCreated() { return createdNewObject; }

source/annotatorlib/include/AnnotatorLib/Commands/RemoveAnnotation.h

@@ -21,9 +21,9 @@ class ANNOTATORLIB_API RemoveAnnotation : public Command {
                    shared_ptr<Annotation> a);
   ~RemoveAnnotation() {}
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
   shared_ptr<AnnotatorLib::Annotation> getAnnotation();
 

source/annotatorlib/include/AnnotatorLib/Commands/RemoveAnnotationRange.h

@@ -38,9 +38,9 @@ class ANNOTATORLIB_API RemoveAnnotationRange : public Command {
                         shared_ptr<AnnotatorLib::Frame> f2);
   ~RemoveAnnotationRange() {}
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
   shared_ptr<AnnotatorLib::Object> getObject();
   unsigned long getFrame1();

source/annotatorlib/include/AnnotatorLib/Commands/RemoveObject.h

@@ -22,9 +22,9 @@ class ANNOTATORLIB_API RemoveObject : public Command {
   RemoveObject(const RemoveObject &other) = delete;
   ~RemoveObject() {}
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
   shared_ptr<Object> getObject() { return object; }
 

source/annotatorlib/include/AnnotatorLib/Commands/UpdateAnnotation.h

@@ -18,9 +18,9 @@ class ANNOTATORLIB_API UpdateAnnotation : public Command {
 
   ~UpdateAnnotation() {}
 
-  bool execute();
+  virtual bool execute(Session *informSession = 0) override;
 
-  bool undo();
+  virtual bool undo(Session *informSession = 0) override;
 
   shared_ptr<Annotation> getAnnotation();