Auto select new report sections after adding them

qgis · Jan 5, 2018 · 43aff9b · 43aff9b
1 parent 69a225a
commit 43aff9b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/src/app/layout/qgsreportorganizerwidget.cpp b/src/app/layout/qgsreportorganizerwidget.cpp
@@ -79,13 +79,19 @@ void QgsReportOrganizerWidget::setMessageBar( QgsMessageBar *bar )
 void QgsReportOrganizerWidget::addLayoutSection()
 {
   std::unique_ptr< QgsReportSectionLayout > section = qgis::make_unique< QgsReportSectionLayout >();
+  QgsAbstractReportSection *newSection = section.get();
   mSectionModel->addSection( mViewSections->currentIndex(), std::move( section ) );
+  QModelIndex newIndex = mSectionModel->indexForSection( newSection );
+  mViewSections->setCurrentIndex( newIndex );
 }
 
 void QgsReportOrganizerWidget::addFieldGroupSection()
 {
   std::unique_ptr< QgsReportSectionFieldGroup > section = qgis::make_unique< QgsReportSectionFieldGroup >();
+  QgsAbstractReportSection *newSection = section.get();
   mSectionModel->addSection( mViewSections->currentIndex(), std::move( section ) );
+  QModelIndex newIndex = mSectionModel->indexForSection( newSection );
+  mViewSections->setCurrentIndex( newIndex );
 }
 
 void QgsReportOrganizerWidget::removeSection()

diff --git a/src/app/layout/qgsreportsectionmodel.cpp b/src/app/layout/qgsreportsectionmodel.cpp
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsreportsectionmodel.h"
+#include "functional"
 
 #ifdef ENABLE_MODELTEST
 #include "modeltest.h"
@@ -187,6 +188,29 @@ QgsAbstractReportSection *QgsReportSectionModel::sectionForIndex( const QModelIn
   return static_cast<QgsAbstractReportSection *>( index.internalPointer() );
 }
 
+QModelIndex QgsReportSectionModel::indexForSection( QgsAbstractReportSection *section ) const
+{
+  if ( !section )
+    return QModelIndex();
+
+  std::function< QModelIndex( const QModelIndex &parent, QgsAbstractReportSection *section ) > findIndex = [&]( const QModelIndex & parent, QgsAbstractReportSection * section )->QModelIndex
+  {
+    for ( int row = 0; row < rowCount( parent ); ++row )
+    {
+      QModelIndex current = index( row, 0, parent );
+      if ( sectionForIndex( current ) == section )
+        return current;
+
+      QModelIndex checkChildren = findIndex( current, section );
+      if ( checkChildren.isValid() )
+        return checkChildren;
+    }
+    return QModelIndex();
+  };
+
+  return findIndex( QModelIndex(), section );
+}
+
 bool QgsReportSectionModel::removeRows( int row, int count, const QModelIndex &parent )
 {
   QgsAbstractReportSection *parentSection = sectionForIndex( parent );

diff --git a/src/app/layout/qgsreportsectionmodel.h b/src/app/layout/qgsreportsectionmodel.h
@@ -57,6 +57,8 @@ class QgsReportSectionModel : public QAbstractItemModel
      */
     QgsAbstractReportSection *sectionForIndex( const QModelIndex &index ) const;
 
+    QModelIndex indexForSection( QgsAbstractReportSection *section ) const;
+
   private:
     QgsReport *mReport = nullptr;
 };