Add a row method to QgsAbstractReportSection

nyalldawson · nyalldawson · commit f4a99b65bbae · 2018-01-05T11:15:04.000+10:00
diff --git a/python/core/layout/qgsabstractreportsection.sip b/python/core/layout/qgsabstractreportsection.sip
@@ -216,6 +216,11 @@ Return the number of child sections for this report section. The child
 sections form the body of the report section.
 
 .. seealso:: :py:func:`children()`
+%End
+
+    int row() const;
+%Docstring
+Returns the row number of the section within it's parent section.
 %End
 
     QList< QgsAbstractReportSection * > childSections() const;
diff --git a/src/core/layout/qgsabstractreportsection.cpp b/src/core/layout/qgsabstractreportsection.cpp
@@ -319,6 +319,14 @@ void QgsAbstractReportSection::setFooter( QgsLayout *footer )
   mFooter.reset( footer );
 }
 
+int QgsAbstractReportSection::row() const
+{
+  if ( mParent )
+    return mParent->childSections().indexOf( const_cast<QgsAbstractReportSection *>( this ) );
+
+  return 0;
+}
+
 QgsAbstractReportSection *QgsAbstractReportSection::childSection( int index )
 {
   return mChildren.value( index );
diff --git a/src/core/layout/qgsabstractreportsection.h b/src/core/layout/qgsabstractreportsection.h
@@ -203,6 +203,11 @@ class CORE_EXPORT QgsAbstractReportSection : public QgsAbstractLayoutIterator
      */
     int childCount() const { return mChildren.count(); }
 
+    /**
+     * Returns the row number of the section within it's parent section.
+     */
+    int row() const;
+
     /**
      * Return all child sections for this report section. The child
      * sections form the body of the report section.
diff --git a/tests/src/python/test_qgsreport.py b/tests/src/python/test_qgsreport.py
@@ -75,13 +75,15 @@ def testchildSections(self):
         self.assertEqual(r.childSections(), [child1])
         self.assertEqual(r.childSection(0), child1)
         self.assertEqual(child1.parentSection(), r)
+        self.assertEqual(child1.row(), 0)
         self.assertEqual(child1.project(), p)
         child2 = QgsReportSectionLayout()
         r.appendChild(child2)
         self.assertEqual(r.childCount(), 2)
         self.assertEqual(r.childSections(), [child1, child2])
         self.assertEqual(r.childSection(1), child2)
         self.assertEqual(child2.parentSection(), r)
+        self.assertEqual(child2.row(), 1)
 
     def testInsertChild(self):
         p = QgsProject()
@@ -92,11 +94,14 @@ def testInsertChild(self):
         self.assertEqual(r.childCount(), 1)
         self.assertEqual(r.childSections(), [child1])
         self.assertEqual(child1.parentSection(), r)
+        self.assertEqual(child1.row(), 0)
         child2 = QgsReportSectionLayout()
         r.insertChild(-1, child2)
         self.assertEqual(r.childCount(), 2)
         self.assertEqual(r.childSections(), [child2, child1])
         self.assertEqual(child2.parentSection(), r)
+        self.assertEqual(child2.row(), 0)
+        self.assertEqual(child1.row(), 1)
 
     def testRemoveChild(self):
         p = QgsProject()

Original file line number	Diff line number	Diff line change
`@@ -319,6 +319,14 @@ void QgsAbstractReportSection::setFooter( QgsLayout *footer )`
`319`	`319`	`mFooter.reset( footer );`
`320`	`320`	`}`
`321`	`321`
	`322`	`+int QgsAbstractReportSection::row() const`
	`323`	`+{`
	`324`	`+ if ( mParent )`
	`325`	`+ return mParent->childSections().indexOf( const_cast<QgsAbstractReportSection *>( this ) );`
	`326`	`+`
	`327`	`+ return 0;`
	`328`	`+}`
	`329`	`+`
`322`	`330`	`QgsAbstractReportSection *QgsAbstractReportSection::childSection( int index )`
`323`	`331`	`{`
`324`	`332`	`return mChildren.value( index );`