Skip to content

/ QGIS Public

Permalink
Browse files
QStringLiteral
  • Loading branch information
@nyalldawson
nyalldawson committed Oct 16, 2018
1 parent c6db18d commit 51f6fb066792103250e338781fd574895e31a3ad
Unified Split
Showing with 1,177 additions and 1,177 deletions.
  1. +4 −4 src/analysis/interpolation/Bezier3D.cpp
  2. +2 −2 src/analysis/interpolation/Bezier3D.h
  3. +4 −4 src/analysis/interpolation/CloughTocherInterpolator.cpp
  4. +23 −23 src/analysis/interpolation/DualEdgeTriangulation.cpp
  5. +4 −4 src/analysis/interpolation/LinTriangleInterpolator.cpp
  6. +25 −25 src/analysis/interpolation/MathUtils.cpp
  7. +14 −14 src/analysis/interpolation/NormVecDecorator.cpp
  8. +1 −1 src/analysis/interpolation/NormVecDecorator.h
  9. +11 −11 src/analysis/interpolation/ParametricLine.cpp
  10. +24 −24 src/analysis/interpolation/TriDecorator.cpp
  11. +7 −7 src/analysis/raster/qgsninecellfilter.cpp
  12. +1 −1 src/analysis/raster/qgsrastercalculator.cpp
  13. +7 −7 src/analysis/raster/qgsrelief.cpp
  14. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheckerror.cpp
  15. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
  16. +11 −11 src/app/dwg/qgsdwgimporter.cpp
  17. +1 −1 src/app/gps/qgsgpsinformationwidget.cpp
  18. +1 −1 src/app/layout/qgslayoutdesignerdialog.cpp
  19. +1 −1 src/app/layout/qgslayoutlegendwidget.cpp
  20. +6 −6 src/app/main.cpp
  21. +5 −5 src/app/mesh/qgsmeshlayerproperties.cpp
  22. +1 −1 src/app/pluginmanager/qgsapppluginmanagerinterface.cpp
  23. +8 −8 src/app/pluginmanager/qgspluginmanager.cpp
  24. +21 −21 src/app/qgisapp.cpp
  25. +1 −1 src/app/qgsattributesformproperties.cpp
  26. +1 −1 src/app/qgsattributetypedialog.cpp
  27. +4 −4 src/app/qgsclipboard.cpp
  28. +1 −1 src/app/qgscrashhandler.cpp
  29. +4 −4 src/app/qgscustomization.cpp
  30. +4 −4 src/app/qgscustomprojectiondialog.cpp
  31. +7 −7 src/app/qgsidentifyresultsdialog.cpp
  32. +1 −1 src/app/qgsmaplayerstyleguiutils.cpp
  33. +2 −2 src/app/qgsmaptooladdpart.cpp
  34. +1 −1 src/app/qgsmaptoolselectutils.cpp
  35. +1 −1 src/app/qgsmaptoolshowhidelabels.cpp
  36. +1 −1 src/app/qgsnewspatialitelayerdialog.cpp
  37. +4 −4 src/app/qgspluginregistry.cpp
  38. +3 −3 src/app/qgsprojectproperties.cpp
  39. +8 −8 src/app/qgsrasterlayerproperties.cpp
  40. +1 −1 src/app/qgsrulebasedlabelingwidget.cpp
  41. +1 −1 src/app/qgsversionmigration.cpp
  42. +1 −1 src/app/vertextool/qgsselectedfeature.cpp
  43. +6 −6 src/app/vertextool/qgsvertextool.cpp
  44. +1 −1 src/auth/basic/qgsauthbasicmethod.cpp
  45. +3 −3 src/auth/identcert/qgsauthidentcertmethod.cpp
  46. +3 −3 src/auth/pkipaths/qgsauthpkipathsmethod.cpp
  47. +3 −3 src/auth/pkipkcs12/qgsauthpkcs12method.cpp
  48. +17 −17 src/core/auth/qgsauthcertutils.cpp
  49. +54 −54 src/core/auth/qgsauthmanager.cpp
  50. +1 −1 src/core/auth/qgsauthmethodregistry.cpp
  51. +3 −3 src/core/dxf/qgsdxfpallabeling.cpp
  52. +3 −3 src/core/geocms/geonode/qgsgeonoderequest.cpp
  53. +4 −4 src/core/geometry/qgsgeometrymakevalid.cpp
  54. +1 −1 src/core/geometry/qgsgeos.cpp
  55. +1 −1 src/core/gps/qgsgpsdconnection.cpp
  56. +7 −7 src/core/gps/qgsnmeaconnection.cpp
  57. +8 −8 src/core/gps/qgsqtlocationconnection.cpp
  58. +2 −2 src/core/layertree/qgslayertreemodel.cpp
  59. +1 −1 src/core/mesh/qgsmeshlayerrenderer.cpp
  60. +1 −1 src/core/qgsaction.cpp
  61. +1 −1 src/core/qgsactionmanager.cpp
  62. +2 −2 src/core/qgsapplication.cpp
  63. +1 −1 src/core/qgscadutils.cpp
  64. +17 −17 src/core/qgscoordinatereferencesystem.cpp
  65. +13 −13 src/core/qgscoordinatetransform.cpp
  66. +11 −11 src/core/qgscoordinatetransform_p.cpp
  67. +2 −2 src/core/qgscredentials.cpp
  68. +6 −6 src/core/qgsdataitem.cpp
  69. +9 −9 src/core/qgsdatasourceuri.cpp
  70. +1 −1 src/core/qgsdistancearea.cpp
  71. +1 −1 src/core/qgseditformconfig.cpp
  72. +1 −1 src/core/qgsfeaturerequest.cpp
  73. +6 −6 src/core/qgsgml.cpp
  74. +2 −2 src/core/qgslayerdefinition.cpp
  75. +2 −2 src/core/qgsmaplayerlegend.cpp
  76. +1 −1 src/core/qgsmaplayerstore.cpp
  77. +1 −1 src/core/qgsmaplayerstyle.cpp
  78. +13 −13 src/core/qgsmaprenderercustompainterjob.cpp
  79. +3 −3 src/core/qgsmaprendererjob.cpp
  80. +4 −4 src/core/qgsmaprendererparalleljob.cpp
  81. +7 −7 src/core/qgsmaprenderersequentialjob.cpp
  82. +1 −1 src/core/qgsmapsettings.cpp
  83. +5 −5 src/core/qgsofflineediting.cpp
  84. +1 −1 src/core/qgsogrutils.cpp
  85. +1 −1 src/core/qgspluginlayerregistry.cpp
  86. +5 −5 src/core/qgsprojectbadlayerhandler.cpp
  87. +4 −4 src/core/qgsprojectfiletransform.cpp
  88. +19 −19 src/core/qgsprojectproperty.cpp
  89. +1 −1 src/core/qgsproviderregistry.cpp
  90. +2 −2 src/core/qgspythonrunner.cpp
  91. +2 −2 src/core/qgsrelation.cpp
  92. +2 −2 src/core/qgsrelationmanager.cpp
  93. +1 −1 src/core/qgsrendercontext.cpp
  94. +1 −1 src/core/qgsrulebasedlabeling.cpp
  95. +1 −1 src/core/qgsscalecalculator.cpp
  96. +4 −4 src/core/qgssettings.h
  97. +2 −2 src/core/qgsvectordataprovider.cpp
  98. +5 −5 src/core/qgsvectorfilewriter.cpp
  99. +6 −6 src/core/qgsvectorlayer.cpp
  100. +4 −4 src/core/qgsvectorlayereditbuffer.cpp
  101. +1 −1 src/core/qgsvectorlayereditutils.cpp
  102. +1 −1 src/core/qgsvectorlayerexporter.cpp
  103. +1 −1 src/core/qgsvectorlayerrenderer.cpp
  104. +9 −9 src/core/raster/qgsbrightnesscontrastfilter.cpp
  105. +1 −1 src/core/raster/qgscolorrampshader.cpp
  106. +2 −2 src/core/raster/qgscontrastenhancement.cpp
  107. +2 −2 src/core/raster/qgshillshaderenderer.cpp
  108. +9 −9 src/core/raster/qgshuesaturationfilter.cpp
  109. +1 −1 src/core/raster/qgsmultibandcolorrenderer.cpp
  110. +1 −1 src/core/raster/qgspalettedrasterrenderer.cpp
  111. +20 −20 src/core/raster/qgsrasterblock.cpp
  112. +8 −8 src/core/raster/qgsrasterdataprovider.cpp
  113. +3 −3 src/core/raster/qgsrasterdrawer.cpp
  114. +9 −9 src/core/raster/qgsrasterfilewriter.cpp
  115. +2 −2 src/core/raster/qgsrasterinterface.h
  116. +21 −21 src/core/raster/qgsrasterlayer.cpp
  117. +3 −3 src/core/raster/qgsrasterlayerrenderer.cpp
  118. +2 −2 src/core/raster/qgsrasternuller.cpp
  119. +4 −4 src/core/raster/qgsrasterpipe.cpp
  120. +12 −12 src/core/raster/qgsrasterprojector.cpp
  121. +12 −12 src/core/raster/qgsrasterresamplefilter.cpp
  122. +2 −2 src/core/raster/qgsrastershader.cpp
  123. +1 −1 src/core/raster/qgsrastershaderfunction.cpp
  124. +1 −1 src/core/raster/qgssinglebandcolordatarenderer.cpp
  125. +1 −1 src/core/raster/qgssinglebandgrayrenderer.cpp
  126. +1 −1 src/core/raster/qgssinglebandpseudocolorrenderer.cpp
  127. +3 −3 src/core/symbology/qgscategorizedsymbolrenderer.cpp
  128. +9 −9 src/core/symbology/qgscptcityarchive.cpp
  129. +1 −1 src/core/symbology/qgsellipsesymbollayer.cpp
  130. +2 −2 src/core/symbology/qgslinesymbollayer.cpp
  131. +3 −3 src/core/symbology/qgsmarkersymbollayer.cpp
  132. +2 −2 src/core/symbology/qgsrenderer.cpp
  133. +1 −1 src/core/symbology/qgsrulebasedrenderer.cpp
  134. +1 −1 src/core/symbology/qgssinglesymbolrenderer.cpp
  135. +2 −2 src/core/symbology/qgssvgcache.cpp
  136. +8 −8 src/core/symbology/qgssymbol.cpp
  137. +18 −18 src/core/symbology/qgssymbollayerutils.cpp
  138. +2 −2 src/gui/attributetable/qgsattributetablefiltermodel.cpp
  139. +2 −2 src/gui/attributetable/qgsattributetablemodel.cpp
  140. +1 −1 src/gui/attributetable/qgsfeaturelistview.cpp
  141. +3 −3 src/gui/auth/qgsauthauthoritieseditor.cpp
  142. +2 −2 src/gui/auth/qgsauthcertificateinfo.cpp
  143. +1 −1 src/gui/auth/qgsauthconfigedit.cpp
  144. +1 −1 src/gui/auth/qgsauthguiutils.cpp
  145. +3 −3 src/gui/auth/qgsauthidentitieseditor.cpp
  146. +3 −3 src/gui/auth/qgsauthserverseditor.cpp
  147. +3 −3 src/gui/auth/qgsauthsslconfigwidget.cpp
  148. +1 −1 src/gui/auth/qgsauthsslerrorsdialog.cpp
  149. +1 −1 src/gui/auth/qgsauthsslimportdialog.cpp
  150. +1 −1 src/gui/auth/qgsauthtrustedcasdialog.cpp
  151. +1 −1 src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
  152. +1 −1 src/gui/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.cpp
  153. +1 −1 src/gui/qgsattributeform.cpp
  154. +1 −1 src/gui/qgsbrowserdockwidget.cpp
  155. +3 −3 src/gui/qgsbrowserdockwidget_p.cpp
  156. +1 −1 src/gui/qgsbrowsertreeview.cpp
  157. +3 −3 src/gui/qgscollapsiblegroupbox.cpp
  158. +6 −6 src/gui/qgscredentialdialog.cpp
  159. +1 −1 src/gui/qgsguiutils.cpp
  160. +6 −6 src/gui/qgsidentifymenu.cpp
  161. +2 −2 src/gui/qgsmaplayerstylemanagerwidget.cpp
  162. +4 −4 src/gui/qgsmapoverviewcanvas.cpp
  163. +1 −1 src/gui/qgsmaptool.cpp
  164. +5 −5 src/gui/qgsmaptoolcapture.cpp
  165. +4 −4 src/gui/qgsnewvectorlayerdialog.cpp
  166. +4 −4 src/gui/qgsowssourceselect.cpp
  167. +10 −10 src/gui/qgsprojectionselectiontreewidget.cpp
  168. +4 −4 src/gui/qgsrasterformatsaveoptionswidget.cpp
  169. +1 −1 src/gui/qgsrasterpyramidsoptionswidget.cpp
  170. +3 −3 src/gui/qgstabwidget.cpp
  171. +1 −1 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  172. +3 −3 src/gui/raster/qgsrasterminmaxwidget.cpp
  173. +1 −1 src/gui/raster/qgsrendererrasterpropertieswidget.cpp
  174. +6 −6 src/gui/symbology/qgscptcitycolorrampdialog.cpp
  175. +4 −4 src/gui/symbology/qgsrendererpropertiesdialog.cpp
  176. +1 −1 src/gui/symbology/qgsrulebasedrendererwidget.cpp
  177. +1 −1 src/plugins/georeferencer/qgsimagewarper.cpp
  178. +1 −1 src/plugins/globe/featuresource/qgsglobefeaturecursor.h
  179. +2 −2 src/plugins/gps_importer/qgsgpsplugin.cpp
  180. +1 −1 src/providers/arcgisrest/qgsamsprovider.cpp
  181. +4 −4 src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
  182. +7 −7 src/providers/db2/qgsdb2dataitems.cpp
  183. +6 −6 src/providers/db2/qgsdb2expressioncompiler.cpp
  184. +9 −9 src/providers/db2/qgsdb2featureiterator.cpp
  185. +3 −3 src/providers/db2/qgsdb2geometrycolumns.cpp
  186. +18 −18 src/providers/db2/qgsdb2provider.cpp
  187. +7 −7 src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
  188. +1 −1 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  189. +3 −3 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  190. +1 −1 src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
  191. +2 −2 src/providers/gdal/qgsgdaldataitems.cpp
  192. +40 −40 src/providers/gdal/qgsgdalprovider.cpp
  193. +4 −4 src/providers/gdal/qgsgdalproviderbase.cpp
  194. +1 −1 src/providers/gpx/qgsgpxfeatureiterator.cpp
  195. +1 −1 src/providers/mssql/qgsmssqlfeatureiterator.cpp
  196. +10 −10 src/providers/mssql/qgsmssqlgeometryparser.cpp
  197. +1 −1 src/providers/ogr/qgsogrdataitems.cpp
  198. +15 −15 src/providers/ogr/qgsogrprovider.cpp
  199. +13 −13 src/providers/oracle/qgsoracleprovider.cpp
  200. +5 −5 src/providers/oracle/qgsoracletablemodel.cpp
  201. +1 −1 src/providers/ows/qgsowsdataitems.cpp
  202. +2 −2 src/providers/postgres/qgspgsourceselect.cpp
  203. +4 −4 src/providers/postgres/qgspgtablemodel.cpp
  204. +15 −15 src/providers/postgres/qgspostgresconn.cpp
  205. +1 −1 src/providers/postgres/qgspostgresdataitems.cpp
  206. +1 −1 src/providers/postgres/qgspostgresfeatureiterator.cpp
  207. +9 −9 src/providers/postgres/qgspostgreslistener.cpp
  208. +12 −12 src/providers/postgres/qgspostgresprovider.cpp
  209. +1 −1 src/providers/spatialite/qgsspatialiteconnection.cpp
  210. +1 −1 src/providers/spatialite/qgsspatialitefeatureiterator.cpp
  211. +18 −18 src/providers/spatialite/qgsspatialiteprovider.cpp
  212. +11 −11 src/providers/wcs/qgswcscapabilities.cpp
  213. +28 −28 src/providers/wcs/qgswcsprovider.cpp
  214. +7 −7 src/providers/wfs/qgswfssourceselect.cpp
  215. +4 −4 src/providers/wms/qgstilescalewidget.cpp
  216. +43 −43 src/providers/wms/qgswmscapabilities.cpp
  217. +31 −31 src/providers/wms/qgswmsprovider.cpp
  218. +4 −4 src/providers/wms/qgswmssourceselect.cpp
  219. +2 −2 src/providers/wms/qgswmtsdimensions.cpp
  220. +3 −3 src/python/qgspythonutilsimpl.cpp
  221. +1 −1 src/server/qgscapabilitiescache.cpp
  222. +3 −3 src/server/qgsserverfilter.cpp
  223. +3 −3 src/server/qgsserverplugins.cpp
  224. +2 −2 src/server/services/DummyService/dummy.cpp
  225. +1 −1 src/server/services/wcs/qgswcs.cpp
  226. +1 −1 src/server/services/wfs/qgswfs.cpp
  227. +1 −1 src/server/services/wms/qgswms.cpp
  228. +1 −1 tests/bench/main.cpp
  229. +4 −4 tests/src/core/testqgscoordinatereferencesystem.cpp
  230. +1 −1 tests/src/gui/testqgssqlcomposerdialog.cpp
  231. +3 −3 tests/src/providers/testqgswcspublicservers.cpp
