[FEATURE][composer] Multiple overview frames per composer map (fix #1…

…0299)
qgis · Jul 20, 2014 · ac005b9 · ac005b9
1 parent 2973250
commit ac005b9
Show file tree

Hide file tree

Showing 9 changed files with 1,254 additions and 463 deletions.
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h
@@ -112,6 +112,19 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
     void on_mAnnotationFontButton_clicked();
     void on_mAnnotationFontColorButton_colorChanged( const QColor &color );
 
+    //overviews
+    void on_mAddOverviewPushButton_clicked();
+    void on_mRemoveOverviewPushButton_clicked();
+    void on_mOverviewUpButton_clicked();
+    void on_mOverviewDownButton_clicked();
+    QgsComposerMapOverview* currentOverview();
+    void on_mOverviewCheckBox_toggled( bool state );
+    void on_mOverviewListWidget_currentItemChanged( QListWidgetItem* current, QListWidgetItem* previous );
+    void on_mOverviewListWidget_itemChanged( QListWidgetItem* item );
+    void setOverviewItemsEnabled( bool enabled );
+    void setOverviewItems( const QgsComposerMapOverview* overview );
+    void blockOverviewItemsSignals( bool block );
+
   protected:
     void showEvent( QShowEvent * event );
 
@@ -155,7 +168,6 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
     void initAnnotationPositionBox( QComboBox* c, QgsComposerMap::GridAnnotationPosition pos );
     void initAnnotationDirectionBox( QComboBox* c, QgsComposerMap::GridAnnotationDirection dir );
 
-    void updateOverviewSymbolMarker();
     void updateGridLineSymbolMarker( const QgsComposerMapGrid* grid );
     void updateGridMarkerSymbolMarker( const QgsComposerMapGrid* grid );
 
@@ -177,6 +189,12 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
     QListWidgetItem* addGridListItem( const QString& id, const QString& name );
 
     void loadGridEntries();
+
+    QListWidgetItem* addOverviewListItem( const QString& id, const QString& name );
+
+    void loadOverviewEntries();
+
+    void updateOverviewFrameSymbolMarker( const QgsComposerMapOverview* overview );
 };
 
 #endif
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -172,6 +172,7 @@ SET(QGIS_CORE_SRCS
   composer/qgscomposerpicture.cpp
   composer/qgscomposermap.cpp
   composer/qgscomposermapgrid.cpp
+  composer/qgscomposermapoverview.cpp
   composer/qgscomposertable.cpp
   composer/qgscomposertablecolumn.cpp  
   composer/qgscomposerattributetable.cpp
@@ -364,6 +365,7 @@ SET(QGIS_CORE_MOC_HDRS
   composer/qgsaddremoveitemcommand.h
   composer/qgscomposerlegend.h
   composer/qgscomposermap.h
+  composer/qgscomposermapoverview.h
   composer/qgscomposerpicture.h
   composer/qgscomposerscalebar.h
   composer/qgscomposerobject.h