added merge objects command

Author: chriamue

source/annotatorlib/include/AnnotatorLib/Annotation.h

@@ -205,6 +205,8 @@ class ANNOTATORLIB_API Annotation {
 
   Annotation(shared_ptr<Annotation> a, shared_ptr<AnnotatorLib::Frame> f,
              bool isTemporary = false);
+  Annotation(shared_ptr<Annotation> a, shared_ptr<AnnotatorLib::Object> o,
+             bool isTemporary = false);
 
   Annotation(unsigned long id, const shared_ptr<AnnotatorLib::Frame> &frame,
              const shared_ptr<Object> &obj,

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

@@ -0,0 +1,36 @@
+// Copyright 2017 Annotator Team
+#ifndef MERGEOBJECTS_H
+#define MERGEOBJECTS_H
+
+#include <AnnotatorLib/Commands/Command.h>
+#include <memory>
+
+namespace AnnotatorLib {
+
+class Session;
+class Object;
+class Class;
+
+namespace Commands {
+
+class ANNOTATORLIB_API MergeObjects : public Command {
+ public:
+  MergeObjects() = delete;
+
+  MergeObjects(std::shared_ptr<Session> session, std::shared_ptr<Object> first,
+               std::shared_ptr<Object> second);
+
+  ~MergeObjects() {}
+
+  virtual bool execute(Session *informSession = 0) override;
+
+  virtual bool undo(Session *informSession = 0) override;
+
+ protected:
+  std::shared_ptr<Session> session;
+  std::shared_ptr<Object> first;
+  std::shared_ptr<Object> second;
+};
+}
+}
+#endif  // MERGEOBJECTS_H

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

@@ -36,4 +36,4 @@ class ANNOTATORLIB_API UpdateObject : public Command {
 };
 }
 }
-#endif  // UPDATEANNOTATION_H
+#endif  // UPDATEOBJECT_H

source/annotatorlib/include/AnnotatorLib/Session.h

@@ -128,6 +128,16 @@ class ANNOTATORLIB_API Session {
     return frames;
   }
 
