[QGIS Commit] r15303 - in trunk/qgis/src: app gui/symbology-ng
plugins/spatialquery
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Mar 1 03:10:18 EST 2011
Author: jef
Date: 2011-03-01 00:10:18 -0800 (Tue, 01 Mar 2011)
New Revision: 15303
Modified:
trunk/qgis/src/app/qgsmanageconnectionsdialog.cpp
trunk/qgis/src/app/qgsoptions.cpp
trunk/qgis/src/app/qgsrasterlayerproperties.cpp
trunk/qgis/src/app/qgstipgui.cpp
trunk/qgis/src/app/qgswmssourceselect.cpp
trunk/qgis/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp
trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h
trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h
trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
Log:
automatic indentation update (r15222-r15302)
Modified: trunk/qgis/src/app/qgsmanageconnectionsdialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsmanageconnectionsdialog.cpp 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/app/qgsmanageconnectionsdialog.cpp 2011-03-01 08:10:18 UTC (rev 15303)
@@ -83,7 +83,7 @@
if ( mDialogMode == Export )
{
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save connections" ), ".",
- tr( "XML files (*.xml *.XML)" ) );
+ tr( "XML files (*.xml *.XML)" ) );
if ( fileName.isEmpty() )
{
return;
@@ -354,15 +354,15 @@
{
case QMessageBox::Cancel: return;
case QMessageBox::No: child = child.nextSiblingElement();
- continue;
+ continue;
case QMessageBox::Yes: overwrite = true;
- break;
+ break;
case QMessageBox::YesToAll: prompt = false;
- overwrite = true;
- break;
+ overwrite = true;
+ break;
case QMessageBox::NoToAll: prompt = false;
- overwrite = false;
- break;
+ overwrite = false;
+ break;
}
}
@@ -429,15 +429,15 @@
{
case QMessageBox::Cancel: return;
case QMessageBox::No: child = child.nextSiblingElement();
- continue;
+ continue;
case QMessageBox::Yes: overwrite = true;
- break;
+ break;
case QMessageBox::YesToAll: prompt = false;
- overwrite = true;
- break;
+ overwrite = true;
+ break;
case QMessageBox::NoToAll: prompt = false;
- overwrite = false;
- break;
+ overwrite = false;
+ break;
}
}
Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/app/qgsoptions.cpp 2011-03-01 08:10:18 UTC (rev 15303)
@@ -79,7 +79,7 @@
spinBoxIdentifyValue->setMinimum( 0.01 );
spinBoxIdentifyValue->setValue( identifyValue );
- //local directories to search when loading c++ plugins
+ //local directories to search when loading c++ plugins
QString myPaths = settings.value( "plugins/searchPathsForPlugins", "" ).toString();
if ( !myPaths.isEmpty() )
{
Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2011-03-01 08:10:18 UTC (rev 15303)
@@ -728,8 +728,8 @@
{
labelDefaultContrastEnhancementAlgorithm->setText( tr( "No Stretch" ) );
}
- mDefaultStandardDeviation = myQSettings.value("/Raster/defaultStandardDeviation", 1.0).toDouble();
- sboxThreeBandStdDev->setValue(mDefaultStandardDeviation);
+ mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toDouble();
+ sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
}
QgsDebugMsg( "populate transparency tab" );
Modified: trunk/qgis/src/app/qgstipgui.cpp
===================================================================
--- trunk/qgis/src/app/qgstipgui.cpp 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/app/qgstipgui.cpp 2011-03-01 08:10:18 UTC (rev 15303)
@@ -64,14 +64,14 @@
// TODO - This html construction can be simplified using QStringBuilder
// once Qt 4.6 is the minimum required version for building QGIS.
//
- QString content = "<img src='"
- + QgsApplication::iconsPath()
- + "qgis-icon-60x60.png"
- + "' style='float:left;'>"
- + "<h2>"
- + myTip.title()
- + "</h2><br clear='all'/>"
- + myTip.content();
+ QString content = "<img src='"
+ + QgsApplication::iconsPath()
+ + "qgis-icon-60x60.png"
+ + "' style='float:left;'>"
+ + "<h2>"
+ + myTip.title()
+ + "</h2><br clear='all'/>"
+ + myTip.content();
txtTip->setHtml( content );
}
Modified: trunk/qgis/src/app/qgswmssourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgswmssourceselect.cpp 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/app/qgswmssourceselect.cpp 2011-03-01 08:10:18 UTC (rev 15303)
@@ -253,7 +253,7 @@
void QgsWMSSourceSelect::loadClicked()
{
QString fileName = QFileDialog::getOpenFileName( this, tr( "Load connections" ), ".",
- tr( "XML files (*.xml *XML)" ) );
+ tr( "XML files (*.xml *XML)" ) );
if ( fileName.isEmpty() )
{
return;
Modified: trunk/qgis/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp 2011-03-01 08:10:18 UTC (rev 15303)
@@ -88,7 +88,7 @@
if ( mDialogMode == Export )
{
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save styles" ), ".",
- tr( "XML files (*.xml *.XML)" ) );
+ tr( "XML files (*.xml *.XML)" ) );
if ( fileName.isEmpty() )
{
return;
@@ -184,7 +184,7 @@
bool prompt = true;
bool overwrite = true;
- for( int i = 0; i < selection->size(); ++i )
+ for ( int i = 0; i < selection->size(); ++i )
{
index = selection->at( i );
symbolName = index.model()->data( index, 0 ).toString();
@@ -197,7 +197,7 @@
if ( isSymbol )
{
- if ( dst->symbolNames().contains( symbolName ) && prompt )
+ if ( dst->symbolNames().contains( symbolName ) && prompt )
{
int res = QMessageBox::warning( this, tr( "Duplicate names" ),
tr( "Symbol with name '%1' already exists.\nOverwrite?" )
@@ -208,21 +208,21 @@
case QMessageBox::Cancel: return;
case QMessageBox::No: continue;
case QMessageBox::Yes: dst->addSymbol( symbolName, symbol );
- continue;
+ continue;
case QMessageBox::YesToAll: prompt = false;
- overwrite = true;
- break;
+ overwrite = true;
+ break;
case QMessageBox::NoToAll: prompt = false;
- overwrite = false;
- break;
+ overwrite = false;
+ break;
}
}
- if ( dst->symbolNames().contains( symbolName ) && overwrite )
+ if ( dst->symbolNames().contains( symbolName ) && overwrite )
{
dst->addSymbol( symbolName, symbol );
}
- else if ( dst->symbolNames().contains( symbolName ) && !overwrite )
+ else if ( dst->symbolNames().contains( symbolName ) && !overwrite )
{
continue;
}
@@ -233,7 +233,7 @@
}
else
{
- if ( dst->colorRampNames().contains( symbolName ) && prompt )
+ if ( dst->colorRampNames().contains( symbolName ) && prompt )
{
int res = QMessageBox::warning( this, tr( "Duplicate names" ),
tr( "Color ramp with name '%1' already exists.\nOverwrite?" )
@@ -244,21 +244,21 @@
case QMessageBox::Cancel: return;
case QMessageBox::No: continue;
case QMessageBox::Yes: dst->addColorRamp( symbolName, ramp );
- continue;
+ continue;
case QMessageBox::YesToAll: prompt = false;
- overwrite = true;
- break;
+ overwrite = true;
+ break;
case QMessageBox::NoToAll: prompt = false;
- overwrite = false;
- break;
+ overwrite = false;
+ break;
}
}
- if ( dst->colorRampNames().contains( symbolName ) && overwrite )
+ if ( dst->colorRampNames().contains( symbolName ) && overwrite )
{
dst->addColorRamp( symbolName, ramp );
}
- else if ( dst->colorRampNames().contains( symbolName ) && !overwrite )
+ else if ( dst->colorRampNames().contains( symbolName ) && !overwrite )
{
continue;
}
Modified: trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp 2011-03-01 08:10:18 UTC (rev 15303)
@@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: qgsrubberselectid.cpp 13377 2010-04-25 01:07:36Z jef $ */
+/* $Id$ */
#include "qgsrubberselectid.h"
@@ -43,7 +43,7 @@
void QgsRubberSelectId::reset()
{
- mRubberBand->reset( mIsPolygon );
+ mRubberBand->reset( mIsPolygon );
} // void QgsRubberSelectId::reset()
void QgsRubberSelectId::setStyle( int colorRed, int colorGreen, int colorBlue, int width )
@@ -58,7 +58,7 @@
void QgsRubberSelectId::addFeature( QgsVectorLayer* lyr, int fid )
{
bool isPolygon = ( lyr->geometryType() == QGis::Polygon );
- if( mIsPolygon != isPolygon)
+ if ( mIsPolygon != isPolygon )
{
reset();
delete mRubberBand;
Modified: trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h 2011-03-01 08:10:18 UTC (rev 15303)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: qgsrubberselectid.h 13377 2010-04-25 01:07:36Z jef $ */
+/* $Id$ */
#ifndef QGSRUBBERSELECTID_H
#define QGSRUBBERSELECTID_H
@@ -52,7 +52,7 @@
* \param colorGreen integer for value green (0 - 255)
* \param colorBlue integer for value blue (0 - 255)
*/
- void setStyle( int colorRed, int colorGreen, int colorBlue, int width);
+ void setStyle( int colorRed, int colorGreen, int colorBlue, int width );
/**
* \brief Create rubber band from geometry by feature
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp 2011-03-01 08:10:18 UTC (rev 15303)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: qgsspatialquerydialog.cpp 15141 2011-02-08 13:34:43Z jef $ */
+/* $Id$ */
#include <QMessageBox>
#include <QDateTime>
@@ -67,7 +67,7 @@
void QgsSpatialQueryDialog::initGui()
{
- mRubberSelectId->setStyle(250, 0, 0, 2); // Same identify
+ mRubberSelectId->setStyle( 250, 0, 0, 2 ); // Same identify
visibleResult( false );
populateTypeItems();
populateCbTargetLayer();
@@ -187,7 +187,7 @@
msg = tr( "Total of features = %1" ).arg( mFeatureResult.size() );
teStatus->append( msg );
teStatus->append( "" );
- teStatus->append( tr("Total of invalid features:") );
+ teStatus->append( tr( "Total of invalid features:" ) );
teStatus->append( getDescriptionInvalidFeaturesShow( true ) );
teStatus->append( getDescriptionInvalidFeaturesShow( false ) );
teStatus->append( "" );
@@ -197,8 +197,8 @@
teStatus->append( "" );
ckbLogProcessing->setChecked( false );
- QVariant item = QVariant::fromValue( (int)itemsResult );
- int index = cbTypeItems->findData(item);
+ QVariant item = QVariant::fromValue(( int )itemsResult );
+ int index = cbTypeItems->findData( item );
cbTypeItems->setCurrentIndex( index );
on_cbTypeItems_currentIndexChanged( index );
@@ -206,8 +206,8 @@
if ( mFeatureResult.size() > 0 )
{
// Select features
- TypeResultFor typeResultFor = (TypeResultFor) cbResultFor->itemData( cbResultFor->currentIndex() ).toInt();
- switch( typeResultFor )
+ TypeResultFor typeResultFor = ( TypeResultFor ) cbResultFor->itemData( cbResultFor->currentIndex() ).toInt();
+ switch ( typeResultFor )
{
case selectedNew:
mLayerTarget->setSelectedFeatures( mFeatureResult );
@@ -216,7 +216,7 @@
mLayerTarget->setSelectedFeatures( mLayerTarget->selectedFeaturesIds() + mFeatureResult );
break;
case selectedRemove:
- mLayerTarget->setSelectedFeatures( mLayerTarget->selectedFeaturesIds() - mFeatureResult);
+ mLayerTarget->setSelectedFeatures( mLayerTarget->selectedFeaturesIds() - mFeatureResult );
break;
default:
return;
@@ -226,9 +226,9 @@
QString QgsSpatialQueryDialog::getSubsetFIDs( const QSet< int > *fids, QString fieldFID )
{
- if( fids->size() == 0 )
+ if ( fids->size() == 0 )
{
- return QString("");
+ return QString( "" );
}
QSetIterator <int>item( *fids );
QStringList lstFID;
@@ -236,36 +236,36 @@
{
lstFID.append( QString::number( item.next() ) );
}
- QString qFormat("%1 in (%2)");
- QString qReturn = qFormat.arg( fieldFID ).arg( lstFID.join(",") );
+ QString qFormat( "%1 in (%2)" );
+ QString qReturn = qFormat.arg( fieldFID ).arg( lstFID.join( "," ) );
lstFID.clear();
return qReturn;
} // QString QgsSpatialQueryDialog::getSubsetFIDs( const QSet< int > *fids, QString fieldFID )
-QgsSpatialQueryDialog::TypeVerifyCreateSubset QgsSpatialQueryDialog::verifyCreateSubset(QString &msg, QString &fieldFID)
+QgsSpatialQueryDialog::TypeVerifyCreateSubset QgsSpatialQueryDialog::verifyCreateSubset( QString &msg, QString &fieldFID )
{
QString providerType = mLayerTarget->providerType().toUpper();
// OGR
- if( providerType == "OGR")
+ if ( providerType == "OGR" )
{
- fieldFID = QString("FID");
+ fieldFID = QString( "FID" );
return verifyOk;
}
// Database Postgis and Spatialite
- if( providerType == "POSTGRES" || providerType == "SPATIALITE" )
+ if ( providerType == "POSTGRES" || providerType == "SPATIALITE" )
{
fieldFID = mLayerTarget->dataProvider()->fields().value( 0 ).name();
- msg = tr("Using the field \"%1\" for subset").arg( fieldFID );
+ msg = tr( "Using the field \"%1\" for subset" ).arg( fieldFID );
return verifyTry;
}
- msg = tr("Sorry! Only this providers are enable: OGR, POSTGRES and SPATIALITE.");
+ msg = tr( "Sorry! Only this providers are enable: OGR, POSTGRES and SPATIALITE." );
return verifyImpossible;
} // TypeVerifyCreateSubset QgsSpatialQueryDialog::verifyCreateSubset(QString &msg, QString &fieldFID)
bool QgsSpatialQueryDialog::addLayerSubset( QString name, QString subset )
{
QgsVectorLayer *addLyr = new QgsVectorLayer( mLayerTarget->source(), name, mLayerTarget->providerType() );
- if( ! addLyr->setSubsetString( subset ) )
+ if ( ! addLyr->setSubsetString( subset ) )
{
delete addLyr;
return false;
@@ -464,9 +464,9 @@
cmb->setCurrentIndex( 0 );
setLayer( isTarget, 0 );
evaluateCheckBoxLayer( isTarget );
- if (isTarget)
+ if ( isTarget )
{
- if( gbResultQuery->isVisible() )
+ if ( gbResultQuery->isVisible() )
{
visibleResult( false );
}
@@ -482,19 +482,19 @@
cbResultFor->blockSignals( true );
cbResultFor->clear();
QVariant item;
- item = QVariant::fromValue( (int)selectedNew );
- cbResultFor->addItem( tr("Create new selection"), item );
- if( mLayerTarget->selectedFeatureCount() == 0 )
+ item = QVariant::fromValue(( int )selectedNew );
+ cbResultFor->addItem( tr( "Create new selection" ), item );
+ if ( mLayerTarget->selectedFeatureCount() == 0 )
{
- return;
+ return;
}
- if( ! ckbUsingSelectedTarget->isChecked() )
+ if ( ! ckbUsingSelectedTarget->isChecked() )
{
- item = QVariant::fromValue( (int)selectedAdd );
- cbResultFor->addItem( tr("Add to current selection"), item );
+ item = QVariant::fromValue(( int )selectedAdd );
+ cbResultFor->addItem( tr( "Add to current selection" ), item );
}
- item = QVariant::fromValue( (int)selectedRemove );
- cbResultFor->addItem( tr("Remove from current selection"), item );
+ item = QVariant::fromValue(( int )selectedRemove );
+ cbResultFor->addItem( tr( "Remove from current selection" ), item );
cbResultFor->blockSignals( false );
} // void QgsSpatialQueryDialog::populateCbResulFor()
@@ -502,12 +502,12 @@
{
QVariant item;
cbTypeItems->blockSignals( true );
- item = QVariant::fromValue( (int)itemsResult );
- cbTypeItems->addItem( tr("Result query"), item );
- item = QVariant::fromValue( (int)itemsInvalidTarget );
- cbTypeItems->addItem( tr("Invalid source"), item );
- item = QVariant::fromValue( (int)itemsInvalidReference );
- cbTypeItems->addItem( tr("Invalid reference"), item );
+ item = QVariant::fromValue(( int )itemsResult );
+ cbTypeItems->addItem( tr( "Result query" ), item );
+ item = QVariant::fromValue(( int )itemsInvalidTarget );
+ cbTypeItems->addItem( tr( "Invalid source" ), item );
+ item = QVariant::fromValue(( int )itemsInvalidReference );
+ cbTypeItems->addItem( tr( "Invalid reference" ), item );
cbTypeItems->blockSignals( false );
}
@@ -621,10 +621,10 @@
{
int selectedFeat = mLayerTarget->selectedFeatureCount();
int totalFeat = mLayerTarget->featureCount();
- QString formatLabel( tr("%1 of %2 selected by \"%3\""));
- if( ! mIsSelectedOperator )
+ QString formatLabel( tr( "%1 of %2 selected by \"%3\"" ) );
+ if ( ! mIsSelectedOperator )
{
- mSourceSelected = tr("user");
+ mSourceSelected = tr( "user" );
}
lbStatusSelected->setText( formatLabel.arg( selectedFeat ).arg( totalFeat ).arg( mSourceSelected ) );
mIsSelectedOperator = false;
@@ -636,19 +636,19 @@
lwFeatures->setEnabled( false ); // The showRubberFeature can be slow
showRubberFeature( lyr, fid );
// Zoom
- if( ckbZoomItem->isChecked() )
+ if ( ckbZoomItem->isChecked() )
{
- zoomFeature(lyr, fid);
+ zoomFeature( lyr, fid );
}
lwFeatures->setEnabled( true );
lwFeatures->setFocus();
} // void QgsSpatialQueryDialog::changeLwFeature( QListWidget *listWidget, QgsVectorLayer* lyr, int fid )
-void QgsSpatialQueryDialog::zoomFeature(QgsVectorLayer* lyr, int fid)
+void QgsSpatialQueryDialog::zoomFeature( QgsVectorLayer* lyr, int fid )
{
static QgsVectorLayer* lyrCheck = NULL;
static bool hasMsg = false;
- if( ! lyrCheck || lyrCheck != lyr )
+ if ( ! lyrCheck || lyrCheck != lyr )
{
lyrCheck = lyr;
hasMsg = true;
@@ -668,26 +668,26 @@
return;
}
// Set system reference
- QgsCoordinateReferenceSystem srsSource = lyr->dataProvider()->crs();
+ QgsCoordinateReferenceSystem srsSource = lyr->dataProvider()->crs();
QgsCoordinateReferenceSystem srcMapcanvas = mIface->mapCanvas()->mapRenderer()->destinationSrs();
- if( ! srsSource.isValid() )
+ if ( ! srsSource.isValid() )
{
- if( hasMsg )
+ if ( hasMsg )
{
long epsgMapcanvas = srcMapcanvas.epsg();
bool isFly = mIface->mapCanvas()->mapRenderer()->hasCrsTransformEnabled();
- QString msgFly = tr("Map \"%1\" \"on the fly\" transformation.").arg( isFly ? tr( "enable" ) : tr( "disable") );
- QString msg = tr("Coordinate reference system(CRS) of\n\"%1\" is invalid(see CRS of provider).").arg( lyr->name() );
- msg.append( tr("\n\nEPSG of map is %1.\n%2.").arg( epsgMapcanvas ).arg( msgFly ) );
- msg.append("\n\nUsing CRS of map for all features!");
+ QString msgFly = tr( "Map \"%1\" \"on the fly\" transformation." ).arg( isFly ? tr( "enable" ) : tr( "disable" ) );
+ QString msg = tr( "Coordinate reference system(CRS) of\n\"%1\" is invalid(see CRS of provider)." ).arg( lyr->name() );
+ msg.append( tr( "\n\nEPSG of map is %1.\n%2." ).arg( epsgMapcanvas ).arg( msgFly ) );
+ msg.append( "\n\nUsing CRS of map for all features!" );
- QMessageBox::warning(this, tr( "Zoom to feature" ), msg, QMessageBox::Ok );
+ QMessageBox::warning( this, tr( "Zoom to feature" ), msg, QMessageBox::Ok );
}
mIface->mapCanvas()->setExtent( feat.geometry()->boundingBox() );
}
- else if ( srsSource == srcMapcanvas)
+ else if ( srsSource == srcMapcanvas )
{
- mIface->mapCanvas()->setExtent( feat.geometry()->boundingBox() );
+ mIface->mapCanvas()->setExtent( feat.geometry()->boundingBox() );
}
else
{
@@ -735,7 +735,7 @@
mIsSelectedOperator = true;
runQuery();
QDateTime datetimeEnd = QDateTime::currentDateTime();
- if( mFeatureResult.count() == 0 )
+ if ( mFeatureResult.count() == 0 )
{
mIsSelectedOperator = false;
}
@@ -746,7 +746,7 @@
void QgsSpatialQueryDialog::visibleResult( bool show )
{
blockSignals( true );
- if( show == false)
+ if ( show == false )
{
mRubberSelectId->reset();
}
@@ -754,7 +754,7 @@
pgbStatus->setVisible( show );
gbResultQuery->setVisible( show );
gbSelected->setVisible( show );
- ckbLogProcessing->setVisible( show );
+ ckbLogProcessing->setVisible( show );
teStatus->setVisible( false );
pgbStatus->setVisible( !show );
blockSignals( false );
@@ -762,9 +762,9 @@
} // void QgsSpatialQueryDialog::visibleResult( bool show )
//! Slots for signs of Dialog
-void QgsSpatialQueryDialog::on_bbMain_clicked( QAbstractButton * button)
+void QgsSpatialQueryDialog::on_bbMain_clicked( QAbstractButton * button )
{
- switch( bbMain->buttonRole( button ) )
+ switch ( bbMain->buttonRole( button ) )
{
case QDialogButtonBox::ApplyRole:
apply();
@@ -780,9 +780,9 @@
void QgsSpatialQueryDialog::on_pbCreateLayerItems_clicked()
{
- TypeItems typeItem = (TypeItems) cbTypeItems->itemData( cbTypeItems->currentIndex() ).toInt();
+ TypeItems typeItem = ( TypeItems ) cbTypeItems->itemData( cbTypeItems->currentIndex() ).toInt();
QSet<int> * fids = 0;
- switch( typeItem )
+ switch ( typeItem )
{
case itemsResult:
fids = &mFeatureResult;
@@ -800,22 +800,22 @@
QString msg;
QString fieldFID;
TypeVerifyCreateSubset verify = verifyCreateSubset( msg, fieldFID );
- if( verify == verifyImpossible )
+ if ( verify == verifyImpossible )
{
- QMessageBox::critical(this, title, msg, QMessageBox::Ok );
+ QMessageBox::critical( this, title, msg, QMessageBox::Ok );
return;
}
- if( verify == verifyTry )
+ if ( verify == verifyTry )
{
- QMessageBox::warning(this, title, msg, QMessageBox::Ok );
+ QMessageBox::warning( this, title, msg, QMessageBox::Ok );
}
- QString subset = getSubsetFIDs( fids, fieldFID );
- QString name = QString("%1 < %2 > %3").arg( mLayerTarget->name() ).arg( cbOperation->currentText() ).arg( mLayerReference->name() );
- if( ! addLayerSubset( name, subset ) )
+ QString subset = getSubsetFIDs( fids, fieldFID );
+ QString name = QString( "%1 < %2 > %3" ).arg( mLayerTarget->name() ).arg( cbOperation->currentText() ).arg( mLayerReference->name() );
+ if ( ! addLayerSubset( name, subset ) )
{
- msg = tr("The query from \"%1\" using \"%2\" in field not possible.").arg( mLayerTarget->name() ).arg( fieldFID );
- QMessageBox::critical(this, title, msg, QMessageBox::Ok );
+ msg = tr( "The query from \"%1\" using \"%2\" in field not possible." ).arg( mLayerTarget->name() ).arg( fieldFID );
+ QMessageBox::critical( this, title, msg, QMessageBox::Ok );
}
} // void QgsSpatialQueryDialog::on_pbCreateLayerItems_clicked()
@@ -826,22 +826,22 @@
QString msg;
QString fieldFID;
TypeVerifyCreateSubset verify = verifyCreateSubset( msg, fieldFID );
- if( verify == verifyImpossible )
+ if ( verify == verifyImpossible )
{
- QMessageBox::critical(this, title, msg, QMessageBox::Ok );
+ QMessageBox::critical( this, title, msg, QMessageBox::Ok );
return;
}
- if( verify == verifyTry )
+ if ( verify == verifyTry )
{
- QMessageBox::warning(this, title, msg, QMessageBox::Ok );
+ QMessageBox::warning( this, title, msg, QMessageBox::Ok );
}
- QString subset = getSubsetFIDs( fids, fieldFID );
- QString name = QString("%1 selected").arg( mLayerTarget->name() );
- if( ! addLayerSubset( name, subset ) )
+ QString subset = getSubsetFIDs( fids, fieldFID );
+ QString name = QString( "%1 selected" ).arg( mLayerTarget->name() );
+ if ( ! addLayerSubset( name, subset ) )
{
- msg = tr("The query from \"%1\" using \"%2\" in field not possible.").arg( mLayerTarget->name() ).arg( fieldFID );
- QMessageBox::critical(this, title, msg, QMessageBox::Ok );
+ msg = tr( "The query from \"%1\" using \"%2\" in field not possible." ).arg( mLayerTarget->name() ).arg( fieldFID );
+ QMessageBox::critical( this, title, msg, QMessageBox::Ok );
}
} // void QgsSpatialQueryDialog::on_pbCreateLayerSelected_clicked()
@@ -860,7 +860,7 @@
populateCbOperation();
- if( gbResultQuery->isVisible() )
+ if ( gbResultQuery->isVisible() )
{
visibleResult( false );
}
@@ -873,7 +873,7 @@
populateCbOperation();
- if( gbResultQuery->isVisible() )
+ if ( gbResultQuery->isVisible() )
{
visibleResult( false );
}
@@ -883,11 +883,11 @@
{
// Get Value type Item
QVariant qtypItem = cbTypeItems->itemData( index );
- TypeItems typeItem = (TypeItems) qtypItem.toInt();
+ TypeItems typeItem = ( TypeItems ) qtypItem.toInt();
QSet<int> * setItems = 0;
int totalFeat = mLayerTarget->featureCount();
- switch( typeItem )
+ switch ( typeItem )
{
case itemsResult:
setItems = &mFeatureResult;
@@ -913,7 +913,7 @@
QListWidgetItem *lwItem = NULL;
while ( item.hasNext() )
{
- lwItem = new QListWidgetItem(lwFeatures);
+ lwItem = new QListWidgetItem( lwFeatures );
QVariant fid = QVariant( item.next() );
lwItem->setData( Qt::UserRole, fid ); // Data
lwItem->setData( Qt::DisplayRole, fid ); // Label
@@ -921,7 +921,7 @@
}
lwFeatures->sortItems();
lwFeatures->blockSignals( false );
- lwFeatures->setCurrentRow(0); // Has signal/slot for change current item in ListWidget
+ lwFeatures->setCurrentRow( 0 ); // Has signal/slot for change current item in ListWidget
}
else
{
@@ -929,7 +929,7 @@
lwFeatures->blockSignals( false );
}
// Set lbStatusItems and pbCreateLayer
- QString formatLabel( tr("%1 of %2 identified"));
+ QString formatLabel( tr( "%1 of %2 identified" ) );
lbStatusItems->setText( formatLabel.arg( totalItens ).arg( totalFeat ) );
pbCreateLayerItems->setEnabled( totalItens > 0 );
ckbZoomItem->setEnabled( totalItens > 0 );
@@ -937,7 +937,7 @@
void QgsSpatialQueryDialog::on_cbResultFor_currentIndexChanged()
{
- if( gbResultQuery->isVisible() )
+ if ( gbResultQuery->isVisible() )
{
visibleResult( false );
}
@@ -945,7 +945,7 @@
void QgsSpatialQueryDialog::on_cbOperation_currentIndexChanged()
{
- if( gbResultQuery->isVisible() )
+ if ( gbResultQuery->isVisible() )
{
visibleResult( false );
}
@@ -953,10 +953,10 @@
void QgsSpatialQueryDialog::on_lwFeatures_currentItemChanged( QListWidgetItem * item )
{
- TypeItems typeItem = (TypeItems)( cbTypeItems->itemData( cbTypeItems->currentIndex() ).toInt() );
+ TypeItems typeItem = ( TypeItems )( cbTypeItems->itemData( cbTypeItems->currentIndex() ).toInt() );
QgsVectorLayer *lyr = typeItem == itemsInvalidReference
? mLayerReference : mLayerTarget;
- int fid = item->data(Qt::UserRole).toInt();
+ int fid = item->data( Qt::UserRole ).toInt();
changeLwFeature( lyr, fid );
} // void QgsSpatialQueryDialog::on_lwFeatures_currentItemChanged( QListWidgetItem * item )
@@ -973,15 +973,15 @@
void QgsSpatialQueryDialog::on_ckbZoomItem_clicked( bool checked )
{
- if( checked )
+ if ( checked )
{
- if( lwFeatures->count() > 0 )
+ if ( lwFeatures->count() > 0 )
{
- int fid = lwFeatures->currentItem()->data(Qt::UserRole).toInt();
- TypeItems typeItem = (TypeItems)( cbTypeItems->itemData( cbTypeItems->currentIndex() ).toInt() );
+ int fid = lwFeatures->currentItem()->data( Qt::UserRole ).toInt();
+ TypeItems typeItem = ( TypeItems )( cbTypeItems->itemData( cbTypeItems->currentIndex() ).toInt() );
QgsVectorLayer *lyr = typeItem == itemsInvalidReference
? mLayerReference : mLayerTarget;
- zoomFeature(lyr, fid);
+ zoomFeature( lyr, fid );
}
}
} // QgsSpatialQueryDialog::on_ckbZoomItem_clicked( bool checked )
@@ -1033,18 +1033,18 @@
removeLayer( false, mLayerTarget );
}
- if( cbTargetLayer->count() < 2 )
+ if ( cbTargetLayer->count() < 2 )
{
bbMain->button( QDialogButtonBox::Apply )->hide();
cbOperation->setEnabled( false );
cbResultFor->setEnabled( false );
- if( gbResultQuery->isVisible() )
+ if ( gbResultQuery->isVisible() )
{
visibleResult( false );
}
mLayerReference = NULL;
- if( cbTargetLayer->count() < 1 )
+ if ( cbTargetLayer->count() < 1 )
{
mLayerTarget = NULL;
}
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h 2011-03-01 08:10:18 UTC (rev 15303)
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* $Id: qgsspatialquerydialog.h 15141 2011-02-08 13:34:43Z jef $ */
+/* $Id$ */
#ifndef SPATIALQUERYDIALOG_H
#define SPATIALQUERYDIALOG_H
@@ -49,7 +49,7 @@
private slots:
//! Slots for signs of Dialog
- void on_bbMain_clicked( QAbstractButton * button);
+ void on_bbMain_clicked( QAbstractButton * button );
void on_pbCreateLayerItems_clicked();
void on_pbCreateLayerSelected_clicked();
void on_cbTargetLayer_currentIndexChanged( int index );
@@ -95,7 +95,7 @@
//! Get string subset with selected FID
QString getSubsetFIDs( const QSet< int > *fids, QString fieldFID );
//! Verify can create layer subset
- TypeVerifyCreateSubset verifyCreateSubset(QString &msg, QString &fieldFID);
+ TypeVerifyCreateSubset verifyCreateSubset( QString &msg, QString &fieldFID );
//! Add layer target with subset
bool addLayerSubset( QString name, QString subset );
//! Get Description Layer to show result
@@ -133,7 +133,7 @@
//! Make action when change item in List feature
void changeLwFeature( QgsVectorLayer* lyr, int fid );
//! Zoom mapcanvas to current feature in listbox target
- void zoomFeature(QgsVectorLayer* lyr, int fid);
+ void zoomFeature( QgsVectorLayer* lyr, int fid );
//! Show rubber from feature
void showRubberFeature( QgsVectorLayer* lyr, int id );
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui 2011-03-01 08:00:54 UTC (rev 15302)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui 2011-03-01 08:10:18 UTC (rev 15303)
@@ -1,424 +1,424 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QgsSpatialQueryDialogBase</class>
- <widget class="QDialog" name="QgsSpatialQueryDialogBase">
- <property name="windowModality">
- <enum>Qt::NonModal</enum>
- </property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>353</width>
- <height>510</height>
- </rect>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="acceptDrops">
- <bool>true</bool>
- </property>
- <property name="windowTitle">
- <string>Spatial Query</string>
- </property>
- <property name="locale">
- <locale language="English" country="UnitedKingdom"/>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="lyOperatorResult">
- <item>
- <layout class="QVBoxLayout" name="lytOperator">
- <item>
- <widget class="QGroupBox" name="gbTarget">
- <property name="toolTip">
- <string>Layer on which the topological operation will select geometries</string>
- </property>
- <property name="title">
- <string>Select source features from</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
- <widget class="QComboBox" name="cbTargetLayer">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the target layer</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="ckbUsingSelectedTarget">
- <property name="toolTip">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will only consider selected geometries of the target layer</span></p></body></html></string>
- </property>
- <property name="text">
- <string>Selected feature(s) only</string>
- </property>
- </widget>
- </item>
- </layout>
- <zorder>ckbUsingSelectedTarget</zorder>
- <zorder>cbTargetLayer</zorder>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lbOperation">
- <property name="text">
- <string>Where the feature</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cbOperation">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the topological operation</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="gbReference">
- <property name="toolTip">
- <string>Layer whose geometries will be used as reference by the topological operation</string>
- </property>
- <property name="title">
- <string>Reference features of </string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <property name="sizeConstraint">
- <enum>QLayout::SetMinimumSize</enum>
- </property>
- <item>
- <widget class="QComboBox" name="cbReferenceLayer">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the reference layer</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="ckbUsingSelectedReference">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>18</height>
- </size>
- </property>
- <property name="toolTip">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will be only consider selected geometries of the reference layer</span></p></body></html></string>
- </property>
- <property name="text">
- <string>Selected feature(s) only</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lbResultFor">
- <property name="text">
- <string>And use the result to</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cbResultFor"/>
- </item>
- <item>
- <spacer name="spResult">
- <property name="minimumSize">
- <size>
- <width>146</width>
- <height>40</height>
- </size>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QGroupBox" name="gbSelected">
- <property name="title">
- <string>Selected features</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="lbStatusSelected">
- <property name="toolTip">
- <string>Number of selected features in map</string>
- </property>
- <property name="locale">
- <locale language="English" country="UnitedStates"/>
- </property>
- <property name="text">
- <string notr="true">selected</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbCreateLayerSelected">
- <property name="minimumSize">
- <size>
- <width>44</width>
- <height>32</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>44</width>
- <height>32</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Create layer with selected</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="qgsspatialquerydialogbase.qrc">
- <normaloff>:/icons/selectcreatelayer.png</normaloff>:/icons/selectcreatelayer.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="Line" name="leSpace">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="lyResult">
- <item>
- <widget class="QGroupBox" name="gbResultQuery">
- <property name="title">
- <string>FIDs identified</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
- <item>
- <widget class="QComboBox" name="cbTypeItems">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QListWidget" name="lwFeatures">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select one FID to identify geometry of feature</string>
- </property>
- <property name="resizeMode">
- <enum>QListView::Fixed</enum>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="lytItems">
- <item>
- <widget class="QLabel" name="lbStatusItems">
- <property name="toolTip">
- <string>Number of selected features in map</string>
- </property>
- <property name="locale">
- <locale language="English" country="UnitedStates"/>
- </property>
- <property name="text">
- <string notr="true">items</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbCreateLayerItems">
- <property name="minimumSize">
- <size>
- <width>35</width>
- <height>32</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>35</width>
- <height>32</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Create layer with list of items</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="qgsspatialquerydialogbase.qrc">
- <normaloff>:/icons/itemscreatelayer.png</normaloff>:/icons/itemscreatelayer.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QCheckBox" name="ckbZoomItem">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Zoom to item</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="lyLogMessage">
- <item>
- <widget class="QCheckBox" name="ckbLogProcessing">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Check to show log processing of query</string>
- </property>
- <property name="text">
- <string>Log messages</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QTextEdit" name="teStatus">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QProgressBar" name="pgbStatus">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>25</height>
- </size>
- </property>
- <property name="value">
- <number>0</number>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="textVisible">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="bbMain">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::DefaultContextMenu</enum>
- </property>
- <property name="toolTip">
- <string>Run query or close the window</string>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Apply|QDialogButtonBox::Close</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <tabstops>
- <tabstop>cbTargetLayer</tabstop>
- <tabstop>ckbUsingSelectedTarget</tabstop>
- <tabstop>cbReferenceLayer</tabstop>
- <tabstop>ckbUsingSelectedReference</tabstop>
- <tabstop>bbMain</tabstop>
- </tabstops>
- <resources>
- <include location="qgsspatialquerydialogbase.qrc"/>
- </resources>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QgsSpatialQueryDialogBase</class>
+ <widget class="QDialog" name="QgsSpatialQueryDialogBase">
+ <property name="windowModality">
+ <enum>Qt::NonModal</enum>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>353</width>
+ <height>510</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="acceptDrops">
+ <bool>true</bool>
+ </property>
+ <property name="windowTitle">
+ <string>Spatial Query</string>
+ </property>
+ <property name="locale">
+ <locale language="English" country="UnitedKingdom"/>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="lyOperatorResult">
+ <item>
+ <layout class="QVBoxLayout" name="lytOperator">
+ <item>
+ <widget class="QGroupBox" name="gbTarget">
+ <property name="toolTip">
+ <string>Layer on which the topological operation will select geometries</string>
+ </property>
+ <property name="title">
+ <string>Select source features from</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <widget class="QComboBox" name="cbTargetLayer">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the target layer</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="ckbUsingSelectedTarget">
+ <property name="toolTip">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will only consider selected geometries of the target layer</span></p></body></html></string>
+ </property>
+ <property name="text">
+ <string>Selected feature(s) only</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ <zorder>ckbUsingSelectedTarget</zorder>
+ <zorder>cbTargetLayer</zorder>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lbOperation">
+ <property name="text">
+ <string>Where the feature</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="cbOperation">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the topological operation</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="gbReference">
+ <property name="toolTip">
+ <string>Layer whose geometries will be used as reference by the topological operation</string>
+ </property>
+ <property name="title">
+ <string>Reference features of </string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
+ <item>
+ <widget class="QComboBox" name="cbReferenceLayer">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the reference layer</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="ckbUsingSelectedReference">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>18</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will be only consider selected geometries of the reference layer</span></p></body></html></string>
+ </property>
+ <property name="text">
+ <string>Selected feature(s) only</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lbResultFor">
+ <property name="text">
+ <string>And use the result to</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="cbResultFor"/>
+ </item>
+ <item>
+ <spacer name="spResult">
+ <property name="minimumSize">
+ <size>
+ <width>146</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="gbSelected">
+ <property name="title">
+ <string>Selected features</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="lbStatusSelected">
+ <property name="toolTip">
+ <string>Number of selected features in map</string>
+ </property>
+ <property name="locale">
+ <locale language="English" country="UnitedStates"/>
+ </property>
+ <property name="text">
+ <string notr="true">selected</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pbCreateLayerSelected">
+ <property name="minimumSize">
+ <size>
+ <width>44</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>44</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Create layer with selected</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="qgsspatialquerydialogbase.qrc">
+ <normaloff>:/icons/selectcreatelayer.png</normaloff>:/icons/selectcreatelayer.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="Line" name="leSpace">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="lyResult">
+ <item>
+ <widget class="QGroupBox" name="gbResultQuery">
+ <property name="title">
+ <string>FIDs identified</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <item>
+ <widget class="QComboBox" name="cbTypeItems">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListWidget" name="lwFeatures">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select one FID to identify geometry of feature</string>
+ </property>
+ <property name="resizeMode">
+ <enum>QListView::Fixed</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="lytItems">
+ <item>
+ <widget class="QLabel" name="lbStatusItems">
+ <property name="toolTip">
+ <string>Number of selected features in map</string>
+ </property>
+ <property name="locale">
+ <locale language="English" country="UnitedStates"/>
+ </property>
+ <property name="text">
+ <string notr="true">items</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pbCreateLayerItems">
+ <property name="minimumSize">
+ <size>
+ <width>35</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>35</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Create layer with list of items</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="qgsspatialquerydialogbase.qrc">
+ <normaloff>:/icons/itemscreatelayer.png</normaloff>:/icons/itemscreatelayer.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="ckbZoomItem">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Zoom to item</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="lyLogMessage">
+ <item>
+ <widget class="QCheckBox" name="ckbLogProcessing">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Check to show log processing of query</string>
+ </property>
+ <property name="text">
+ <string>Log messages</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextEdit" name="teStatus">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QProgressBar" name="pgbStatus">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>25</height>
+ </size>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="textVisible">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="bbMain">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::DefaultContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Run query or close the window</string>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Apply|QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <tabstops>
+ <tabstop>cbTargetLayer</tabstop>
+ <tabstop>ckbUsingSelectedTarget</tabstop>
+ <tabstop>cbReferenceLayer</tabstop>
+ <tabstop>ckbUsingSelectedReference</tabstop>
+ <tabstop>bbMain</tabstop>
+ </tabstops>
+ <resources>
+ <include location="qgsspatialquerydialogbase.qrc"/>
+ </resources>
+ <connections/>
+</ui>
More information about the QGIS-commit
mailing list