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

indentation update

Browse Source
This commit is contained in:
Juergen E. Fischer 2012-01-14 16:58:04 +01:00
parent 96b5592c50
commit 50cdcc36ff
15 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/astyle-all.sh
View File

@ -8,7 +8,7 @@ export elcr="$(tput el)$(tput cr)"
find src -type f -print | while read f; do find src -type f -print | while read f; do
case "$f" in case "$f" in
src/app/gps/qwtpolar-*|src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*) src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*)
echo $f skipped echo $f skipped
continue continue
;; ;;
@ -22,7 +22,7 @@ find src -type f -print | while read f; do
;; ;;
*) *)
echo $f skipped echo -ne "$f skipped $elcr"
continue continue
;; ;;
esac esac

11
src/analysis/raster/qgshillshadefilter.cpp
View File

@ -18,8 +18,10 @@
#include "qgshillshadefilter.h" #include "qgshillshadefilter.h"
QgsHillshadeFilter::QgsHillshadeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, double lightAzimuth, QgsHillshadeFilter::QgsHillshadeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, double lightAzimuth,
double lightAngle): \ double lightAngle )
QgsDerivativeFilter( inputFile, outputFile, outputFormat ), mLightAzimuth( lightAzimuth ), mLightAngle( lightAngle ) : QgsDerivativeFilter( inputFile, outputFile, outputFormat )
, mLightAzimuth( lightAzimuth )
, mLightAngle( lightAngle )
{ {
} }
@ -27,8 +29,9 @@ QgsHillshadeFilter::~QgsHillshadeFilter()
{ {
} }
float QgsHillshadeFilter::processNineCellWindow( float* x11, float* x21, float* x31, \ float QgsHillshadeFilter::processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ) float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 )
{ {
float derX = calcFirstDerX( x11, x21, x31, x12, x22, x32, x13, x23, x33 ); float derX = calcFirstDerX( x11, x21, x31, x12, x22, x32, x13, x23, x33 );
float derY = calcFirstDerY( x11, x21, x31, x12, x22, x32, x13, x23, x33 ); float derY = calcFirstDerY( x11, x21, x31, x12, x22, x32, x13, x23, x33 );

7
src/analysis/raster/qgshillshadefilter.h
View File

@ -27,10 +27,11 @@ class ANALYSIS_EXPORT QgsHillshadeFilter: public QgsDerivativeFilter
double lightAngle = 40 ); double lightAngle = 40 );
~QgsHillshadeFilter(); ~QgsHillshadeFilter();
/**Calculates output value from nine input values. The input values and the output value can be equal to the \ /**Calculates output value from nine input values. The input values and the output value can be equal to the
nodata value if not present or outside of the border. Must be implemented by subclasses*/ nodata value if not present or outside of the border. Must be implemented by subclasses*/
float processNineCellWindow( float* x11, float* x21, float* x31, \ float processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ); float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 );
float lightAzimuth() const { return mLightAzimuth; } float lightAzimuth() const { return mLightAzimuth; }
void setLightAzimuth( float azimuth ) { mLightAzimuth = azimuth; } void setLightAzimuth( float azimuth ) { mLightAzimuth = azimuth; }

2
src/analysis/raster/qgsrelief.cpp
View File

@ -2,7 +2,7 @@
qgsrelief.cpp - description qgsrelief.cpp - description
--------------------------- ---------------------------
begin : November 2011 begin : November 2011
copyright : (C) 20011 by Marco Hugentobler copyright : (C) 2011 by Marco Hugentobler
email : marco dot hugentobler at sourcepole dot ch email : marco dot hugentobler at sourcepole dot ch
***************************************************************************/ ***************************************************************************/

2
src/analysis/raster/qgsrelief.h
View File

@ -2,7 +2,7 @@
qgsrelief.h - description qgsrelief.h - description
--------------------------- ---------------------------
begin : November 2011 begin : November 2011
copyright : (C) 20011 by Marco Hugentobler copyright : (C) 2011 by Marco Hugentobler
email : marco dot hugentobler at sourcepole dot ch email : marco dot hugentobler at sourcepole dot ch
***************************************************************************/ ***************************************************************************/

14
src/plugins/gps_importer/qgsgpsplugingui.cpp
View File

@ -89,14 +89,15 @@ void QgsGPSPluginGui::on_buttonBox_accepted()
// what should we do? // what should we do?
switch ( tabWidget->currentIndex() ) switch ( tabWidget->currentIndex() )
{ {
// add a GPX layer?
case 0: case 0:
// add a GPX layer?
emit loadGPXFile( leGPXFile->text(), cbGPXWaypoints->isChecked(), emit loadGPXFile( leGPXFile->text(), cbGPXWaypoints->isChecked(),
cbGPXRoutes->isChecked(), cbGPXTracks->isChecked() ); cbGPXRoutes->isChecked(), cbGPXTracks->isChecked() );
break; break;
// or import other file?
case 1: case 1:
{ {
// or import other file?
const QString& typeString( cmbIMPFeature->currentText() ); const QString& typeString( cmbIMPFeature->currentText() );
emit importGPSFile( leIMPInput->text(), emit importGPSFile( leIMPInput->text(),
mImporters.find( mImpFormat )->second, mImporters.find( mImpFormat )->second,
@ -107,9 +108,10 @@ void QgsGPSPluginGui::on_buttonBox_accepted()
leIMPLayer->text() ); leIMPLayer->text() );
break; break;
} }
// or download GPS data from a device?
case 2: case 2:
{ {
// or download GPS data from a device?
int featureType = cmbDLFeatureType->currentIndex(); int featureType = cmbDLFeatureType->currentIndex();
QString fileName = leDLOutput->text(); QString fileName = leDLOutput->text();
@ -124,17 +126,19 @@ void QgsGPSPluginGui::on_buttonBox_accepted()
fileName, leDLBasename->text() ); fileName, leDLBasename->text() );
break; break;
} }
// or upload GPS data to a device?
case 3: case 3:
{ {
// or upload GPS data to a device?
emit uploadToGPS( mGPXLayers[cmbULLayer->currentIndex()], emit uploadToGPS( mGPXLayers[cmbULLayer->currentIndex()],
cmbULDevice->currentText(), cmbULDevice->currentText(),
cmbULPort->itemData( cmbULPort->currentIndex() ).toString() ); cmbULPort->itemData( cmbULPort->currentIndex() ).toString() );
break; break;
} }
// or convert between waypoints/tracks=
case 4: case 4:
{ {
// or convert between waypoints/tracks=
int convertType = cmbCONVType->itemData( cmbCONVType->currentIndex() ).toInt(); int convertType = cmbCONVType->itemData( cmbCONVType->currentIndex() ).toInt();
emit convertGPSFile( leCONVInput->text(), emit convertGPSFile( leCONVInput->text(),