Drag and drop support for composer legend model

git-svn-id: http://svn.osgeo.org/qgis/trunk@13491 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: mhugent

src/app/composer/qgscomposer.cpp

@@ -1349,6 +1349,10 @@ void QgsComposer::addComposerLegend( QgsComposerLegend* legend )
   }
 
   QgsComposerLegendWidget* lWidget = new QgsComposerLegendWidget( legend );
+  if ( sender() ) //only update if created from GUI (not after XML read)
+  {
+    lWidget->updateLegend();
+  }
   mItemWidgetMap.insert( legend, lWidget );
 }
 

src/app/composer/qgscomposerlegendwidget.cpp

@@ -39,13 +39,9 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend ): m
     mItemTreeView->setModel( legend->model() );
   }
 
-  updateLegend();
-
   mItemTreeView->setDragEnabled( true );
   mItemTreeView->setAcceptDrops( true );
   mItemTreeView->setDropIndicatorShown( true );
-  //only available in 4.6
-  //mItemTreeView->setDefaultDropAction( Qt::MoveAction );
   mItemTreeView->setDragDropMode( QAbstractItemView::InternalMove );
 
   setGuiElements();

src/app/composer/qgscomposerlegendwidget.h

@@ -34,6 +34,9 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
     QgsComposerLegendWidget( QgsComposerLegend* legend );
     ~QgsComposerLegendWidget();
 
+    /**Updates the legend layers and groups*/
+    void updateLegend();
+
   public slots:
 
     void on_mTitleLineEdit_textChanged( const QString& text );
@@ -61,8 +64,6 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
     QgsComposerLegendWidget();
     /**Sets GUI according to state of mLegend*/
     void setGuiElements();
-    /**Updates the legend layers and groups*/
-    void updateLegend();
 
     QgsComposerLegend* mLegend;
 };

src/core/composer/qgscomposerlegend.cpp

@@ -604,7 +604,6 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
   if ( modelNodeList.size() > 0 )
   {
     QDomElement modelElem = modelNodeList.at( 0 ).toElement();
-    mLegendModel.clear();
     mLegendModel.readXML( modelElem, doc );
   }
 

src/core/composer/qgscomposerlegenditem.cpp

@@ -16,9 +16,11 @@
  ***************************************************************************/
 
 #include "qgscomposerlegenditem.h"
+#include "qgsmaplayerregistry.h"
 #include "qgssymbol.h"
 #include "qgssymbolv2.h"
 #include "qgssymbollayerv2utils.h"
+#include "qgsvectorlayer.h"
 #include <QDomDocument>
 #include <QDomElement>
 
@@ -79,7 +81,6 @@ void QgsComposerSymbolItem::setSymbol( QgsSymbol* s )
 
 QStandardItem* QgsComposerSymbolItem::clone() const
 {
-  qWarning( "QgsComposerSymbolItem::clone" );
   QgsComposerSymbolItem* cloneItem = new QgsComposerSymbolItem();
   *cloneItem = *this;
   if ( mSymbol )
@@ -97,12 +98,48 @@ void QgsComposerSymbolItem::writeXML( QDomElement& elem, QDomDocument& doc ) con
     mSymbol->writeXML( vectorClassElem, doc, 0 );
   }
   vectorClassElem.setAttribute( "text", text() );
+  vectorClassElem.setAttribute( "layerId", mLayerID );
+
   elem.appendChild( vectorClassElem );
 }
 
 void QgsComposerSymbolItem::readXML( const QDomElement& itemElem )
 {
-  //soon...
+  if ( itemElem.isNull() )
+  {
+    return;
+  }
+  setText( itemElem.attribute( "text", "" ) );
+  setLayerID( itemElem.attribute( "layerId", "" ) );
+
+  QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( mLayerID ) );
+  if ( vLayer )
+  {
+    QDomElement symbolElem = itemElem.firstChildElement( "symbol" );
+    if ( !symbolElem.isNull() )
+    {
+      QgsSymbol* symbol = new QgsSymbol( vLayer->geometryType() );
+      symbol->readXML( symbolElem, vLayer );
+      setSymbol( symbol );
+
+      //add icon
+      switch ( symbol->type() )
+      {
+        case QGis::Point:
+          setIcon( QIcon( QPixmap::fromImage( symbol->getPointSymbolAsImage() ) ) );
+          break;
+        case QGis::Line:
+          setIcon( QIcon( QPixmap::fromImage( symbol->getLineSymbolAsImage() ) ) );
+          break;
+        case QGis::Polygon:
+          setIcon( QIcon( QPixmap::fromImage( symbol->getPolygonSymbolAsImage() ) ) );
+          break;
+        case QGis::UnknownGeometry:
+          // should not occur
+          break;
+      }
+    }
+  }
 }
 
 ////////////////QgsComposerSymbolV2Item
