Mesh point add elevation

src/app/mesh/qgsmaptooleditmeshframe.cpp

@@ -16,6 +16,9 @@
 #include "qgsmaptooleditmeshframe.h"
 
 #include <QMessageBox>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QCheckBox>
 
 #include "qgis.h"
 #include "qgisapp.h"
@@ -45,7 +48,9 @@
 #include "qgsmeshselectbyexpressiondialog.h"
 #include "qgsmaptoolidentify.h"
 #include "qgsidentifymenu.h"
-
+#include "qgsprojectelevationproperties.h"
+#include "qgscoordinatetransform.h"
+#include "qgsterrainprovider.h"
 
 //
 // QgsZValueWidget
@@ -54,9 +59,12 @@
 
 QgsZValueWidget::QgsZValueWidget( const QString &label, QWidget *parent ): QWidget( parent )
 {
-  QHBoxLayout *layout = new QHBoxLayout( this );
+  QVBoxLayout *mainLayout = new QVBoxLayout( this );
+  mainLayout->setContentsMargins( 0, 0, 0, 0 );
+  setLayout( mainLayout );
+
+  QHBoxLayout *layout = new QHBoxLayout();
   layout->setContentsMargins( 0, 0, 0, 0 );
-  setLayout( layout );
 
   if ( !label.isEmpty() )
   {
@@ -76,6 +84,27 @@ QgsZValueWidget::QgsZValueWidget( const QString &label, QWidget *parent ): QWidg
   mZValueSpinBox->clear();
 
   mZValueSpinBox->setFocusPolicy( Qt::NoFocus );
+
+  mGetZValuesButton = new QPushButton( this );
+  mGetZValuesButton->setText( "Get Z value from project terrain" );
+
+  mGetZValuesFromProjectElevationByDefaultCheckBox = new QCheckBox( "Set Z value from project terrain for new points", this );
+
+  mainLayout->addLayout( layout );
+  mainLayout->addWidget( mGetZValuesButton );
+  mainLayout->addWidget( mGetZValuesFromProjectElevationByDefaultCheckBox );
+
+  connect( mGetZValuesButton, &QPushButton::pressed, this, &QgsZValueWidget::getZValuesFromProjectElevation_pressed );
+}
+
+void QgsZValueWidget::getZValuesFromProjectElevation_pressed()
+{
+  emit applyZValuesFromProjectElevation();
+}
+
+bool QgsZValueWidget::getZFromProjectElevation()
+{
+  return mGetZValuesFromProjectElevationByDefaultCheckBox->isChecked();
 }
 
 double QgsZValueWidget::zValue() const
@@ -893,6 +922,10 @@ void QgsMapToolEditMeshFrame::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
         {
           addVertex( mFirstClickPoint, e->mapPointMatch() );
           mCadDockWidget->setPoints( QList<QgsPointXY>() << mFirstClickPoint << mFirstClickPoint );
+
+          // after addition select the vertex for easier editing of Z value
+          mCurrentVertexIndex = closeVertex( mapPoint );
+          select( mapPoint, e->modifiers(), tolerance );
         }
         else if ( mNewFaceMarker->isVisible() &&
                   mapPoint.distance( mNewFaceMarker->center() ) < tolerance
@@ -2047,6 +2080,40 @@ void QgsMapToolEditMeshFrame::selectContainedByGeometry( const QgsGeometry &geom
   setSelectedVertices( selectedVertices.values(), behavior );
 }
 
+void QgsMapToolEditMeshFrame::applyZValueFromProjectTerrainOnSelectedVertices()
+{
+  if ( !mZValueWidget )
+    return;
+
+  if ( mSelectedVertices.isEmpty() )
+    return;
+
+  const QgsAbstractTerrainProvider *terrainProvider = QgsProject::instance()->elevationProperties()->terrainProvider();
+  const QgsCoordinateTransform transformation = QgsCoordinateTransform( mCurrentLayer->crs(), terrainProvider->crs(), QgsProject::instance() );
+
+  QList<double> zValues;
+  zValues.reserve( mSelectedVertices.count() );
+
+  for ( QMap<int, SelectedVertexData>::iterator it = mSelectedVertices.begin(); it != mSelectedVertices.end(); ++it )
+  {
+    const QgsPoint vertex = mapVertex( it.key() );
+    QgsPointXY point;
+
+    try
+    {
+      point = transformation.transform( vertex.x(), vertex.y() );
+    }
+    catch ( const QgsCsException & )
+    {
+      point = QgsPointXY( vertex.x(), vertex.y() );
+    }
+
+    zValues.append( terrainProvider->heightAt( point.x(), point.y() ) );
+  }
+
+  mCurrentEditor->changeZValues( mSelectedVertices.keys(), zValues );
+}
+
 void QgsMapToolEditMeshFrame::applyZValueOnSelectedVertices()
 {
   if ( !mZValueWidget )
@@ -2631,6 +2698,8 @@ void QgsMapToolEditMeshFrame::createZValueWidget()
   mZValueWidget->setDefaultValue( defaultZValue() );
   mZValueWidget->setZValue( mUserZValue );
   QgisApp::instance()->addUserInputWidget( mZValueWidget );
+
+  connect( mZValueWidget, &QgsZValueWidget::applyZValuesFromProjectElevation, this, &QgsMapToolEditMeshFrame::applyZValueFromProjectTerrainOnSelectedVertices );
 }
 
 void QgsMapToolEditMeshFrame::deleteZValueWidget()
@@ -2717,7 +2786,20 @@ void QgsMapToolEditMeshFrame::addVertex(
     zValue = QgsMeshLayerUtils::interpolateFromVerticesData( v1, v2, v3, v1.z(), v2.z(), v3.z(), mapPoint );
   }
   else
-    zValue = currentZValue();
+  {
+    if ( mZValueWidget->getZFromProjectElevation() )
+    {
+      const QgsAbstractTerrainProvider *terrainProvider = QgsProject::instance()->elevationProperties()->terrainProvider();
+      const QgsCoordinateTransform transformation = QgsCoordinateTransform( mCurrentLayer->crs(), terrainProvider->crs(), QgsProject::instance() );
+      const QgsPointXY point = transformation.transform( effectivePoint.x(), effectivePoint.y() );
+
+      zValue = terrainProvider->heightAt( point.x(), point.y() );
+    }
+    else
+    {
+      zValue = currentZValue();
+    }
+  }
 
   const QVector<QgsMeshVertex> points( 1, QgsMeshVertex( effectivePoint.x(), effectivePoint.y(), zValue ) );
   if ( mCurrentEditor )

src/app/mesh/qgsmaptooleditmeshframe.h

@@ -36,6 +36,8 @@ class QgsSnapIndicator;
 class QgsMeshTransformCoordinatesDockWidget;
 class QComboBox;
 class QCheckBox;
+class QPushButton;
+class QCheckBox;
 class QgsUnitSelectionWidget;
 class QgsMapToolSelectionHandler;
 
@@ -58,6 +60,9 @@ class APP_EXPORT QgsZValueWidget : public QWidget
     //! Sets the current value \a z of the widget
     void setZValue( double z );
 
+    //! Should \a z value be extract from project elevation setting
+    bool getZFromProjectElevation();
+
     /**
      *  Sets the current value of the widget and set it as the default one,
      *  that is the value that is retrieve if the z value spin box is cleared
@@ -66,8 +71,15 @@ class APP_EXPORT QgsZValueWidget : public QWidget
 
     QWidget *keyboardEntryWidget() const;
 
+  signals:
+    void applyZValuesFromProjectElevation();
+
   private:
+    void getZValuesFromProjectElevation_pressed();
+
     QgsDoubleSpinBox *mZValueSpinBox = nullptr;
+    QPushButton *mGetZValuesButton = nullptr;
+    QCheckBox *mGetZValuesFromProjectElevationByDefaultCheckBox = nullptr;
 };
 
 class QgsMeshEditForceByLineAction : public QWidgetAction
@@ -235,6 +247,7 @@ class APP_EXPORT QgsMapToolEditMeshFrame : public QgsMapToolAdvancedDigitizing
     void selectTouchedByGeometry( const QgsGeometry &geometry, Qgis::SelectBehavior behavior );
     void selectContainedByGeometry( const QgsGeometry &geometry, Qgis::SelectBehavior behavior );
     void applyZValueOnSelectedVertices();
+    void applyZValueFromProjectTerrainOnSelectedVertices();
     void prepareSelection();
     void updateSelectecVerticesMarker();
     void moveSelection( const QgsPointXY &destinationPoint );