update widget to work with new checkbox

qgis · Feb 21, 2025 · a109937 · a109937
1 parent 3b6d8ff
commit a109937
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/src/app/mesh/qgsmeshtransformcoordinatesdockwidget.cpp b/src/app/mesh/qgsmeshtransformcoordinatesdockwidget.cpp
@@ -56,7 +56,16 @@ QgsMeshTransformCoordinatesDockWidget::QgsMeshTransformCoordinatesDockWidget( QW
   connect( mButtonPreview, &QToolButton::clicked, this, &QgsMeshTransformCoordinatesDockWidget::calculate );
   connect( mButtonApply, &QPushButton::clicked, this, &QgsMeshTransformCoordinatesDockWidget::apply );
   connect( mButtonImport, &QToolButton::toggled, this, &QgsMeshTransformCoordinatesDockWidget::onImportVertexClicked );
-  connect( mGetZValuesButton, &QPushButton::clicked, this, &QgsMeshTransformCoordinatesDockWidget::updateZValuesFromTerrain );
+
+  connect( mCheckBoxZ, &QCheckBox::toggled, this, [=]( const bool checked ) {
+    if ( checked )
+      mCheckBoxZFromProjectTerrain->setChecked( !checked );
+  } );
+  connect( mCheckBoxZFromProjectTerrain, &QCheckBox::toggled, this, [=]( const bool checked ) {
+    if ( checked )
+      mCheckBoxZ->setChecked( !checked );
+  } );
+  connect( mCheckBoxZFromProjectTerrain, &QCheckBox::toggled, this, &QgsMeshTransformCoordinatesDockWidget::updateButton );
 }
 
 QgsExpressionContext QgsMeshTransformCoordinatesDockWidget::createExpressionContext() const
@@ -104,8 +113,6 @@ void QgsMeshTransformCoordinatesDockWidget::setInput( QgsMeshLayer *layer, const
     }
   }
 
-  mGetZValuesButton->setDisabled( vertexIndexes.empty() );
-
   importVertexCoordinates();
   updateButton();
   emit calculationUpdated();
@@ -120,6 +127,7 @@ void QgsMeshTransformCoordinatesDockWidget::calculate()
   mTransformVertices.clear();
   mTransformVertices.setInputVertices( mInputVertices );
   mTransformVertices.setExpressions( mCheckBoxX->isChecked() ? mExpressionEditX->expression() : QString(), mCheckBoxY->isChecked() ? mExpressionEditY->expression() : QString(), mCheckBoxZ->isChecked() ? mExpressionEditZ->expression() : QString() );
+  mTransformVertices.setZFromTerrain( mCheckBoxZFromProjectTerrain->isChecked() );
   QgsExpressionContext context;
   context.appendScope( QgsExpressionContextUtils::projectScope( QgsProject::instance() ) );
 
@@ -133,6 +141,7 @@ void QgsMeshTransformCoordinatesDockWidget::calculate()
 
 void QgsMeshTransformCoordinatesDockWidget::updateButton()
 {
+  bool modifyXYZSelected = false;
   mButtonApply->setEnabled( false );
   bool isCalculable = mInputLayer && !mInputVertices.isEmpty();
   if ( isCalculable )
@@ -141,6 +150,11 @@ void QgsMeshTransformCoordinatesDockWidget::updateButton()
     for ( const QCheckBox *cb : std::as_const( mCheckBoxes ) )
       isCalculable |= cb->isChecked();
 
+    if ( isCalculable )
+    {
+      modifyXYZSelected = true;
+    }
+
     if ( isCalculable )
     {
       for ( int i = 0; i < mCheckBoxes.count(); ++i )
@@ -149,6 +163,11 @@ void QgsMeshTransformCoordinatesDockWidget::updateButton()
         isCalculable &= !checked || mExpressionLineEdits.at( i )->isValidExpression();
       }
     }
+
+    if ( !modifyXYZSelected && mCheckBoxZFromProjectTerrain->isChecked() )
+    {
+      isCalculable = true;
+    }
   }
 
   mButtonPreview->setEnabled( isCalculable );

diff --git a/src/ui/mesh/qgsmeshtransformcoordinatesdockwidgetbase.ui b/src/ui/mesh/qgsmeshtransformcoordinatesdockwidgetbase.ui
@@ -38,7 +38,14 @@
       </property>
      </widget>
     </item>
-    <item row="4" column="0" colspan="2">
+    <item row="4" column="0">
+     <widget class="QCheckBox" name="mCheckBoxZFromProjectTerrain">
+      <property name="text">
+       <string>Get Z value from project terrain</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="0" colspan="2">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="sizeConstraint">
        <enum>QLayout::SetDefaultConstraint</enum>
@@ -150,16 +157,6 @@
     <item row="1" column="1">
      <widget class="QgsExpressionLineEdit" name="mExpressionEditX" native="true"/>
     </item>
-    <item row="5" column="0" colspan="2">
-     <widget class="QPushButton" name="mGetZValuesButton">
-      <property name="enabled">
-       <bool>false</bool>
-      </property>
-      <property name="text">
-       <string>Get Z value from project terrain</string>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
  </widget>