Skip to content
Permalink
Browse files

respect CamelCase for enums and their values

  • Loading branch information
3nids committed Jan 11, 2017
1 parent 6be4505 commit 4467487e1cf1ba962015ad64a5bf49132ab9c039
Showing with 968 additions and 961 deletions.
  1. +7 −0 doc/api_break.dox
  2. +7 −7 python/analysis/interpolation/NormVecDecorator.sip
  3. +2 −2 python/analysis/interpolation/qgstininterpolator.sip
  4. +1 −1 scripts/chkspelling_ag.sh
  5. +23 −23 src/analysis/interpolation/CloughTocherInterpolator.cc
  6. +7 −7 src/analysis/interpolation/NormVecDecorator.cc
  7. +10 −10 src/analysis/interpolation/NormVecDecorator.h
  8. +1 −1 src/analysis/interpolation/qgstininterpolator.cpp
  9. +3 −3 src/analysis/interpolation/qgstininterpolator.h
  10. +13 −13 src/app/qgscustomprojectiondialog.cpp
  11. +1 −1 src/app/qgscustomprojectiondialog.h
  12. +42 −42 src/app/qgsfieldsproperties.cpp
  13. +14 −14 src/app/qgsfieldsproperties.h
  14. +1 −1 src/app/qgspluginregistry.cpp
  15. +1 −1 src/core/geometry/qgscompoundcurve.cpp
  16. +1 −1 src/core/geometry/qgscurvepolygon.cpp
  17. +1 −1 src/core/geometry/qgsgeometrycollection.cpp
  18. +8 −8 src/core/geometry/qgsgeometryutils.h
  19. +63 −63 src/core/qgsgml.cpp
  20. +19 −19 src/core/qgsgml.h
  21. +11 −11 src/core/qgsgmlschema.cpp
  22. +9 −9 src/core/qgsgmlschema.h
  23. +49 −49 src/gui/qgsprojectionselector.cpp
  24. +2 −2 src/gui/qgsprojectionselector.h
  25. +1 −1 src/plugins/coordinate_capture/coordinatecapture.cpp
  26. +10 −10 src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp
  27. +9 −9 src/plugins/evis/databaseconnection/evisdatabaseconnection.h
  28. +4 −4 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp
  29. +1 −1 src/plugins/evis/evis.cpp
  30. +1 −1 src/plugins/geometry_checker/qgsgeometrycheckerplugin.h
  31. +1 −1 src/plugins/georeferencer/qgsgeorefplugin.cpp
  32. +1 −1 src/plugins/gps_importer/qgsgpsplugin.cpp
  33. +1 −1 src/plugins/grass/qgsgrassmapcalc.cpp
  34. +16 −16 src/plugins/grass/qgsgrassnewmapset.cpp
  35. +7 −7 src/plugins/grass/qgsgrassnewmapset.h
  36. +1 −1 src/plugins/grass/qgsgrassplugin.cpp
  37. +15 −15 src/plugins/grass/qgsgrassselect.cpp
  38. +7 −7 src/plugins/grass/qgsgrassselect.h
  39. +1 −1 src/plugins/offline_editing/offline_editing_plugin.cpp
  40. +9 −9 src/plugins/qgisplugin.h
  41. +25 −25 src/plugins/spatialquery/qgsspatialquerydialog.cpp
  42. +3 −3 src/plugins/spatialquery/qgsspatialquerydialog.h
  43. +1 −1 src/plugins/spatialquery/qgsspatialqueryplugin.cpp
  44. +1 −1 src/plugins/topology/topol.cpp
  45. +17 −17 src/providers/db2/qgsdb2sourceselect.cpp
  46. +40 −40 src/providers/db2/qgsdb2tablemodel.cpp
  47. +10 −10 src/providers/db2/qgsdb2tablemodel.h
  48. +3 −3 src/providers/grass/qgsgrass.cpp
  49. +4 −4 src/providers/grass/qgsgrass.h
  50. +20 −20 src/providers/grass/qgsgrassfeatureiterator.cpp
  51. +27 −27 src/providers/grass/qgsgrassprovider.cpp
  52. +10 −10 src/providers/grass/qgsgrassprovider.h
  53. +17 −17 src/providers/mssql/qgsmssqlsourceselect.cpp
  54. +40 −40 src/providers/mssql/qgsmssqltablemodel.cpp
  55. +10 −10 src/providers/mssql/qgsmssqltablemodel.h
  56. +7 −7 src/providers/oracle/ocispatial/qsql_ocispatial.cpp
  57. +8 −8 src/providers/oracle/ocispatial/wkbptr.h
  58. +9 −9 src/providers/oracle/qgsoraclefeatureiterator.cpp
  59. +39 −39 src/providers/oracle/qgsoracleprovider.cpp
  60. +4 −4 src/providers/oracle/qgsoracleprovider.h
  61. +24 −24 src/providers/oracle/qgsoraclesourceselect.cpp
  62. +26 −26 src/providers/oracle/qgsoracletablemodel.cpp
  63. +10 −10 src/providers/oracle/qgsoracletablemodel.h
  64. +24 −24 src/providers/postgres/qgspgsourceselect.cpp
  65. +28 −28 src/providers/postgres/qgspgtablemodel.cpp
  66. +12 −12 src/providers/postgres/qgspgtablemodel.h
  67. +25 −25 src/providers/postgres/qgspostgresconn.cpp
  68. +11 −11 src/providers/postgres/qgspostgresconn.h
  69. +18 −18 src/providers/postgres/qgspostgresfeatureiterator.cpp
  70. +90 −90 src/providers/postgres/qgspostgresprovider.cpp
  71. +1 −1 src/providers/postgres/qgspostgresprovider.h
  72. +5 −5 src/providers/spatialite/qgsspatialitesourceselect.h
  73. +2 −2 src/providers/wms/qgswmscapabilities.cpp
  74. +5 −5 src/providers/wms/qgswmscapabilities.h
  75. +9 −9 src/providers/wms/qgswmsprovider.cpp
  76. +2 −2 tests/src/python/acceptable_missing_doc.py