@@ -153,7 +190,28 @@ void QgsComposerSymbolV2Item::writeXML( QDomElement& elem, QDomDocument& doc ) c
 
 void QgsComposerSymbolV2Item::readXML( const QDomElement& itemElem )
 {
-  //soon...
+  if ( itemElem.isNull() )
+  {
+    return;
+  }
+
+  setText( itemElem.attribute( "text", "" ) );
+  QDomElement symbolsElem = itemElem.firstChildElement( "symbols" );
+  if ( !symbolsElem.isNull() )
+  {
+    QgsSymbolV2Map loadSymbolMap = QgsSymbolLayerV2Utils::loadSymbols( symbolsElem );
+    //we assume there is only one symbol in the map...
+    QgsSymbolV2Map::iterator mapIt = loadSymbolMap.begin();
+    if ( mapIt != loadSymbolMap.end() )
+    {
+      QgsSymbolV2* symbolNg = mapIt.value();
+      if ( symbolNg )
+      {
+        setSymbolV2( symbolNg );
+        setIcon( QgsSymbolLayerV2Utils::symbolPreviewIcon( symbolNg, QSize( 30, 30 ) ) );
+      }
+    }
+  }
 }
 
 void QgsComposerSymbolV2Item::setSymbolV2( QgsSymbolV2* s )
@@ -195,7 +253,45 @@ void QgsComposerLayerItem::writeXML( QDomElement& elem, QDomDocument& doc ) cons
 
 void QgsComposerLayerItem::readXML( const QDomElement& itemElem )
 {
-  //soon...
+  if ( itemElem.isNull() )
+  {
+    return;
+  }
+  setText( itemElem.attribute( "text", "" ) );
+  setLayerID( itemElem.attribute( "layerId", "" ) );
+
+  //now call readXML for all the child items
+  QDomNodeList childList = itemElem.childNodes();
+  QDomNode currentNode;
+  QDomElement currentElem;
+  QgsComposerLegendItem* currentChildItem = 0;
+
+  int nChildItems = childList.count();
+  for ( int i = 0; i < nChildItems; ++i )
+  {
+    currentNode = childList.at( i );
+    if ( !currentNode.isElement() )
+    {
+      continue;
+    }
+
+    currentElem = currentNode.toElement();
+    QString elemTag = currentElem.tagName();
+    if ( elemTag == "VectorClassificationItem" )
+    {
+      currentChildItem = new QgsComposerSymbolItem();
+    }
+    else if ( elemTag == "VectorClassificationItemNg" )
+    {
+      currentChildItem = new QgsComposerSymbolV2Item();
+    }
+    else
+    {
+      continue; //unsupported child type
+    }
+    currentChildItem->readXML( currentElem );
+    appendRow( currentChildItem );
+  }
 }
 
 ////////////////////QgsComposerGroupItem
@@ -229,5 +325,43 @@ void QgsComposerGroupItem::writeXML( QDomElement& elem, QDomDocument& doc ) cons
 
 void QgsComposerGroupItem::readXML( const QDomElement& itemElem )
 {
-  //soon...
+  if ( itemElem.isNull() )
+  {
+    return;
+  }
+  setText( itemElem.attribute( "text", "" ) );
+
+  //now call readXML for all the child items
+  QDomNodeList childList = itemElem.childNodes();
+  QDomNode currentNode;
+  QDomElement currentElem;
+  QgsComposerLegendItem* currentChildItem = 0;
+
+  int nChildItems = childList.count();
+  for ( int i = 0; i < nChildItems; ++i )
+  {
+    currentNode = childList.at( i );
+    if ( !currentNode.isElement() )
+    {
+      continue;
+    }
+
+    currentElem = currentNode.toElement();
+    QString elemTag = currentElem.tagName();
+
+    if ( elemTag == "GroupItem" )
+    {
+      currentChildItem = new QgsComposerGroupItem();
+    }
+    else if ( elemTag == "LayerItem" )
+    {
+      currentChildItem = new QgsComposerLayerItem();
+    }
+    else
+    {
+      continue; //unsupported child item type
+    }
+    currentChildItem->readXML( currentElem );
+    appendRow( currentChildItem );
+  }
 }

src/core/composer/qgscomposerlegenditem.h

@@ -69,10 +69,14 @@ class CORE_EXPORT QgsComposerSymbolItem: public QgsComposerLegendItem
     void setSymbol( QgsSymbol* s );
     QgsSymbol* symbol() {return mSymbol;}
 
+    void setLayerID( const QString& id ) { mLayerID = id; }
+    QString layerID() const { return mLayerID; }
+
     ItemType itemType() const { return SymbologyItem; }
 
   private:
     QgsSymbol* mSymbol;
+    QString mLayerID; //this is needed to read the symbol from XML
 };
 
 class QgsSymbolV2;