Merge pull request #13 from andywang0607/param-setting-window

andywang0607 · andywang0607 · commit b11ef668121e · 2020-11-19T01:05:46.000+08:00
Param setting window
diff --git a/AutoAnnotationTool/AutoAnnotationTool.pro b/AutoAnnotationTool/AutoAnnotationTool.pro
@@ -17,6 +17,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += \
         CV/cvmodule.cpp \
+        CV/cvparam.cpp \
         datasaver.cpp \
         labelcollector.cpp \
         labeldatamodel.cpp \
@@ -38,6 +39,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 HEADERS += \
     CV/cvmodule.h \
+    CV/cvparam.h \
     datasaver.h \
     labelcollector.h \
     labeldata.h \
diff --git a/AutoAnnotationTool/CV/cvmodule.cpp b/AutoAnnotationTool/CV/cvmodule.cpp
@@ -22,14 +22,14 @@ void CVModule::GetCroppedImg(QRectF rect, qreal factor)
     cv::imshow("Cropped", croppedImg);
 }
 
-void CVModule::GetContour(QVector<LabelData *> &dataVec, int labelIdx, qreal factor)
+void CVModule::GetContour(QVector<LabelData *> &dataVec, int labelIdx, qreal factor, CVParam *param)
 {
     qDebug()<< Q_FUNC_INFO << "start";
     if(m_imgOri.empty()) return;
 
     // grabcut
     cv::Mat grab, bg, fg;
-    cv::grabCut(m_imgOri, grab, GetROIRect(dataVec.at(labelIdx)->rect, factor), bg, fg, 5, cv::GC_INIT_WITH_RECT);
+    cv::grabCut(m_imgOri, grab, GetROIRect(dataVec.at(labelIdx)->rect, factor), bg, fg, param->iteration(), cv::GC_INIT_WITH_RECT);
 
     // equalizeHist
     equalizeHist(grab, grab);
@@ -59,7 +59,7 @@ void CVModule::GetContour(QVector<LabelData *> &dataVec, int labelIdx, qreal fac
         }
     }
     std::vector<std::vector<cv::Point>> contoursPoly(contours.size());
-    approxPolyDP(cv::Mat(contours[largestContourIndex]), contoursPoly[largestContourIndex], 1, true);
+    approxPolyDP(cv::Mat(contours[largestContourIndex]), contoursPoly[largestContourIndex], param->epsilon(), true);
     SetContours(dataVec, labelIdx, contoursPoly.at(largestContourIndex), factor);
     qDebug()<< Q_FUNC_INFO << "end";
 }
diff --git a/AutoAnnotationTool/CV/cvmodule.h b/AutoAnnotationTool/CV/cvmodule.h
@@ -1,6 +1,7 @@
 #ifndef CVMODULE_H
 #define CVMODULE_H
 #include "labeldata.h"
+#include "CV/cvparam.h"
 
 #include <QRectF>
 #include <QString>
@@ -14,7 +15,7 @@ class CVModule
 public:
     CVModule();
     void GetCroppedImg(QRectF rect, qreal factor);
-    void GetContour(QVector<LabelData*> &dataVec, int labelIdx, qreal factor);
+    void GetContour(QVector<LabelData*> &dataVec, int labelIdx, qreal factor, CVParam *param);
     void GetOriginImg(QString imgSrc);
 private:
     cv::Rect GetROIRect(QRectF rect, qreal factor);
