[feature] CTRL-click in composer to select items below other items (fix #4358)

nyalldawson · mhugent · commit aaa2fcf47244 · 2013-09-21T08:02:59.000+02:00
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -170,10 +170,16 @@ int QgsComposition::numPages() const
 
 QgsComposerItem* QgsComposition::composerItemAt( const QPointF & position )
 {
+  return composerItemAt( position, 0 );
+}
+
+QgsComposerItem* QgsComposition::composerItemAt( const QPointF & position, const QgsComposerItem* belowItem )
+{
+  //get a list of items which intersect the specified position, in descending z order
   QList<QGraphicsItem*> itemList;
   if ( mSelectionTolerance <= 0.0 )
   {
-    itemList = items( position );
+    itemList = items( position, Qt::IntersectsItemShape, Qt::DescendingOrder );
   }
   else
   {
@@ -182,13 +188,27 @@ QgsComposerItem* QgsComposition::composerItemAt( const QPointF & position )
   }
   QList<QGraphicsItem *>::iterator itemIt = itemList.begin();
 
+  bool foundBelowItem = false;
   for ( ; itemIt != itemList.end(); ++itemIt )
   {
     QgsComposerItem* composerItem = dynamic_cast<QgsComposerItem *>( *itemIt );
     QgsPaperItem* paperItem = dynamic_cast<QgsPaperItem*>( *itemIt );
     if ( composerItem && !paperItem )
     {
-      return composerItem;
+      // If we are not checking for a an item below a specified item, or if we've
+      // already found that item, then we've found our target
+      if ( ! belowItem || foundBelowItem )
+      {
+        return composerItem;
+      }
+      else
+      {
+        if ( composerItem == belowItem )
+        {
+          //Target item is next in list
+          foundBelowItem = true;
+        }
+      }
     }
   }
   return 0;
diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -131,6 +131,11 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
     /**Returns the topmost composer item. Ignores mPaperItem*/
     QgsComposerItem* composerItemAt( const QPointF & position );
 
+    /**Returns the highest composer item at a specified position which is below a specified item. Ignores mPaperItem
+      @note Added in QGIS 2.1
+    */
+    QgsComposerItem* composerItemAt( const QPointF & position, const QgsComposerItem* belowItem );
+
     /** Returns the page number (0-bsaed) given a coordinate */
     int pageNumberAt( const QPointF& position ) const;
 
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -89,13 +89,43 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )
       //select/deselect items and pass mouse event further
     case Select:
     {
+      QgsComposerItem* selectedItem;
+      QgsComposerItem* previousSelectedItem = 0;
+
+      if ( e->modifiers() & Qt::ControlModifier )
+      {
+        //CTRL modifier, so we are trying to select the next item below the current one
+        //first, find currently selected item
+        QList<QgsComposerItem*> selectedItems = composition()->selectedComposerItems();
+        if ( selectedItems.size() > 0 )
+        {
+          previousSelectedItem = selectedItems.at( 0 );
+        }
+      }
+
       if ( !( e->modifiers() & Qt::ShiftModifier ) ) //keep selection if shift key pressed
       {
         composition()->clearSelection();
       }
 
-      //select topmost item at position of event
-      QgsComposerItem* selectedItem = composition()->composerItemAt( scenePoint );
+      if ( previousSelectedItem )
+      {
+        //select highest item just below previously selected item at position of event
+        selectedItem = composition()->composerItemAt( scenePoint, previousSelectedItem );
+
+        //if we didn't find a lower item we'll use the top-most as fall-back
+        //this duplicates mapinfo/illustrator/etc behaviour where ctrl-clicks are "cyclic"
+        if ( !selectedItem )
+        {
+          selectedItem = composition()->composerItemAt( scenePoint );
+        }
+      }
+      else
+      {
+        //select topmost item at position of event
+        selectedItem = composition()->composerItemAt( scenePoint );
+      }
+
       if ( !selectedItem )
       {
         break;

Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,16 @@ int QgsComposition::numPages() const`
`170`	`170`
`171`	`171`	`QgsComposerItem* QgsComposition::composerItemAt( const QPointF & position )`
`172`	`172`	`{`
	`173`	`+ return composerItemAt( position, 0 );`
	`174`	`+}`
	`175`	`+`
	`176`	`+QgsComposerItem* QgsComposition::composerItemAt( const QPointF & position, const QgsComposerItem* belowItem )`
	`177`	`+{`
	`178`	`+ //get a list of items which intersect the specified position, in descending z order`
`173`	`179`	`QList<QGraphicsItem*> itemList;`
`174`	`180`	`if ( mSelectionTolerance <= 0.0 )`
`175`	`181`	`{`
`176`		`- itemList = items( position );`
	`182`	`+ itemList = items( position, Qt::IntersectsItemShape, Qt::DescendingOrder );`
`177`	`183`	`}`
`178`	`184`	`else`
`179`	`185`	`{`
`@@ -182,13 +188,27 @@ QgsComposerItem* QgsComposition::composerItemAt( const QPointF & position )`
`182`	`188`	`}`
`183`	`189`	`QList<QGraphicsItem *>::iterator itemIt = itemList.begin();`
`184`	`190`
	`191`	`+ bool foundBelowItem = false;`
`185`	`192`	`for ( ; itemIt != itemList.end(); ++itemIt )`
`186`	`193`	`{`
`187`	`194`	`QgsComposerItem* composerItem = dynamic_cast<QgsComposerItem >( itemIt );`
`188`	`195`	`QgsPaperItem* paperItem = dynamic_cast<QgsPaperItem>( itemIt );`
`189`	`196`	`if ( composerItem && !paperItem )`
`190`	`197`	`{`
`191`		`- return composerItem;`
	`198`	`+ // If we are not checking for a an item below a specified item, or if we've`
	`199`	`+ // already found that item, then we've found our target`
	`200`	`+ if ( ! belowItem \|\| foundBelowItem )`
	`201`	`+ {`
	`202`	`+ return composerItem;`
	`203`	`+ }`
	`204`	`+ else`
	`205`	`+ {`
	`206`	`+ if ( composerItem == belowItem )`
	`207`	`+ {`
	`208`	`+ //Target item is next in list`
	`209`	`+ foundBelowItem = true;`
	`210`	`+ }`
	`211`	`+ }`
`192`	`212`	`}`
`193`	`213`	`}`
`194`	`214`	`return 0;`