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

spatial query plugin: fix warnings, reindent, include in debian package

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@13360 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-04-24 09:00:25 +00:00
parent e0ec67b2fe
commit 3d2b177143
18 changed files with 1016 additions and 1014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -5,8 +5,9 @@ qgis (1.5.0) UNRELEASED; urgency=low
* require CMake >2.6 and Qt 4.4 for sid
* remove circular dependencies
* integrate new GRASS raster provider
* add spatialquery plugin
-- Jürgen E. Fischer <jef@norbit.de> Thu, 04 Feb 2010 23:20:29 +0100
-- Jürgen E. Fischer <jef@norbit.de> Sat, 24 Apr 2010 10:57:21 +0200
qgis (1.4.0) UNRELEASED; urgency=low

1
debian/qgis.install vendored
View File

@ -26,6 +26,7 @@ usr/lib/qgis/libevis.so
usr/lib/qgis/libosmprovider.so
usr/lib/qgis/librasterterrainplugin.so
usr/lib/qgis/liblabelingplugin.so
usr/lib/qgis/libspatialqueryplugin.so
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

2
debian/rules vendored
View File

@ -10,7 +10,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny hardy intrepid jaunty karmic"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny hardy intrepid jaunty karmic lucid"))
DISTRIBUTION := sid
endif

5
src/plugins/spatialquery/CMakeLists.txt
View File

@ -14,11 +14,6 @@ SET (SPATIALQUERY_SRCS
SET (SPATIALQUERY_MOC_HDRS
qgsspatialqueryplugin.h
qgsspatialquerydialog.h
qgsspatialquery.h
qgsreaderfeatures.h
qgsrubberselectid.h
qgsgeometrycoordinatetransform.h
qgsmngprogressbar.h
)
SET( SPATIALQUERY_UIS qgsspatialquerydialogbase.ui)

3
src/plugins/spatialquery/qgsspatialquery.cpp
View File

@ -150,6 +150,9 @@ short int QgsSpatialQuery::dimensionGeometry(QGis::GeometryType geomType)
break;
case QGis::Polygon:
dimGeom = 2;
default:
Q_ASSERT( 0 );
dimGeom = 0;
}
return dimGeom;

3
src/plugins/spatialquery/qgsspatialquerydialog.cpp
View File

@ -108,7 +108,8 @@ void QgsSpatialQueryDialog::setColorRubberSelectId()
void QgsSpatialQueryDialog::setLayer( bool isTarget, int index )
{
if (isTarget) {
if ( isTarget )
{
if ( mLayerTarget )
{
disconnect( mLayerTarget, SIGNAL( selectionChanged() ),

3
src/plugins/spatialquery/qgsspatialqueryplugin.cpp
View File

@ -104,7 +104,8 @@ void QgsSpatialQueryPlugin::unload()
void QgsSpatialQueryPlugin::run()
{
if (!mDialog){
if ( !mDialog )
{
if ( QgsMapLayerRegistry::instance()->mapLayers().size() < 2 )
{
QgsSpatialQueryDialog::messageLayersLessTwo();