images/images.qrc

@@ -229,6 +229,7 @@
         <file>themes/default/mActionLocalCumulativeCutStretch.svg</file>
         <file>themes/default/mActionLocalHistogramStretch.svg</file>
         <file>themes/default/mActionLowerItems.svg</file>
+        <file>themes/default/mActionMap.png</file>
         <file>themes/default/mActionMapTips.svg</file>
         <file>themes/default/mActionMeasure.svg</file>
         <file>themes/default/mActionMeasureAngle.svg</file>

python/core/composer/qgscomposermap.sip

@@ -256,6 +256,15 @@ class QgsComposerMap : QgsComposerItem
     /** Sets canvas pointer (necessary to query and draw map canvas items)*/
     void setMapCanvas( QGraphicsView* canvas /Transfer/ );
 
+    /** Returns the canvas pointer */
+    QGraphicsView* mapCanvas() const;
+
+    /** Returns the canvas name */
+    QString mapCanvasName() const;
+
+    /** Returns the map settings of the canvas */
+    const QgsMapSettings& mapSettings() const;
+
     void setDrawCanvasItems( bool b );
     bool drawCanvasItems() const;
 

python/core/composer/qgscomposition.sip

@@ -375,6 +375,9 @@ class QgsComposition : QGraphicsScene
     //! @note added in 2.4
     const QgsMapSettings& mapSettings() const;
 
+    //! Returns the settings of the specified map canvas
+    virtual const QgsMapSettings& mapSettings( const QgsComposerMap* map ) const;
+
     QgsComposition::PlotStyle plotStyle() const;
     void setPlotStyle( const QgsComposition::PlotStyle style );
 

python/core/layertree/qgslayertreegroup.sip

@@ -12,7 +12,8 @@ class QgsLayerTreeGroup : QgsLayerTreeNode
 %End
 
   public:
-    QgsLayerTreeGroup( const QString& name = QString(), Qt::CheckState checked = Qt::Checked );
+    //! Constructor
+    QgsLayerTreeGroup( const QString& name = QString(), Qt::CheckState checked = Qt::Checked, NodeType nodeType = NodeGroup );
 
     //! Get group's name
     QString name() const;
@@ -82,6 +83,10 @@ class QgsLayerTreeGroup : QgsLayerTreeNode
     //! @note added in 2.12
     void setIsMutuallyExclusive( bool enabled, int initialChildIndex = -1 );
 
+  signals:
+    //! Emitted when the node was renamed
+    void nameChanged( const QString& oldName, const QString& newName );
+
   protected slots:
     void layerDestroyed();
     void nodeVisibilityChanged( QgsLayerTreeNode* node );

python/core/layertree/qgslayertreemodel.sip

@@ -220,6 +220,9 @@ class QgsLayerTreeModel : QAbstractItemModel
 
     static const QIcon& iconGroup();
 
+    //! Returns the QIcon to draw a NodeMapGroup
+    static const QIcon& iconMapGroup();
+
     //! Filter nodes from QgsMapLayerLegend according to the current filtering rules
     QList<QgsLayerTreeModelLegendNode*> filterLegendNodes( const QList<QgsLayerTreeModelLegendNode*>& nodes );
 

python/core/layertree/qgslayertreenode.sip

@@ -34,6 +34,10 @@
  * - "embedded_project" - path to the external project (embedded root node only)
  * - "legend/..." - properties for legend appearance customization
  * - "expandedLegendNodes" - list of layer's legend nodes' rules in expanded state
+ * - "multimapOrphan" - node without a MapTreeGroup parent (multimap mode only),
+ *    it will be deleted
+ * - "synchronizeExtent" - all MapTreeGroup nodes with this flag synchronize the
+ *    extent of their related map canvas (multimap mode only)
  *
  * @see also QgsLayerTree, QgsLayerTreeLayer, QgsLayerTreeGroup
  * @note added in 2.4
@@ -64,7 +68,8 @@ class QgsLayerTreeNode : QObject
     enum NodeType
     {
       NodeGroup,   //!< container of other groups and layers
-      NodeLayer    //!< leaf node pointing to a layer
+      NodeLayer,   //!< leaf node pointing to a layer
+      NodeMapGroup //!< container of a map canvas, for multimap view mode
     };
 
     ~QgsLayerTreeNode();

python/core/qgssnappingutils.sip

@@ -7,7 +7,7 @@ class QgsSnappingUtils : QObject
 
   public:
     QgsSnappingUtils( QObject* parent /TransferThis/ = 0 );
-    ~QgsSnappingUtils();
+    virtual ~QgsSnappingUtils();
 
     // main actions
 

python/gui/layertree/qgslayertreeview.sip

@@ -53,6 +53,8 @@ class QgsLayerTreeView : QTreeView
     QgsLayerTreeNode* currentNode() const;
     //! Get current group node. If a layer is current node, the function will return parent group. May be null.
     QgsLayerTreeGroup* currentGroupNode() const;
