Skip to content

Commit

Permalink
Update indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Nov 7, 2016
1 parent cef4719 commit 32b1603
Show file tree
Hide file tree
Showing 345 changed files with 846 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/analysis/interpolation/DualEdgeTriangulation.h
Expand Up @@ -98,6 +98,7 @@ class ANALYSIS_EXPORT DualEdgeTriangulation: public Triangulation
virtual bool swapEdge( double x, double y ) override;
//! Returns a value list with the numbers of the four points, which would be affected by an edge swap. This function is e.g. needed by NormVecDecorator to know the points, for which the normals have to be recalculated. The returned ValueList has to be deleted by the code which calls the method
virtual QList<int>* getPointsAroundEdge( double x, double y ) override;

/** Saves the triangulation as a (line) shapefile
@return true in case of success*/
virtual bool saveAsShapefile( const QString& fileName ) const override;
Expand Down
2 changes: 2 additions & 0 deletions src/analysis/interpolation/NormVecDecorator.h
Expand Up @@ -52,6 +52,7 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
Vector3D* getNormal( int n ) const;
//! Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', exept if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise
bool getTriangle( double x, double y, Point3D* p1, Vector3D* v1, Point3D* p2, Vector3D* v2, Point3D* p3, Vector3D* v3 );

/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the pointStates of the triangle points (state1, state2, state3)
* @note not available in Python bindings
*/
Expand All @@ -62,6 +63,7 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
void setTriangleInterpolator( TriangleInterpolator* inter ) override;
//! Swaps the edge which is closest to the point with x and y coordinates (if this is possible) and forces recalculation of the concerned normals (if alreadyestimated is true)
virtual bool swapEdge( double x, double y ) override;

/** Saves the triangulation as a (line) shapefile
@return true in case of success*/
virtual bool saveAsShapefile( const QString& fileName ) const override;
Expand Down
1 change: 1 addition & 0 deletions src/analysis/interpolation/ParametricLine.h
Expand Up @@ -37,6 +37,7 @@ class ANALYSIS_EXPORT ParametricLine
public:
//! Default constructor
ParametricLine();

/** Constructor, par is a pointer to the parent object, controlpoly the controlpolygon
*/
ParametricLine( ParametricLine* par, QVector<Point3D*>* controlpoly );
Expand Down
2 changes: 2 additions & 0 deletions src/analysis/interpolation/qgsinterpolator.h
Expand Up @@ -69,6 +69,7 @@ class ANALYSIS_EXPORT QgsInterpolator
const QList<LayerData>& layerData() const { return mLayerData; }

protected:

/** Caches the vertex and value data from the provider. All the vertex data
will be held in virtual memory
@return 0 in case of success*/
Expand All @@ -84,6 +85,7 @@ class ANALYSIS_EXPORT QgsInterpolator

private:
QgsInterpolator(); //forbidden

