[QGIS Commit] r13377 - trunk/qgis/src/plugins/spatialquery
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Apr 24 21:07:36 EDT 2010
Author: jef
Date: 2010-04-24 21:07:36 -0400 (Sat, 24 Apr 2010)
New Revision: 13377
Modified:
trunk/qgis/src/plugins/spatialquery/CMakeLists.txt
trunk/qgis/src/plugins/spatialquery/README
trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp
trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.cpp
trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.h
trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.cpp
trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.h
trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp
trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h
trunk/qgis/src/plugins/spatialquery/qgsspatialquery.cpp
trunk/qgis/src/plugins/spatialquery/qgsspatialquery.h
trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h
trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.qrc
trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.h
trunk/qgis/src/plugins/spatialquery/spatialquery.png
Log:
spatial query: cosmetic changes and set svn keywords
Property changes on: trunk/qgis/src/plugins/spatialquery/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Property changes on: trunk/qgis/src/plugins/spatialquery/README
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#include "qgsgeometrycoordinatetransform.h"
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#ifndef GEOMETRYCOORDINATETRANSFORM_H
#define GEOMETRYCOORDINATETRANSFORM_H
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.cpp 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.cpp 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#include "qgsmngprogressbar.h"
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.h 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.h 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#ifndef QGSMNGPROGRESSBAR_H
#define QGSMNGPROGRESSBAR_H
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.cpp 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.cpp 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#include <qgsvectordataprovider.h>
@@ -54,10 +54,7 @@
}
else
{
- QgsAttributeList attListGeom;
- int idGeom = 0;
- attListGeom.append( idGeom );
- mLayer->select( attListGeom, mLayer->extent(), true, false );
+ mLayer->select( QgsAttributeList() );
mFuncNextFeature = &QgsReaderFeatures::nextFeatureTotal;
}
@@ -65,8 +62,7 @@
bool QgsReaderFeatures::nextFeatureTotal( QgsFeature & feature )
{
- return mLayer->dataProvider()->nextFeature( feature );
-
+ return mLayer->nextFeature( feature );
} // bool QgsReaderFeatures::nextFeatureTotal ( QgsFeature & feature )
bool QgsReaderFeatures::nextFeatureSelected( QgsFeature & feature )
@@ -82,7 +78,4 @@
mIterSelectedFeature++;
}
return bReturn;
-
} // bool QgsReaderFeatures::nextFeatureSelected( QgsFeature &feature )
-
-
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.h 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.h 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#ifndef READERFEATURES_H
#define READERFEATURES_H
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp 2010-04-25 01:07:36 UTC (rev 13377)
@@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#include "qgsrubberselectid.h"
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#ifndef QGSRUBBERSELECTID_H
#define QGSRUBBERSELECTID_H
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquery.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquery.cpp 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquery.cpp 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#include <QMessageBox>
@@ -195,12 +195,8 @@
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 ) )
@@ -293,7 +289,7 @@
{
mLayerReference->featureAtId( *iterIdReference, featureReference );
geomReference = featureReference.geometry();
- if (( geomTarget->*op )( geomReference ) == 1 )
+ if (( geomTarget->*op )( geomReference ) )
{
qsetIndexResult.insert( idTarget );
break;
@@ -321,7 +317,8 @@
{
mLayerReference->featureAtId( *iterIdReference, featureReference );
geomReference = featureReference.geometry();
- if (( geomTarget->*op )( geomTarget ) == 0 )
+
+ if ( !( geomTarget->*op )( geomTarget ) )
{
addIndex = false;
break;
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquery.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquery.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquery.h 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquery.h 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#ifndef SPATIALQUERY_H
#define SPATIALQUERY_H
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquery.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#include <QMessageBox>
#include <QDateTime>
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h 2010-04-25 01:07:36 UTC (rev 13377)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#ifndef SPATIALQUERYDIALOG_H
#define SPATIALQUERYDIALOG_H
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.qrc
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp 2010-04-25 01:07:36 UTC (rev 13377)
@@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
//
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.h 2010-04-25 01:03:53 UTC (rev 13376)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.h 2010-04-25 01:07:36 UTC (rev 13377)
@@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: $ */
+/* $Id$ */
#ifndef SPATIALQUERYPLUGIN_H
#define SPATIALQUERYPLUGIN_H
Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Property changes on: trunk/qgis/src/plugins/spatialquery/spatialquery.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
More information about the QGIS-commit
mailing list