+    //! Get current map group node. May be null.
+    QgsLayerTreeGroup* currentMapGroupNode() const;
 
     /** Get current legend node. May be null if current node is not a legend node.
      * @note added in QGIS 2.14

python/gui/qgisinterface.sip

@@ -17,6 +17,8 @@ class QgisInterface : QObject
 %End
 
   public:
+    //! Returns the QgisInterface singleton instance
+    static QgisInterface * instance();
 
     /** Constructor */
     QgisInterface();
@@ -158,6 +160,36 @@ class QgisInterface : QObject
     /** Return a pointer to the map canvas */
     virtual QgsMapCanvas * mapCanvas() = 0;
 
+    //! Return the collection of map canvas instances managed
+    virtual QList<QgsMapCanvas*> mapCanvases() = 0;
+
+    //! Create a new map canvas with the specified unique name
+    virtual QgsMapCanvas* createNewMapCanvas( const QString& mapName, bool activateObject = true, bool floatingWidget = true, const QRect& geometryForWidget = QRect() ) = 0;
+    //! Delete the map canvas with the specified name
+    virtual bool deleteMapCanvas( const QString& mapName ) = 0;
+
+    //! Get the default map canvas of the application
+    virtual QgsMapCanvas* defaultMapCanvas() = 0;
+    //! Get the map canvas with the specified name
+    virtual QgsMapCanvas* getMapCanvas( const QString& mapName ) = 0;
+    //! Get the map canvas that manages the specified layer
+    virtual QgsMapCanvas* getMapCanvas( QgsMapLayer* mapLayer ) = 0;
+
+    //! Set the active MapCanvas instance of the application (canvas gets selected in the legend)
+    virtual bool setActiveMapCanvas( const QString& mapName ) = 0;
+    //! Set the active MapCanvas instance of the application (canvas gets selected in the legend)
+    virtual bool setActiveMapCanvas( QgsMapCanvas *mapCanvas ) = 0;
+
+    //! Creates a changeable MapCanvas connection of the given type from the signal in the sender object to the method in the receiver object
+    virtual bool connectChangeableCanvas( const QgsMapCanvas* sender, const char* signal, const QObject* receiver, const char* member ) = 0;
+    //! Creates a changeable MapCanvas connection of the given type from the signal in the sender object to the method in the receiver object
+    virtual bool connectChangeableCanvas( const QObject* sender, const char* signal, const QgsMapCanvas* receiver, const char* member ) = 0;
+
+    //! Removes a changeable MapCanvas connection of the given type from the signal in the sender object to the method in the receiver object
+    virtual bool disconnectChangeableCanvas( const QgsMapCanvas* sender, const char* signal, const QObject* receiver, const char* member ) = 0;
+    //! Removes a changeable MapCanvas connection of the given type from the signal in the sender object to the method in the receiver object
+    virtual bool disconnectChangeableCanvas( const QObject* sender, const char* signal, const QgsMapCanvas* receiver, const char* member ) = 0;
+
     /**
      * Returns a pointer to the layer tree canvas bridge
      *
@@ -358,6 +390,8 @@ class QgisInterface : QObject
     virtual QAction *actionSaveProjectAs() = 0;
     virtual QAction *actionSaveMapAsImage() = 0;
     virtual QAction *actionProjectProperties() = 0;
+    //! Action to create a new map canvas
+    virtual QAction *actionNewMapCanvas() = 0;
     virtual QAction *actionPrintComposer() = 0;
     virtual QAction *actionShowComposerManager() = 0;
     virtual QAction *actionExit() = 0;
@@ -528,6 +562,21 @@ class QgisInterface : QObject
     virtual int messageTimeout() = 0;
 
   signals:
+    /**
+     * This signal is emitted when the current (selected) map canvas is changed
+     */
+    void currentMapCanvasChanged( QgsMapCanvas* mapCanvas );
+
+    /**
+     * This signal is emitted when a new map canvas instance has been created
+     */
+    void mapCanvasAdded( QgsMapCanvas* mapCanvas );
+
+    /**
+     * This signal is emitted when a map canvas instance has been removed
+     */
+    void mapCanvasRemoved( QgsMapCanvas* mapCanvas );
+
     /** Emitted whenever current (selected) layer changes.
      *  The pointer to layer can be null if no layer is selected
      */

python/gui/qgsgeometryrubberband.sip

@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 /** A rubberband class for QgsAbstractGeometry (considering curved geometries)*/
-class QgsGeometryRubberBand: QgsMapCanvasItem
+class QgsGeometryRubberBand: QObject, QgsMapCanvasItem
 {
 %TypeHeaderCode
 #include "qgsgeometryrubberband.h"
@@ -51,7 +51,7 @@ class QgsGeometryRubberBand: QgsMapCanvasItem
     };
 
     QgsGeometryRubberBand( QgsMapCanvas* mapCanvas, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::LineGeometry );
