From 28a95aedeeb454ec21be1a26bec0323863d0664b Mon Sep 17 00:00:00 2001
From: Jeremy Hu <huxingyi@msn.com>
Date: Tue, 10 Apr 2018 16:44:02 +0800
Subject: [PATCH] Only allow item been selected when visible

---
 src/skeletongraphicswidget.cpp | 41 +++++++++++++++++++++++-----------
 src/skeletongraphicswidget.h   |  2 ++
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/skeletongraphicswidget.cpp b/src/skeletongraphicswidget.cpp
index c385dbfc..98e6f269 100644
--- a/src/skeletongraphicswidget.cpp
+++ b/src/skeletongraphicswidget.cpp
@@ -607,7 +607,10 @@ bool SkeletonGraphicsWidget::mousePress(QMouseEvent *event)
                 QPointF sideProfile = mainProfile;
                 if (m_addFromNodeItem) {
                     auto itemIt = nodeItemMap.find(m_addFromNodeItem->id());
-                    sideProfile.setX(itemIt->second.second->origin().x());
+                    if (SkeletonProfile::Main == m_addFromNodeItem->profile())
+                        sideProfile.setX(itemIt->second.second->origin().x());
+                    else
+                        mainProfile.setX(itemIt->second.first->origin().x());
                 } else {
                     if (mainProfile.x() >= scene()->width() / 2) {
                         sideProfile.setX(mainProfile.x() - scene()->width() / 4);
@@ -636,11 +639,9 @@ bool SkeletonGraphicsWidget::mousePress(QMouseEvent *event)
                         clearRangeSelection();
                     }
                     if (m_hoveredNodeItem) {
-                        m_hoveredNodeItem->setChecked(true);
-                        m_rangeSelectionSet.insert(m_hoveredNodeItem);
+                        addItemToRangeSelection(m_hoveredNodeItem);
                     } else if (m_hoveredEdgeItem) {
-                        m_hoveredEdgeItem->setChecked(true);
-                        m_rangeSelectionSet.insert(m_hoveredEdgeItem);
+                        addItemToRangeSelection(m_hoveredEdgeItem);
                     }
                 }
                 if (!m_rangeSelectionSet.empty()) {
@@ -958,6 +959,10 @@ void SkeletonGraphicsWidget::partVisibleStateChanged(QUuid partId)
 
 bool SkeletonGraphicsWidget::checkSkeletonItem(QGraphicsItem *item, bool checked)
 {
+    if (checked) {
+        if (!item->isVisible())
+            return false;
+    }
     if (item->data(0) == "node") {
         SkeletonGraphicsNodeItem *nodeItem = (SkeletonGraphicsNodeItem *)item;
         if (checked != nodeItem->checked())
@@ -1115,8 +1120,7 @@ void SkeletonGraphicsWidget::selectPartAll()
         }
         if (node->partId != choosenPartId)
             continue;
-        checkSkeletonItem(item, true);
-        m_rangeSelectionSet.insert(item);
+        addItemToRangeSelection(item);
     }
     for (const auto &it: edgeItemMap) {
         SkeletonGraphicsEdgeItem *item = SkeletonProfile::Main == choosenProfile ? it.second.first : it.second.second;
@@ -1128,8 +1132,7 @@ void SkeletonGraphicsWidget::selectPartAll()
         }
         if (edge->partId != choosenPartId)
             continue;
-        checkSkeletonItem(item, true);
-        m_rangeSelectionSet.insert(item);
+        addItemToRangeSelection(item);
     }
 }
 
@@ -1144,16 +1147,28 @@ void SkeletonGraphicsWidget::selectAll()
     }
     for (const auto &it: nodeItemMap) {
         SkeletonGraphicsNodeItem *item = SkeletonProfile::Main == choosenProfile ? it.second.first : it.second.second;
-        checkSkeletonItem(item, true);
-        m_rangeSelectionSet.insert(item);
+        addItemToRangeSelection(item);
     }
     for (const auto &it: edgeItemMap) {
         SkeletonGraphicsEdgeItem *item = SkeletonProfile::Main == choosenProfile ? it.second.first : it.second.second;
-        checkSkeletonItem(item, true);
-        m_rangeSelectionSet.insert(item);
+        addItemToRangeSelection(item);
     }
 }
 
+void SkeletonGraphicsWidget::addItemToRangeSelection(QGraphicsItem *item)
+{
+    if (!item->isVisible())
+        return;
+    checkSkeletonItem(item, true);
+    m_rangeSelectionSet.insert(item);
+}
+
+void SkeletonGraphicsWidget::removeItemFromRangeSelection(QGraphicsItem *item)
+{
+    checkSkeletonItem(item, false);
+    m_rangeSelectionSet.erase(item);
+}
+
 void SkeletonGraphicsWidget::unselectAll()
 {
     for (const auto &item: m_rangeSelectionSet) {
diff --git a/src/skeletongraphicswidget.h b/src/skeletongraphicswidget.h
index a88b5521..3d641bc2 100644
--- a/src/skeletongraphicswidget.h
+++ b/src/skeletongraphicswidget.h
@@ -332,6 +332,8 @@ private:
     void removeItem(QGraphicsItem *item);
     QVector2D centerOfNodeItemSet(const std::set<SkeletonGraphicsNodeItem *> &set);
     bool isSingleNodeSelected();
+    void addItemToRangeSelection(QGraphicsItem *item);
+    void removeItemFromRangeSelection(QGraphicsItem *item);
 private:
     QGraphicsPixmapItem *m_backgroundItem;
     const SkeletonDocument *m_document;