updates in object active state

Author: chriamue

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

@@ -26,7 +26,7 @@ class ANNOTATORLIB_API NewAnnotation : public Command {
                 const shared_ptr<Class> newObjectClass,
                 std::shared_ptr<Session> session, shared_ptr<Frame> frame,
                 float x, float y, float width, float height,
-                float confidence = 1.0);
+                float confidence = 1.0, bool objectActive = true);
 
   NewAnnotation(std::shared_ptr<Session> session, shared_ptr<Object> object_,
                 shared_ptr<Frame> frame_, float x, float y, float width,
@@ -53,6 +53,7 @@ class ANNOTATORLIB_API NewAnnotation : public Command {
   const shared_ptr<Class> newObjectClass;
   shared_ptr<Annotation> annotation_;
   const bool createNewObject;
+  bool objectActive = true;
   bool createdNewObject = false;
 };
 }

source/annotatorlib/source/Algo/InterpolateAnnotation.cpp

@@ -83,7 +83,8 @@ shared_ptr<Annotation> InterpolateAnnotation::getInterpolation(
     }
 
   } else if (object->getLastAnnotation() &&
-             *frame > *object->getLastAnnotation()->getFrame()) {
+             *frame > *object->getLastAnnotation()->getFrame() &&
+             object->isActive()) {
     // copy the previous annotation to the requested frame
     return Annotation::make_shared(object->getLastAnnotation(), frame, true);
   }

source/annotatorlib/source/Commands/NewAnnotation.cpp

@@ -7,7 +7,7 @@
 AnnotatorLib::Commands::NewAnnotation::NewAnnotation(
     const unsigned long newObjectId, const shared_ptr<Class> newObjectClass,
     std::shared_ptr<Session> session, shared_ptr<Frame> frame, float x, float y,
-    float width, float height, float confidence)
+    float width, float height, float confidence, bool objectActive)
     : newObjectId(newObjectId),
       newObjectClass(newObjectClass),
       createNewObject(true) {
@@ -18,6 +18,7 @@ AnnotatorLib::Commands::NewAnnotation::NewAnnotation(
   this->width = width;
   this->height = height;
   this->confidence = confidence;
+  this->objectActive = objectActive;
 }
 
 AnnotatorLib::Commands::NewAnnotation::NewAnnotation(
@@ -46,6 +47,7 @@ bool AnnotatorLib::Commands::NewAnnotation::execute(
   bool success = session->addAnnotation(
       annotation_, true);  // adds annotation and register to them
   if (createNewObject && success) createdNewObject = true;
+  if (!objectActive) object->setActive(false);
   if (informSession) {
     informSession->updateAnnotation(this->annotation_);
   }

source/annotatorlib/source/Commands/UpdateAttribute.cpp

@@ -37,5 +37,5 @@ bool AnnotatorLib::Commands::UpdateAttribute::execute(
 bool AnnotatorLib::Commands::UpdateAttribute::undo(
     AnnotatorLib::Session *informSession) {
   // TODO
-	return true;
+  return true;
 }

source/annotatorlib/source/Storage/JSONLoader.cpp

@@ -134,6 +134,9 @@ void JSONLoader::loadAnnotations(Poco::JSON::Object::Ptr json,
         }
       }
       session->addAnnotation(a);
+      if (value->has("next") && value->get("next") == value->get("id")) {
+        o->setActive(false);
+      }
     }
   }
 }

source/storages/mongodb/MongoDBLoader.cpp

@@ -69,6 +69,11 @@ void MongoDBLoader::loadAnnotations(Poco::MongoDB::Connection &connection,
         a->setPosition(x, y, width, height);
         session->addAnnotation(a);
         loadAnnotationAttributes(connection, a);
+        try {
+          if ((*it)->get<int>("next") == (*it)->get<int>("id"))
+            o->setActive(false);
+        } catch (...) {
+        }
       }
     }
     if (response.cursorID() == 0) {