Add a super-basic way to pick legend patch shapes

With the only choices so far being the default or oval for fills, and default or "zig zag" for lines
qgis · Apr 17, 2020 · f27a490 · f27a490
1 parent 9e548a0
commit f27a490
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 7 deletions.
diff --git a/src/gui/layout/qgslayoutlegendwidget.cpp b/src/gui/layout/qgslayoutlegendwidget.cpp
@@ -40,6 +40,7 @@
 #include "qgsunittypes.h"
 #include "qgsexpressionbuilderdialog.h"
 #include "qgsexpressioncontextutils.h"
+#include "qgscircle.h"
 
 #include <QMenu>
 #include <QMessageBox>
@@ -1377,10 +1378,50 @@ QgsLayoutLegendNodeWidget::QgsLayoutLegendNodeWidget( QgsLayoutItemLegend *legen
   else
   {
     currentLabel = QgsLayerTree::toGroup( mNode )->name();
+
+  }
+
+  if ( mLayer && mLayer->layer()  && mLayer->layer()->type() == QgsMapLayerType::VectorLayer )
+  {
+    switch ( qobject_cast< QgsVectorLayer * >( mLayer->layer() )->geometryType() )
+    {
+      case QgsWkbTypes::PolygonGeometry:
+        mPatchShapeCombo->addItem( tr( "Default" ) );
+        mPatchShapeCombo->addItem( tr( "Oval" ) );
+        if ( ( dynamic_cast< QgsSymbolLegendNode * >( mLegendNode ) && !dynamic_cast< QgsSymbolLegendNode * >( mLegendNode )->patchShape().isNull() )
+             || ( !mLegendNode && !mLayer->patchShape().isNull() ) )
+        {
+          mPatchShapeCombo->addItem( tr( "Custom" ) );
+          mPatchShapeCombo->setCurrentIndex( 2 );
+        }
+        break;
+
+      case QgsWkbTypes::LineGeometry:
+        mPatchShapeCombo->addItem( tr( "Default" ) );
+        mPatchShapeCombo->addItem( tr( "Zig-zag" ) );
+        if ( ( dynamic_cast< QgsSymbolLegendNode * >( mLegendNode ) && !dynamic_cast< QgsSymbolLegendNode * >( mLegendNode )->patchShape().isNull() )
+             || ( !mLegendNode && !mLayer->patchShape().isNull() ) )
+        {
+          mPatchShapeCombo->addItem( tr( "Custom" ) );
+          mPatchShapeCombo->setCurrentIndex( 2 );
+        }
+        break;
+
+      default:
+        mPatchShapeLabel->hide();
+        mPatchShapeCombo->hide();
+        break;
+    }
+  }
+  else
+  {
+    mPatchShapeLabel->hide();
+    mPatchShapeCombo->hide();
   }
 
   mLabelEdit->setText( currentLabel );
   connect( mLabelEdit, &QLineEdit::textChanged, this, &QgsLayoutLegendNodeWidget::labelChanged );
+  connect( mPatchShapeCombo, qgis::overload<int>::of( &QComboBox::currentIndexChanged ), this, &QgsLayoutLegendNodeWidget::patchChanged );
 
 }
 
@@ -1410,3 +1451,43 @@ void QgsLayoutLegendNodeWidget::labelChanged( const QString &label )
   mLegend->updateFilterByMap();
   mLegend->endCommand();
 }
+
+void QgsLayoutLegendNodeWidget::patchChanged( int )
+{
+  mLegend->beginCommand( tr( "Edit Legend Item" ) );
+
+  QgsLegendPatchShape shape;
+  if ( mPatchShapeCombo->currentText() == tr( "Default" ) )
+  {
+    // use null shape to use default
+  }
+  else if ( mPatchShapeCombo->currentText() == tr( "Oval" ) )
+  {
+    QgsGeometry g = QgsGeometry::fromWkt( QStringLiteral( "CurvePolygon(CircularString (0 5, 5 0, 0 -5, -5 0, 0 5))" ) );
+    g.convertToStraightSegment();
+    shape = QgsLegendPatchShape( QgsSymbol::Fill, g, false );
+  }
+  else if ( mPatchShapeCombo->currentText() == tr( "Zig-zag" ) )
+  {
+    QgsGeometry g = QgsGeometry::fromWkt( QStringLiteral( "LineString(0 0, 1 1, 2 0, 3 1)" ) );
+    shape = QgsLegendPatchShape( QgsSymbol::Line, g, false );
+  }
+
+  if ( mLegendNode )
+  {
+    QgsMapLayerLegendUtils::setLegendNodePatchShape( mLayer, mOriginalLegendNodeIndex, shape );
+    mLegend->model()->refreshLayerLegend( mLayer );
+  }
+  else if ( mLayer )
+  {
+    mLayer->setPatchShape( shape );
+
+    // force update of label of the legend node with embedded icon (a bit clumsy i know)
+    if ( QgsLayerTreeModelLegendNode *embeddedNode = mLegend->model()->legendNodeEmbeddedInParent( mLayer ) )
+      embeddedNode->setUserLabel( QString() );
+  }
+
+  mLegend->adjustBoxSize();
+  mLegend->updateFilterByMap();
+  mLegend->endCommand();
+}
diff --git a/src/gui/layout/qgslayoutlegendwidget.h b/src/gui/layout/qgslayoutlegendwidget.h
@@ -184,6 +184,7 @@ class GUI_EXPORT QgsLayoutLegendNodeWidget: public QgsPanelWidget, private Ui::Q
   private slots:
 
     void labelChanged( const QString &label );
+    void patchChanged( int index );
 
   private:
 

diff --git a/src/ui/layout/qgslayoutlegendnodewidgetbase.ui b/src/ui/layout/qgslayoutlegendnodewidgetbase.ui
@@ -26,23 +26,39 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
+   <item row="2" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Label</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </spacer>
-   </item>
    <item row="0" column="1">
     <widget class="QLineEdit" name="mLabelEdit"/>
    </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="mPatchShapeLabel">
+     <property name="text">
+      <string>Patch shape</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="mPatchShapeCombo"/>
+   </item>
   </layout>
  </widget>
  <customwidgets>