qgis_legendiface.patch

     /**
      * \class QgsLegendInterface
      * \brief Abstract base class to make QgsLegend available to plugins.
      */
     class QgsLegendInterface : QObject
+    {
     %TypeHeaderCode
     #include <qgslegendinterface.h>
     %End
       public:
         /** Constructor */
         QgsLegendInterface();
         /** Virtual destructor */
         ~QgsLegendInterface();
         virtual QStringList groups() =0;
       signals:
         void groupIndexChanged( int oldIndex, int newIndex );
       public slots:
         //! Add a new group
         virtual int addGroup( QString name = "group", bool expand = true ) =0;
         virtual void removeGroup( int groupIndex ) =0;
         virtual void moveLayer( QgsMapLayer * layer, int groupIndex ) =0;
     };

python/gui/qgisinterface.sip (working copy)
25	25	/** Virtual destructor */
26	26	virtual ~QgisInterface();
27	27
	28	virtual QgsLegendInterface* legendInterface()=0;
28	29
29	30	public slots: // TODO: do these functions really need to be slots?
30	31

python/gui/gui.sip (working copy)
7	7
8	8	%Import core/core.sip
9	9
	10	%Include qgslegendinterface.sip
10	11	%Include qgisinterface.sip
11	12	%Include qgscomposerview.sip
12	13	%Include qgsencodingfiledialog.sip

     /***************************************************************************
         qgsapplegendinterface.h - description
          --------------------------------------
         Date                 : 23-Nov-2009
         Copyright            : (C) 2009 by Andres Manz
         Email                : manz dot andres at gmail dot com
     ****************************************************************************/
     /***************************************************************************
      *                                                                         *
      *   This program is free software; you can redistribute it and/or modify  *
      *   it under the terms of the GNU General Public License as published by  *
      *   the Free Software Foundation; either version 2 of the License, or     *
      *   (at your option) any later version.                                   *
      *                                                                         *
      ***************************************************************************/
     /* $Id$ */
     #ifndef QGSLEGENDAPPIFACE_H
     #define QGSLEGENDAPPIFACE_H
     #include "qgslegendinterface.h"
     #include "qgslegend.h"
     #include "qgsmaplayer.h"
     /** \ingroup gui
      * QgsLegendInterface
      * Abstract base class to make QgsLegend available to plugins.
      */
     class QgsAppLegendInterface : public QgsLegendInterface
+    {
         Q_OBJECT
       public:
         /** Constructor */
         explicit QgsAppLegendInterface( QgsLegend * legend );
         /** Virtual destructor */
         ~QgsAppLegendInterface();
         //! Return a string list of groups
         QStringList groups();
       public slots:
         //! Add a new group
         int addGroup( QString name = "group", bool expand = true );
         //! Remove all groups with the given name
         void removeGroup( int groupIndex );
         //! Move a layer to a group
         void moveLayer( QgsMapLayer * ml, int groupIndex );
         //! Update an index
         void updateIndex( const QModelIndex &oldIndex, const QModelIndex &newIndex );
       private:
         //! Pointer to QgsLegend object
         QgsLegend *mLegend;
     };
     #endif //QGSLEGENDAPPIFACE_H

       emit currentLayerChanged( layer );
+    }
     void QgsLegend::addGroup()
     int QgsLegend::addGroup( QString name, bool expand )
+    {
       QgsLegendGroup* group = new QgsLegendGroup( this, tr( "group" ) );
       QgsLegendGroup* group = new QgsLegendGroup( this, name );
       group->setData( 0, Qt::UserRole, Qt::Checked );
       setExpanded( indexFromItem( group ), true );
       QModelIndex groupIndex = indexFromItem( group );
       setExpanded( groupIndex, expand );
       return groupIndex.row();
+    }
     void QgsLegend::removeAll()
-...
       mMapCanvas->setRenderFlag( renderFlagState );
+    }
     void QgsLegend::removeGroup( int groupIndex )
+    {
       QgsLegendGroup * lg = dynamic_cast<QgsLegendGroup *>( topLevelItem( groupIndex ) );
       if( lg )
+      {
         removeGroup( lg );
+      }
+    }
     void QgsLegend::removeLayer( QString layer_key )
