Fix misleading override of QList::size

qgis · Feb 9, 2022 · 56fccbd · 56fccbd
1 parent b8b79f6
commit 56fccbd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 35 deletions.
diff --git a/src/app/georeferencer/qgsgcplist.cpp b/src/app/georeferencer/qgsgcplist.cpp
@@ -35,40 +35,40 @@ QgsGCPList::QgsGCPList( const QgsGCPList &list )
 
 void QgsGCPList::createGCPVectors( QVector<QgsPointXY> &sourceCoordinates, QVector<QgsPointXY> &destinationCoordinates, const QgsCoordinateReferenceSystem &targetCrs )
 {
-  sourceCoordinates = QVector<QgsPointXY>( size() );
-  destinationCoordinates = QVector<QgsPointXY>( size() );
-  QgsPointXY transCoords;
-  for ( int i = 0, j = 0; i < sizeAll(); i++ )
+  const int targetSize = countEnabledPoints();
+  sourceCoordinates.clear();
+  sourceCoordinates.reserve( targetSize );
+  destinationCoordinates.clear();
+  destinationCoordinates.reserve( targetSize );
+
+  for ( QgsGeorefDataPoint *pt : std::as_const( *this ) )
   {
-    QgsGeorefDataPoint *pt = at( i );
-    if ( pt->isEnabled() )
+    if ( !pt->isEnabled() )
+      continue;
+
+    sourceCoordinates.push_back( pt->sourceCoords() );
+    if ( targetCrs.isValid() )
     {
-      if ( targetCrs.isValid() )
+      try
       {
-        try
-        {
-          transCoords = QgsCoordinateTransform( pt->destinationCrs(), targetCrs,
-                                                QgsProject::instance() ).transform( pt->destinationMapCoords() );
-          destinationCoordinates[j] = transCoords;
-          pt->setTransCoords( transCoords );
-        }
-        catch ( const QgsException & )
-        {
-          destinationCoordinates[j] = pt->destinationMapCoords();
-        }
+        QgsPointXY transCoords = QgsCoordinateTransform( pt->destinationCrs(), targetCrs,
+                                 QgsProject::instance() ).transform( pt->destinationMapCoords() );
+        destinationCoordinates.push_back( transCoords );
+        pt->setTransCoords( transCoords );
+      }
+      catch ( const QgsException & )
+      {
+        destinationCoordinates.push_back( pt->destinationMapCoords() );
       }
-      else
-        destinationCoordinates[j] = pt->destinationMapCoords();
-
-      sourceCoordinates[j] = pt->sourceCoords();
-      j++;
     }
+    else
+      destinationCoordinates.push_back( pt->destinationMapCoords() );
   }
 }
 
-int QgsGCPList::size() const
+int QgsGCPList::countEnabledPoints() const
 {
-  if ( QList<QgsGeorefDataPoint *>::isEmpty() )
+  if ( isEmpty() )
     return 0;
 
   int s = 0;
@@ -82,11 +82,6 @@ int QgsGCPList::size() const
   return s;
 }
 
-int QgsGCPList::sizeAll() const
-{
-  return QList<QgsGeorefDataPoint *>::size();
-}
-
 QgsGCPList &QgsGCPList::operator =( const QgsGCPList &list )
 {
   clear();

diff --git a/src/app/georeferencer/qgsgcplist.h b/src/app/georeferencer/qgsgcplist.h
@@ -23,16 +23,23 @@ class QgsGeorefDataPoint;
 class QgsPointXY;
 class QgsCoordinateReferenceSystem;
 
-// what is better use inherid or agrigate QList?
+/**
+ * A container for GCP data points.
+ *
+ * The container does NOT own the points!
+ */
 class QgsGCPList : public QList<QgsGeorefDataPoint *>
 {
   public:
     QgsGCPList() = default;
     QgsGCPList( const QgsGCPList &list );
 
     void createGCPVectors( QVector<QgsPointXY> &sourceCoordinates, QVector<QgsPointXY> &destinationCoordinates, const QgsCoordinateReferenceSystem &targetCrs );
-    int size() const;
-    int sizeAll() const;
+
+    /**
+     * Returns the count of currently enabled data points.
+     */
+    int countEnabledPoints() const;
 
     QgsGCPList &operator =( const QgsGCPList &list );
 };

diff --git a/src/app/georeferencer/qgsgcplistmodel.cpp b/src/app/georeferencer/qgsgcplistmodel.cpp
@@ -116,7 +116,7 @@ void QgsGCPListModel::updateModel()
   setHorizontalHeaderLabels( itemLabels );
   setRowCount( mGCPList->size() );
 
-  for ( int i = 0; i < mGCPList->sizeAll(); ++i )
+  for ( int i = 0; i < mGCPList->size(); ++i )
   {
     int j = 0;
     QgsGeorefDataPoint *p = mGCPList->at( i );

diff --git a/src/app/georeferencer/qgsgeorefmainwindow.cpp b/src/app/georeferencer/qgsgeorefmainwindow.cpp
@@ -754,7 +754,7 @@ void QgsGeoreferencerMainWindow::localHistogramStretch()
 // Comfort slots
 void QgsGeoreferencerMainWindow::jumpToGCP( uint theGCPIndex )
 {
-  if ( static_cast<int>( theGCPIndex ) >= mPoints.size() )
+  if ( static_cast<int>( theGCPIndex ) >= mPoints.numberEnabledPoints() )
   {
     return;
   }