/** Helper method that adds the vertices of a geometry to the mCachedBaseData
@param geom the geometry
@param zCoord true if the z-coordinate of the geometry is to be interpolated
Expand Down
1 change: 1 addition & 0 deletions src/analysis/interpolation/qgstininterpolator.h
Expand Up @@ -63,6 +63,7 @@ class ANALYSIS_EXPORT QgsTINInterpolator: public QgsInterpolator

//! Create dual edge triangulation
void initialize();

/** Inserts the vertices of a feature into the triangulation
@param f the feature
@param zCoord true if the z coordinate is the interpolation attribute
Expand Down
1 change: 1 addition & 0 deletions src/analysis/network/qgsarcproperter.h
Expand Up @@ -32,6 +32,7 @@
class ANALYSIS_EXPORT QgsArcProperter
{
public:

/**
* default constructor
*/
Expand Down
2 changes: 2 additions & 0 deletions src/analysis/network/qgsgraph.h
Expand Up @@ -88,6 +88,7 @@ typedef QList< int > QgsGraphArcIdList;
class ANALYSIS_EXPORT QgsGraphVertex
{
public:

/**
* default constructor. It need for QT's container, e.g. QVector
*/
Expand Down Expand Up @@ -134,6 +135,7 @@ class ANALYSIS_EXPORT QgsGraph
QgsGraph();

// begin graph constructing methods

/**
* add vertex to a grap
*/
Expand Down
1 change: 1 addition & 0 deletions src/analysis/network/qgsgraphanalyzer.h
Expand Up @@ -31,6 +31,7 @@ class QgsGraph;
class ANALYSIS_EXPORT QgsGraphAnalyzer
{
public:

/**
* solve shortest path problem using dijkstra algorithm
* @param source The source graph
Expand Down
1 change: 1 addition & 0 deletions src/analysis/network/qgsgraphbuilder.h
Expand Up @@ -36,6 +36,7 @@ class QgsGraph;
class ANALYSIS_EXPORT QgsGraphBuilder : public QgsGraphBuilderInterface
{
public:

/**
* default constructor
*/
Expand Down
1 change: 1 addition & 0 deletions src/analysis/network/qgsgraphbuilderintr.h
Expand Up @@ -34,6 +34,7 @@
class ANALYSIS_EXPORT QgsGraphBuilderInterface
{
public:

/**
* QgsGraphBuilderInterface constructor
* @param crs Coordinate reference system for new graph vertex
Expand Down
1 change: 1 addition & 0 deletions src/analysis/network/qgslinevectorlayerdirector.h
Expand Up @@ -36,6 +36,7 @@ class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
Q_OBJECT

public:

/**
* @param myLayer source vector layer
* @param directionFieldId feield contain road direction value
Expand Down
1 change: 1 addition & 0 deletions src/analysis/openstreetmap/qgsosmbase.h
Expand Up @@ -110,6 +110,7 @@ class ANALYSIS_EXPORT QgsOSMWay : public QgsOSMElement


#if 0

/** \ingroup analysis
A relation is one of the core data elements that consists of one or more tags and also an ordered list
of one or more nodes and/or ways as members which is used to define logical or geographic relationships
Expand Down
2 changes: 2 additions & 0 deletions src/analysis/openstreetmap/qgsosmdatabase.h
Expand Up @@ -138,6 +138,7 @@ class ANALYSIS_EXPORT QgsOSMNodeIterator // clazy:exclude=rule-of-three
void close();

protected:

/** @note not available in Python bindings
*/
QgsOSMNodeIterator( sqlite3* handle );
Expand All @@ -163,6 +164,7 @@ class ANALYSIS_EXPORT QgsOSMWayIterator // clazy:exclude=rule-of-three
void close();

protected:

/** @note not available in Python bindings
*/
QgsOSMWayIterator( sqlite3* handle );
Expand Down
3 changes: 3 additions & 0 deletions src/analysis/raster/qgsninecellfilter.h
Expand Up @@ -34,6 +34,7 @@ class ANALYSIS_EXPORT QgsNineCellFilter
//! Constructor that takes input file, output file and output format (GDAL string)
QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
virtual ~QgsNineCellFilter();

/** Starts the calculation, reads from mInputFile and stores the result in mOutputFile
@param p progress dialog that receives update and that is checked for abort. 0 if no progress bar is needed.
@return 0 in case of success*/
Expand Down Expand Up @@ -64,9 +65,11 @@ class ANALYSIS_EXPORT QgsNineCellFilter

//! Opens the input file and returns the dataset handle and the number of pixels in x-/y- direction
GDALDatasetH openInputFile( int& nCellsX, int& nCellsY );

/** Opens the output driver and tests if it supports the creation of a new dataset
@return nullptr on error and the driver handle on success*/
GDALDriverH openOutputDriver();

/** Opens the output file and sets the same geotransform and CRS as the input data
@return the output dataset or nullptr in case of error*/
GDALDatasetH openOutputFile( GDALDatasetH inputDataset, GDALDriverH outputDriver );
Expand Down
4 changes: 4 additions & 0 deletions src/analysis/raster/qgsrelief.h
Expand Up @@ -94,9 +94,11 @@ class ANALYSIS_EXPORT QgsRelief

//! Opens the input file and returns the dataset handle and the number of pixels in x-/y- direction
GDALDatasetH openInputFile( int& nCellsX, int& nCellsY );

/** Opens the output driver and tests if it supports the creation of a new dataset
@return nullptr on error and the driver handle on success*/
GDALDriverH openOutputDriver();

/** Opens the output file and sets the same geotransform and CRS as the input data
@return the output dataset or nullptr in case of error*/
GDALDatasetH openOutputFile( GDALDatasetH inputDataset, GDALDriverH outputDriver );
Expand All @@ -106,11 +108,13 @@ class ANALYSIS_EXPORT QgsRelief

//! Sets relief colors
void setDefaultReliefColors();

/** Returns class (0-255) for an elevation value
@return elevation class or -1 in case of error*/
int frequencyClassForElevation( double elevation, double minElevation, double elevationClassRange );
//! Do one iteration of class break optimisation (algorithm from Garcia and Rodriguez)
void optimiseClassBreaks( QList<int>& breaks, double* frequencies );

/** Calculates coefficients a and b
@param input data points ( elevation class / frequency )
@param a slope
Expand Down
1 change: 1 addition & 0 deletions src/analysis/raster/qgsruggednessfilter.h
Expand Up @@ -30,6 +30,7 @@ class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter
~QgsRuggednessFilter();

protected:

/** 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*/
float processNineCellWindow( float* x11, float* x21, float* x31,
Expand Down
1 change: 1 addition & 0 deletions src/analysis/raster/qgstotalcurvaturefilter.h
Expand Up @@ -29,6 +29,7 @@ class ANALYSIS_EXPORT QgsTotalCurvatureFilter: public QgsNineCellFilter
~QgsTotalCurvatureFilter();

protected:

/** Calculates total curvature 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*/
float processNineCellWindow( float* x11, float* x21, float* x31,
Expand Down
2 changes: 2 additions & 0 deletions src/analysis/vector/qgsgeometryanalyzer.h
Expand Up @@ -120,6 +120,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer

//! Returns linear reference geometry as a multiline (or 0 if no match). Currently, the z-coordinates are considered to be the measures (no support for m-values in QGIS)
QgsGeometry locateBetweenMeasures( double fromMeasure, double toMeasure, const QgsGeometry& lineGeom );

/** Returns linear reference geometry. Unlike the PostGIS function, this method always returns multipoint or 0 if no match (not geometry collection).
* Currently, the z-coordinates are considered to be the measures (no support for m-values in QGIS)
*/
Expand All @@ -144,6 +145,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
//helper functions for event layer
void addEventLayerFeature( QgsFeature& feature, const QgsGeometry& geom, const QgsGeometry& lineGeom, QgsVectorFileWriter* fileWriter, QgsFeatureList& memoryFeatures, int offsetField = -1, double offsetScale = 1.0,
bool forceSingleType = false );

/** Create geometry offset relative to line geometry.
@param geom the geometry to modify
@param lineGeom the line geometry to which the feature is referenced
Expand Down
1 change: 1 addition & 0 deletions src/analysis/vector/qgstransectsample.h
Expand Up @@ -85,6 +85,7 @@ class ANALYSIS_EXPORT QgsTransectSample
static bool closestSegmentPoints( const QgsGeometry& g1, const QgsGeometry& g2, double& dist, QgsPoint& pt1, QgsPoint& pt2 );
//! Returns a copy of the multiline element closest to a point (caller takes ownership)
static QgsGeometry closestMultilineElement( const QgsPoint& pt, const QgsGeometry& multiLine );

/** Returns clipped buffer line. Iteratively applies reduced tolerances if the result is not a single line
@param stratumGeom stratum polygon
@param clippedBaseline base line geometry clipped to the stratum
Expand Down
1 change: 1 addition & 0 deletions src/app/composer/qgscomposeritemwidget.h
Expand Up @@ -142,6 +142,7 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
*/
void on_mFrameColorButton_colorChanged( const QColor& newFrameColor );
void on_mBackgroundColorButton_clicked();

/** Set the background color
*/
void on_mBackgroundColorButton_colorChanged( const QColor& newBackgroundColor );
Expand Down
1 change: 1 addition & 0 deletions src/app/composer/qgscomposermanager.h
Expand Up @@ -59,6 +59,7 @@ class QgsComposerManager: public QDialog, private Ui::QgsComposerManagerBase
void activate();

private:

/** Stores the relation between items and composer pointers. A 0 pointer for the composer means that
this composer needs to be created from a default template*/
QMap<QListWidgetItem*, QgsComposer*> mItemComposerMap;
Expand Down
1 change: 1 addition & 0 deletions src/app/nodetool/qgsmaptoolnodetool.h
Expand Up @@ -71,6 +71,7 @@ class QgsMapToolNodeTool: public QgsMapToolEdit
void deleteNodeSelection();

private:

/**
* Get the feature on the mouse click
*/
Expand Down
1 change: 1 addition & 0 deletions src/app/nodetool/qgsselectedfeature.h
Expand Up @@ -178,6 +178,7 @@ class QgsSelectedFeature: public QObject
void beforeRollBack();

private:

/**
* Deletes whole vertex map.
*/
Expand Down
1 change: 1 addition & 0 deletions src/app/ogr/qgsvectorlayersaveasdialog.h
Expand Up @@ -56,6 +56,7 @@ class APP_EXPORT QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVec
//! Return selected attributes that must be exported with their displayed values instead of their raw values. Added in QGIS 2.16
QgsAttributeList attributesAsDisplayedValues() const;
bool addToCanvas() const;

/** Returns type of symbology export.
0: No symbology
1: Feature symbology
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgisapp.cpp
Expand Up @@ -4622,8 +4622,10 @@ void QgisApp::fileOpenAfterLaunch()
bool projOpenedOK = settings.value( QStringLiteral( "/qgis/projOpenedOKAtLaunch" ), QVariant( true ) ).toBool();

// notify user if last attempt at auto-opening a project failed

/** NOTE: Notification will not show if last auto-opened project failed but
next project opened is from command line (minor issue) */

/** TODO: Keep projOpenedOKAtLaunch from being reset to true after
reading command line project (which happens before initialization signal) */
if ( !projOpenedOK )
Expand Down Expand Up @@ -6221,6 +6223,7 @@ void QgisApp::saveAsLayerDefinition()
}

///@cond PRIVATE

/** Field value converter for export as vecotr layer
* \note Not available in Python bindings
*/
Expand Down Expand Up @@ -7767,6 +7770,7 @@ void QgisApp::copyStyle( QgsMapLayer * sourceLayer )
mActionPasteStyle->setEnabled( true );
}
}

/**
\param destinationLayer The layer that the clipboard will be pasted to
(defaults to the active layer on the legend)
Expand Down

0 comments on commit 32b1603

Please sign in to comment.