+    {
       if ( !mMapCanvas || mMapCanvas->isDrawing() )
-...
       QgsLegendItem* origin = dynamic_cast<QgsLegendItem *>( mItemBeingMoved );
       mItemBeingMoved = NULL;
       QModelIndex oldIndex = indexFromItem( origin );
       QgsLegendItem* dest = dynamic_cast<QgsLegendItem *>( destItem );
-...
+          {
             moveItem( origin, dest );
             setCurrentItem( origin );
             emit itemMoved( oldIndex, indexFromItem( origin ) );
+          }
+        }
         else if ( mDropAction == BEFORE )// below center of item
-...
             moveItem( origin, dest ); // Insert after, as above...
             moveItem( dest, origin ); // ... and then switch places!
             setCurrentItem( origin );
             emit itemMoved( oldIndex, indexFromItem( origin ) );
+          }
+        }
         else if ( mDropAction == INTO_GROUP )
-...
+          {
             insertItem( origin, dest );
             setCurrentItem( origin );
             emit itemMoved( oldIndex, indexFromItem( origin ) );
+          }
+        }
         else//no action
-...
       QgsLegendGroup* lg = dynamic_cast<QgsLegendGroup *>( currentItem() );
       if ( lg )
+      {
         //delete the legend layers first
         QTreeWidgetItem * child = lg->child( 0 );
         while ( child )
+        {
           setCurrentItem( child );
           removeCurrentLayer();
           child = lg->child( 0 );
+        }
         delete lg;
         adjustIconSize();
         removeGroup( lg );
+      }
+    }
     void QgsLegend::removeGroup( QgsLegendGroup * lg )
+    {
       if ( !mMapCanvas || mMapCanvas->isDrawing() )
+      {
         return;
+      }
       //delete the legend layers first
       QTreeWidgetItem * child = lg->child( 0 );
       while ( child )
+      {
         setCurrentItem( child );
         removeCurrentLayer();
         child = lg->child( 0 );
+      }
       delete lg;
       adjustIconSize();
+    }
     void QgsLegend::removeCurrentLayer()
+    {
       if ( !mMapCanvas || mMapCanvas->isDrawing() )
-...
       return true;
+    }
     void QgsLegend::moveLayer( QgsMapLayer * ml, int groupIndex )
+    {
         QgsLegendLayer *layer = findLegendLayer( ml->getLayerID() );
         QgsLegendGroup *group = dynamic_cast<QgsLegendGroup*>( topLevelItem( groupIndex ) );
         if ( layer && group )
+        {
           insertItem( layer, group );
+        }
+    }
     void QgsLegend::legendLayerShowProperties()
+    {
       if ( !mMapCanvas || mMapCanvas->isDrawing() )
-...
+      }
+    }
     bool QgsLegend::isLegendGroup( const QModelIndex &index )
+    {
       return dynamic_cast<QgsLegendGroup *>( itemFromIndex( index ) );
+    }
     QStringList QgsLegend::groups()
+    {
       QStringList groupList;
       QTreeWidgetItem *current = firstItem();
       while ( current )
+      {
         QgsLegendGroup *group = dynamic_cast<QgsLegendGroup *>( current );
         if ( group )
+        {
           groupList.append( group->text( 0 ) );
+        }
         current = nextItem( current );
+      }
       return groupList;
+    }
     /**Returns the first item in the hierarchy*/
     QTreeWidgetItem* QgsLegend::firstItem()
