Skip to content

Commit 0157d83

Browse files
jef-njef-n
committedJul 12, 2013
indentation update
·
ltr-3_40archive/master_2
1 parent 52dd890 commit 0157d83

File tree

16 files changed

+92
-92
lines changed

16 files changed

+92
-92
lines changed
 

‎python/plugins/sextante/algs/mmqgisx/MMQGISXAlgorithms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ def processAlgorithm(self, progress):
418418

419419
crsId = self.getParameterValue(self.CRS)
420420
self.crs = QgsCoordinateReferenceSystem(crsId)
421-
421+
422422
if (hspacing <= 0) or (vspacing <= 0):
423423
raise GeoAlgorithmExecutionException("Invalid grid spacing: " + unicode(hspacing) + " / " + unicode(vspacing))
424424

‎python/plugins/sextante/core/GeoAlgorithm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def resolveTemporaryOutputs(self):
262262
SextanteUtils.setTempOutput(out, self)
263263

264264
def setOutputCRS(self):
265-
layers = QGisLayers.getAllLayers()
265+
layers = QGisLayers.getAllLayers()
266266
for param in self.parameters:
267267
if isinstance(param, (ParameterRaster, ParameterVector, ParameterMultipleInput)):
268268
if param.value:
@@ -272,14 +272,14 @@ def setOutputCRS(self):
272272
if layer.source() == inputlayer:
273273
self.crs = layer.crs()
274274
return
275-
if (isinstance(param, ParameterRaster) or
275+
if (isinstance(param, ParameterRaster) or
276276
(isinstance(param, ParameterMultipleInput) and param.datatype == ParameterMultipleInput.TYPE_RASTER)):
277277
p = QgsProviderRegistry.instance().provider('gdal', inputlayer)
278278
else:
279279
p = QgsProviderRegistry.instance().provider('ogr', inputlayer)
280280
if p is not None:
281281
self.crs = p.crs()
282-
return
282+
return
283283
qgis = QGisLayers.iface
284284
self.crs = qgis.mapCanvas().mapRenderer().destinationCrs()
285285

‎python/plugins/sextante/grass/description/r.report.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
r.report
2-
r.report - Reports statistics for raster layers.
3-
Raster (r.*)
4-
ParameterMultipleInput|map|Raster layer(s) to report on|3.0|False
5-
ParameterSelection|units|Units|mi;me;k;a;h;c;p
6-
ParameterString|null|Character representing no data cell value|*
7-
ParameterNumber|nsteps|Number of fp subranges to collect stats from|1|None|255
8-
ParameterBoolean|-h|Suppress page headers|True
9-
ParameterBoolean|-f|Use formfeeds between pages|True
10-
ParameterBoolean|-e|Scientific format|True
11-
ParameterBoolean|-n|Filter out all no data cells|True
12-
ParameterBoolean|-N|Filter out cells where all layers have no data|True
13-
OutputHTML|html|Output report file
1+
r.report
2+
r.report - Reports statistics for raster layers.
3+
Raster (r.*)
4+
ParameterMultipleInput|map|Raster layer(s) to report on|3.0|False
5+
ParameterSelection|units|Units|mi;me;k;a;h;c;p
6+
ParameterString|null|Character representing no data cell value|*
7+
ParameterNumber|nsteps|Number of fp subranges to collect stats from|1|None|255
8+
ParameterBoolean|-h|Suppress page headers|True
9+
ParameterBoolean|-f|Use formfeeds between pages|True
10+
ParameterBoolean|-e|Scientific format|True
11+
ParameterBoolean|-n|Filter out all no data cells|True
12+
ParameterBoolean|-N|Filter out cells where all layers have no data|True
13+
OutputHTML|html|Output report file

‎python/plugins/sextante/grass/ext/r_report.py

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
# -*- coding: utf-8 -*-
2-
3-
"""
4-
***************************************************************************
5-
r_report.py
6-
---------------------
7-
Date : December 2012
8-
Copyright : (C) 2012 by Victor Olaya
9-
Email : volayaf at gmail dot com
10-
***************************************************************************
11-
* *
12-
* This program is free software; you can redistribute it and/or modify *
13-
* it under the terms of the GNU General Public License as published by *
14-
* the Free Software Foundation; either version 2 of the License, or *
15-
* (at your option) any later version. *
16-
* *
17-
***************************************************************************
18-
"""
19-
__author__ = 'Victor Olaya'
20-
__date__ = 'December 2012'
21-
__copyright__ = '(C) 2012, Victor Olaya'
22-
# This will get replaced with a git SHA1 when you do a git archive
23-
__revision__ = '$Format:%H$'
24-
25-
from sextante.grass.ext import HtmlReportPostProcessor
26-
27-
def postProcessResults(alg):
28-
HtmlReportPostProcessor.postProcessResults(alg)
1+
# -*- coding: utf-8 -*-
2+
3+
"""
4+
***************************************************************************
5+
r_report.py
6+
---------------------
7+
Date : December 2012
8+
Copyright : (C) 2012 by Victor Olaya
9+
Email : volayaf at gmail dot com
10+
***************************************************************************
11+
* *
12+
* This program is free software; you can redistribute it and/or modify *
13+
* it under the terms of the GNU General Public License as published by *
14+
* the Free Software Foundation; either version 2 of the License, or *
15+
* (at your option) any later version. *
16+
* *
17+
***************************************************************************
18+
"""
19+
__author__ = 'Victor Olaya'
20+
__date__ = 'December 2012'
21+
__copyright__ = '(C) 2012, Victor Olaya'
22+
# This will get replaced with a git SHA1 when you do a git archive
23+
__revision__ = '$Format:%H$'
24+
25+
from sextante.grass.ext import HtmlReportPostProcessor
26+
27+
def postProcessResults(alg):
28+
HtmlReportPostProcessor.postProcessResults(alg)

‎python/plugins/sextante/saga/SagaAlgorithm.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ def processAlgorithm(self, progress):
234234
raise GeoAlgorithmExecutionException("Unsupported file format")
235235

236236
#2: set parameters and outputs
237-
237+
238238
command = self.undecoratedGroup + " \"" + self.cmdname + "\""
239-
239+
240240
if self.hardcodedStrings:
241241
for s in self.hardcodedStrings:
242242
command += " " + s
@@ -298,9 +298,9 @@ def processAlgorithm(self, progress):
298298
for out in self.outputs:
299299
if isinstance(out, OutputRaster):
300300
filename = out.getCompatibleFileName(self)
301-
filename2 = SextanteUtils.tempFolder() + os.sep + os.path.basename(filename) + ".sgrd"
301+
filename2 = SextanteUtils.tempFolder() + os.sep + os.path.basename(filename) + ".sgrd"
302302
commands.append("io_gdal 1 -GRIDS \"" + filename2 + "\" -FORMAT 4 -TYPE 0 -FILE \"" + filename + "\"");
303-
303+
304304

305305
#4 Run SAGA
306306
SagaUtils.createSagaBatchJobFileFromSagaCommands(commands)

‎src/app/composer/qgscomposer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -973,14 +973,14 @@ void QgsComposer::on_mActionExportAsImage_triggered()
973973
for ( int i = 0; i < mComposition->numPages(); ++i )
974974
{
975975
QImage image = mComposition->printPageAsRaster( i );
976-
if (image.isNull())
976+
if ( image.isNull() )
977977
{
978978
QMessageBox::warning( 0, tr( "Memory Allocation Error" ),
979-
tr( "Trying to create image #%1( %2x%3 @ %4dpi ) "
980-
"may result in a memory overflow.\n"
981-
"Please try a lower resolution or a smaller papersize" )
982-
.arg( i+1 ).arg( width ).arg( height ).arg ( dpi ),
983-
QMessageBox::Ok , QMessageBox::Ok );
979+
tr( "Trying to create image #%1( %2x%3 @ %4dpi ) "
980+
"may result in a memory overflow.\n"
981+
"Please try a lower resolution or a smaller papersize" )
982+
.arg( i + 1 ).arg( width ).arg( height ).arg( dpi ),
983+
QMessageBox::Ok , QMessageBox::Ok );
984984
mView->setPaintingEnabled( true );
985985
return;
986986
}

‎src/app/pluginmanager/qgspluginmanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ void QgsPluginManager::pluginItemChanged( QStandardItem * item )
566566

567567
if ( item->checkState() )
568568
{
569-
if ( mPluginsAreEnabled && ! isPluginEnabled( id ))
569+
if ( mPluginsAreEnabled && ! isPluginEnabled( id ) )
570570
{
571571
QgsDebugMsg( " Loading plugin: " + id );
572572
loadPlugin( id );

‎src/core/qgscoordinatereferencesystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,7 @@ int QgsCoordinateReferenceSystem::syncDb()
17221722
{
17231723
srsProj4 = ( const char * ) sqlite3_column_text( select, 0 );
17241724

1725-
if( QString::fromUtf8(( char * )sqlite3_column_text( select, 1 ) ).toInt() != 0 )
1725+
if ( QString::fromUtf8(( char * )sqlite3_column_text( select, 1 ) ).toInt() != 0 )
17261726
continue;
17271727
}
17281728

‎src/core/qgsgeometryvalidator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ void QgsGeometryValidator::run()
282282

283283
for ( int i = 0; !mStop && i < mp.size(); i++ )
284284
{
285-
if ( mp[i].isEmpty() )
285+
if ( mp[i].isEmpty() )
286286
{
287287
emit errorFound( QgsGeometry::Error( QObject::tr( "polygon %1 has no rings" ).arg( i ) ) );
288288
mErrorCount++;
@@ -291,8 +291,8 @@ void QgsGeometryValidator::run()
291291

292292
for ( int j = i + 1; !mStop && j < mp.size(); j++ )
293293
{
294-
if ( mp[j].isEmpty() )
295-
continue;
294+
if ( mp[j].isEmpty() )
295+
continue;
296296

297297
if ( ringInRing( mp[i][0], mp[j][0] ) )
298298
{

‎src/core/qgsvectorfilewriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ QMap<QString, QString> QgsVectorFileWriter::ogrDriverList()
10161016
if ( ds )
10171017
{
10181018
writableDrivers << "SpatiaLite";
1019-
OGR_Dr_DeleteDataSource( poDriver, TO8( QString( "/vsimem/spatialitetest.sqlite" ) ));
1019+
OGR_Dr_DeleteDataSource( poDriver, TO8( QString( "/vsimem/spatialitetest.sqlite" ) ) );
10201020
OGR_DS_Destroy( ds );
10211021
}
10221022
}

‎src/core/symbology-ng/qgsstylev2.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
754754

755755
QString item = ( type == SymbolEntity ) ? "symbol" : "colorramp";
756756
char *query = sqlite3_mprintf( "SELECT name FROM %q WHERE xml LIKE '%%%q%%'",
757-
item.toUtf8().constData(), qword.toUtf8().constData() );
757+
item.toUtf8().constData(), qword.toUtf8().constData() );
758758

759759
sqlite3_stmt *ppStmt;
760760
int nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
@@ -784,12 +784,12 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
784784
if ( type == SymbolEntity )
785785
{
786786
query = sqlite3_mprintf( "SELECT symbol_id FROM tagmap WHERE tag_id IN (%q)",
787-
dummy.toUtf8().constData() );
787+
dummy.toUtf8().constData() );
788788
}
789789
else
790790
{
791791
query = sqlite3_mprintf( "SELECT colorramp_id FROM ctagmap WHERE tag_id IN (%q)",
792-
dummy.toUtf8().constData() );
792+
dummy.toUtf8().constData() );
793793
}
794794
nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
795795

@@ -804,7 +804,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
804804

805805
dummy = symbolids.join( ", " );
806806
query = sqlite3_mprintf( "SELECT name FROM %q WHERE id IN (%q)",
807-
item.toUtf8().constData(), dummy.toUtf8().constData() );
807+
item.toUtf8().constData(), dummy.toUtf8().constData() );
808808
nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
809809
while ( nErr == SQLITE_OK && sqlite3_step( ppStmt ) == SQLITE_ROW )
810810
{

‎src/gui/qgsattributedialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
229229
mypInnerLayout->addWidget( mypLabel, index, 0 );
230230
mypInnerLayout->addWidget( myWidget, index, 1 );
231231
++index;
232-
}
232+
}
233233
}
234234

