fix default M value

lbartoletti · nyalldawson · commit 8f8628ef3a6c · 2021-09-13T08:03:46.000+10:00
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -338,7 +338,7 @@ void QgsAdvancedDigitizingDockWidget::switchZM( )
     mMLabel->setEnabled( QgsWkbTypes::hasM( type ) );
     mMLineEdit->setEnabled( QgsWkbTypes::hasM( type ) );
     if ( mMLineEdit->isEnabled() )
-      mMLineEdit->setText( QLocale().toString( 0.0, 'f', 6 ) );
+      mZLineEdit->setText( QLocale().toString( QgsMapToolEdit( mMapCanvas ).defaultMValue(), 'f', 6 ) );
     else
       mMLineEdit->clear();
     mLockMButton->setEnabled( QgsWkbTypes::hasM( type ) );
@@ -862,7 +862,7 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )
   else
   {
     point.setZ( QgsMapToolEdit( mMapCanvas ).defaultZValue() );
-    point.setM( 0.0 );
+    point.setM( QgsMapToolEdit( mMapCanvas ).defaultMValue() );
   }
   // update the point list
   updateCurrentPoint( point );
@@ -955,7 +955,7 @@ void QgsAdvancedDigitizingDockWidget::updateUnlockedConstraintValues( const QgsP
     }
     else
     {
-      mMConstraint->setValue( 0.0 );
+      mMConstraint->setValue( point.m() );
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ void QgsAdvancedDigitizingDockWidget::switchZM( )`
`338`	`338`	`mMLabel->setEnabled( QgsWkbTypes::hasM( type ) );`
`339`	`339`	`mMLineEdit->setEnabled( QgsWkbTypes::hasM( type ) );`
`340`	`340`	`if ( mMLineEdit->isEnabled() )`
`341`		`- mMLineEdit->setText( QLocale().toString( 0.0, 'f', 6 ) );`
	`341`	`+ mZLineEdit->setText( QLocale().toString( QgsMapToolEdit( mMapCanvas ).defaultMValue(), 'f', 6 ) );`
`342`	`342`	`else`
`343`	`343`	`mMLineEdit->clear();`
`344`	`344`	`mLockMButton->setEnabled( QgsWkbTypes::hasM( type ) );`
`@@ -862,7 +862,7 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )`
`862`	`862`	`else`
`863`	`863`	`{`
`864`	`864`	`point.setZ( QgsMapToolEdit( mMapCanvas ).defaultZValue() );`
`865`		`- point.setM( 0.0 );`
	`865`	`+ point.setM( QgsMapToolEdit( mMapCanvas ).defaultMValue() );`
`866`	`866`	`}`
`867`	`867`	`// update the point list`
`868`	`868`	`updateCurrentPoint( point );`
`@@ -955,7 +955,7 @@ void QgsAdvancedDigitizingDockWidget::updateUnlockedConstraintValues( const QgsP`
`955`	`955`	`}`
`956`	`956`	`else`
`957`	`957`	`{`
`958`		`- mMConstraint->setValue( 0.0 );`
	`958`	`+ mMConstraint->setValue( point.m() );`
`959`	`959`	`}`
`960`	`960`	`}`
`961`	`961`	`}`