typo and spelling

qgis · Oct 19, 2020 · abc112b · abc112b
1 parent b5c787b
commit abc112b
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 15 deletions.
diff --git a/python/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in b/python/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in
@@ -58,7 +58,7 @@ Adds break lines from a vector layer, return ``True`` if successful.
    if the feature iterator contains only point geometries, the vertices will be added only without treating them as breaklines
 %End
 
-    QgsMesh triangulatedMesh( QgsFeedback *feedBack = 0 ) const;
+    QgsMesh triangulatedMesh( QgsFeedback *feedback = 0 ) const;
 %Docstring
 Returns the triangulated mesh
 %End

diff --git a/python/gui/auto_additions/qgscodeeditorcolorscheme.py b/python/gui/auto_additions/qgscodeeditorcolorscheme.py
@@ -0,0 +1,39 @@
+# The following has been generated automatically from src/gui/codeeditors/qgscodeeditorcolorscheme.h
+# monkey patching scoped based enum
+QgsCodeEditorColorScheme.ColorRole.Default.__doc__ = "Default text color"
+QgsCodeEditorColorScheme.ColorRole.Keyword.__doc__ = "Keyword color"
+QgsCodeEditorColorScheme.ColorRole.Class.__doc__ = "Class color"
+QgsCodeEditorColorScheme.ColorRole.Method.__doc__ = "Method color"
+QgsCodeEditorColorScheme.ColorRole.Decoration.__doc__ = "Decoration color"
+QgsCodeEditorColorScheme.ColorRole.Number.__doc__ = "Number color"
+QgsCodeEditorColorScheme.ColorRole.Comment.__doc__ = "Comment color"
+QgsCodeEditorColorScheme.ColorRole.CommentLine.__doc__ = "Line comment color"
+QgsCodeEditorColorScheme.ColorRole.CommentBlock.__doc__ = "Comment block color"
+QgsCodeEditorColorScheme.ColorRole.Background.__doc__ = "Background color"
+QgsCodeEditorColorScheme.ColorRole.Cursor.__doc__ = "Cursor color"
+QgsCodeEditorColorScheme.ColorRole.CaretLine.__doc__ = "Caret line color"
+QgsCodeEditorColorScheme.ColorRole.SingleQuote.__doc__ = "Single quote color"
+QgsCodeEditorColorScheme.ColorRole.DoubleQuote.__doc__ = "Double quote color"
+QgsCodeEditorColorScheme.ColorRole.TripleSingleQuote.__doc__ = "Triple single quote color"
+QgsCodeEditorColorScheme.ColorRole.TripleDoubleQuote.__doc__ = "Triple double quote color"
+QgsCodeEditorColorScheme.ColorRole.Operator.__doc__ = "Operator color"
+QgsCodeEditorColorScheme.ColorRole.QuotedOperator.__doc__ = "Quoted operator color"
+QgsCodeEditorColorScheme.ColorRole.Identifier.__doc__ = "Identifier color"
+QgsCodeEditorColorScheme.ColorRole.QuotedIdentifier.__doc__ = "Quoted identifier color"
+QgsCodeEditorColorScheme.ColorRole.Tag.__doc__ = "Tag color"
+QgsCodeEditorColorScheme.ColorRole.UnknownTag.__doc__ = "Unknown tag"
+QgsCodeEditorColorScheme.ColorRole.MarginBackground.__doc__ = "Margin background color"
+QgsCodeEditorColorScheme.ColorRole.MarginForeground.__doc__ = "Margin foreground color"
+QgsCodeEditorColorScheme.ColorRole.SelectionBackground.__doc__ = "Selection background color"
+QgsCodeEditorColorScheme.ColorRole.SelectionForeground.__doc__ = "Selection foreground color"
+QgsCodeEditorColorScheme.ColorRole.MatchedBraceBackground.__doc__ = "Matched brace background color"
+QgsCodeEditorColorScheme.ColorRole.MatchedBraceForeground.__doc__ = "Matched brace foreground color"
+QgsCodeEditorColorScheme.ColorRole.Edge.__doc__ = "Edge color"
+QgsCodeEditorColorScheme.ColorRole.Fold.__doc__ = "Fold color"
+QgsCodeEditorColorScheme.ColorRole.Error.__doc__ = "Error color"
+QgsCodeEditorColorScheme.ColorRole.ErrorBackground.__doc__ = "Error background color"
+QgsCodeEditorColorScheme.ColorRole.FoldIconForeground.__doc__ = "Fold icon foreground color"
+QgsCodeEditorColorScheme.ColorRole.FoldIconHalo.__doc__ = "Fold icon halo color"
+QgsCodeEditorColorScheme.ColorRole.IndentationGuide.__doc__ = "Indentation guide line"
+QgsCodeEditorColorScheme.ColorRole.__doc__ = 'Color roles.\n\n' + '* ``Default``: ' + QgsCodeEditorColorScheme.ColorRole.Default.__doc__ + '\n' + '* ``Keyword``: ' + QgsCodeEditorColorScheme.ColorRole.Keyword.__doc__ + '\n' + '* ``Class``: ' + QgsCodeEditorColorScheme.ColorRole.Class.__doc__ + '\n' + '* ``Method``: ' + QgsCodeEditorColorScheme.ColorRole.Method.__doc__ + '\n' + '* ``Decoration``: ' + QgsCodeEditorColorScheme.ColorRole.Decoration.__doc__ + '\n' + '* ``Number``: ' + QgsCodeEditorColorScheme.ColorRole.Number.__doc__ + '\n' + '* ``Comment``: ' + QgsCodeEditorColorScheme.ColorRole.Comment.__doc__ + '\n' + '* ``CommentLine``: ' + QgsCodeEditorColorScheme.ColorRole.CommentLine.__doc__ + '\n' + '* ``CommentBlock``: ' + QgsCodeEditorColorScheme.ColorRole.CommentBlock.__doc__ + '\n' + '* ``Background``: ' + QgsCodeEditorColorScheme.ColorRole.Background.__doc__ + '\n' + '* ``Cursor``: ' + QgsCodeEditorColorScheme.ColorRole.Cursor.__doc__ + '\n' + '* ``CaretLine``: ' + QgsCodeEditorColorScheme.ColorRole.CaretLine.__doc__ + '\n' + '* ``SingleQuote``: ' + QgsCodeEditorColorScheme.ColorRole.SingleQuote.__doc__ + '\n' + '* ``DoubleQuote``: ' + QgsCodeEditorColorScheme.ColorRole.DoubleQuote.__doc__ + '\n' + '* ``TripleSingleQuote``: ' + QgsCodeEditorColorScheme.ColorRole.TripleSingleQuote.__doc__ + '\n' + '* ``TripleDoubleQuote``: ' + QgsCodeEditorColorScheme.ColorRole.TripleDoubleQuote.__doc__ + '\n' + '* ``Operator``: ' + QgsCodeEditorColorScheme.ColorRole.Operator.__doc__ + '\n' + '* ``QuotedOperator``: ' + QgsCodeEditorColorScheme.ColorRole.QuotedOperator.__doc__ + '\n' + '* ``Identifier``: ' + QgsCodeEditorColorScheme.ColorRole.Identifier.__doc__ + '\n' + '* ``QuotedIdentifier``: ' + QgsCodeEditorColorScheme.ColorRole.QuotedIdentifier.__doc__ + '\n' + '* ``Tag``: ' + QgsCodeEditorColorScheme.ColorRole.Tag.__doc__ + '\n' + '* ``UnknownTag``: ' + QgsCodeEditorColorScheme.ColorRole.UnknownTag.__doc__ + '\n' + '* ``MarginBackground``: ' + QgsCodeEditorColorScheme.ColorRole.MarginBackground.__doc__ + '\n' + '* ``MarginForeground``: ' + QgsCodeEditorColorScheme.ColorRole.MarginForeground.__doc__ + '\n' + '* ``SelectionBackground``: ' + QgsCodeEditorColorScheme.ColorRole.SelectionBackground.__doc__ + '\n' + '* ``SelectionForeground``: ' + QgsCodeEditorColorScheme.ColorRole.SelectionForeground.__doc__ + '\n' + '* ``MatchedBraceBackground``: ' + QgsCodeEditorColorScheme.ColorRole.MatchedBraceBackground.__doc__ + '\n' + '* ``MatchedBraceForeground``: ' + QgsCodeEditorColorScheme.ColorRole.MatchedBraceForeground.__doc__ + '\n' + '* ``Edge``: ' + QgsCodeEditorColorScheme.ColorRole.Edge.__doc__ + '\n' + '* ``Fold``: ' + QgsCodeEditorColorScheme.ColorRole.Fold.__doc__ + '\n' + '* ``Error``: ' + QgsCodeEditorColorScheme.ColorRole.Error.__doc__ + '\n' + '* ``ErrorBackground``: ' + QgsCodeEditorColorScheme.ColorRole.ErrorBackground.__doc__ + '\n' + '* ``FoldIconForeground``: ' + QgsCodeEditorColorScheme.ColorRole.FoldIconForeground.__doc__ + '\n' + '* ``FoldIconHalo``: ' + QgsCodeEditorColorScheme.ColorRole.FoldIconHalo.__doc__ + '\n' + '* ``IndentationGuide``: ' + QgsCodeEditorColorScheme.ColorRole.IndentationGuide.__doc__
+# --
diff --git a/src/analysis/interpolation/qgsdualedgetriangulation.cpp b/src/analysis/interpolation/qgsdualedgetriangulation.cpp
@@ -3260,12 +3260,12 @@ bool QgsDualEdgeTriangulation::saveTriangulation( QgsFeatureSink *sink, QgsFeedb
   return !feedback || !feedback->isCanceled();
 }
 