diff --git a/AutoAnnotationTool/CV/cvparam.cpp b/AutoAnnotationTool/CV/cvparam.cpp
@@ -0,0 +1,36 @@
+#include "cvparam.h"
+
+CVParam::CVParam(QObject *parent) : QObject(parent)
+  , m_iteration(4)
+  , m_epsilon(1)
+{
+
+}
+
+int CVParam::iteration() const
+{
+    return m_iteration;
+}
+
+qreal CVParam::epsilon() const
+{
+    return m_epsilon;
+}
+
+void CVParam::setIteration(int iteration)
+{
+    if (m_iteration == iteration)
+        return;
+
+    m_iteration = iteration;
+    emit iterationChanged(m_iteration);
+}
+
+void CVParam::setEpsilon(qreal epsilon)
+{
+    if (qFuzzyCompare(m_epsilon, epsilon))
+        return;
+
+    m_epsilon = epsilon;
+    emit epsilonChanged(m_epsilon);
+}
diff --git a/AutoAnnotationTool/CV/cvparam.h b/AutoAnnotationTool/CV/cvparam.h
@@ -0,0 +1,34 @@
+#ifndef CVPARAM_H
+#define CVPARAM_H
+
+#include <QObject>
+
+class CVParam : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int iteration READ iteration WRITE setIteration NOTIFY iterationChanged)
+    Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon NOTIFY epsilonChanged)
+
+public:
+    explicit CVParam(QObject *parent = nullptr);
+
+    int iteration() const;
+
+    qreal epsilon() const;
+
+public slots:
+    void setIteration(int iteration);
+
+    void setEpsilon(qreal epsilon);
+
+signals:
+
+    void iterationChanged(int iteration);
+    void epsilonChanged(qreal epsilon);
+
+private:
+    int m_iteration;
+    qreal m_epsilon;
+};
+
+#endif // CVPARAM_H
diff --git a/AutoAnnotationTool/Setting/CVParamSettingPage.qml b/AutoAnnotationTool/Setting/CVParamSettingPage.qml
@@ -0,0 +1,61 @@
+import QtQuick 2.0
+import QtQuick.Controls 2.14
+import QtQuick.Layouts 1.0
+
+Page {
+    property int defaultIteration: 4
+    property double defaultEpsilon: 1
+    ColumnLayout{
+        anchors.fill: parent
+        anchors.margins: 20
+        Layout.fillWidth: true
+        RowLayout{
+            Label{
+                id: iterationLabel
+                Layout.preferredWidth: 100
+                text: qsTr("Iteration")
+            }
+            Label{
+                id: iterationShow
+                horizontalAlignment: Text.AlignHCenter
+                Layout.preferredWidth: 60
+                text: CVParam.iteration
+            }
+            Slider {
+                id: iterationSlider
+                Layout.fillWidth: true
+                value: defaultIteration
+                from: 1
+                to: 10
+                stepSize :1
+                onValueChanged: {
+                    CVParam.iteration = value
+                }
+            }
+        }
+        RowLayout{
+            Label{
+                id: epsilonLabel
+                Layout.preferredWidth: 100
+                text: qsTr("Epsilon")
+            }
+            Label{
+                id: epsilonShow
+                horizontalAlignment: Text.AlignHCenter
+                Layout.preferredWidth: 60
+                text: CVParam.epsilon
+            }
+            Slider {
+                id: epsilonLabelSlider
+                Layout.fillWidth: true
+                value: defaultEpsilon
+                from: 1
+                to: 10
+                stepSize :0.01
+                onValueChanged: {
+                    CVParam.epsilon = value.toFixed(2)
+                }
+            }
+        }
+    }
+}
diff --git a/AutoAnnotationTool/Setting/SettingWindow.qml b/AutoAnnotationTool/Setting/SettingWindow.qml
@@ -0,0 +1,42 @@
+import QtQuick 2.0
+import QtQuick.Controls 2.14
+import QtQuick.Layouts 1.0
+import QtQuick.Window 2.14
+
+Window {
+    id: settingWindow
+    width: 350
+    height: 150
+    title: qsTr("Setting")
+    flags: Qt.Window
+    modality: Qt.WindowModal
+    visible: false
+    property color tabButtonColorPressed: "#CCCCCC"
+    property color tabButtonColorReleased: "#808080"
+
+    TabBar {
+        id: settingWindowTab
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+        height: 30
+        TabButton{
+            text: qsTr("CV Setting")
+            background: Rectangle {
+                color: settingWindowTab.currentIndex == 0 ? tabButtonColorPressed : tabButtonColorReleased
+            }
+        }
+    }
+    SwipeView{
+        id: settingSwipe
+        interactive: false
+        visible: true
+        width: parent.width
+        height: parent.height - settingWindowTab.height
+        anchors.top: settingWindowTab.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        CVParamSettingPage{
+            id: cvParamSettingPage
+        }
+    }
+}
diff --git a/AutoAnnotationTool/labelcollector.cpp b/AutoAnnotationTool/labelcollector.cpp
@@ -27,7 +27,7 @@ LabelCollector::LabelCollector(QQuickItem *parent) : QQuickPaintedItem(parent)
 
     menu.addAction(QStringLiteral("Get Polygon"),this, [&](){
         setCursor(QCursor(Qt::BusyCursor));
-        future = QtConcurrent::run(cvModule.get(), &CVModule::GetContour, m_dataVec, m_selectLabelIdx.front(), getFactorScaled());
+        future = QtConcurrent::run(cvModule.get(), &CVModule::GetContour, m_dataVec, m_selectLabelIdx.front(), getFactorScaled(), m_cvParam);
         watcher.setFuture(future);
     });
 