235235
// Set focus to first widget in list, to help entering data without moving the mouse.

‎src/gui/qgsmaptool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ QAbstractButton* QgsMapTool::button()
110110
return mButton;
111111
}
112112

113-
void QgsMapTool::setCursor(QCursor cursor)
113+
void QgsMapTool::setCursor( QCursor cursor )
114114
{
115115
mCursor = cursor;
116116
}

‎src/gui/qgsmaptool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class GUI_EXPORT QgsMapTool : public QObject
9999
QAbstractButton* button();
100100

101101
/** Set a user defined cursor */
102-
virtual void setCursor(QCursor cursor);
102+
virtual void setCursor( QCursor cursor );
103103

104104
/** Check whether this MapTool performs a zoom or pan operation.
105105
* If it does, we will be able to perform the zoom and then

‎src/mapserver/qgswfsserver.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
289289
QList<QgsMapLayer*> layerList;
290290
QgsMapLayer* currentLayer = 0;
291291
QgsCoordinateReferenceSystem layerCrs;
292-
QgsRectangle searchRect(0,0,0,0);
292+
QgsRectangle searchRect( 0, 0, 0, 0 );
293293

294294
mErrors = QStringList();
295295
mTypeNames = QStringList();
@@ -966,7 +966,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
966966
}
967967
if ( featureCounter == 0 )
968968
startGetFeature( request, format, layerCrs, &searchRect );
969-
969+
970970
endGetFeature( request, format );
971971

972972
return 0;
@@ -1604,7 +1604,7 @@ QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, QgsCoordinateRefer
16041604
for ( int i = 0; i < attrIndexes.count(); ++i )
16051605
{
16061606
int idx = attrIndexes[i];
1607-
QString attributeName = fields->at(idx).name();
1607+
QString attributeName = fields->at( idx ).name();
16081608
//skip attribute if it is excluded from WFS publication
16091609
if ( excludedAttributes.contains( attributeName ) )
16101610
{
@@ -1682,7 +1682,7 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc
16821682
for ( int i = 0; i < attrIndexes.count(); ++i )
16831683
{
16841684
int idx = attrIndexes[i];
1685-
QString attributeName = fields->at(idx).name();
1685+
QString attributeName = fields->at( idx ).name();
16861686
//skip attribute if it is excluded from WFS publication
16871687
if ( excludedAttributes.contains( attributeName ) )
16881688
{
@@ -1741,7 +1741,7 @@ QDomElement QgsWFSServer::createFeatureGML3( QgsFeature* feat, QDomDocument& doc
17411741
for ( int i = 0; i < attrIndexes.count(); ++i )
17421742
{
17431743
int idx = attrIndexes[i];
1744-
QString attributeName = fields->at(idx).name();
1744+
QString attributeName = fields->at( idx ).name();
17451745
//skip attribute if it is excluded from WFS publication
17461746
if ( excludedAttributes.contains( attributeName ) )
17471747
{

‎src/plugins/globe/globe_plugin.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -511,37 +511,37 @@ void GlobePlugin::setupControls()
511511
Control* rotateCCW = new NavigationControl();
512512
rotateCCW->setHeight( 22 );
513513
rotateCCW->setWidth( 20 );
514-
rotateCCW->setPosition( imgLeft+0, imgTop+18 );
514+
rotateCCW->setPosition( imgLeft + 0, imgTop + 18 );
515515
rotateCCW->addEventHandler( new RotateControlHandler( manip, MOVE_OFFSET, 0 ) );
516516
mControlCanvas->addControl( rotateCCW );
517517

518518
Control* rotateCW = new NavigationControl();
519519
rotateCW->setHeight( 22 );
520520
rotateCW->setWidth( 20 );
521-
rotateCW->setPosition( imgLeft+36, imgTop+18 );
521+
rotateCW->setPosition( imgLeft + 36, imgTop + 18 );
522522
rotateCW->addEventHandler( new RotateControlHandler( manip, -MOVE_OFFSET , 0 ) );
523523
mControlCanvas->addControl( rotateCW );
524524

525525
//Rotate Reset
526526
Control* rotateReset = new NavigationControl();
527527
rotateReset->setHeight( 22 );
528528
rotateReset->setWidth( 16 );
529-
rotateReset->setPosition( imgLeft+20, imgTop+18 );
529+
rotateReset->setPosition( imgLeft + 20, imgTop + 18 );
530530
rotateReset->addEventHandler( new RotateControlHandler( manip, 0, 0 ) );
531531
mControlCanvas->addControl( rotateReset );
532532

533533
//TILT CONTROLS
534534
Control* tiltUp = new NavigationControl();
535535
tiltUp->setHeight( 19 );
536536
tiltUp->setWidth( 24 );
537-
tiltUp->setPosition( imgLeft+20, imgTop+0 );
537+
tiltUp->setPosition( imgLeft + 20, imgTop + 0 );
538538
tiltUp->addEventHandler( new RotateControlHandler( manip, 0, MOVE_OFFSET ) );
539539
mControlCanvas->addControl( tiltUp );
540540

541541
Control* tiltDown = new NavigationControl();
542542
tiltDown->setHeight( 19 );
543543
tiltDown->setWidth( 24 );
544-
tiltDown->setPosition( imgLeft+16, imgTop+36 );
544+
tiltDown->setPosition( imgLeft + 16, imgTop + 36 );
545545
tiltDown->addEventHandler( new RotateControlHandler( manip, 0, -MOVE_OFFSET ) );
546546
mControlCanvas->addControl( tiltDown );
547547

@@ -557,77 +557,77 @@ void GlobePlugin::setupControls()
557557
Control* moveLeft = new NavigationControl();
558558
moveLeft->setHeight( 22 );
559559
moveLeft->setWidth( 20 );
560-
moveLeft->setPosition( imgLeft+0, imgTop+18 );
560+
moveLeft->setPosition( imgLeft + 0, imgTop + 18 );
561561
moveLeft->addEventHandler( new PanControlHandler( manip, -MOVE_OFFSET, 0 ) );
562562
mControlCanvas->addControl( moveLeft );
563563

564564
Control* moveRight = new NavigationControl();
565565
moveRight->setHeight( 22 );
566566
moveRight->setWidth( 20 );
567-
moveRight->setPosition( imgLeft+36, imgTop+18 );
567+
moveRight->setPosition( imgLeft + 36, imgTop + 18 );
568568
moveRight->addEventHandler( new PanControlHandler( manip, MOVE_OFFSET, 0 ) );
569569
mControlCanvas->addControl( moveRight );
570570

571571
Control* moveUp = new NavigationControl();
572572
moveUp->setHeight( 19 );
573573
moveUp->setWidth( 24 );
574-
moveUp->setPosition( imgLeft+20, imgTop+0 );
574+
moveUp->setPosition( imgLeft + 20, imgTop + 0 );
575575
moveUp->addEventHandler( new PanControlHandler( manip, 0, MOVE_OFFSET ) );
576576
mControlCanvas->addControl( moveUp );
577577

578578
Control* moveDown = new NavigationControl();
579579
moveDown->setHeight( 19 );
580580
moveDown->setWidth( 24 );
581-
moveDown->setPosition( imgLeft+16, imgTop+36 );
582-
moveDown->addEventHandler(new PanControlHandler( manip, 0, -MOVE_OFFSET ) );
581+
moveDown->setPosition( imgLeft + 16, imgTop + 36 );
582+
moveDown->addEventHandler( new PanControlHandler( manip, 0, -MOVE_OFFSET ) );
583583
mControlCanvas->addControl( moveDown );
584584

585585
//Zoom Reset
586586
Control* zoomHome = new NavigationControl();
587587
zoomHome->setHeight( 22 );
588588
zoomHome->setWidth( 16 );
589-
zoomHome->setPosition( imgLeft+20, imgTop+18 );
589+
zoomHome->setPosition( imgLeft + 20, imgTop + 18 );
590590
zoomHome->addEventHandler( new HomeControlHandler( manip ) );
591591
mControlCanvas->addControl( zoomHome );
592592

593593
// -------
594594

595595
osg::Image* backgroundImg = osgDB::readImageFile( imgDir + "/button-background.png" );
596596
ImageControl* backgroundGrp1 = new ImageControl( backgroundImg );
597-
imgTop = imgTop+62;
598-
backgroundGrp1->setPosition( imgLeft+12, imgTop );
597+
imgTop = imgTop + 62;
598+
backgroundGrp1->setPosition( imgLeft + 12, imgTop );
599599
mControlCanvas->addControl( backgroundGrp1 );
600600

601601
osg::Image* plusImg = osgDB::readImageFile( imgDir + "/zoom-in.png" );
602602
ImageControl* zoomIn = new NavigationControl( plusImg );
603-
zoomIn->setPosition( imgLeft+12+3, imgTop+3 );
603+
zoomIn->setPosition( imgLeft + 12 + 3, imgTop + 3 );
604604
zoomIn->addEventHandler( new ZoomControlHandler( manip, 0, -MOVE_OFFSET ) );
605605
mControlCanvas->addControl( zoomIn );
606606

607607
osg::Image* minusImg = osgDB::readImageFile( imgDir + "/zoom-out.png" );
608608
ImageControl* zoomOut = new NavigationControl( minusImg );
609-
zoomOut->setPosition( imgLeft+12+3, imgTop+3+23+2 );
609+
zoomOut->setPosition( imgLeft + 12 + 3, imgTop + 3 + 23 + 2 );
610610
zoomOut->addEventHandler( new ZoomControlHandler( manip, 0, MOVE_OFFSET ) );
611611
mControlCanvas->addControl( zoomOut );
612612

613613
// -------
614614

615615
ImageControl* backgroundGrp2 = new ImageControl( backgroundImg );
616-
imgTop = imgTop+60;
617-
backgroundGrp2->setPosition( imgLeft+12, imgTop );
616+
imgTop = imgTop + 60;
617+
backgroundGrp2->setPosition( imgLeft + 12, imgTop );
618618
mControlCanvas->addControl( backgroundGrp2 );
619619

620620
//Zoom Reset
621621
osg::Image* homeImg = osgDB::readImageFile( imgDir + "/zoom-home.png" );
622622
ImageControl* home = new NavigationControl( homeImg );
623-
home->setPosition( imgLeft+12+3, imgTop+2 );
623+
home->setPosition( imgLeft + 12 + 3, imgTop + 2 );
624624
home->addEventHandler( new HomeControlHandler( manip ) );
625625
mControlCanvas->addControl( home );
626626

627627
//refresh layers
628628
osg::Image* refreshImg = osgDB::readImageFile( imgDir + "/refresh-view.png" );
629629
ImageControl* refresh = new NavigationControl( refreshImg );
630-
refresh->setPosition( imgLeft+12+3, imgTop+2+23+2 );
630+
refresh->setPosition( imgLeft + 12 + 3, imgTop + 2 + 23 + 2 );
631631
refresh->addEventHandler( new RefreshControlHandler( this ) );
632632
mControlCanvas->addControl( refresh );
633633

0 commit comments

Comments
 (0)
Please sign in to comment.