-QgsMesh QgsDualEdgeTriangulation::triangulationToMesh( QgsFeedback *feedBack ) const
+QgsMesh QgsDualEdgeTriangulation::triangulationToMesh( QgsFeedback *feedback ) const
 {
   QVector<bool> alreadyVisitedEdges( mHalfEdge.count(), false );
 
-  if ( feedBack )
-    feedBack->setProgress( 0 );
+  if ( feedback )
+    feedback->setProgress( 0 );
 
   QVector< bool> edgeToTreat( mHalfEdge.count(), true );
   QHash<HalfEdge *, int > edgesHash;
@@ -3296,13 +3296,13 @@ QgsMesh QgsDualEdgeTriangulation::triangulationToMesh( QgsFeedback *feedBack ) c
         containVirtualPoint |= currentEdge->getPoint() == -1;
         currentEdge = mHalfEdge.at( currentEdge->getNext() );
       }
-      while ( currentEdge != firstEdge && !containVirtualPoint && ( !feedBack || !feedBack->isCanceled() ) );
+      while ( currentEdge != firstEdge && !containVirtualPoint && ( !feedback || !feedback->isCanceled() ) );
       if ( !containVirtualPoint )
         mesh.faces.append( face );
     }
-    if ( feedBack )
+    if ( feedback )
     {
-      feedBack->setProgress( ( 100 *  i ) / edgeCount ) ;
+      feedback->setProgress( ( 100 *  i ) / edgeCount ) ;
     }
   }
 