8 src/analysis/interpolation/Bezier3D.cpp
View file
@@ -46,7 +46,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D *v )

else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
}
}

@@ -70,7 +70,7 @@ void Bezier3D::calcPoint( float t, QgsPoint *p )

else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
}
}

@@ -102,7 +102,7 @@ void Bezier3D::calcSecDer( float t, Vector3D *v )

else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
}
}

@@ -126,7 +126,7 @@ void Bezier3D::changeDirection()//does this work correctly? more testing is need

else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
}
}

4 src/analysis/interpolation/Bezier3D.h
View file
@@ -82,13 +82,13 @@ inline Bezier3D::Bezier3D( ParametricLine *parent, QVector<QgsPoint *> *controlp
inline void Bezier3D::add( ParametricLine *pl )
{
Q_UNUSED( pl );
QgsDebugMsg( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." );
QgsDebugMsg( QStringLiteral( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." ) );
}

inline void Bezier3D::remove( int i )
{
Q_UNUSED( i );
QgsDebugMsg( "Error!!!!! A Bezier-curve has no children to remove." );
QgsDebugMsg( QStringLiteral( "Error!!!!! A Bezier-curve has no children to remove." ) );
}

//-----------------------------------------------setters and getters---------------------------------------------------------------
8 src/analysis/interpolation/CloughTocherInterpolator.cpp
View file
@@ -34,7 +34,7 @@ double CloughTocherInterpolator::calcBernsteinPoly( int n, int i, int j, int k,
{
if ( i < 0 || j < 0 || k < 0 )
{
QgsDebugMsg( "Invalid parameters for Bernstein poly calculation!" );
QgsDebugMsg( QStringLiteral( "Invalid parameters for Bernstein poly calculation!" ) );
return 0;
}

@@ -146,7 +146,7 @@ bool CloughTocherInterpolator::calcNormVec( double x, double y, Vector3D *result
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@@ -459,7 +459,7 @@ void CloughTocherInterpolator::init( double x, double y )//version, which has th
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}

@@ -728,7 +728,7 @@ void CloughTocherInterpolator::init( double x, double y )//version which has uni

else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
#endif
46 src/analysis/interpolation/DualEdgeTriangulation.cpp
View file
@@ -48,22 +48,22 @@ DualEdgeTriangulation::~DualEdgeTriangulation()

void DualEdgeTriangulation::performConsistencyTest()
{
QgsDebugMsg( "performing consistency test" );
QgsDebugMsg( QStringLiteral( "performing consistency test" ) );

for ( int i = 0; i < mHalfEdge.count(); i++ )
{
int a = mHalfEdge[mHalfEdge[i]->getDual()]->getDual();
int b = mHalfEdge[mHalfEdge[mHalfEdge[i]->getNext()]->getNext()]->getNext();
if ( i != a )
{
QgsDebugMsg( "warning, first test failed" );
QgsDebugMsg( QStringLiteral( "warning, first test failed" ) );
}
if ( i != b )
{
QgsDebugMsg( "warning, second test failed" );
QgsDebugMsg( QStringLiteral( "warning, second test failed" ) );
}
}
QgsDebugMsg( "consistency test finished" );
QgsDebugMsg( QStringLiteral( "consistency test finished" ) );
}

void DualEdgeTriangulation::addLine( const QVector<QgsPoint> &points, QgsInterpolator::SourceType lineType )
@@ -134,7 +134,7 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
//test, if it is the same point as the first point
if ( p.x() == mPointVector[0]->x() && p.y() == mPointVector[0]->y() )
{
QgsDebugMsg( "second point is the same as the first point, it thus has not been inserted" );
QgsDebugMsg( QStringLiteral( "second point is the same as the first point, it thus has not been inserted" ) );
QgsPoint *p = mPointVector[1];
mPointVector.remove( 1 );
delete p;
@@ -200,7 +200,7 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
else//p is in a line with p0 and p1
{
mPointVector.remove( mPointVector.count() - 1 );
QgsDebugMsg( "error: third point is on the same line as the first and the second point. It thus has not been inserted into the triangulation" );
QgsDebugMsg( QStringLiteral( "error: third point is on the same line as the first and the second point. It thus has not been inserted into the triangulation" ) );
return -100;
}
}
@@ -392,7 +392,7 @@ int DualEdgeTriangulation::baseEdgeOfPoint( int point )
control += 1;
if ( control > 1000000 )
{
// QgsDebugMsg( "warning, endless loop" );
// QgsDebugMsg( QStringLiteral( "warning, endless loop" ) );

//use the secure and slow method
//qWarning( "******************warning, using the slow method in baseEdgeOfPoint****************************************" );
@@ -626,7 +626,7 @@ bool DualEdgeTriangulation::calcNormal( double x, double y, Vector3D *result )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@@ -639,7 +639,7 @@ bool DualEdgeTriangulation::calcPoint( double x, double y, QgsPoint &result )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@@ -1167,7 +1167,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, QgsInterpolator:
control += 1;
if ( control > 17000 )
{
QgsDebugMsg( "warning, endless loop" );
QgsDebugMsg( QStringLiteral( "warning, endless loop" ) );
return -100;//return an error code
}

@@ -1534,7 +1534,7 @@ void DualEdgeTriangulation::setTriangleInterpolator( TriangleInterpolator *inter

void DualEdgeTriangulation::eliminateHorizontalTriangles()
{
QgsDebugMsg( "am in eliminateHorizontalTriangles" );
QgsDebugMsg( QStringLiteral( "am in eliminateHorizontalTriangles" ) );
double minangle = 0;//minimum angle for swapped triangles. If triangles generated by a swap would have a minimum angle (in degrees) below that value, the swap will not be done.

while ( true )
@@ -1618,7 +1618,7 @@ void DualEdgeTriangulation::eliminateHorizontalTriangles()
delete[] control;
}

QgsDebugMsg( "end of method" );
QgsDebugMsg( QStringLiteral( "end of method" ) );
}

void DualEdgeTriangulation::ruppertRefinement()
@@ -1714,7 +1714,7 @@ void DualEdgeTriangulation::ruppertRefinement()
//calculate the circumcenter
if ( !MathUtils::circumcenter( mPointVector[mHalfEdge[minedge]->getPoint()], mPointVector[mHalfEdge[minedgenext]->getPoint()], mPointVector[mHalfEdge[minedgenextnext]->getPoint()], &circumcenter ) )
{
QgsDebugMsg( "warning, calculation of circumcenter failed" );
QgsDebugMsg( QStringLiteral( "warning, calculation of circumcenter failed" ) );
//put all three edges to dontexamine and remove them from the other maps
dontexamine.insert( minedge );
edge_angle.erase( minedge );
@@ -1757,7 +1757,7 @@ void DualEdgeTriangulation::ruppertRefinement()
{
encroached = true;
//split segment
QgsDebugMsg( "segment split" );
QgsDebugMsg( QStringLiteral( "segment split" ) );
int pointno = splitHalfEdge( i, 0.5 );

//update dontexmine, angle_edge, edge_angle
@@ -1963,7 +1963,7 @@ void DualEdgeTriangulation::ruppertRefinement()
if ( ( mHalfEdge[*it]->getForced() || edgeOnConvexHull( *it ) ) && MathUtils::inDiametral( mPointVector[mHalfEdge[*it]->getPoint()], mPointVector[mHalfEdge[mHalfEdge[*it]->getDual()]->getPoint()], &circumcenter ) )
{
//split segment
QgsDebugMsg( "segment split" );
QgsDebugMsg( QStringLiteral( "segment split" ) );
int pointno = splitHalfEdge( *it, 0.5 );
encroached = true;

@@ -2142,7 +2142,7 @@ void DualEdgeTriangulation::ruppertRefinement()
}
if ( !flag )
{
QgsDebugMsg( "point is not present in the triangulation" );
QgsDebugMsg( QStringLiteral( "point is not present in the triangulation" ) );
}
}
//put all three edges to dontexamine and remove them from the other maps
@@ -2158,7 +2158,7 @@ void DualEdgeTriangulation::ruppertRefinement()
}
else//insertion successful
{
QgsDebugMsg( "circumcenter added" );
QgsDebugMsg( QStringLiteral( "circumcenter added" ) );

//update the maps
//go around the inserted point and make changes for every half edge
@@ -2480,7 +2480,7 @@ void DualEdgeTriangulation::triangulatePolygon( QList<int> *poly, QList<int> *fr

else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}

}
@@ -2557,7 +2557,7 @@ bool DualEdgeTriangulation::pointInside( double x, double y )
}
if ( numinstabs > 0 )//a numerical instability occurred
{
QgsDebugMsg( "numerical instabilities" );
QgsDebugMsg( QStringLiteral( "numerical instabilities" ) );
return true;
}

@@ -2964,13 +2964,13 @@ QList<int> *DualEdgeTriangulation::getPointsAroundEdge( double x, double y )
}
else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
return nullptr;
}
}
else
{
QgsDebugMsg( "Edge number negative" );
QgsDebugMsg( QStringLiteral( "Edge number negative" ) );
return nullptr;
}
}
@@ -2985,7 +2985,7 @@ bool DualEdgeTriangulation::saveTriangulation( QgsFeatureSink *sink, QgsFeedback
bool *alreadyVisitedEdges = new bool[mHalfEdge.size()];
if ( !alreadyVisitedEdges )
{
QgsDebugMsg( "out of memory" );
QgsDebugMsg( QStringLiteral( "out of memory" ) );
return false;
}

@@ -3083,7 +3083,7 @@ int DualEdgeTriangulation::splitHalfEdge( int edge, float position )
//just a short test if position is between 0 and 1
if ( position < 0 || position > 1 )
{
QgsDebugMsg( "warning, position is not between 0 and 1" );
QgsDebugMsg( QStringLiteral( "warning, position is not between 0 and 1" ) );
}

//create the new point on the heap
8 src/analysis/interpolation/LinTriangleInterpolator.cpp
View file
@@ -39,7 +39,7 @@ bool LinTriangleInterpolator::calcFirstDerX( double x, double y, Vector3D *vec )

else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@@ -65,7 +65,7 @@ bool LinTriangleInterpolator::calcFirstDerY( double x, double y, Vector3D *vec )

else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@@ -91,7 +91,7 @@ bool LinTriangleInterpolator::calcNormVec( double x, double y, Vector3D *vec )

else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}

@@ -121,7 +121,7 @@ bool LinTriangleInterpolator::calcPoint( double x, double y, QgsPoint &point )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}

0 comments on commit 51f6fb0

Please sign in to comment.