@@ -164,6 +164,11 @@ int LabelCollector::fileIdx() const
     return m_fileIdx;
 }
 
+CVParam *LabelCollector::cvParam() const
+{
+    return m_cvParam;
+}
+
 void LabelCollector::setImage(const QImage &image){
     if(image.isNull()){
         qDebug() << Q_FUNC_INFO << "image is Null";
@@ -570,3 +575,12 @@ void LabelCollector::setFileIdx(int fileIdx)
     emit fileIdxChanged(m_fileIdx);
     setImgSrc(fileInfoList.at(m_fileIdx).absoluteFilePath());
 }
+
+void LabelCollector::setCvParam(CVParam *cvParam)
+{
+    if (m_cvParam == cvParam)
+        return;
+
+    m_cvParam = cvParam;
+    emit cvParamChanged(m_cvParam);
+}
diff --git a/AutoAnnotationTool/labelcollector.h b/AutoAnnotationTool/labelcollector.h
@@ -22,13 +22,15 @@
 #include "labeldata.h"
 #include "mouseselectresult.h"
 #include "CV/cvmodule.h"
+#include "CV/cvparam.h"
 
 class LabelCollector : public QQuickPaintedItem
 {
     Q_OBJECT
     Q_PROPERTY(QImage image READ image WRITE setImage NOTIFY imageChanged)
     Q_PROPERTY(QString imgSrc READ imgSrc WRITE setImgSrc NOTIFY imgSrcChanged)
     Q_PROPERTY(int fileIdx READ fileIdx WRITE setFileIdx NOTIFY fileIdxChanged)
+    Q_PROPERTY(CVParam* cvParam READ cvParam WRITE setCvParam NOTIFY cvParamChanged)
 
 public:
     explicit LabelCollector(QQuickItem *parent = nullptr);
@@ -48,6 +50,8 @@ class LabelCollector : public QQuickPaintedItem
     qreal getFactorScaled() const;
     int fileIdx() const;
 
+    CVParam *cvParam() const;
+
 private:
     QImage m_image;
     QImage m_imageScaled;
@@ -64,6 +68,8 @@ public slots:
 
     void setFileIdx(int fileIdx);
 
+    void setCvParam(CVParam* cvParam);
+
 signals:
     void imageChanged();
     void imgSrcChanged(QString imgSrc);
@@ -81,6 +87,8 @@ public slots:
     void fileIdxChanged(int fileIdx);
 
     //mouse behavior
+    void cvParamChanged(CVParam* cvParam);
+
 protected:
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
@@ -121,6 +129,7 @@ public slots:
     QFuture<void> future;
     QFutureWatcher<void> watcher;
     int m_fileIdx;
+    CVParam* m_cvParam;
 };
 
 #endif // LABELCOLLECTOR_H
diff --git a/AutoAnnotationTool/main.cpp b/AutoAnnotationTool/main.cpp
@@ -1,10 +1,12 @@
 #include <QApplication>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
+#include <QQmlContext>
 
 #include <labelcollector.h>
 #include <labeldatamodel.h>
 #include <datasaver.h>
+#include <CV/cvparam.h>
 
 int main(int argc, char *argv[])
 {
@@ -16,7 +18,9 @@ int main(int argc, char *argv[])
     qmlRegisterType<LabelDataModel>("LabelDataModel", 1, 0, "LabelDataModel");
     qmlRegisterType<DataSaver>("DataSaver", 1, 0, "DataSaver");
 
+    CVParam cvParam;
     QQmlApplicationEngine engine;
+    engine.rootContext()->setContextProperty("CVParam", &cvParam);
     const QUrl url(QStringLiteral("qrc:/main.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
                      &app, [url](QObject *obj, const QUrl &objUrl) {
diff --git a/AutoAnnotationTool/main.qml b/AutoAnnotationTool/main.qml
@@ -8,6 +8,8 @@ import LabelCollector 1.0
 import LabelDataModel 1.0
 import DataSaver 1.0
 
+import "Setting"
+
 Window {
     visible: true
     width: 870
@@ -67,13 +69,23 @@ Window {
                     dataSaver.SaveData(0)
                 }
             }
+            Button{
+                id:settingButton
+                Layout.fillHeight: true
+                Layout.fillWidth: true
+                text: qsTr("Setting")
+                onClicked: {
+                    settingWindow.show()
+                }
+            }
         }
         LabelCollector{
             id:labelCollector
             Layout.alignment: Qt.AlignLeft
             Layout.fillWidth: true
             Layout.fillHeight: true
             Layout.preferredWidth: 500
+            cvParam: CVParam
             onWidthChanged: {
                 labelCollector.setImage(labelCollector.image)
             }
@@ -176,4 +188,7 @@ Window {
             labelCollector: labelCollector
         }
     }
+    SettingWindow{
+        id: settingWindow
+    }
 }
diff --git a/AutoAnnotationTool/qml.qrc b/AutoAnnotationTool/qml.qrc
@@ -1,5 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
+        <file>Setting/SettingWindow.qml</file>
+        <file>Setting/CVParamSettingPage.qml</file>
     </qresource>
 </RCC>

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@ void CVModule::GetCroppedImg(QRectF rect, qreal factor)`
`22`	`22`	`cv::imshow("Cropped", croppedImg);`
`23`	`23`	`}`
`24`	`24`
`25`		`-void CVModule::GetContour(QVector<LabelData *> &dataVec, int labelIdx, qreal factor)`
	`25`	`+void CVModule::GetContour(QVector<LabelData > &dataVec, int labelIdx, qreal factor, CVParam param)`
`26`	`26`	`{`
`27`	`27`	`qDebug()<< Q_FUNC_INFO << "start";`
`28`	`28`	`if(m_imgOri.empty()) return;`
`29`	`29`
`30`	`30`	`// grabcut`
`31`	`31`	`cv::Mat grab, bg, fg;`
`32`		`- cv::grabCut(m_imgOri, grab, GetROIRect(dataVec.at(labelIdx)->rect, factor), bg, fg, 5, cv::GC_INIT_WITH_RECT);`
	`32`	`+ cv::grabCut(m_imgOri, grab, GetROIRect(dataVec.at(labelIdx)->rect, factor), bg, fg, param->iteration(), cv::GC_INIT_WITH_RECT);`
`33`	`33`
`34`	`34`	`// equalizeHist`
`35`	`35`	`equalizeHist(grab, grab);`
`@@ -59,7 +59,7 @@ void CVModule::GetContour(QVector<LabelData *> &dataVec, int labelIdx, qreal fac`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`std::vector<std::vector<cv::Point>> contoursPoly(contours.size());`
`62`		`- approxPolyDP(cv::Mat(contours[largestContourIndex]), contoursPoly[largestContourIndex], 1, true);`
	`62`	`+ approxPolyDP(cv::Mat(contours[largestContourIndex]), contoursPoly[largestContourIndex], param->epsilon(), true);`
`63`	`63`	`SetContours(dataVec, labelIdx, contoursPoly.at(largestContourIndex), factor);`
`64`	`64`	`qDebug()<< Q_FUNC_INFO << "end";`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ import LabelCollector 1.0`
`8`	`8`	`import LabelDataModel 1.0`
`9`	`9`	`import DataSaver 1.0`
`10`	`10`
	`11`	`+import "Setting"`
	`12`	`+`
`11`	`13`	`Window {`
`12`	`14`	`visible: true`
`13`	`15`	`width: 870`
`@@ -67,13 +69,23 @@ Window {`
`67`	`69`	`dataSaver.SaveData(0)`
`68`	`70`	`}`
`69`	`71`	`}`
	`72`	`+ Button{`
	`73`	`+ id:settingButton`
	`74`	`+ Layout.fillHeight: true`
	`75`	`+ Layout.fillWidth: true`
	`76`	`+ text: qsTr("Setting")`
	`77`	`+ onClicked: {`
	`78`	`+ settingWindow.show()`
	`79`	`+ }`
	`80`	`+ }`
`70`	`81`	`}`
`71`	`82`	`LabelCollector{`
`72`	`83`	`id:labelCollector`
`73`	`84`	`Layout.alignment: Qt.AlignLeft`
`74`	`85`	`Layout.fillWidth: true`
`75`	`86`	`Layout.fillHeight: true`
`76`	`87`	`Layout.preferredWidth: 500`
	`88`	`+ cvParam: CVParam`
`77`	`89`	`onWidthChanged: {`
`78`	`90`	`labelCollector.setImage(labelCollector.image)`
`79`	`91`	`}`
`@@ -176,4 +188,7 @@ Window {`
`176`	`188`	`labelCollector: labelCollector`
`177`	`189`	`}`
`178`	`190`	`}`
	`191`	`+ SettingWindow{`
	`192`	`+ id: settingWindow`
	`193`	`+ }`
`179`	`194`	`}`