Select a valid variant when there's no variant with the same number of colors in new scheme. Fixes #2254

wonder · wonder · commit bed548daa4a4 · 2009-12-19T10:41:57.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12511 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
@@ -59,7 +59,13 @@ void QgsVectorColorBrewerColorRampV2Dialog::populateVariants()
   }
 
   // try to set the original variant again (if exists)
-  cboColors->setCurrentIndex( cboColors->findText( oldVariant ) );
+  int idx = cboColors->findText( oldVariant );
+  if ( idx == -1 ) // not found?
+  {
+    // use the last item
+    idx = cboColors->count() - 1;
+  }
+  cboColors->setCurrentIndex( idx );
 }
 
 void QgsVectorColorBrewerColorRampV2Dialog::updatePreview()

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,13 @@ void QgsVectorColorBrewerColorRampV2Dialog::populateVariants()`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`// try to set the original variant again (if exists)`
`62`		`- cboColors->setCurrentIndex( cboColors->findText( oldVariant ) );`
	`62`	`+ int idx = cboColors->findText( oldVariant );`
	`63`	`+ if ( idx == -1 ) // not found?`
	`64`	`+ {`
	`65`	`+ // use the last item`
	`66`	`+ idx = cboColors->count() - 1;`
	`67`	`+ }`
	`68`	`+ cboColors->setCurrentIndex( idx );`
`63`	`69`	`}`
`64`	`70`
`65`	`71`	`void QgsVectorColorBrewerColorRampV2Dialog::updatePreview()`