Fix some labels incorrectly flagged as unplaced when they actually are placed

nyalldawson · nyalldawson · commit 3e21da8553cd · 2020-05-01T12:37:29.000+10:00
diff --git a/src/core/pal/problem.cpp b/src/core/pal/problem.cpp
@@ -672,8 +672,10 @@ QList<LabelPosition *> Problem::getSolution( bool returnInactive, QList<LabelPos
     }
     else if ( unlabeled )
     {
-      if ( mFeatStartId[i] < static_cast< int >( mLabelPositions.size() ) )
-        unlabeled->push_back( mLabelPositions[ mFeatStartId[i] ].get() );
+      const int startPos = mFeatStartId[i];
+      // need to be careful here -- if the next feature's start id is the same as this one, then this feature had no candidates!
+      if ( startPos < static_cast< int >( mLabelPositions.size() ) && ( i == mFeatureCount - 1 || startPos != mFeatStartId[i + 1] ) )
+        unlabeled->push_back( mLabelPositions[ startPos ].get() );
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -672,8 +672,10 @@ QList<LabelPosition *> Problem::getSolution( bool returnInactive, QList<LabelPos`
`672`	`672`	`}`
`673`	`673`	`else if ( unlabeled )`
`674`	`674`	`{`
`675`		`- if ( mFeatStartId[i] < static_cast< int >( mLabelPositions.size() ) )`
`676`		`- unlabeled->push_back( mLabelPositions[ mFeatStartId[i] ].get() );`
	`675`	`+ const int startPos = mFeatStartId[i];`
	`676`	`+ // need to be careful here -- if the next feature's start id is the same as this one, then this feature had no candidates!`
	`677`	`+ if ( startPos < static_cast< int >( mLabelPositions.size() ) && ( i == mFeatureCount - 1 \|\| startPos != mFeatStartId[i + 1] ) )`
	`678`	`+ unlabeled->push_back( mLabelPositions[ startPos ].get() );`
`677`	`679`	`}`
`678`	`680`	`}`
`679`	`681`