+  /**
+   * @brief getFrames
+   * returns frames within range if exists
+   * @param first the first frame
+   * @param last the last frame
+   * @return
+   */
+  virtual std::unordered_map<unsigned long, std::shared_ptr<Frame>> getFrames(
+      unsigned long first, unsigned long last);
+
   /**
    * @brief Will add the given frame and all annotations, objects
    * within this frame to this session. Checks for duplicates.

source/annotatorlib/source/Annotation.cpp

@@ -34,9 +34,20 @@ Annotation::Annotation(shared_ptr<Frame> frame, shared_ptr<Object> obj,
     : Annotation(genId(frame, obj), frame, obj, type) {}
 
 Annotation::Annotation(shared_ptr<Annotation> a, shared_ptr<Frame> frame,
-                       bool isInterpolated)
+                       bool isTemporary)
     : Annotation(genId(frame, a->getObject()), frame, a->getObject(),
-                 a->getType(), isInterpolated) {
+                 a->getType(), isTemporary) {
+  this->setPosition(a->getX(), a->getY(), a->getWidth(), a->getHeight());
+  for (std::shared_ptr<Attribute> attribute :
+       a->getAttributesWithoutDefaults()) {
+    this->addAttribute(std::make_shared<Attribute>(attribute));
+  }
+}
+
+Annotation::Annotation(shared_ptr<Annotation> a, shared_ptr<Object> o,
+                       bool isTemporary)
+    : Annotation(genId(a->getFrame(), o), a->getFrame(), o, a->getType(),
+                 isTemporary) {
   this->setPosition(a->getX(), a->getY(), a->getWidth(), a->getHeight());
   for (std::shared_ptr<Attribute> attribute :
        a->getAttributesWithoutDefaults()) {

source/annotatorlib/source/Commands/MergeObjects.cpp

@@ -0,0 +1,44 @@
+// Copyright 2017 Annotator Team
+#include <AnnotatorLib/Class.h>
+#include <AnnotatorLib/Commands/MergeObjects.h>
+#include <AnnotatorLib/Object.h>
+#include <AnnotatorLib/Session.h>
+
+AnnotatorLib::Commands::MergeObjects::MergeObjects(
+    std::shared_ptr<Session> session, shared_ptr<Object> first,
+    shared_ptr<Object> second)
+    : session(session) {
+  this->first = first;
+  this->second = second;
+}
+
+bool AnnotatorLib::Commands::MergeObjects::execute(
+    AnnotatorLib::Session *informSession) {
+  bool success = false;
+  first->setActive(true);
+  for (auto &pair : second->getAnnotations()) {
+    auto annotation = Annotation::make_shared(pair.second.lock(), first);
+    success = session->addAnnotation(annotation, true);
+    session->removeAnnotation(pair.second.lock()->getId(), true);
+  }
+
+  for (auto &attribute : second->getAttributes()) {
+    first->addAttribute(attribute);
+    second->removeAttribute(attribute);
+  }
+
+  first->setActive(false);
+
+  session->removeObject(second->getId());
+
+  if (informSession) {
+    informSession->updateObject(first);
+    informSession->updateObject(second);
+  }
+  return success;
+}
+
+bool AnnotatorLib::Commands::MergeObjects::undo(
+    AnnotatorLib::Session *informSession) {
+  return false;
+}

source/annotatorlib/source/Session.cpp

@@ -128,6 +128,17 @@ shared_ptr<Class> Session::getClass(unsigned long id) const {
   return shared_ptr<Class>(nullptr);
 }
 
+std::unordered_map<unsigned long, std::shared_ptr<Frame>> Session::getFrames(
+    unsigned long first, unsigned long last) {
+  std::unordered_map<unsigned long, std::shared_ptr<Frame>> ret_frames;
+  for (auto& pair : frames) {
+    if (pair.first >= first && pair.first <= last) {
+      ret_frames.insert(pair);
+    }
+  }
+  return ret_frames;
+}
+
 bool Session::addFrame(shared_ptr<Frame> frame, bool add_associated_objects) {
   if (frame.get() == nullptr) return false;
   auto result = frames.insert(std::make_pair(frame->getId(), frame));

source/tests/annotatorlib-test/commands_test.cpp

@@ -1,6 +1,7 @@
 // Copyright 2016-2017 Annotator Team
 #include <AnnotatorLib/Annotation.h>
 #include <AnnotatorLib/Commands/CompressObject.h>
+#include <AnnotatorLib/Commands/MergeObjects.h>
 #include <AnnotatorLib/Commands/NewAnnotation.h>
 #include <AnnotatorLib/Commands/NewAttribute.h>
 #include <AnnotatorLib/Commands/RemoveAnnotation.h>
@@ -203,6 +204,40 @@ TEST_F(commands_test, compressObject) {
   ASSERT_EQ(obj->getAnnotations().size(), 2ul);
 }
 
+TEST_F(commands_test, mergeObjects) {
+  std::shared_ptr<Session> session = std::make_shared<Session>();
+  shared_ptr<Object> first = std::make_shared<Object>();
+
+  for (unsigned long i = 0; i < 5; ++i) {
+    shared_ptr<Frame> frame_i = std::make_shared<Frame>(i);
+    session->addAnnotation(Annotation::make_shared(frame_i, first));
+    session->getAnnotation(frame_i, first)->setPosition(i * 10, 40, 20, 20);
+    ASSERT_EQ(session->getAnnotations().size(), i + 1);
+    ASSERT_EQ(session->getFrames().size(), i + 1);
+  }
+  ASSERT_EQ(session->getFrames().size(), 5ul);
+  ASSERT_EQ(first->getAnnotations().size(), 5ul);
+
+  shared_ptr<Object> second = std::make_shared<Object>();
+
+  for (unsigned long i = 5; i < 10; ++i) {
+    shared_ptr<Frame> frame_i = std::make_shared<Frame>(i);
+    session->addAnnotation(Annotation::make_shared(frame_i, second));
+    session->getAnnotation(frame_i, second)->setPosition(i * 10, 40, 20, 20);
+    ASSERT_EQ(session->getAnnotations().size(), i + 1);
+    ASSERT_EQ(session->getFrames().size(), i + 1);
+  }
+  ASSERT_EQ(session->getFrames().size(), 10ul);
+  ASSERT_EQ(second->getAnnotations().size(), 5ul);
+
+  Commands::MergeObjects *cmd =
+      new Commands::MergeObjects(session, first, second);
+  session->execute(shared_ptr<Commands::Command>(cmd));
+
+  ASSERT_EQ(first->getAnnotations().size(), 10ul);
+  ASSERT_EQ(second->getAnnotations().size(), 0ul);
+}
+
 TEST_F(commands_test, newAttribute) {
   std::shared_ptr<Session> session = std::make_shared<Session>();
   ASSERT_EQ(session->getAnnotations().size(), (unsigned long)0);

source/tests/annotatorlib-test/session_test.cpp

@@ -26,3 +26,17 @@ TEST_F(session_test, getObject) {
   ASSERT_TRUE(o2->getName() == "testname");
   ASSERT_TRUE(success);
 }
+
+TEST_F(session_test, getFrames) {
+  std::shared_ptr<Session> session = std::make_shared<Session>();
+  shared_ptr<Object> o = std::make_shared<Object>();
+  for (unsigned long i = 0; i < 5; ++i) {
+    shared_ptr<Frame> frame_i = std::make_shared<Frame>(i);
+    session->addAnnotation(Annotation::make_shared(frame_i, o));
+    session->getAnnotation(frame_i, o)->setPosition(i * 10, 40, 20, 20);
+    ASSERT_EQ(session->getAnnotations().size(), i + 1);
+    ASSERT_EQ(session->getFrames().size(), i + 1);
+  }
+  ASSERT_EQ(session->getFrames(1, 3).size(), 3);
+  ASSERT_EQ(session->getFrames(4, 10).size(), 1);
+}