[Marble-commits] KDE/kdeedu/marble/src/lib

[Thibaut Gridel]

SVN commit 1150827 by tgridel:

PlacemarkLayout: fix the filtering according to PopularityIndex

loading a document with no popularity values should not disable
filtering altogether

 M  +1 -7      PlacemarkLayout.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkLayout.cpp #1150826:1150827
@@ -334,12 +334,6 @@
     /**
      * Now handle all other placemarks...
      */
-    const QModelIndex firstIndex = model->index( 0, 0 );
-    const int firstPopularity = firstIndex.data( MarblePlacemarkModel::PopularityRole ).toInt();
-    const bool  noFilter = ( firstPopularity == 0 
-                             || ( firstPopularity != 0
-                             && firstIndex.data( MarblePlacemarkModel::GeoTypeRole ).toString().isEmpty() ) ) 
-                           ? true : false;
     const QItemSelection selection = selectionModel->selection();
 
     const int rowCount = model->rowCount();
@@ -365,7 +359,7 @@
         }
 
         // Skip the places that are too small.
-        if ( !noFilter && m_weightfilter.at( popularityIndex ) > viewParams->radius() ) {
+        if ( m_weightfilter.at( popularityIndex ) > viewParams->radius() ) {
             break;
         }