Working gui for setting point cloud opacity and blend mode

qgis · Nov 16, 2020 · 1951489 · 1951489
1 parent 1758ca1
commit 1951489
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/python/gui/auto_generated/pointcloud/qgspointcloudrendererpropertieswidget.sip.in b/python/gui/auto_generated/pointcloud/qgspointcloudrendererpropertieswidget.sip.in
@@ -35,10 +35,12 @@ Sets the ``context`` in which the widget is shown, e.g., the associated map canv
 
     virtual void syncToLayer( QgsMapLayer *layer );
 
+
   public slots:
 
     virtual void apply();
 
+
 };
 
 

diff --git a/src/app/pointcloud/qgspointcloudlayerproperties.cpp b/src/app/pointcloud/qgspointcloudlayerproperties.cpp
@@ -131,12 +131,17 @@ void QgsPointCloudLayerProperties::apply()
 
   // TODO -- move to proper widget classes!
 
+#if 0
   std::unique_ptr< QgsDummyPointCloudRenderer > renderer = qgis::make_unique< QgsDummyPointCloudRenderer >();
   renderer->setAttribute( mAttributeComboBox->currentAttribute() );
   renderer->setZMin( mMinZSpin->value() );
   renderer->setZMax( mMaxZSpin->value() );
   renderer->setColorRamp( mBtnColorRamp->colorRamp() );
   mLayer->setRenderer( renderer.release() );
+#endif
+
+  for ( QgsMapLayerConfigWidget *w : mConfigWidgets )
+    w->apply();
 
   mLayer->triggerRepaint();
 }
@@ -176,6 +181,9 @@ void QgsPointCloudLayerProperties::syncToLayer()
     mMaxZSpin->setValue( renderer->zMax() );
     mBtnColorRamp->setColorRamp( renderer->colorRamp() );
   }
+
+  for ( QgsMapLayerConfigWidget *w : mConfigWidgets )
+    w->syncToLayer( mLayer );
 }
 
 

diff --git a/src/gui/pointcloud/qgspointcloudrendererpropertieswidget.cpp b/src/gui/pointcloud/qgspointcloudrendererpropertieswidget.cpp
@@ -78,9 +78,11 @@ QgsPointCloudRendererPropertiesWidget::QgsPointCloudRendererPropertiesWidget( Qg
   // connect layer opacity slider and spin box
   //connect( cboRenderers, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsPointCloudRendererPropertiesWidget::rendererChanged );
 
-  //syncToLayer();
-}
+  connect( mBlendModeComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsPointCloudRendererPropertiesWidget::emitWidgetChanged );
+  connect( mOpacityWidget, &QgsOpacityWidget::opacityChanged, this, &QgsPointCloudRendererPropertiesWidget::emitWidgetChanged );
 
+  syncToLayer( layer );
+}
 
 void QgsPointCloudRendererPropertiesWidget::setContext( const QgsSymbolWidgetContext &context )
 {
@@ -92,3 +94,25 @@ void QgsPointCloudRendererPropertiesWidget::setContext( const QgsSymbolWidgetCon
   }
 }
 
+void QgsPointCloudRendererPropertiesWidget::syncToLayer( QgsMapLayer *layer )
+{
+  mLayer = qobject_cast< QgsPointCloudLayer * >( layer );
+
+  mBlockChangedSignal = true;
+  mOpacityWidget->setOpacity( mLayer->opacity() );
+  mBlendModeComboBox->setBlendMode( mLayer->blendMode() );
+  mBlockChangedSignal = false;
+}
+
+void QgsPointCloudRendererPropertiesWidget::apply()
+{
+  mLayer->setOpacity( mOpacityWidget->opacity() );
+  mLayer->setBlendMode( mBlendModeComboBox->blendMode() );
+}
+
+void QgsPointCloudRendererPropertiesWidget::emitWidgetChanged()
+{
+  if ( !mBlockChangedSignal )
+    emit widgetChanged();
+}
+
diff --git a/src/gui/pointcloud/qgspointcloudrendererpropertieswidget.h b/src/gui/pointcloud/qgspointcloudrendererpropertieswidget.h
@@ -51,11 +51,15 @@ class GUI_EXPORT QgsPointCloudRendererPropertiesWidget : public QgsMapLayerConfi
      */
     void setContext( const QgsSymbolWidgetContext &context );
 
-    void syncToLayer( QgsMapLayer *layer ) override { Q_UNUSED( layer ) }
+    void syncToLayer( QgsMapLayer *layer ) override;
 
   public slots:
 
-    void apply() override {}
+    void apply() override;
+
+  private slots:
+
+    void emitWidgetChanged();
 
   private:
 
@@ -67,6 +71,8 @@ class GUI_EXPORT QgsPointCloudRendererPropertiesWidget : public QgsMapLayerConfi
     QgsMapCanvas *mMapCanvas = nullptr;
     QgsMessageBar *mMessageBar = nullptr;
 
+    bool mBlockChangedSignal = false;
+
 };