save next and previous annotation to database

Author: chriamue

source/annotatorlib/source/Loader/MySQLLoader.cpp

@@ -46,26 +46,26 @@ void MySQLLoader::loadAttributes(Poco::Data::Session &sqlSession,
 
 void MySQLLoader::loadAnnotations(Poco::Data::Session &sqlSession,
                                   Session *session) {
-  typedef Poco::Tuple<std::string, std::string, std::string, std::string, float,
+  typedef Poco::Tuple<std::string, std::string, std::string, std::string, std::string, float,
                       float, float, float, std::string>
       AnnotationTuple;
   std::vector<AnnotationTuple> annotations;
 
   Poco::Data::Statement statement(sqlSession);
-  statement << "SELECT `id`,`next`,`object`, `frame`, `x`, `y`, `width`, "
+  statement << "SELECT `id`,`next`, `previous`,`object`, `frame`, `x`, `y`, `width`, "
                "`height`, `type` FROM `annotations`",
       into(annotations);
   statement.execute();
 
   for (AnnotationTuple at : annotations) {
-    unsigned long object_id = std::stol(at.get<2>());
-    unsigned long frame_id = std::stol(at.get<3>());
-
-    float x = at.get<4>();
-    float y = at.get<5>();
-    float width = at.get<6>();
-    float height = at.get<7>();
-    AnnotationType type = AnnotationTypeFromString(at.get<8>());
+    unsigned long object_id = std::stol(at.get<3>());
+    unsigned long frame_id = std::stol(at.get<4>());
+
+    float x = at.get<5>();
+    float y = at.get<6>();
+    float width = at.get<7>();
+    float height = at.get<8>();
+    AnnotationType type = AnnotationTypeFromString(at.get<9>());
 
     shared_ptr<Object> o = session->getObject(object_id);
     shared_ptr<Frame> f = session->getFrame(frame_id);

source/annotatorlib/source/Storage/MySQLStorage.cpp

@@ -33,6 +33,7 @@ bool MySQLStorage::addAnnotation(shared_ptr<Annotation> annotation,
     struct Annotation {
       std::string id;
       std::string next;
+      std::string previous;
       std::string object;
       std::string frame;
       float x;
@@ -44,23 +45,25 @@ bool MySQLStorage::addAnnotation(shared_ptr<Annotation> annotation,
     Annotation a_ = {
         std::to_string(annotation->getId()),
         "0",
+        "0",
         std::to_string(annotation->getObject()->getId()),
         "0",
         annotation->getX(),
         annotation->getY(),
         annotation->getWidth(),
         annotation->getHeight(),
         AnnotatorLib::AnnotationTypeToString(annotation->getType())};
-    if (annotation->getNext()) a_.next = std::to_string(annotation->getId());
+    if (annotation->getNext()) a_.next = std::to_string(annotation->getNext()->getId());
+    if (annotation->getPrevious()) a_.previous = std::to_string(annotation->getPrevious()->getId());
     if (annotation->getFrame())
       a_.frame = std::to_string(annotation->getFrame()->getId());
 
     Poco::Data::Statement statement = getStatement();
 
     try {
-      statement << "INSERT IGNORE INTO `annotations` VALUES(?, ?, ?, ?, ?, ?, "
+      statement << "INSERT IGNORE INTO `annotations` VALUES(?, ?, ?, ?, ?, ?, ?, "
                    "?, ?, ?);",
-          use(a_.id), use(a_.next), use(a_.object), use(a_.frame), use(a_.x),
+          use(a_.id), use(a_.next), use(a_.previous), use(a_.object), use(a_.frame), use(a_.x),
           use(a_.y), use(a_.width), use(a_.height), use(a_.type);
       statement.execute();
     } catch (Poco::Exception &e) {
@@ -91,6 +94,7 @@ void MySQLStorage::updateAnnotation(shared_ptr<Annotation> annotation) {
     struct Annotation {
       std::string id;
       std::string next;
+      std::string previous;
       std::string object;
       std::string frame;
       float x;
@@ -102,24 +106,26 @@ void MySQLStorage::updateAnnotation(shared_ptr<Annotation> annotation) {
     Annotation a_ = {
         std::to_string(annotation->getId()),
         "0",
+        "0",
         std::to_string(annotation->getObject()->getId()),
         "0",
         annotation->getX(),
         annotation->getY(),
         annotation->getWidth(),
         annotation->getHeight(),
         AnnotatorLib::AnnotationTypeToString(annotation->getType())};
-    if (annotation->getNext()) a_.next = std::to_string(annotation->getId());
+    if (annotation->getNext()) a_.next = std::to_string(annotation->getNext()->getId());
+    if (annotation->getPrevious()) a_.previous = std::to_string(annotation->getPrevious()->getId());
     if (annotation->getFrame())
       a_.frame = std::to_string(annotation->getFrame()->getId());
 
     Poco::Data::Statement statement = getStatement();
 
     try {
       statement
-          << "UPDATE `annotations` SET `id`=?, `next`=?, `object`=?, `frame`=?,"
+          << "UPDATE `annotations` SET `id`=?, `next`=?, `previous`=?, `object`=?, `frame`=?,"
              "`x`=?, `y`=?, `width`=?, `height`=?, `type`=? WHERE `id`=?;",
-          use(a_.id), use(a_.next), use(a_.object), use(a_.frame), use(a_.x),
+          use(a_.id), use(a_.next), use(a_.previous), use(a_.object), use(a_.frame), use(a_.x),
           use(a_.y), use(a_.width), use(a_.height), use(a_.type), use(a_.id);
       statement.execute();
     } catch (Poco::Exception &e) {
@@ -285,6 +291,7 @@ void MySQLStorage::createTables() {
   statement << "CREATE TABLE IF NOT EXISTS `annotations` ( \
            `id` char(16) NOT NULL, \
             `next` char(16) NOT NULL, \
+            `previous` char(16) NOT NULL, \
             `object` char(16) NOT NULL, \
             `frame` char(16) NOT NULL, \
             `x` float NOT NULL default 0, \