Merge pull request #24 from andywang0607/ux-improvement

Ux improvement

Author: andywang0607

AutoAnnotationTool/labelcollector.cpp

@@ -13,6 +13,7 @@ LabelCollector::LabelCollector(QQuickItem *parent) : QQuickPaintedItem(parent)
   , m_highlightPen(QPen(Qt::red, 5, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin))
   , m_pointPen(QPen(QColor(220,118,51), 7, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin))
   , m_polyPen(QPen(Qt::yellow , 3, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin))
+  , m_extensivePen(QPen(QColor("#556b2f"), 1, Qt::DashLine, Qt::SquareCap, Qt::MiterJoin)) // darkolivegreen
   , m_cvModule(std::make_unique<CvModule>())
 {
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -42,13 +43,42 @@ void LabelCollector::paint(QPainter *painter)
     }
     if (m_selectLabelIdx.empty()) {
         if (m_mouseMoved) {
+            // Draw a horizontal and vertical dash line to show cursor point
+            painter->setPen(m_extensivePen);
+            painter->drawLine(m_lastPoint.x(), 0, m_lastPoint.x(), m_scaledImg.height());
+            painter->drawLine(0, m_lastPoint.y(), m_scaledImg.width(), m_lastPoint.y());
             painter->setPen(m_normalPen);
             painter->setRenderHint(QPainter::Antialiasing);
             painter->drawRect(QRectF(m_firstPoint,m_lastPoint));
         }
     }
     if (m_dataVec.empty())
         return;
+    // Draw a horizontal and vertical dash line to show cursor point while adjust rectangle
+    if(!m_polySelectResult.isSelect && m_rectCornerSelectResult.isSelect) {
+        painter->setPen(m_extensivePen);
+        painter->drawLine(m_lastPoint.x(), 0, m_lastPoint.x(), m_scaledImg.height());
+        painter->drawLine(0, m_lastPoint.y(), m_scaledImg.width(), m_lastPoint.y());
+    } else if (!m_polySelectResult.isSelect && !m_rectCornerSelectResult.isSelect && m_rectEdgeSelectResult.isSelect) {
+        painter->setPen(m_extensivePen);
+        switch (m_rectEdgeSelectResult.line) {
+        case 0:
+            painter->drawLine(m_lastPoint.x(), 0, m_lastPoint.x(), m_scaledImg.height());
+            break;
+        case 1:
+            painter->drawLine(0, m_lastPoint.y(), m_scaledImg.width(), m_lastPoint.y());
+            break;
+        case 2:
+            painter->drawLine(m_lastPoint.x(), 0, m_lastPoint.x(), m_scaledImg.height());
+            break;
+        case 3:
+            painter->drawLine(0, m_lastPoint.y(), m_scaledImg.width(), m_lastPoint.y());
+            break;
+        default:
+            break;
+        }
+    }
+
     QVector<LabelData*>::iterator iter;
     for (iter=m_dataVec.begin();iter!=m_dataVec.end();iter++) {
         // Draw bounding box
@@ -183,14 +213,13 @@ void LabelCollector::mouseReleaseEvent(QMouseEvent *event)
     m_mousePressed = false;
     m_mouseMoved = false;
     GeometryModule::preventInvalidRect(m_dataVec, m_rectCornerSelectResult, m_rectEdgeSelectResult);
-    if (m_polySelectResult.isSelect) {
-        PolygonSelectResult defaultResult;
-        m_polySelectResult = defaultResult;
+    if (m_polySelectResult.isSelect || m_rectEdgeSelectResult.isSelect || m_rectCornerSelectResult.isSelect) {
+        m_polySelectResult.isSelect = false;
+        m_rectEdgeSelectResult.isSelect = false;
+        m_rectCornerSelectResult.isSelect = false;
         update();
         return;
     }
-    if (m_polySelectResult.isSelect || m_rectEdgeSelectResult.isSelect || m_rectCornerSelectResult.isSelect)
-        return;
     if (!m_selectLabelIdx.empty())
         return;
     if (m_firstPoint != m_lastPoint){

AutoAnnotationTool/labelcollector.h

@@ -111,6 +111,7 @@ public slots:
     QPen m_highlightPen;
     QPen m_pointPen;
     QPen m_polyPen;
+    QPen m_extensivePen;
     QVector<QPen> m_penVec;
 
     QVector<LabelData*> m_dataVec;

AutoAnnotationTool/main.qml

@@ -30,6 +30,7 @@ ApplicationWindow {
                 visible: view.currentIndex!=0
                 onClicked: {
                     view.setCurrentIndex(0)
+                    focus = false
                 }
             }
             ToolButton{
@@ -38,34 +39,39 @@ ApplicationWindow {
                                              "qrc:/icon/round_menu_black_18dp.png"
                 onClicked: {
                     (drawer.position==1) ? drawer.close() : drawer.open()
+                    focus = false
                 }
             }
             ToolButton{
                 visible: view.currentIndex==0
                 icon.source: "qrc:/icon/round_folder_open_black_18dp.png"
                 onClicked: {
                     folderDialog.open()
+                    focus = false
                 }
             }
             ToolButton{
                 visible: view.currentIndex==0
                 icon.source: "qrc:/icon/round_photo_black_18dp.png"
                 onClicked: {
                     fileDialog.open()
+                    focus = false
                 }
             }
             ToolButton{
                 visible: !(labelCollector.imgSrc == "") && view.currentIndex==0
                 icon.source: "qrc:/icon/round_save_black_18dp.png"
                 onClicked: {
                     dataSaver.saveAnnotation(0)
+                    focus = false
                 }
             }
             Item { Layout.fillWidth: true }
             ToolButton{
                 icon.source: "qrc:/icon/round_list_black_18dp.png"
                 onClicked: {
                     (listViewDrawer.position==1) ? listViewDrawer.close() : listViewDrawer.open()
+                    focus = false
                 }
             }
         }
@@ -310,4 +316,32 @@ ApplicationWindow {
         id: dataSaver
         labelCollector: labelCollector
     }
+
+    // Short cut
+    Item{
+        Action {
+            shortcut: "Space"
+            onTriggered: {
+                listViewDrawer.open()
+            }
+        }
+        Action {
+            shortcut: "D"
+            onTriggered: {
+                labelCollector.fileIdx++
+            }
+        }
+        Action {
+            shortcut: "A"
+            onTriggered: {
+                labelCollector.fileIdx--
+            }
+        }
+        Action {
+            shortcut: "S"
+            onTriggered: {
+                dataSaver.saveAnnotation(0)
+            }
+        }
+    }
 }