Merge pull request #15 from andywang0607/load-exist-annotation

[format] Rename DataSaver to AnnotationManager

Author: andywang0607

AutoAnnotationTool/AutoAnnotationTool.pro

@@ -18,7 +18,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES += \
         CV/cvmodule.cpp \
         CV/cvparam.cpp \
-        datasaver.cpp \
+        annotationmanager.cpp \
         labelcollector.cpp \
         labeldatamodel.cpp \
         main.cpp \
@@ -40,7 +40,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 HEADERS += \
     CV/cvmodule.h \
     CV/cvparam.h \
-    datasaver.h \
+    annotationmanager.h \
     labelcollector.h \
     labeldata.h \
     labeldatamodel.h \

AutoAnnotationTool/datasaver.cpp renamed to AutoAnnotationTool/annotationmanager.cpp

@@ -6,19 +6,19 @@
 #include <QJsonArray>
 #include <QBuffer>
 
-#include "datasaver.h"
+#include "annotationmanager.h"
 
-DataSaver::DataSaver(QObject *parent) : QObject(parent)
+AnnotationManager::AnnotationManager(QObject *parent) : QObject(parent)
 {
 
 }
 
-LabelCollector *DataSaver::labelCollector() const
+LabelCollector *AnnotationManager::labelCollector() const
 {
     return m_labelCollector;
 }
 
-QString DataSaver::GetSavingPath()
+QString AnnotationManager::GetSavingPath()
 {
     QString imgSrc = labelCollector()->imgSrc();
     QFileInfo info(imgSrc);
@@ -27,13 +27,13 @@ QString DataSaver::GetSavingPath()
     return savingPath;
 }
 
-QString DataSaver::GetImagePath()
+QString AnnotationManager::GetImagePath()
 {
     QFileInfo info(labelCollector()->imgSrc());
     return info.fileName();
 }
 
-QString DataSaver::Base64Encode()
+QString AnnotationManager::Base64Encode()
 {
     QByteArray ba;
     QBuffer buf(&ba);
@@ -47,17 +47,17 @@ QString DataSaver::Base64Encode()
     return hexed;
 }
 
-int DataSaver::GetImageHeight()
+int AnnotationManager::GetImageHeight()
 {
     return labelCollector()->image().height();
 }
 
-int DataSaver::GetImageWidth()
+int AnnotationManager::GetImageWidth()
 {
     return labelCollector()->image().width();
 }
 
-void DataSaver::SaveData(int mode)
+void AnnotationManager::SaveAnnotation(int mode)
 {
     QString savingPath = GetSavingPath();
     QFile file(savingPath);
@@ -140,7 +140,7 @@ void DataSaver::SaveData(int mode)
     return;
 }
 
-void DataSaver::LoadData(int mode)
+void AnnotationManager::LoadAnnotation(int mode)
 {
     QFileInfo fi(GetSavingPath());
     if(!fi.exists()) return;
@@ -184,7 +184,7 @@ void DataSaver::LoadData(int mode)
     }
 }
 
-void DataSaver::setLabelCollector(LabelCollector *labelCollector)
+void AnnotationManager::setLabelCollector(LabelCollector *labelCollector)
 {
     if (m_labelCollector == labelCollector)
         return;

AutoAnnotationTool/datasaver.h renamed to AutoAnnotationTool/annotationmanager.h

@@ -1,19 +1,19 @@
-#ifndef DATASAVER_H
-#define DATASAVER_H
+#ifndef ANNOTATIONMANAGER_H
+#define ANNOTATIONMANAGER_H
 
 #include <QObject>
 #include <labelcollector.h>
-class DataSaver : public QObject
+class AnnotationManager : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(LabelCollector * labelCollector READ labelCollector WRITE setLabelCollector NOTIFY labelCollectorChanged)
 
 public:
-    explicit DataSaver(QObject *parent = nullptr);
+    explicit AnnotationManager(QObject *parent = nullptr);
     LabelCollector * labelCollector() const;
 public:
-    Q_INVOKABLE void SaveData(int mode); //0:all, 1:rectangle, 2:polygon
-    Q_INVOKABLE void LoadData(int mode); //0:all, 1:rectangle, 2:polygon
+    Q_INVOKABLE void SaveAnnotation(int mode); //0:all, 1:rectangle, 2:polygon
+    Q_INVOKABLE void LoadAnnotation(int mode); //0:all, 1:rectangle, 2:polygon
 private:
     QString GetSavingPath();
     QString GetImagePath();
@@ -33,4 +33,4 @@ public slots:
 
 };
 
-#endif // DATASAVER_H
+#endif // ANNOTATIONMANAGER_H

AutoAnnotationTool/main.cpp

@@ -5,7 +5,7 @@
 
 #include <labelcollector.h>
 #include <labeldatamodel.h>
-#include <datasaver.h>
+#include <annotationmanager.h>
 #include <CV/cvparam.h>
 
 int main(int argc, char *argv[])
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
 
     qmlRegisterType<LabelCollector>("LabelCollector", 1, 0, "LabelCollector");
     qmlRegisterType<LabelDataModel>("LabelDataModel", 1, 0, "LabelDataModel");
-    qmlRegisterType<DataSaver>("DataSaver", 1, 0, "DataSaver");
+    qmlRegisterType<AnnotationManager>("AnnotationManager", 1, 0, "AnnotationManager");
 
     CVParam cvParam;
     QQmlApplicationEngine engine;

AutoAnnotationTool/main.qml

@@ -6,7 +6,7 @@ import QtQuick.Window 2.14
 
 import LabelCollector 1.0
 import LabelDataModel 1.0
-import DataSaver 1.0
+import AnnotationManager 1.0
 
 import "Setting"
 
@@ -66,7 +66,7 @@ Window {
                 Layout.fillWidth: true
                 text: qsTr("Save File")
                 onClicked: {
-                    dataSaver.SaveData(0)
+                    dataSaver.SaveAnnotation(0)
                 }
             }
             Button{
@@ -93,7 +93,7 @@ Window {
                 labelCollector.setImage(labelCollector.image)
             }
             onImageChanged: {
-                dataSaver.LoadData(0)
+                dataSaver.LoadAnnotation(0)
             }
         }
         Rectangle{
@@ -186,7 +186,7 @@ Window {
             id:labelDataModel
             item: labelCollector
         }
-        DataSaver{
+        AnnotationManager{
             id: dataSaver
             labelCollector: labelCollector
         }