Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
spatial query: cosmetic changes and set svn keywords
git-svn-id: http://svn.osgeo.org/qgis/trunk@13377 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 25, 2010
1 parent 9b1f6ff commit d69d9fa
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 30 deletions.
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#include "qgsgeometrycoordinatetransform.h"

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */
#ifndef GEOMETRYCOORDINATETRANSFORM_H
#define GEOMETRYCOORDINATETRANSFORM_H

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsmngprogressbar.cpp
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#include "qgsmngprogressbar.h"

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsmngprogressbar.h
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */
#ifndef QGSMNGPROGRESSBAR_H
#define QGSMNGPROGRESSBAR_H

Expand Down
13 changes: 3 additions & 10 deletions src/plugins/spatialquery/qgsreaderfeatures.cpp
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#include <qgsvectordataprovider.h>

Expand Down Expand Up @@ -54,19 +54,15 @@ void QgsReaderFeatures::initReader( bool useSelection )
}
else
{
QgsAttributeList attListGeom;
int idGeom = 0;
attListGeom.append( idGeom );
mLayer->select( attListGeom, mLayer->extent(), true, false );
mLayer->select( QgsAttributeList() );
mFuncNextFeature = &QgsReaderFeatures::nextFeatureTotal;
}

} // void QgsReaderFeatures::initReader()

bool QgsReaderFeatures::nextFeatureTotal( QgsFeature & feature )
{
return mLayer->dataProvider()->nextFeature( feature );

return mLayer->nextFeature( feature );
} // bool QgsReaderFeatures::nextFeatureTotal ( QgsFeature & feature )

bool QgsReaderFeatures::nextFeatureSelected( QgsFeature & feature )
Expand All @@ -82,7 +78,4 @@ bool QgsReaderFeatures::nextFeatureSelected( QgsFeature & feature )
mIterSelectedFeature++;
}
return bReturn;

} // bool QgsReaderFeatures::nextFeatureSelected( QgsFeature &feature )


2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsreaderfeatures.h
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */
#ifndef READERFEATURES_H
#define READERFEATURES_H

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsrubberselectid.cpp
Expand Up @@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#include "qgsrubberselectid.h"

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsrubberselectid.h
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#ifndef QGSRUBBERSELECTID_H
#define QGSRUBBERSELECTID_H
Expand Down
13 changes: 5 additions & 8 deletions src/plugins/spatialquery/qgsspatialquery.cpp
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#include <QMessageBox>

Expand Down Expand Up @@ -195,12 +195,8 @@ void QgsSpatialQuery::setSpatialIndexReference()
QgsReaderFeatures * readerFeaturesReference = new QgsReaderFeatures( mLayerReference, mUseReferenceSelection );
QgsFeature feature;
int step = 1;
while ( true )
while ( readerFeaturesReference->nextFeature( feature ) )
{
if ( ! readerFeaturesReference->nextFeature( feature ) )
{
break;
}
mPb->step( step++ );

if ( ! hasValidGeometry( feature ) )
Expand Down Expand Up @@ -293,7 +289,7 @@ void QgsSpatialQuery::populateIndexResult(
{
mLayerReference->featureAtId( *iterIdReference, featureReference );
geomReference = featureReference.geometry();
if (( geomTarget->*op )( geomReference ) == 1 )
if (( geomTarget->*op )( geomReference ) )
{
qsetIndexResult.insert( idTarget );
break;
Expand Down Expand Up @@ -321,7 +317,8 @@ void QgsSpatialQuery::populateIndexResultDisjoint(
{
mLayerReference->featureAtId( *iterIdReference, featureReference );
geomReference = featureReference.geometry();
if (( geomTarget->*op )( geomTarget ) == 0 )

if ( !( geomTarget->*op )( geomTarget ) )
{
addIndex = false;
break;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsspatialquery.h
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */
#ifndef SPATIALQUERY_H
#define SPATIALQUERY_H

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsspatialquerydialog.cpp
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#include <QMessageBox>
#include <QDateTime>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsspatialquerydialog.h
Expand Up @@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#ifndef SPATIALQUERYDIALOG_H
#define SPATIALQUERYDIALOG_H
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsspatialqueryplugin.cpp
Expand Up @@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */


//
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/qgsspatialqueryplugin.h
Expand Up @@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: $ */
/* $Id$ */

#ifndef SPATIALQUERYPLUGIN_H
#define SPATIALQUERYPLUGIN_H
Expand Down

0 comments on commit d69d9fa

Please sign in to comment.