[pointclouds] Don't regenerate ramp classes automatically when

restoring previous renderer settings in point cloud attribute by ramp widgets Otherwise we lose the previously set user classes and always reset to autogenerated ones.
qgis · Feb 4, 2021 · 9fe1c17 · 9fe1c17
1 parent 0d857d2
commit 9fe1c17
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/app/3d/qgspointcloud3dsymbolwidget.cpp b/src/app/3d/qgspointcloud3dsymbolwidget.cpp
@@ -91,7 +91,6 @@ QgsPointCloud3DSymbolWidget::QgsPointCloud3DSymbolWidget( QgsPointCloudLayer *la
   if ( symbol )
     setSymbol( symbol );
 
-
   connect( mPointSizeSpinBox, qgis::overload<double>::of( &QDoubleSpinBox::valueChanged ), this, &QgsPointCloud3DSymbolWidget::emitChangedSignal );
   connect( mRenderingStyleComboBox, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), this, &QgsPointCloud3DSymbolWidget::onRenderingStyleChanged );
   connect( mScalarRecalculateMinMaxButton, &QPushButton::clicked, this, &QgsPointCloud3DSymbolWidget::setMinMaxFromLayer );
@@ -104,7 +103,8 @@ QgsPointCloud3DSymbolWidget::QgsPointCloud3DSymbolWidget( QgsPointCloudLayer *la
   connect( mMaxScreenErrorSpinBox, qgis::overload<double>::of( &QDoubleSpinBox::valueChanged ), this, [&]() { emitChangedSignal(); } );
   connect( mShowBoundingBoxesCheckBox, &QCheckBox::stateChanged, [&]() { emitChangedSignal(); } );
 
-  rampAttributeChanged();
+  if ( !symbol ) // if we have a symbol, this was already handled in setSymbol above
+    rampAttributeChanged();
 
   mClassifiedRendererWidget = new QgsPointCloudClassifiedRendererWidget( layer, nullptr );
   mClassifiedRendererWidget->setParent( this );
@@ -138,13 +138,16 @@ void QgsPointCloud3DSymbolWidget::setSymbol( QgsPointCloud3DSymbol *symbol )
     mStackedWidget->setCurrentIndex( 2 );
     QgsColorRampPointCloud3DSymbol *symb = dynamic_cast<QgsColorRampPointCloud3DSymbol *>( symbol );
 
+    // we will be restoring the existing ramp classes -- we don't want to regenerate any automatically!
+    mBlockSetMinMaxFromLayer = true;
     mRenderingParameterComboBox->setAttribute( symb->attribute() );
 
     mColorRampShaderMinEdit->setValue( symb->colorRampShaderMin() );
     mColorRampShaderMaxEdit->setValue( symb->colorRampShaderMax() );
 
     whileBlocking( mColorRampShaderWidget )->setFromShader( symb->colorRampShader() );
     whileBlocking( mColorRampShaderWidget )->setMinimumMaximum( symb->colorRampShaderMin(), symb->colorRampShaderMax() );
+    mBlockSetMinMaxFromLayer = false;
   }
   else if ( symbol->symbolType() == QLatin1String( "rgb" ) )
   {
@@ -472,7 +475,8 @@ void QgsPointCloud3DSymbolWidget::rampAttributeChanged()
       mProviderMax = mProviderMax * zScale + zOffset;
     }
   }
-  setMinMaxFromLayer();
+  if ( !mBlockSetMinMaxFromLayer )
+    setMinMaxFromLayer();
   mScalarRecalculateMinMaxButton->setEnabled( !std::isnan( mProviderMin ) && !std::isnan( mProviderMax ) );
   emitChangedSignal();
 }

diff --git a/src/app/3d/qgspointcloud3dsymbolwidget.h b/src/app/3d/qgspointcloud3dsymbolwidget.h
@@ -74,6 +74,7 @@ class QgsPointCloud3DSymbolWidget : public QWidget, private Ui::QgsPointCloud3DS
     QgsPointCloudLayer *mLayer = nullptr;
 
     bool mBlockMinMaxChanged = false;
+    bool mBlockSetMinMaxFromLayer = false;
 
     double mProviderMin = std::numeric_limits< double >::quiet_NaN();
     double mProviderMax = std::numeric_limits< double >::quiet_NaN();

diff --git a/src/gui/pointcloud/qgspointcloudattributebyramprendererwidget.cpp b/src/gui/pointcloud/qgspointcloudattributebyramprendererwidget.cpp
@@ -50,8 +50,6 @@ QgsPointCloudAttributeByRampRendererWidget::QgsPointCloudAttributeByRampRenderer
 
   connect( mScalarColorRampShaderWidget, &QgsColorRampShaderWidget::widgetChanged, this, &QgsPointCloudAttributeByRampRendererWidget::emitWidgetChanged );
   connect( mScalarRecalculateMinMaxButton, &QPushButton::clicked, this, &QgsPointCloudAttributeByRampRendererWidget::setMinMaxFromLayer );
-
-  attributeChanged();
 }
 
 QgsPointCloudRendererWidget *QgsPointCloudAttributeByRampRendererWidget::create( QgsPointCloudLayer *layer, QgsStyle *style, QgsPointCloudRenderer * )
@@ -117,7 +115,9 @@ void QgsPointCloudAttributeByRampRendererWidget::attributeChanged()
     }
 
   }
-  setMinMaxFromLayer();
+  if ( !mBlockSetMinMaxFromLayer )
+    setMinMaxFromLayer();
+
   mScalarRecalculateMinMaxButton->setEnabled( !std::isnan( mProviderMin ) && !std::isnan( mProviderMax ) );
   emitWidgetChanged();
 }
@@ -141,6 +141,9 @@ void QgsPointCloudAttributeByRampRendererWidget::setFromRenderer( const QgsPoint
   const QgsPointCloudAttributeByRampRenderer *mbcr = dynamic_cast<const QgsPointCloudAttributeByRampRenderer *>( r );
   if ( mbcr )
   {
+    // we will be restoring the existing ramp classes -- we don't want to regenerate any automatically!
+    mBlockSetMinMaxFromLayer = true;
+
     mAttributeComboBox->setAttribute( mbcr->attribute() );
 
     mMinSpin->setValue( mbcr->minimum() );
@@ -162,6 +165,7 @@ void QgsPointCloudAttributeByRampRendererWidget::setFromRenderer( const QgsPoint
   }
   attributeChanged();
   mBlockChangedSignal = false;
+  mBlockSetMinMaxFromLayer = false;
 }
 
 ///@endcond
diff --git a/src/gui/pointcloud/qgspointcloudattributebyramprendererwidget.h b/src/gui/pointcloud/qgspointcloudattributebyramprendererwidget.h
@@ -52,6 +52,7 @@ class GUI_EXPORT QgsPointCloudAttributeByRampRendererWidget: public QgsPointClou
 
     bool mBlockChangedSignal = false;
     bool mBlockMinMaxChanged = false;
+    bool mBlockSetMinMaxFromLayer = false;
 
     double mProviderMin = std::numeric_limits< double >::quiet_NaN();
     double mProviderMax = std::numeric_limits< double >::quiet_NaN();