Skip to content

Commit ac005b9

Browse files
committedJul 20, 2014
[FEATURE][composer] Multiple overview frames per composer map (fix #10299)
1 parent 2973250 commit ac005b9

File tree

9 files changed

+1254
-463
lines changed

9 files changed

+1254
-463
lines changed
 

‎src/app/composer/qgscomposermapwidget.cpp

Lines changed: 375 additions & 121 deletions
Large diffs are not rendered by default.

‎src/app/composer/qgscomposermapwidget.h

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,19 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
112112
void on_mAnnotationFontButton_clicked();
113113
void on_mAnnotationFontColorButton_colorChanged( const QColor &color );
114114

115+
//overviews
116+
void on_mAddOverviewPushButton_clicked();
117+
void on_mRemoveOverviewPushButton_clicked();
118+
void on_mOverviewUpButton_clicked();
119+
void on_mOverviewDownButton_clicked();
120+
QgsComposerMapOverview* currentOverview();
121+
void on_mOverviewCheckBox_toggled( bool state );
122+
void on_mOverviewListWidget_currentItemChanged( QListWidgetItem* current, QListWidgetItem* previous );
123+
void on_mOverviewListWidget_itemChanged( QListWidgetItem* item );
124+
void setOverviewItemsEnabled( bool enabled );
125+
void setOverviewItems( const QgsComposerMapOverview* overview );
126+
void blockOverviewItemsSignals( bool block );
127+
115128
protected:
116129
void showEvent( QShowEvent * event );
117130

@@ -155,7 +168,6 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
155168
void initAnnotationPositionBox( QComboBox* c, QgsComposerMap::GridAnnotationPosition pos );
156169
void initAnnotationDirectionBox( QComboBox* c, QgsComposerMap::GridAnnotationDirection dir );
157170

158-
void updateOverviewSymbolMarker();
159171
void updateGridLineSymbolMarker( const QgsComposerMapGrid* grid );
160172
void updateGridMarkerSymbolMarker( const QgsComposerMapGrid* grid );
161173

@@ -177,6 +189,12 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
177189
QListWidgetItem* addGridListItem( const QString& id, const QString& name );
178190

179191
void loadGridEntries();
192+
193+
QListWidgetItem* addOverviewListItem( const QString& id, const QString& name );
194+
195+
void loadOverviewEntries();
196+
197+
void updateOverviewFrameSymbolMarker( const QgsComposerMapOverview* overview );
180198
};
181199

182200
#endif

‎src/core/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ SET(QGIS_CORE_SRCS
172172
composer/qgscomposerpicture.cpp
173173
composer/qgscomposermap.cpp
174174
composer/qgscomposermapgrid.cpp
175+
composer/qgscomposermapoverview.cpp
175176
composer/qgscomposertable.cpp
176177
composer/qgscomposertablecolumn.cpp
177178
composer/qgscomposerattributetable.cpp
@@ -364,6 +365,7 @@ SET(QGIS_CORE_MOC_HDRS
364365
composer/qgsaddremoveitemcommand.h
365366
composer/qgscomposerlegend.h
366367
composer/qgscomposermap.h
368+
composer/qgscomposermapoverview.h
367369
composer/qgscomposerpicture.h
368370
composer/qgscomposerscalebar.h
369371
composer/qgscomposerobject.h

0 commit comments

Comments
 (0)
Please sign in to comment.