-    ~QgsGeometryRubberBand();
+    virtual ~QgsGeometryRubberBand();
 
     /** Sets geometry (takes ownership). Geometry is expected to be in map coordinates */
     void setGeometry( QgsAbstractGeometry* geom /Transfer/ );

python/gui/qgsidentifymenu.sip

@@ -83,6 +83,9 @@ class QgsIdentifyMenu : QMenu
      */
     QList<QgsMapToolIdentify::IdentifyResult> exec( const QList<QgsMapToolIdentify::IdentifyResult>& idResults, QPoint pos );
 
+    //! sets the map canvas
+    void setMapCanvas( QgsMapCanvas* mapCanvas );
+
   protected:
     virtual void closeEvent( QCloseEvent *e );
 };

python/gui/qgsmapcanvasitem.sip

@@ -48,6 +48,12 @@ class QgsMapCanvasItem : QGraphicsItem
 
     //! transformation from map coordinates to screen coordinates
     QPointF toCanvasCoordinates( const QgsPoint& point ) const;
+
+    //! sets the map canvas
+    virtual void setMapCanvas( QgsMapCanvas* mapCanvas );
+
+    //! returns pointer to the map canvas
+    QgsMapCanvas* mapCanvas();
 };
 
 

python/gui/qgsmapcanvassnappingutils.sip

@@ -5,6 +5,7 @@ class QgsMapCanvasSnappingUtils : QgsSnappingUtils
 %End
   public:
     QgsMapCanvasSnappingUtils( QgsMapCanvas* canvas, QObject* parent = 0 );
+    virtual ~QgsMapCanvasSnappingUtils();
 
   protected:
     virtual void prepareIndexStarting( int count );

python/gui/qgsmaptool.sip

@@ -101,6 +101,9 @@ class QgsMapTool : QObject
     //! called when map tool is being deactivated
     virtual void deactivate();
 
+    //! sets the tool's map canvas
+    virtual void setMapCanvas( QgsMapCanvas* mapCanvas );
+
     //! returns pointer to the tool's map canvas
     QgsMapCanvas* canvas();
 
@@ -164,6 +167,19 @@ class QgsMapTool : QObject
     //! transformation from map coordinates to screen coordinates
     QPoint toCanvasCoordinates( const QgsPoint& point );
 
+    //! Creates a changeable MapCanvas connection of the given type from the signal in the sender object to the method in the receiver object
+    void connect( const QgsMapCanvas* sender, const char* signal, const QObject* receiver, const char* member );
+    //! Creates a changeable MapCanvas connection of the given type from the signal in the sender object to the method in the receiver object
+    void connect( const QObject* sender, const char* signal, const QgsMapCanvas* receiver, const char* member );
+    //! Creates a connection of the given type from the signal in the sender object to the method in the receiver object
+    void connect( const QObject* sender, const char* signal, const QObject* receiver, const char* member );
+
+    //! Removes a changeable MapCanvas connection of the given type from the signal in the sender object to the method in the receiver object
+    void disconnect( const QgsMapCanvas* sender, const char* signal, const QObject* receiver, const char* member );
+    //! Removes a changeable MapCanvas connection of the given type from the signal in the sender object to the method in the receiver object
+    void disconnect( const QObject* sender, const char* signal, const QgsMapCanvas* receiver, const char* member );
+    //! Removes a connection of the given type from the signal in the sender object to the method in the receiver object
+    void disconnect( const QObject* sender, const char* signal, const QObject* receiver, const char* member );
 
 };
 

python/gui/qgsmaptoolcapture.sip

@@ -31,6 +31,9 @@ class QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
     //! deactive the tool
     virtual void deactivate();
 
+    //! sets the tool's map canvas
+    virtual void setMapCanvas( QgsMapCanvas* mapCanvas );
+
     /** Adds a whole curve (e.g. circularstring) to the captured geometry. Curve must be in map CRS*/
     int addCurve( QgsCurve* c );
 

python/gui/qgsmaptoolidentify.sip

@@ -84,6 +84,9 @@ class QgsMapToolIdentify : QgsMapTool
     //! this menu can also be customized
     QgsIdentifyMenu* identifyMenu();
 
+    //! sets the tool's map canvas
+    virtual void setMapCanvas( QgsMapCanvas* mapCanvas );
+
   public slots:
     void formatChanged( QgsRasterLayer *layer );
 

python/gui/qgsrubberband.sip

@@ -1,4 +1,4 @@
-class QgsRubberBand: QgsMapCanvasItem
+class QgsRubberBand: QObject, QgsMapCanvasItem
 {
 %TypeHeaderCode
 #include <qgsrubberband.h>
@@ -41,7 +41,7 @@ class QgsRubberBand: QgsMapCanvasItem
      *  @param geometryType Defines how the data should be drawn onto the screen. (Use QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry or QgsWkbTypes::PointGeometry)
      */
     QgsRubberBand( QgsMapCanvas* mapCanvas /TransferThis/, QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry );
-    ~QgsRubberBand();
+    virtual ~QgsRubberBand();
 
     /**
      * Set the color for the rubberband