70
70
#include " qgsvectordataprovider.h"
71
71
#include " qgsvectorlayerundocommand.h"
72
72
#include " qgsvectoroverlay.h"
73
- #include " qgslogger.h"
74
73
#include " qgsmaplayerregistry.h"
75
74
#include " qgsclipper.h"
76
75
#include " qgsproject.h"
@@ -365,17 +364,15 @@ void QgsVectorLayer::drawLabels( QgsRenderContext& rendererContext )
365
364
catch ( QgsCsException &e )
366
365
{
367
366
Q_UNUSED ( e );
368
- QgsLogger::critical ( " Error projecting label locations, caught in " + QString ( __FILE__ ) + " , line " + QString ( __LINE__ ) );
367
+ QgsDebugMsg ( " Error projecting label locations" );
369
368
}
370
369
371
370
if ( mRendererV2 )
372
371
{
373
372
mRendererV2 ->stopRender ( rendererContext );
374
373
}
375
374
376
- #ifdef QGISDEBUG
377
- QgsLogger::debug ( " Total features processed" , featureCount, 1 , __FILE__, __FUNCTION__, __LINE__ );
378
- #endif
375
+ QgsDebugMsg ( QString ( " Total features processed %1" ).arg ( featureCount ) );
379
376
380
377
// XXX Something in our draw event is triggering an additional draw event when resizing [TE 01/26/06]
381
378
// XXX Calling this will begin processing the next draw event causing image havoc and recursion crashes.
@@ -768,10 +765,8 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
768
765
}
769
766
catch ( const QgsCsException &cse )
770
767
{
771
- QString msg ( " Failed to transform a point while drawing a feature of type '"
772
- + fet.typeName () + " '. Ignoring this feature." );
773
- msg += cse.what ();
774
- QgsLogger::warning ( msg );
768
+ QgsDebugMsg ( QString ( " Failed to transform a point while drawing a feature of type '%1'. Ignoring this feature. %2" )
769
+ .arg ( fet.typeName () ).arg ( cse.what () ) );
775
770
}
776
771
#ifndef Q_WS_MAC
777
772
++featureCount;
@@ -898,10 +893,8 @@ void QgsVectorLayer::drawRendererV2Levels( QgsRenderContext& rendererContext, bo
898
893
}
899
894
catch ( const QgsCsException &cse )
900
895
{
901
- QString msg ( " Failed to transform a point while drawing a feature of type '"
902
- + fet.typeName () + " '. Ignoring this feature." );
903
- msg += cse.what ();
904
- QgsLogger::warning ( msg );
896
+ QgsDebugMsg ( QString ( " Failed to transform a point while drawing a feature of type '%1'. Ignoring this feature. %2" )
897
+ .arg ( fet.typeName () ).arg ( cse.what () ) );
905
898
}
906
899
#ifndef Q_WS_MAC
907
900
++featureCount;
@@ -1090,16 +1083,14 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
1090
1083
}
1091
1084
catch ( QgsCsException &cse )
1092
1085
{
1093
- QString msg ( " Failed to transform a point while drawing a feature of type '"
1094
- + fet.typeName () + " '. Rendering stopped." );
1095
- msg += cse.what ();
1096
- QgsLogger::warning ( msg );
1086
+ QgsDebugMsg ( QString ( " Failed to transform a point while drawing a feature of type '%1'. Rendering stopped. %2" )
1087
+ .arg ( fet.typeName () ).arg ( cse.what () ) );
1097
1088
return false ;
1098
1089
}
1099
1090
}
1100
1091
else
1101
1092
{
1102
- QgsLogger::warning ( " QgsRenderer is null in QgsVectorLayer::draw() " );
1093
+ QgsDebugMsg ( " QgsRenderer is null" );
1103
1094
}
1104
1095
1105
1096
if ( mEditable )
@@ -1392,18 +1383,18 @@ long QgsVectorLayer::featureCount() const
1392
1383
{
1393
1384
if ( !mDataProvider )
1394
1385
{
1395
- QgsLogger::warning ( " QgsVectorLayer::featureCount() invoked with null mDataProvider" );
1386
+ QgsDebugMsg ( " invoked with null mDataProvider" );
1396
1387
return 0 ;
1397
1388
}
1398
1389
1399
1390
return mDataProvider ->featureCount ();
1400
- } // QgsVectorLayer::featureCount
1391
+ }
1401
1392
1402
1393
long QgsVectorLayer::updateFeatureCount () const
1403
1394
{
1404
1395
if ( !mDataProvider )
1405
1396
{
1406
- QgsLogger::warning ( " QgsVectorLayer::updateFeatureCount() invoked with null mDataProvider" );
1397
+ QgsDebugMsg ( " invoked with null mDataProvider" );
1407
1398
return 0 ;
1408
1399
}
1409
1400
return mDataProvider ->updateFeatureCount ();
@@ -1414,7 +1405,7 @@ void QgsVectorLayer::updateExtents()
1414
1405
mLayerExtent .setMinimal ();
1415
1406
1416
1407
if ( !mDataProvider )
1417
- QgsLogger::warning ( " QgsVectorLayer::updateExtents() invoked with null mDataProvider" );
1408
+ QgsDebugMsg ( " invoked with null mDataProvider" );
1418
1409
1419
1410
if ( mDeletedFeatureIds .isEmpty () && mChangedGeometries .isEmpty () )
1420
1411
{
@@ -1461,7 +1452,7 @@ QString QgsVectorLayer::subsetString()
1461
1452
{
1462
1453
if ( ! mDataProvider )
1463
1454
{
1464
- QgsLogger::warning ( " QgsVectorLayer::subsetString() invoked with null mDataProvider" );
1455
+ QgsDebugMsg ( " invoked with null mDataProvider" );
1465
1456
return 0 ;
1466
1457
}
1467
1458
return mDataProvider ->subsetString ();
@@ -1471,7 +1462,7 @@ bool QgsVectorLayer::setSubsetString( QString subset )
1471
1462
{
1472
1463
if ( ! mDataProvider )
1473
1464
{
1474
- QgsLogger::warning ( " QgsVectorLayer::setSubsetString() invoked with null mDataProvider" );
1465
+ QgsDebugMsg ( " invoked with null mDataProvider" );
1475
1466
return false ;
1476
1467
}
1477
1468
@@ -1611,7 +1602,7 @@ bool QgsVectorLayer::nextFeature( QgsFeature &f )
1611
1602
}
1612
1603
1613
1604
if ( !found )
1614
- QgsLogger::warning ( QString ( " No attributes for the added feature %1 found" ).arg ( f.id () ) );
1605
+ QgsDebugMsg ( QString ( " No attributes for the added feature %1 found" ).arg ( f.id () ) );
1615
1606
}
1616
1607
else
1617
1608
{
@@ -1712,7 +1703,7 @@ bool QgsVectorLayer::featureAtId( int featureId, QgsFeature& f, bool fetchGeomet
1712
1703
}
1713
1704
1714
1705
if ( !found )
1715
- QgsLogger::warning ( QString ( " No attributes for the added feature %1 found" ).arg ( f.id () ) );
1706
+ QgsDebugMsg ( QString ( " No attributes for the added feature %1 found" ).arg ( f.id () ) );
1716
1707
}
1717
1708
else
1718
1709
{
@@ -3379,23 +3370,24 @@ bool QgsVectorLayer::commitChanges()
3379
3370
//
3380
3371
if ( mAddedFeatures .size () > 0 )
3381
3372
{
3382
- for ( QgsFeatureList::iterator iter = mAddedFeatures . begin (); iter != mAddedFeatures .end (); ++iter )
3373
+ for ( int i = 0 ; i < mAddedFeatures .size (); i++ )
3383
3374
{
3384
- if ( mDeletedFeatureIds .contains ( iter->id () ) )
3385
- {
3386
- mDeletedFeatureIds .remove ( iter->id () );
3375
+ QgsFeature &f = mAddedFeatures [i];
3387
3376
3388
- if ( mChangedGeometries .contains ( iter->id () ) )
3389
- mChangedGeometries .remove ( iter->id () );
3377
+ if ( mDeletedFeatureIds .contains ( f.id () ) )
3378
+ {
3379
+ mDeletedFeatureIds .remove ( f.id () );
3390
3380
3391
- mAddedFeatures .erase ( iter );
3381
+ if ( mChangedGeometries .contains ( f.id () ) )
3382
+ mChangedGeometries .remove ( f.id () );
3392
3383
3384
+ mAddedFeatures .removeAt ( i-- );
3393
3385
continue ;
3394
3386
}
3395
3387
3396
- if ( mChangedGeometries .contains ( iter-> id () ) )
3388
+ if ( mChangedGeometries .contains ( f. id () ) )
3397
3389
{
3398
- iter-> setGeometry ( mChangedGeometries .take ( iter-> id () ) );
3390
+ f. setGeometry ( mChangedGeometries .take ( f. id () ) );
3399
3391
}
3400
3392
}
3401
3393
0 commit comments