diff --git a/src/analysis/interpolation/qgsdualedgetriangulation.h b/src/analysis/interpolation/qgsdualedgetriangulation.h
@@ -95,7 +95,7 @@ class ANALYSIS_EXPORT QgsDualEdgeTriangulation: public QgsTriangulation
 
     bool saveTriangulation( QgsFeatureSink *sink, QgsFeedback *feedback = nullptr ) const override;
 
-    virtual QgsMesh triangulationToMesh( QgsFeedback *feedBack = nullptr ) const override;
+    virtual QgsMesh triangulationToMesh( QgsFeedback *feedback = nullptr ) const override;
 
   private:
     //! X-coordinate of the upper right corner of the bounding box

diff --git a/src/analysis/mesh/qgsmeshtriangulation.cpp b/src/analysis/mesh/qgsmeshtriangulation.cpp
@@ -94,9 +94,9 @@ bool QgsMeshTriangulation::addBreakLines( QgsFeatureIterator &lineFeatureIterato
   return true;
 }
 
-QgsMesh QgsMeshTriangulation::triangulatedMesh( QgsFeedback *feedBack ) const
+QgsMesh QgsMeshTriangulation::triangulatedMesh( QgsFeedback *feedback ) const
 {
-  return mTriangulation->triangulationToMesh( feedBack );
+  return mTriangulation->triangulationToMesh( feedback );
 }
 
 void QgsMeshTriangulation::setCrs( const QgsCoordinateReferenceSystem &crs )

