qgspoint3dsymbolwidget: Add support for data defined minor radius

qgis · Jun 28, 2024 · db63491 · db63491
1 parent 2ef348a
commit db63491
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/app/3d/qgspoint3dsymbolwidget.cpp b/src/app/3d/qgspoint3dsymbolwidget.cpp
@@ -82,6 +82,7 @@ QgsPoint3DSymbolWidget::QgsPoint3DSymbolWidget( QWidget *parent )
   connect( mBtnLengthOverride, &QgsPropertyOverrideButton::changed, this, &QgsPoint3DSymbolWidget::changed );
   connect( mBtnRadiusOverride, &QgsPropertyOverrideButton::changed, this, &QgsPoint3DSymbolWidget::changed );
   connect( mBtnBottomRadiusOverride, &QgsPropertyOverrideButton::changed, this, &QgsPoint3DSymbolWidget::changed );
+  connect( mBtnMinorRadiusOverride, &QgsPropertyOverrideButton::changed, this, &QgsPoint3DSymbolWidget::changed );
   connect( mBtnTopRadiusOverride, &QgsPropertyOverrideButton::changed, this, &QgsPoint3DSymbolWidget::changed );
   connect( mBtnSizeOverride, &QgsPropertyOverrideButton::changed, this, &QgsPoint3DSymbolWidget::changed );
 }
@@ -153,6 +154,7 @@ void QgsPoint3DSymbolWidget::setSymbol( const QgsAbstract3DSymbol *symbol, QgsVe
   mBtnLengthOverride->init( static_cast< int >( QgsAbstract3DSymbol::Property::Length ), pointSymbol->dataDefinedProperties(), QgsAbstract3DSymbol::propertyDefinitions(), layer, true );
   mBtnRadiusOverride->init( static_cast< int >( QgsAbstract3DSymbol::Property::Radius ), pointSymbol->dataDefinedProperties(), QgsAbstract3DSymbol::propertyDefinitions(), layer, true );
   mBtnBottomRadiusOverride->init( static_cast< int >( QgsAbstract3DSymbol::Property::BottomRadius ), pointSymbol->dataDefinedProperties(), QgsAbstract3DSymbol::propertyDefinitions(), layer, true );
+  mBtnMinorRadiusOverride->init( static_cast< int >( QgsAbstract3DSymbol::Property::MinorRadius ), pointSymbol->dataDefinedProperties(), QgsAbstract3DSymbol::propertyDefinitions(), layer, true );
   mBtnTopRadiusOverride->init( static_cast< int >( QgsAbstract3DSymbol::Property::TopRadius ), pointSymbol->dataDefinedProperties(), QgsAbstract3DSymbol::propertyDefinitions(), layer, true );
   mBtnSizeOverride->init( static_cast< int >( QgsAbstract3DSymbol::Property::Size ), pointSymbol->dataDefinedProperties(), QgsAbstract3DSymbol::propertyDefinitions(), layer, true );
 
@@ -234,6 +236,7 @@ QgsAbstract3DSymbol *QgsPoint3DSymbolWidget::symbol()
       vm[QStringLiteral( "radius" )] = spinRadius->value();
       vm[QStringLiteral( "minorRadius" )] = spinMinorRadius->value();
       ddp.setProperty( QgsAbstract3DSymbol::Property::Radius, mBtnRadiusOverride->toProperty() );
+      ddp.setProperty( QgsAbstract3DSymbol::Property::MinorRadius, mBtnMinorRadiusOverride->toProperty() );
       break;
     case Qgis::Point3DShape::Model:
       vm[QStringLiteral( "model" )] = lineEditModel->source();
@@ -276,7 +279,7 @@ void QgsPoint3DSymbolWidget::onShapeChanged()
   QList<QWidget *> allWidgets;
   allWidgets << labelSize << spinSize << mBtnSizeOverride
              << labelRadius << spinRadius << mBtnRadiusOverride
-             << labelMinorRadius << spinMinorRadius
+             << labelMinorRadius << spinMinorRadius << mBtnMinorRadiusOverride
              << labelTopRadius << spinTopRadius << mBtnTopRadiusOverride
              << labelBottomRadius << spinBottomRadius << mBtnBottomRadiusOverride
              << labelLength << spinLength << mBtnLengthOverride
@@ -305,7 +308,7 @@ void QgsPoint3DSymbolWidget::onShapeChanged()
       activeWidgets << labelSize << spinSize << mBtnSizeOverride;
       break;
     case Qgis::Point3DShape::Torus:
-      activeWidgets << labelRadius << spinRadius << mBtnRadiusOverride << labelMinorRadius << spinMinorRadius;
+      activeWidgets << labelRadius << spinRadius << mBtnRadiusOverride << labelMinorRadius << spinMinorRadius << mBtnMinorRadiusOverride;
       break;
     case Qgis::Point3DShape::Model:
       activeWidgets << labelModel << lineEditModel;

diff --git a/src/ui/3d/point3dsymbolwidget.ui b/src/ui/3d/point3dsymbolwidget.ui
@@ -370,6 +370,13 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="2">
+      <widget class="QgsPropertyOverrideButton" name="mBtnMinorRadiusOverride">
+       <property name="text">
+        <string>…</string>
+       </property>
+      </widget>
+     </item>
      <item row="7" column="0">
       <widget class="QLabel" name="labelModel">
        <property name="text">
@@ -506,6 +513,7 @@
   <tabstop>spinRadius</tabstop>
   <tabstop>mBtnRadiusOverride</tabstop>
   <tabstop>spinMinorRadius</tabstop>
+  <tabstop>mBtnMinorRadiusOverride</tabstop>
   <tabstop>spinTopRadius</tabstop>
   <tabstop>mBtnTopRadiusOverride</tabstop>
   <tabstop>spinBottomRadius</tabstop>