@@ -1045,6 +1045,13 @@ QgsEditorWidgetFactory {#qgis_api_break_3_0_QgsEditorWidgetFactory}
- `alignmentFlag` has been removed. Use QgsFieldFormatter::representValue() instead
- `createCache` has been removed. Use QgsFieldFormatter::representValue() instead


QgsGeometryUtils {#qgis_api_break_3_0_QgsGeometryUtils}
----------------

- componentType enum has been renamed to ComponentType and its members were CamelCased too: VERTEX, RING and PART become Vertex, Ring and Part, respectively.


QgsGPSConnectionRegistry {#qgis_api_break_3_0_QgsGPSConnectionRegistry}
------------------------

@@ -5,8 +5,8 @@ class NormVecDecorator : TriDecorator
%End

public:
/** Enumeration for the state of a point. NORMAL means, that the point is not on a breakline, BREAKLINE means that the point is on a breakline (but not an endpoint of it) and ENDPOINT means, that it is an endpoint of a breakline*/
enum pointState {NORMAL, BREAKLINE, ENDPOINT};
//! Enumeration for the state of a point. Normal means, that the point is not on a BreakLine, BreakLine means that the point is on a breakline (but not an end point of it) and EndPoint means, that it is an endpoint of a breakline
enum PointState {Normal, BreakLine, EndPoint};
NormVecDecorator();
NormVecDecorator( Triangulation* tin );
virtual ~NormVecDecorator();
@@ -28,12 +28,12 @@ class NormVecDecorator : 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 /Out/, Vector3D* v1 /Out/, Point3D* p2 /Out/, Vector3D* v2 /Out/, Point3D* p3 /Out/, Vector3D* v3 /Out/ );
/** 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)
/** 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
*/
//bool getTriangle( double x, double y, Point3D* p1 /Out/, int* ptn1 /Out/, Vector3D* v1 /Out/, pointState* state1 /Out/, Point3D* p2 /Out/, int* ptn2 /Out/, Vector3D* v2 /Out/, pointState* state2 /Out/, Point3D* p3 /Out/, int* ptn3 /Out/, Vector3D* v3 /Out/, pointState* state3 /Out/);
//bool getTriangle( double x, double y, Point3D* p1 /Out/, int* ptn1 /Out/, Vector3D* v1 /Out/, PointState* state1 /Out/, Point3D* p2 /Out/, int* ptn2 /Out/, Vector3D* v2 /Out/, PointState* state2 /Out/, Point3D* p3 /Out/, int* ptn3 /Out/, Vector3D* v3 /Out/, PointState* state3 /Out/);
/** Returns the state of the point with the number 'pointno'*/
pointState getState( int pointno ) const;
PointState getState( int pointno ) const;
/** Sets an interpolator*/
void setTriangleInterpolator( TriangleInterpolator* inter );
/** 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)*/
@@ -43,6 +43,6 @@ class NormVecDecorator : TriDecorator
virtual bool saveAsShapefile( const QString& fileName ) const;

protected:
/** Sets the state (BREAKLINE, NORMAL, ENDPOINT) of a point*/
void setState( int pointno, pointState s );
/** Sets the state (BreakLine, Normal, EndPoint) of a point*/
void setState( int pointno, PointState s );
};
@@ -5,12 +5,12 @@ class QgsTINInterpolator: QgsInterpolator
%End
public:
//describes the type of interpolation
enum TIN_INTERPOLATION
enum TINInterpolation
{
Linear,
CloughTocher
};
QgsTINInterpolator( const QList<QgsInterpolator::LayerData>& inputData, TIN_INTERPOLATION interpolation = Linear, bool showProgressDialog = false );
QgsTINInterpolator( const QList<QgsInterpolator::LayerData>& inputData, TINInterpolation interpolation = Linear, bool showProgressDialog = false );
~QgsTINInterpolator();

/** Calculates interpolation value for map coordinates x, y
@@ -34,7 +34,7 @@ else
FILES="."
fi

SPELLOK='(#spellok|<!--#spellok-->)$'
SPELLOK='(#\s*spellok|<!--#\s*spellok-->)$'


exec 5>&1
@@ -260,7 +260,7 @@ void CloughTocherInterpolator::init( double x, double y )//version, which has th
{
Vector3D v1, v2, v3;//normals at the three data points
int ptn1, ptn2, ptn3;//numbers of the vertex points
NormVecDecorator::pointState state1, state2, state3;//states of the vertex points (NORMAL, BREAKLINE, ENDPOINT possible)
NormVecDecorator::PointState state1, state2, state3;//states of the vertex points (Normal, BreakLine, EndPoint possible)

if ( mTIN )
{
@@ -309,62 +309,62 @@ void CloughTocherInterpolator::init( double x, double y )//version, which has th
cp10.setY(( point1.getY() + point2.getY() + point3.getY() ) / 3 );

//set the derivatives of the points to new values if they are on a breakline
if ( state1 == NormVecDecorator::BREAKLINE )
if ( state1 == NormVecDecorator::BreakLine )
{
Vector3D target1;
if ( mTIN->calcNormalForPoint( x, y, ptn1, &target1 ) )
{
der1X = -target1.getX() / target1.getZ();
der1Y = -target1.getY() / target1.getZ();

if ( state2 == NormVecDecorator::NORMAL )
if ( state2 == NormVecDecorator::Normal )
{
//recalculate cp1
cp1.setZ( point1.getZ() + ( cp1.getX() - point1.getX() )*der1X + ( cp1.getY() - point1.getY() )*der1Y );
}
if ( state3 == NormVecDecorator::NORMAL )
if ( state3 == NormVecDecorator::Normal )
{
//recalculate cp6
cp6.setZ( point1.getZ() + ( cp6.getX() - point1.getX() )*der1X + ( cp6.getY() - point1.getY() )*der1Y );
}
}
}

if ( state2 == NormVecDecorator::BREAKLINE )
if ( state2 == NormVecDecorator::BreakLine )
{
Vector3D target2;
if ( mTIN->calcNormalForPoint( x, y, ptn2, &target2 ) )
{
der2X = -target2.getX() / target2.getZ();
der2Y = -target2.getY() / target2.getZ();

if ( state1 == NormVecDecorator::NORMAL )
if ( state1 == NormVecDecorator::Normal )
{
//recalculate cp2
cp2.setZ( point2.getZ() + ( cp2.getX() - point2.getX() )*der2X + ( cp2.getY() - point2.getY() )*der2Y );
}
if ( state3 == NormVecDecorator::NORMAL )
if ( state3 == NormVecDecorator::Normal )
{
//recalculate cp9
cp9.setZ( point2.getZ() + ( cp9.getX() - point2.getX() )*der2X + ( cp9.getY() - point2.getY() )*der2Y );
}
}
}

if ( state3 == NormVecDecorator::BREAKLINE )
if ( state3 == NormVecDecorator::BreakLine )
{
Vector3D target3;
if ( mTIN->calcNormalForPoint( x, y, ptn3, &target3 ) )
{
der3X = -target3.getX() / target3.getZ();
der3Y = -target3.getY() / target3.getZ();

if ( state1 == NormVecDecorator::NORMAL )
if ( state1 == NormVecDecorator::Normal )
{
//recalculate cp14
cp14.setZ( point3.getZ() + ( cp14.getX() - point3.getX() )*der3X + ( cp14.getY() - point3.getY() )*der3Y );
}
if ( state2 == NormVecDecorator::NORMAL )
if ( state2 == NormVecDecorator::Normal )
{
//recalculate cp16
cp16.setZ( point3.getZ() + ( cp16.getX() - point3.getX() )*der3X + ( cp16.getY() - point3.getY() )*der3Y );
@@ -506,7 +506,7 @@ void CloughTocherInterpolator::init( double x, double y )//version which has uni
{
Vector3D v1, v2, v3;//normals at the three data points
int ptn1, ptn2, ptn3;//numbers of the vertex points
NormVecDecorator::pointState state1, state2, state3;//states of the vertex points (NORMAL, BREAKLINE, ENDPOINT possible)
NormVecDecorator::PointState state1, state2, state3;//states of the vertex points (Normal, BreakLine, EndPoint possible)

if ( mTIN )
{
@@ -562,51 +562,51 @@ void CloughTocherInterpolator::init( double x, double y )//version which has uni
Vector3D tmp( 0, 0, 0 );

//point1
if ( state1 == NormVecDecorator::BREAKLINE )
if ( state1 == NormVecDecorator::BreakLine )
{
if ( mTIN->calcNormalForPoint( x, y, ptn1, &tmp ) )
{
tmpx = -tmp.getX() / tmp.getZ();
tmpy = -tmp.getY() / tmp.getZ();
if ( state3 == NormVecDecorator::NORMAL )
if ( state3 == NormVecDecorator::Normal )
{
cp6.setZ( point1.getZ() + (( point3.getX() - point1.getX() ) / 3 )*tmpx + (( point3.getY() - point1.getY() ) / 3 )*tmpy );
}
if ( state2 == NormVecDecorator::NORMAL )
if ( state2 == NormVecDecorator::Normal )
{
cp1.setZ( point1.getZ() + (( point2.getX() - point1.getX() ) / 3 )*tmpx + (( point2.getY() - point1.getY() ) / 3 )*tmpy );
}
}
}

if ( state2 == NormVecDecorator::BREAKLINE )
if ( state2 == NormVecDecorator::Breakline )
{
if ( mTIN->calcNormalForPoint( x, y, ptn2, &tmp ) )
{
tmpx = -tmp.getX() / tmp.getZ();
tmpy = -tmp.getY() / tmp.getZ();
if ( state1 == NormVecDecorator::NORMAL )
if ( state1 == NormVecDecorator::Normal )
{
cp2.setZ( point2.getZ() + (( point1.getX() - point2.getX() ) / 3 )*tmpx + (( point1.getY() - point2.getY() ) / 3 )*tmpy );
}
if ( state3 == NormVecDecorator::NORMAL )
if ( state3 == NormVecDecorator::Normal )
{
cp9.setZ( point2.getZ() + (( point3.getX() - point2.getX() ) / 3 )*tmpx + (( point3.getY() - point2.getY() ) / 3 )*tmpy );
}
}
}

if ( state3 == NormVecDecorator::BREAKLINE )
if ( state3 == NormVecDecorator::Breakline )
{
if ( mTIN->calcNormalForPoint( x, y, ptn3, &tmp ) )
{
tmpx = -tmp.getX() / tmp.getZ();
tmpy = -tmp.getY() / tmp.getZ();
if ( state1 == NormVecDecorator::NORMAL )
if ( state1 == NormVecDecorator::Normal )
{
cp14.setZ( point3.getZ() + (( point1.getX() - point3.getX() ) / 3 )*tmpx + (( point1.getY() - point3.getY() ) / 3 )*tmpy );
}
if ( state2 == NormVecDecorator::NORMAL )
if ( state2 == NormVecDecorator::Normal )
{
cp16.setZ( point3.getZ() + (( point2.getX() - point3.getX() ) / 3 )*tmpx + (( point2.getY() - point3.getY() ) / 3 )*tmpy );
}
@@ -618,7 +618,7 @@ void CloughTocherInterpolator::init( double x, double y )//version which has uni

cp3.setX( point1.getX() + ( cp10.getX() - point1.getX() ) / 3 );
cp3.setY( point1.getY() + ( cp10.getY() - point1.getY() ) / 3 );
if ( state1 == NormVecDecorator::BREAKLINE )
if ( state1 == NormVecDecorator::Breakline )
{
MathUtils::normalFromPoints( &point1, &cp1, &cp6, &normal );
//recalculate der1X and der1Y
@@ -632,7 +632,7 @@ void CloughTocherInterpolator::init( double x, double y )//version which has uni

cp5.setX( point2.getX() + ( cp10.getX() - point2.getX() ) / 3 );
cp5.setY( point2.getY() + ( cp10.getY() - point2.getY() ) / 3 );
if ( state2 == NormVecDecorator::BREAKLINE )
if ( state2 == NormVecDecorator::Breakline )
{
MathUtils::normalFromPoints( &point2, &cp9, &cp2, &normal );
//recalculate der2X and der2Y
@@ -645,7 +645,7 @@ void CloughTocherInterpolator::init( double x, double y )//version which has uni

cp15.setX( point3.getX() + ( cp10.getX() - point3.getX() ) / 3 );
cp15.setY( point3.getY() + ( cp10.getY() - point3.getY() ) / 3 );
if ( state3 == NormVecDecorator::BREAKLINE )
if ( state3 == NormVecDecorator::Breakline )
{
MathUtils::normalFromPoints( &point3, &cp14, &cp16, &normal );
//recalculate der3X and der3Y
@@ -308,7 +308,7 @@ bool NormVecDecorator::getTriangle( double x, double y, Point3D* p1, Vector3D* v
}
}

NormVecDecorator::pointState NormVecDecorator::getState( int pointno ) const
NormVecDecorator::PointState NormVecDecorator::getState( int pointno ) const
{
if ( pointno >= 0 )
{
@@ -322,7 +322,7 @@ NormVecDecorator::pointState NormVecDecorator::getState( int pointno ) const
}


bool NormVecDecorator::getTriangle( double x, double y, Point3D* p1, int* ptn1, Vector3D* v1, pointState* state1, Point3D* p2, int* ptn2, Vector3D* v2, pointState* state2, Point3D* p3, int* ptn3, Vector3D* v3, pointState* state3 )
bool NormVecDecorator::getTriangle( double x, double y, Point3D* p1, int* ptn1, Vector3D* v1, PointState* state1, Point3D* p2, int* ptn2, Vector3D* v2, PointState* state2, Point3D* p3, int* ptn3, Vector3D* v3, PointState* state3 )
{
if ( p1 && p2 && p3 && v1 && v2 && v3 && ptn1 && ptn2 && ptn3 && state1 && state2 && state3 )
{
@@ -377,7 +377,7 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )
int numberofbreaks = 0;//number of counted breaklines
double weights = 0;//sum of the weights
double currentweight = 0;//current weight
pointState status;
PointState status;

QList<int>* vlist = getSurroundingTriangles( pointno );//get the value list

@@ -468,15 +468,15 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )

if ( numberofbreaks == 0 )
{
status = NORMAL;
status = Normal;
}
else if ( numberofbreaks == 1 )
{
status = ENDPOINT;
status = EndPoint;
}
else
{
status = BREAKLINE;
status = BreakLine;
}

delete vlist;
@@ -558,7 +558,7 @@ void NormVecDecorator::eliminateHorizontalTriangles()
}
}

void NormVecDecorator::setState( int pointno, pointState s )
void NormVecDecorator::setState( int pointno, PointState s )
{
if ( pointno >= 0 )
{
@@ -30,8 +30,8 @@ class QProgressDialog;
class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
{
public:
//! Enumeration for the state of a point. NORMAL means, that the point is not on a breakline, BREAKLINE means that the point is on a breakline (but not an endpoint of it) and ENDPOINT means, that it is an endpoint of a breakline
enum pointState {NORMAL, BREAKLINE, ENDPOINT};
//! Enumeration for the state of a point. Normal means, that the point is not on a BreakLine, BreakLine means that the point is on a breakline (but not an end point of it) and EndPoint means, that it is an endpoint of a breakline.
enum PointState {Normal, BreakLine, EndPoint};
NormVecDecorator();
NormVecDecorator( Triangulation* tin );
virtual ~NormVecDecorator();
@@ -54,12 +54,12 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
//! 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)
/** 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
*/
bool getTriangle( double x, double y, Point3D* p1, int* ptn1, Vector3D* v1, pointState* state1, Point3D* p2, int* ptn2, Vector3D* v2, pointState* state2, Point3D* p3, int* ptn3, Vector3D* v3, pointState* state3 );
bool getTriangle( double x, double y, Point3D* p1, int* ptn1, Vector3D* v1, PointState* state1, Point3D* p2, int* ptn2, Vector3D* v2, PointState* state2, Point3D* p3, int* ptn3, Vector3D* v3, PointState* state3 );
//! Returns the state of the point with the number 'pointno'
pointState getState( int pointno ) const;
PointState getState( int pointno ) const;
//! Sets an interpolator
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)
@@ -78,17 +78,17 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
//! Vector that stores the normals for the points. If 'estimateFirstDerivatives()' was called and there is a null pointer, this means, that the triangle point is on a breakline
QVector<Vector3D*>* mNormVec;
//! Vector who stores, it a point is not on a breakline, if it is a normal point of the breakline or if it is an endpoint of a breakline
QVector<pointState>* mPointState;
//! Sets the state (BREAKLINE, NORMAL, ENDPOINT) of a point
void setState( int pointno, pointState s );
QVector<PointState>* mPointState;
//! Sets the state (BreakLine, Normal, EndPoint) of a point
void setState( int pointno, PointState s );
};

