[QGIS Commit] r13883 - trunk/qgis/src/gui/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-07-04 16:18:38 +0000 (Sun, 04 Jul 2010)
New Revision: 13883

Modified:
   trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
Log:
Fix #2862


Modified: trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp	2010-07-04 10:21:59 UTC (rev 13882)
+++ trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp	2010-07-04 16:18:38 UTC (rev 13883)
@@ -279,7 +279,6 @@
   QgsCategoryList cats;
   _createCategories( cats, unique_vals, mCategorizedSymbol, ramp );
 
-  bool deleteExisting = false;
   if ( !mOldClassificationAttribute.isEmpty() &&
        attrName != mOldClassificationAttribute &&
        mRenderer->categories().count() > 0 )
@@ -292,31 +291,31 @@
                                      QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel );
     if ( res == QMessageBox::Cancel )
       return;
-    if ( res == QMessageBox::Yes )
-      deleteExisting = true;
-  }
 
-  mOldClassificationAttribute = attrName;
-
-  if ( !deleteExisting )
-  {
-    QgsCategoryList prevCats = mRenderer->categories();
-    for ( int i = 0; i < cats.size(); ++i )
+    bool deleteExisting = ( res == QMessageBox::Yes );
+    if ( !deleteExisting )
     {
-      bool contains = false;
-      QVariant value = cats.at( i ).value();
-      for ( int j = 0; j < prevCats.size() && !contains; ++j )
+      QgsCategoryList prevCats = mRenderer->categories();
+      for ( int i = 0; i < cats.size(); ++i )
       {
-        if ( prevCats.at( j ).value() == value )
-          contains = true;
-      }
+        bool contains = false;
+        QVariant value = cats.at( i ).value();
+        for ( int j = 0; j < prevCats.size() && !contains; ++j )
+        {
+          if ( prevCats.at( j ).value() == value )
+            contains = true;
+        }
 
-      if ( !contains )
-        prevCats.append( cats.at( i ) );
+        if ( !contains )
+          prevCats.append( cats.at( i ) );
+      }
+      cats = prevCats;
     }
-    cats = prevCats;
+
   }
 
+  mOldClassificationAttribute = attrName;
+
   // TODO: if not all categories are desired, delete some!
   /*
   if (not dlg.readAllCats.isChecked())