+    {

     #include <set>
     #include <QTreeWidget>
     class QgsLegendGroup;
     class QgsLegendLayer;
     class QgsLegendItem;
     class QgsMapLayer;
-...
         /**Returns true, if the y-coordinate is >= the center of the item*/
         bool yCoordAboveCenter( QgsLegendItem* it, int ycoord );
         /**Returns true, if the item at index is a QgsLegendGroup*/
         bool isLegendGroup( const QModelIndex &index );
         /**Returns a string list of groups*/
         QStringList groups();
         /**Returns the first item in the hierarchy*/
         QTreeWidgetItem* firstItem();
-...
         /*!
          * Slot called when user wishes to add a new empty layer group to the legend.
          * The user will be prompted for the name of the newly added group.
          * @param name name of the new group
          * @param expand expand the group
          * @return void
          */
         void addGroup();
         int addGroup( QString name = "group", bool expand = true );
         /*!
          * Removes all groups with the given name.
          * @param name name of the groups to remove
          * @return void
          */
         void removeGroup( int groupIndex );
         void removeLayer( QString );
         /** called to read legend settings from project */
-...
           @param return false if canceled or in case of error, true else*/
         bool removeLayer( QgsMapLayer* ml, bool askCancelOnEditable );
         /*!
          * Moves a layer to a group.
          * @param ml the maplayer to move
          * @param groupIndex index of group
          * @return false if the group does not exist, false otherwise
          */
         void moveLayer( QgsMapLayer* ml, int groupIndex );
         /**Toggle show in overview for current layer*/
         void legendLayerShowInOverview();
-...
         void handleRightClickEvent( QTreeWidgetItem* item, const QPoint& position );
         /**Removes the current legend group*/
         void legendGroupRemove();
         /**Removes a legend group and its layers*/
         void removeGroup( QgsLegendGroup * lg );
         /**Sets all listview items to open*/
         void expandAll();
         /**Sets all listview items to closed*/
-...
         QWidget *mInsertionLine;
       signals:
         void itemMoved( QModelIndex oldIndex, QModelIndex newIndex );
         void zOrderChanged( QgsLegend * lv );
         //! Emited whenever current (selected) layer changes

     /***************************************************************************
                         qgslegendinterface.h - description
          --------------------------------------
         Date                 : 19-Nov-2009
         Copyright            : (C) 2009 by Andres Manz
         Email                : manz dot andres at gmail dot com
     ****************************************************************************/
     /***************************************************************************
      *                                                                         *
      *   This program is free software; you can redistribute it and/or modify  *
      *   it under the terms of the GNU General Public License as published by  *
      *   the Free Software Foundation; either version 2 of the License, or     *
      *   (at your option) any later version.                                   *
      *                                                                         *
      ***************************************************************************/
     /* $Id$ */
     #include "qgsapplegendinterface.h"
     QgsAppLegendInterface::QgsAppLegendInterface( QgsLegend * legend )
         : mLegend( legend )
+    {
+    }
     QgsAppLegendInterface::~QgsAppLegendInterface()
+    {
+    }
     int QgsAppLegendInterface::addGroup( QString name, bool expand )
+    {
       return mLegend->addGroup( name, expand );
+    }
     void QgsAppLegendInterface::removeGroup( int groupIndex )
+    {
       mLegend->removeGroup( groupIndex );
+    }
     void QgsAppLegendInterface::moveLayer( QgsMapLayer * ml, int groupIndex )
+    {
       mLegend->moveLayer( ml, groupIndex );
+    }
     void QgsAppLegendInterface::updateIndex( const QModelIndex &oldIndex, const QModelIndex& newIndex)
+    {
       if ( mLegend->isLegendGroup( newIndex ) )
+      {
         emit groupIndexChanged( oldIndex.row(), newIndex.row() );
+      }
+    }
     QStringList QgsAppLegendInterface::groups()
+    {
       return mLegend->groups();
+    }

     #define QGISIFACE_H
     #include "qgisinterface.h"
     #include "qgsapplegendinterface.h"
     class QgisApp;
-...
         QgisAppInterface( QgisApp *qgisapp );
         ~QgisAppInterface();
         QgsLegendInterface* legendInterface();
         /* Exposed functions */
         //! Zoom map to full extent
         void zoomFull();
-...
         //! Pointer to the QgisApp object
         QgisApp *qgis;
         //! Pointer to the LegendInterface object
         QgsAppLegendInterface legendIface;
     };

       legend/qgslegendgroup.cpp
       legend/qgslegend.cpp
       legend/qgsapplegendinterface.cpp
       legend/qgslegenditem.cpp
       legend/qgslegendlayer.cpp
       legend/qgslegendpropertygroup.cpp
-...
       composer/qgsitempositiondialog.h
       legend/qgslegend.h
       legend/qgsapplegendinterface.h
       legend/qgslegendlayer.h
       ogr/qgsopenvectorlayerdialog.h