inline NormVecDecorator::NormVecDecorator(): TriDecorator(), mInterpolator( nullptr ), mNormVec( new QVector<Vector3D*>( mDefaultStorageForNormals ) ), mPointState( new QVector<pointState>( mDefaultStorageForNormals ) )
inline NormVecDecorator::NormVecDecorator(): TriDecorator(), mInterpolator( nullptr ), mNormVec( new QVector<Vector3D*>( mDefaultStorageForNormals ) ), mPointState( new QVector<PointState>( mDefaultStorageForNormals ) )
{
alreadyestimated = false;
}

inline NormVecDecorator::NormVecDecorator( Triangulation* tin ): TriDecorator( tin ), mInterpolator( nullptr ), mNormVec( new QVector<Vector3D*>( mDefaultStorageForNormals ) ), mPointState( new QVector<pointState>( mDefaultStorageForNormals ) )
inline NormVecDecorator::NormVecDecorator( Triangulation* tin ): TriDecorator( tin ), mInterpolator( nullptr ), mNormVec( new QVector<Vector3D*>( mDefaultStorageForNormals ) ), mPointState( new QVector<PointState>( mDefaultStorageForNormals ) )
{
alreadyestimated = false;
}
@@ -29,7 +29,7 @@
#include "qgswkbptr.h"
#include <QProgressDialog>

QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData>& inputData, TIN_INTERPOLATION interpolation, bool showProgressDialog )
QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData>& inputData, TINInterpolation interpolation, bool showProgressDialog )
: QgsInterpolator( inputData )
, mTriangulation( nullptr )
, mTriangleInterpolator( nullptr )
@@ -32,12 +32,12 @@ class ANALYSIS_EXPORT QgsTINInterpolator: public QgsInterpolator
{
public:
//describes the type of interpolation
enum TIN_INTERPOLATION
enum TINInterpolation
{
Linear,
CloughTocher
};
QgsTINInterpolator( const QList<LayerData>& inputData, TIN_INTERPOLATION interpolation = Linear, bool showProgressDialog = false );
QgsTINInterpolator( const QList<LayerData>& inputData, TINInterpolation interpolation = Linear, bool showProgressDialog = false );
~QgsTINInterpolator();

/** Calculates interpolation value for map coordinates x, y
@@ -60,7 +60,7 @@ class ANALYSIS_EXPORT QgsTINInterpolator: public QgsInterpolator
//! File path to export the triangulation
QString mTriangulationFilePath;
//! Type of interpolation
TIN_INTERPOLATION mInterpolation;
TINInterpolation mInterpolation;

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

0 comments on commit 4467487

Please sign in to comment.
You can’t perform that action at this time.