[chore] Modify data type of poly in label data

Note:
- From QPolygon to QPolygonF

Author: andywang0607

AutoAnnotationTool/datasaver.cpp

@@ -171,7 +171,7 @@ void DataSaver::LoadData(int mode)
             labelCollector()->appendData(tmpRect, label);
         }
         else if(shapeType == "polygon"){
-            QPolygon tmpPoly;
+            QPolygonF tmpPoly;
             for (const auto& point : pointArray) {
                 QJsonArray pointArray = point.toArray();
                 QPointF polyPoint(pointArray[0].toDouble() / labelCollector()->getFactorScaled(),

AutoAnnotationTool/labelcollector.cpp

@@ -58,7 +58,7 @@ void LabelCollector::paint(QPainter *painter){
 
         // Draw result point
         painter->setPen(m_penVec.at(2));
-        QVector<QPoint>::iterator pointIter;
+        QVector<QPointF>::iterator pointIter;
         int dataIdx = std::distance(m_dataVec.begin(),iter);
         for(pointIter=(*iter)->poly.begin();pointIter!=(*iter)->poly.end();pointIter++){
             int pointIdx = std::distance((*iter)->poly.begin(),pointIter);
@@ -261,7 +261,7 @@ void LabelCollector::mouseMoveEvent(QMouseEvent *event)
     m_lastPoint = event->localPos();
     PosBoundaryCheck(m_lastPoint);
     if(polySelectResult.isSelect){
-        m_dataVec.at(polySelectResult.boxIdx)->poly.setPoint(polySelectResult.polyIdx, m_lastPoint.toPoint());
+        m_dataVec.at(polySelectResult.boxIdx)->poly[polySelectResult.polyIdx] = m_lastPoint;
     }
     else if(!polySelectResult.isSelect && rectCornerSelectResult.isSelect){
         switch (rectCornerSelectResult.corner){
@@ -442,8 +442,8 @@ void LabelCollector::GetPolygonSelectResult(QPointF currentPos)
     PolygonSelectResult res;
     QVector<LabelData*>::iterator it;
     for(it=m_dataVec.begin(); it!=m_dataVec.end(); it++){
-        QPolygon checkedPoly = ((*it)->poly);
-        QPolygon::iterator polyIter;
+        QPolygonF checkedPoly = ((*it)->poly);
+        QPolygonF::iterator polyIter;
         for(polyIter = checkedPoly.begin(); polyIter != checkedPoly.end(); polyIter++){
             if(DistanceBetween2Point(*polyIter,currentPos) < thresDistance){
                 polySelectResult.boxIdx = std::distance(m_dataVec.begin(), it);
@@ -574,15 +574,15 @@ void LabelCollector::appendData(QRectF rect, QString labelClass)
     emit postItemAppended();
 }
 
-void LabelCollector::appendData(QPolygon poly, QString labelClass)
+void LabelCollector::appendData(QPolygonF poly, QString labelClass)
 {
     emit preItemAppended();
     LabelData *tmp = new LabelData(poly, labelClass);
     m_dataVec.push_back(tmp);
     emit postItemAppended();
 }
 
-void LabelCollector::appendData(QRectF rect, QPolygon poly, QString labelClass)
+void LabelCollector::appendData(QRectF rect, QPolygonF poly, QString labelClass)
 {
     emit preItemAppended();
     LabelData *tmp = new LabelData(rect, poly, labelClass);

AutoAnnotationTool/labelcollector.h

@@ -66,8 +66,8 @@ public slots:
 public slots:
     void appendData(QRectF rect);
     void appendData(QRectF rect, QString labelClass);
-    void appendData(QPolygon poly, QString labelClass);
-    void appendData(QRectF rect, QPolygon poly, QString labelClass);
+    void appendData(QPolygonF poly, QString labelClass);
+    void appendData(QRectF rect, QPolygonF poly, QString labelClass);
 
     void setFileIdx(int fileIdx);
 

AutoAnnotationTool/labeldata.h

@@ -12,17 +12,17 @@ struct LabelData{
         labelClass(""), rect(m_rect), penIdx(0), isSelect(false){}
     LabelData(const QRectF &m_rect, const QString m_labelClass):
         labelClass(m_labelClass), rect(m_rect), penIdx(0), isSelect(false){}
-    LabelData(const QPolygon &m_poly, const QString m_labelClass):
+    LabelData(const QPolygonF &m_poly, const QString m_labelClass):
         labelClass(m_labelClass), poly(m_poly), penIdx(0), isSelect(false){}
-    LabelData(const QRectF &m_rect, const QPolygon &m_poly, const QString m_labelClass):
+    LabelData(const QRectF &m_rect, const QPolygonF &m_poly, const QString m_labelClass):
         labelClass(m_labelClass), rect(m_rect), poly(m_poly), penIdx(0), isSelect(false){}
     LabelData(const LabelData &e)
     {
         labelClass = e.labelClass;
         penIdx = e.penIdx;
         rect = e.rect;
         isSelect = e.isSelect;
-        poly = QPolygon(e.poly);
+        poly = QPolygonF(e.poly);
     }
     ~LabelData()
     {
@@ -31,7 +31,7 @@ struct LabelData{
     int penIdx; //0: normal, 1:highlight
     bool isSelect;
     QRectF rect;
-    QPolygon poly; // record scaled point show in GUI
+    QPolygonF poly; // record scaled point show in GUI
 };
 
 #endif // LABELDATA_H