Port legend item

qgis · Nov 7, 2017 · d3430e4 · d3430e4
1 parent 585a8b7
commit d3430e4
Show file tree

Hide file tree

Showing 31 changed files with 4,729 additions and 121 deletions.
diff --git a/python/core/composer/qgscomposerlegend.sip b/python/core/composer/qgscomposerlegend.sip
@@ -11,31 +11,6 @@
 
 
 
-class QgsLegendModel : QgsLayerTreeModel
-{
-%Docstring
- Item model implementation based on layer tree model for composer legend.
- Overrides some functionality of QgsLayerTreeModel to better fit the needs of composer legend.
-
-.. versionadded:: 2.6
-%End
-
-%TypeHeaderCode
-#include "qgscomposerlegend.h"
-%End
-  public:
-    QgsLegendModel( QgsLayerTree *rootNode, QObject *parent /TransferThis/ = 0 );
-%Docstring
-Construct the model based on the given layer tree
-%End
-
-    virtual QVariant data( const QModelIndex &index, int role ) const;
-
-
-    virtual Qt::ItemFlags flags( const QModelIndex &index ) const;
-
-};
-
 
 class QgsComposerLegend : QgsComposerItem
 {
@@ -48,6 +23,7 @@ class QgsComposerLegend : QgsComposerItem
 %End
   public:
     QgsComposerLegend( QgsComposition *composition /TransferThis/ );
+    ~QgsComposerLegend();
 
     virtual int type() const;
 %Docstring

diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -408,6 +408,7 @@
 %Include layout/qgslayoutitem.sip
 %Include layout/qgslayoutitemgroup.sip
 %Include layout/qgslayoutitemlabel.sip
+%Include layout/qgslayoutitemlegend.sip
 %Include layout/qgslayoutitemmap.sip
 %Include layout/qgslayoutitemmapgrid.sip
 %Include layout/qgslayoutitemmapitem.sip

diff --git a/python/core/layout/qgslayoutitem.sip b/python/core/layout/qgslayoutitem.sip
@@ -84,6 +84,23 @@ class QgsLayoutItem : QgsLayoutObject, QGraphicsRectItem, QgsLayoutUndoObjectInt
       UndoLabelFont,
       UndoLabelMargin,
       UndoLabelFontColor,
+      UndoLegendText,
+      UndoLegendColumnCount,
+      UndoLegendSymbolWidth,
+      UndoLegendSymbolHeight,
+      UndoLegendWmsLegendWidth,
+      UndoLegendWmsLegendHeight,
+      UndoLegendTitleSpaceBottom,
+      UndoLegendGroupSpace,
+      UndoLegendLayerSpace,
+      UndoLegendSymbolSpace,
+      UndoLegendIconSymbolSpace,
+      UndoLegendFontColor,
+      UndoLegendBoxSpace,
+      UndoLegendColumnSpace,
+      UndoLegendLineSpacing,
+      UndoLegendRasterStrokeWidth,
+      UndoLegendRasterStrokeColor,
       UndoCustomCommand,
     };