src/app/qgisappinterface.cpp (working copy)
32	32	#include "qgsshortcutsmanager.h"
33	33
34	34	QgisAppInterface::QgisAppInterface( QgisApp * _qgis )
35		: qgis( _qgis )
	35	: qgis( _qgis ),
	36	legendIface( _qgis->legend() )
36	37	{
37	38	// connect signals
38	39	connect( qgis->legend(), SIGNAL( currentLayerChanged( QgsMapLayer * ) ),
...	...
46	47	{
47	48	}
48	49
	50	QgsLegendInterface* QgisAppInterface::legendInterface()
	51	{
	52	return &legendIface;
	53	}
	54
49	55	void QgisAppInterface::zoomFull()
50	56	{
51	57	qgis->zoomFull();

     /***************************************************************************
         qgslegendinterface.h - description
          --------------------------------------
         Date                 : 19-Nov-2009
         Copyright            : (C) 2009 by Andres Manz
         Email                : manz dot andres at gmail dot com
     ****************************************************************************/
     /***************************************************************************
      *                                                                         *
      *   This program is free software; you can redistribute it and/or modify  *
      *   it under the terms of the GNU General Public License as published by  *
      *   the Free Software Foundation; either version 2 of the License, or     *
      *   (at your option) any later version.                                   *
      *                                                                         *
      ***************************************************************************/
     /* $Id$ */
     #ifndef QGSLEGENDINTERFACE_H
     #define QGSLEGENDINTERFACE_H
     #include <QObject>
     #include <QStringList>
     class QgsMapLayer;
     /** \ingroup gui
      * QgsLegendInterface
      * Abstract base class to make QgsLegend available to plugins.
      */
     class GUI_EXPORT QgsLegendInterface : public QObject
+    {
         Q_OBJECT
       public:
         /** Constructor */
         QgsLegendInterface();
         /** Virtual destructor */
         virtual ~QgsLegendInterface();
         //! Return a string list of groups
         virtual QStringList groups() = 0;
       signals:
         void groupIndexChanged( int oldIndex, int newIndex );
       public slots:
         //! Add a new group
         virtual int addGroup( QString name = "group", bool expand = true ) = 0;
         //! Remove group on index
         virtual void removeGroup( int groupIndex ) = 0;
         //! Move a layer to a group
         virtual void moveLayer( QgsMapLayer * ml, int groupIndex ) = 0;
     };
     #endif

     /***************************************************************************
                         qgslegendinterface.h - description
          --------------------------------------
         Date                 : 19-Nov-2009
         Copyright            : (C) 2009 by Andres Manz
         Email                : manz dot andres at gmail dot com
     ****************************************************************************/
     /***************************************************************************
      *                                                                         *
      *   This program is free software; you can redistribute it and/or modify  *
      *   it under the terms of the GNU General Public License as published by  *
      *   the Free Software Foundation; either version 2 of the License, or     *
      *   (at your option) any later version.                                   *
      *                                                                         *
      ***************************************************************************/
     /* $Id$ */
     #include "qgslegendinterface.h"
     #include "../app/legend/qgslegend.h"
     QgsLegendInterface::QgsLegendInterface()
+    {
+    }
     QgsLegendInterface::~QgsLegendInterface()
+    {
+    }

     qgisgui.cpp
     qgisinterface.cpp
     qgslegendinterface.cpp
     qgscolorbutton.cpp
     qgscomposerview.cpp
     qgscursors.cpp
-...
     qgscomposerview.h
     qgsdetaileditemdelegate.h
     qgsdetaileditemwidget.h
     qgslegendinterface.h
     qgisinterface.h
     qgsencodingfiledialog.h
     qgsgenericprojectionselector.h

     class QgsMapCanvas;
     class QgsRasterLayer;
     class QgsVectorLayer;
     class QgsLegendInterface;
     /** \ingroup gui
      * QgisInterface
-...
         /** Virtual destructor */
         virtual ~QgisInterface();
         virtual QgsLegendInterface* legendInterface() = 0;
       public slots: // TODO: do these functions really need to be slots?
         //! Zoom to full extent of map layers

QGIS » QGIS Application