diff --git a/src/analysis/mesh/qgsmeshtriangulation.h b/src/analysis/mesh/qgsmeshtriangulation.h
@@ -73,7 +73,7 @@ class ANALYSIS_EXPORT QgsMeshTriangulation : public QObject
     bool addBreakLines( QgsFeatureIterator &lineFeatureIterator, int valueAttribute, const QgsCoordinateTransform &transformContext, QgsFeedback *feedback = nullptr, long featureCount = 1 );
 
     //! Returns the triangulated mesh
-    QgsMesh triangulatedMesh( QgsFeedback *feedBack = nullptr ) const;
+    QgsMesh triangulatedMesh( QgsFeedback *feedback = nullptr ) const;
 
     //! Sets the coordinate reference system used for the triangulation
     void setCrs( const QgsCoordinateReferenceSystem &crs );

diff --git a/src/analysis/processing/qgsalgorithmtinmeshcreation.cpp b/src/analysis/processing/qgsalgorithmtinmeshcreation.cpp
@@ -133,7 +133,7 @@ QVariantMap QgsTinMeshCreationAlgorithm::processAlgorithm( const QVariantMap &pa
   triangulation.setCrs( destinationCrs );
 
   if ( !mVerticesLayer.isEmpty() && feedback )
-    feedback->setProgressText( QObject::tr( "Add vertices layer(s) to the triangulation" ) );
+    feedback->setProgressText( QObject::tr( "Adding vertices layer(s) to the triangulation" ) );
   for ( Layer &l : mVerticesLayer )
   {
     if ( feedback && feedback->isCanceled() )
@@ -142,7 +142,7 @@ QVariantMap QgsTinMeshCreationAlgorithm::processAlgorithm( const QVariantMap &pa
   }
 
   if ( !mBreakLinesLayer.isEmpty() && feedback )
-    feedback->setProgressText( QObject::tr( "Add break lines layer(s) to the triangulation" ) );
+    feedback->setProgressText( QObject::tr( "Adding break lines layer(s) to the triangulation" ) );
   for ( Layer &l : mBreakLinesLayer )
   {
     if ( feedback && feedback->isCanceled() )
@@ -157,7 +157,7 @@ QVariantMap QgsTinMeshCreationAlgorithm::processAlgorithm( const QVariantMap &pa
   int driverIndex = parameterAsEnum( parameters, QStringLiteral( "MESH_FORMAT" ), context );
   const QString driver = mAvailableFormat.at( driverIndex );
   if ( feedback )
-    feedback->setProgressText( QObject::tr( "Create mesh from triangulation" ) );
+    feedback->setProgressText( QObject::tr( "Creating mesh from triangulation" ) );
   const QgsMesh mesh = triangulation.triangulatedMesh( feedback );
 
   if ( feedback && feedback->isCanceled() )
@@ -166,7 +166,7 @@ QVariantMap QgsTinMeshCreationAlgorithm::processAlgorithm( const QVariantMap &pa
   const QgsProviderMetadata *providerMetadata = QgsProviderRegistry::instance()->providerMetadata( QStringLiteral( "mdal" ) );
 
   if ( feedback )
-    feedback->setProgressText( QObject::tr( "Save mesh to file" ) );
+    feedback->setProgressText( QObject::tr( "Saving mesh to file" ) );
   if ( providerMetadata )
     providerMetadata->createMeshData( mesh, fileName, driver, destinationCrs );