sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some warnings and indentation update

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-06-18 23:59:46 +02:00
parent d61c5361ce
commit 0dd02bad04
14 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qgsidentifyresultsdialog.cpp
View File

@ -433,7 +433,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
featItem->addChild( attrItem );
}
if( !featureLabeled )
if ( !featureLabeled )
{
featItem->setText( 0, tr( "feature id" ) );
featItem->setText( 1, QString::number( f.id() ) );

4
src/core/qgsgeometry.cpp
View File

@ -6440,9 +6440,9 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart )
QgsGeometry *QgsGeometry::unaryUnion( const QList<QgsGeometry*> &geometryList )
{
QList<GEOSGeometry*> geoms;
foreach( QgsGeometry* g, geometryList )
foreach ( QgsGeometry* g, geometryList )
{
geoms.append( GEOSGeom_clone(g->asGeos()) );
geoms.append( GEOSGeom_clone( g->asGeos() ) );
}
GEOSGeometry *geomUnion = _makeUnion( geoms );
QgsGeometry *ret = new QgsGeometry();

1
src/core/qgsgeometry.h
View File

@ -356,6 +356,7 @@ class CORE_EXPORT QgsGeometry
QgsGeometry* buffer( double distance, int segments );
/** Returns a buffer region around the geometry, with additional style options.
* @param distance buffer distance
* @param segments For round joins, number of segments to approximate quarter-circle
* @param endCapStyle Round (1) / Flat (2) / Square (3) end cap style
* @param joinStyle Round (1) / Mitre (2) / Bevel (3) join style

2
src/core/qgsmaprendererjob.cpp
View File

@ -562,6 +562,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin
{
bool cacheValid = mCache->init( mSettings.visibleExtent(), mSettings.scale() );
QgsDebugMsg( QString( "CACHE VALID: %1" ).arg( cacheValid ) );
Q_UNUSED( cacheValid );
}
mGeometryCaches.clear();
@ -915,6 +916,7 @@ void QgsMapRendererParallelJob::renderLayerStatic( LayerRenderJob& job )
job.renderer->render();
int tt = t.elapsed();
QgsDebugMsg( QString( "job %1 end [%2 ms]" ).arg(( ulong ) &job, 0, 16 ).arg( tt ) );
Q_UNUSED( tt );
}

2
src/gui/layertree/qgslayertreemodel.cpp
View File

@ -479,7 +479,9 @@ void QgsLayerTreeModel::setLayerTreeNodeFont( int nodeType, const QFont& font )
}
}
else
{
QgsDebugMsg( "invalid node type" );
}
}

2
src/gui/qgsmapcanvasmap.cpp
View File

@ -42,7 +42,9 @@ void QgsMapCanvasMap::paint( QPainter* painter )
{
int w = qRound( boundingRect().width() ) - 2, h = qRound( boundingRect().height() ) - 2; // setRect() makes the size +2 :-(
if ( mImage.size() != QSize( w, h ) )
{
QgsDebugMsg( QString( "map paint DIFFERENT SIZE: img %1,%2 item %3,%4" ).arg( mImage.width() ).arg( mImage.height() ).arg( w ).arg( h ) );
}
painter->drawImage( QRect( 0, 0, w, h ), mImage );
}