[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2009-04-02 15:22:52
Message-ID: 1238685772.101326.1886.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 948221 by sengels:

readd the placemarks

 M  +7 -4      PlacemarkLayout.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkLayout.cpp #948220:948221
@@ -273,6 +273,8 @@
         // Find the corresponding visible placemark
         VisiblePlacemark *mark = m_visiblePlacemarks.value( index );
 
+        // FIXME: this depends on the QAbstractItemModel being a \
MarblePlacemarkModel +        // this has to be either translated via mapping or we \
have to find a different approach for that...  GeoDataStyle* style = \
placemarkModel->styleData( index );  
         // Specify font properties
@@ -344,6 +346,7 @@
 
     const int rowCount = model->rowCount();
 
+    qDebug() << "handling all other placemarks";
     for ( int i = 0; i != rowCount; ++i )
     {
         const QModelIndex& index = model->index( i, 0 );
@@ -358,13 +361,13 @@
         int popularityIndex = index.data( MarblePlacemarkModel::PopularityIndexRole \
).toInt();  
         if ( popularityIndex <= 1 ) {
-            break;
+            qDebug() << "popularityIndex too small!" << popularityIndex;
+            continue;
         }
 
         // Skip the places that are too small.
-        if ( !noFilter ) {
-            if ( m_weightfilter.at( popularityIndex ) > viewParams->radius() )
-                break;
+        if ( !noFilter && m_weightfilter.at( popularityIndex ) > \
viewParams->radius() ) { +                continue;
         }
 
         GeoDataCoordinates geopoint = placemarkModel->coordinateData( index );


[prev in list] [next in list] [prev in thread] [next in thread]