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

indentation update

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-09-19 11:17:42 +02:00
parent abaeb5f8eb
commit 25437c10c6
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py
View File

@ -61,7 +61,7 @@ class OrientedMinimumBoundingBox(GeoAlgorithm):
if byFeature and layer.geometryType() == QGis.Point and layer.featureCount() <= 2:
raise GeoAlgorithmExecutionException(self.tr("Can't calculate an OMBB for each point, it's a point. The number of points must be greater than 2"))
fields = [
QgsField('AREA', QVariant.Double),
QgsField('PERIMETER', QVariant.Double),

2
python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
View File

@ -178,7 +178,7 @@ class QGISAlgorithmProvider(AlgorithmProvider):
SetVectorStyle(), SetRasterStyle(),
SelectByExpression(), HypsometricCurves(),
SplitLinesWithLines(), CreateConstantRaster(),
FieldsMapper(),SelectByAttributeSum(), Datasources2Vrt(),
FieldsMapper(), SelectByAttributeSum(), Datasources2Vrt(),
CheckValidity(), OrientedMinimumBoundingBox()
]

2
scripts/prepare-commit.sh
View File

@ -31,7 +31,7 @@ fi
if [ "$1" = "-c" ]; then
echo "Cleaning..."
find . \( -name "*.prepare" -o -name "*.astyle" -o -name "*.nocopyright" -o -name "astyle.*.diff" -o -name "sha-*.diff" -o -name "*.sortinc" \) -print -delete
find . \( -name "*.prepare" -o -name "*.astyle" -o -name "*.nocopyright" -o -name "astyle.*.diff" -o -name "sha-*.diff" -o -name "*.sortinc" -o -name "*.bom" \) -print -delete
fi
set -e

2
src/core/qgsexpressioncontext.h
View File

@ -1,4 +1,4 @@
/***************************************************************************
/***************************************************************************
qgsexpressioncontext.h
----------------------
Date : April 2015

24
src/gui/symbology-ng/qgsstylev2managerdialog.cpp
View File

@ -192,7 +192,7 @@ void QgsStyleV2ManagerDialog::on_tabItemType_currentChanged( int )
rampTypes << tr( "Gradient" ) << tr( "Random" ) << tr( "ColorBrewer" );
rampTypes << tr( "cpt-city" ); // todo, only for rasters?
QMenu* menu = new QMenu( btnAddItem );
Q_FOREACH( const QString& rampType, rampTypes )
Q_FOREACH ( const QString& rampType, rampTypes )
{
menu->addAction( rampType );
}
@ -691,7 +691,7 @@ void QgsStyleV2ManagerDialog::removeItem()
bool QgsStyleV2ManagerDialog::removeSymbol()
{
QModelIndexList indexes = listItems->selectionModel()->selectedIndexes();
Q_FOREACH( const QModelIndex& index, indexes )
Q_FOREACH ( const QModelIndex& index, indexes )
{
QString symbolName = index.data().toString();
// delete from style and update list
@ -766,7 +766,7 @@ void QgsStyleV2ManagerDialog::exportSelectedItemsImages( QString dir, QString fo
return;
QModelIndexList indexes = listItems->selectionModel()->selection().indexes();
Q_FOREACH( const QModelIndex& index, indexes )
Q_FOREACH ( const QModelIndex& index, indexes )
{
QString name = index.data().toString();
QString path = dir + "/" + name + "." + format;
@ -1157,11 +1157,11 @@ void QgsStyleV2ManagerDialog::regrouped( QStandardItem *item )
void QgsStyleV2ManagerDialog::setSymbolsChecked( QStringList symbols )
{
QStandardItemModel *model = qobject_cast<QStandardItemModel*>( listItems->model() );
Q_FOREACH( const QString& symbol, symbols )
Q_FOREACH ( const QString& symbol, symbols )
{
QList<QStandardItem*> items = model->findItems( symbol );
Q_FOREACH( QStandardItem* item, items )
item->setCheckState( Qt::Checked );
Q_FOREACH ( QStandardItem* item, items )
item->setCheckState( Qt::Checked );
}
}
@ -1204,27 +1204,27 @@ void QgsStyleV2ManagerDialog::tagsChanged()
return;
}
// compare old with new to find removed tags
Q_FOREACH( const QString &tag, oldtags )
Q_FOREACH ( const QString &tag, oldtags )
{
if ( !newtags.contains( tag ) )
removetags.append( tag );
}
if ( removetags.size() > 0 )
{
Q_FOREACH( const QModelIndex& index, indexes )
Q_FOREACH ( const QModelIndex& index, indexes )
{
mStyle->detagSymbol( type, index.data().toString(), removetags );
}
}
// compare new with old to find added tags
Q_FOREACH( const QString &tag, newtags )
Q_FOREACH ( const QString &tag, newtags )
{
if ( !oldtags.contains( tag ) )
addtags.append( tag );
}
if ( addtags.size() > 0 )
{
Q_FOREACH( const QModelIndex& index, indexes )
Q_FOREACH ( const QModelIndex& index, indexes )
{
mStyle->tagSymbol( type, index.data().toString(), addtags );
}
@ -1345,7 +1345,7 @@ void QgsStyleV2ManagerDialog::listitemsContextMenu( const QPoint& point )
groupList->setTitle( tr( "Apply Group" ) );
QStringList groups = mStyle->groupNames();
Q_FOREACH( const QString& group, groups )
Q_FOREACH ( const QString& group, groups )
{
groupList->addAction( group );
}
@ -1368,7 +1368,7 @@ void QgsStyleV2ManagerDialog::listitemsContextMenu( const QPoint& point )
groupId = mStyle->groupId( selectedItem->text() );
}
QModelIndexList indexes = listItems->selectionModel()->selectedIndexes();
Q_FOREACH( const QModelIndex& index, indexes )
Q_FOREACH ( const QModelIndex& index, indexes )
{
mStyle->group( type, index.data().toString(), groupId );
}

2
src/server/qgswmsprojectparser.cpp
View File

@ -259,7 +259,7 @@ void QgsWMSProjectParser::addLayersFromGroup( const QDomElement& legendGroupElem
QMap< int, QDomElement > layerOrderList;
QDomNodeList groupElemChildren = legendGroupElem.childNodes();
// for rendering layers has to be add from bottom (end) to top (start)
for ( int i = groupElemChildren.size()-1; i >= 0 ; --i )
for ( int i = groupElemChildren.size() - 1; i >= 0 ; --i )
{
QDomElement elem = groupElemChildren.at( i ).toElement();
if ( elem.tagName() == "legendgroup" )