Skip to content

Commit c0a4ee3

Browse files
author
mhugent
committed
Move annotation items and widgets from gui to app
git-svn-id: http://svn.osgeo.org/qgis/trunk@13190 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7ba75be commit c0a4ee3

18 files changed

+36
-41
lines changed

python/gui/qgsannotationitem.sip

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ class QgsAnnotationItem: QgsMapCanvasItem
2525
QgsAnnotationItem( QgsMapCanvas* mapCanvas );
2626
virtual ~QgsAnnotationItem();
2727

28-
/**Creates an editor widget (caller takes ownership)*/
29-
virtual QDialog* createEditor() = 0;
30-
3128
void updatePosition();
3229

3330
QRectF boundingRect() const;
@@ -71,4 +68,4 @@ class QgsAnnotationItem: QgsMapCanvasItem
7168

7269
void _writeXML( QDomDocument& doc, QDomElement& itemElem ) const;
7370
void _readXML( const QDomDocument& doc, const QDomElement& annotationElem );
74-
};
71+
};

python/gui/qgsformannotationitem.sip

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ class QgsFormAnnotationItem: QObject, QgsAnnotationItem
1313
//! paint function called by map canvas
1414
void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
1515

16-
/**Create a configuration dialog*/
17-
QDialog* createEditor();
18-
1916
QSizeF minimumFrameSize() const;
2017
/**Returns the optimal frame size*/
2118
QSizeF preferredFrameSize() const;
@@ -28,4 +25,4 @@ class QgsFormAnnotationItem: QObject, QgsAnnotationItem
2825

2926
void writeXML( QDomDocument& doc ) const;
3027
void readXML( const QDomDocument& doc, const QDomElement& itemElem );
31-
};
28+
};

python/gui/qgstextannotationitem.sip

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ class QgsTextAnnotationItem: QgsAnnotationItem
77
QgsTextAnnotationItem( QgsMapCanvas* canvas );
88
~QgsTextAnnotationItem();
99

10-
QDialog* createEditor();
11-
1210
/**Returns document (caller takes ownership)*/
1311
QTextDocument* document() const;
1412
/**Sets document (does not take ownership)*/
@@ -18,4 +16,4 @@ class QgsTextAnnotationItem: QgsAnnotationItem
1816
void readXML( const QDomDocument& doc, const QDomElement& itemElem );
1917

2018
void paint( QPainter* painter );
21-
};
19+
};

src/app/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ SET(QGIS_APP_SRCS
44
qgisappinterface.cpp
55
qgsabout.cpp
66
qgsaddattrdialog.cpp
7+
qgsannotationwidget.cpp
78
qgsattributeactiondialog.cpp
89
qgsattributedialog.cpp
910
qgsattributetypedialog.cpp
@@ -17,6 +18,7 @@ SET(QGIS_APP_SRCS
1718
qgscustomprojectiondialog.cpp
1819
qgsdbfilterproxymodel.cpp
1920
qgsdbtablemodel.cpp
21+
qgsformannotationdialog.cpp
2022
qgsspatialitefilterproxymodel.cpp
2123
qgsspatialitetablemodel.cpp
2224
qgsdelattrdialog.cpp
@@ -65,6 +67,7 @@ SET(QGIS_APP_SRCS
6567
qgsprojectproperties.cpp
6668
qgsrasterlayerproperties.cpp
6769
qgssearchquerybuilder.cpp
70+
qgstextannotationdialog.cpp
6871
qgswmssourceselect.cpp
6972
qgsshortcutsmanager.cpp
7073
qgssinglesymboldialog.cpp
@@ -126,6 +129,7 @@ SET (QGIS_APP_MOC_HDRS
126129
qgisappinterface.h
127130
qgsabout.h
128131
qgsaddattrdialog.h
132+
qgsannotationwidget.h
129133
qgsattributeactiondialog.h
130134
qgsattributedialog.h
131135
qgsattributetypedialog.h
@@ -137,15 +141,14 @@ SET (QGIS_APP_MOC_HDRS
137141
qgscustomprojectiondialog.h
138142
qgsdelattrdialog.h
139143
qgsfieldcalculator.h
144+
qgsformannotationdialog.h
140145
qgsmaptoolmeasureangle.h
141146
qgsnewvectorlayerdialog.h
142147
qgsgraduatedsymboldialog.h
143148
qgshelpviewer.h
144149
qgsidentifyresults.h
145150
qgslabeldialog.h
146-
147151
qgsmanageconnectionsdialog.h
148-
149152
qgsmaptoolidentify.h
150153
qgsmaptoolsplitfeatures.h
151154
qgsmaptoolvertexedit.h
@@ -161,7 +164,6 @@ SET (QGIS_APP_MOC_HDRS
161164
qgsmaptooldeletevertex.h
162165
qgsmaptoolmovevertex.h
163166
qgsmaptoolsimplify.h
164-
165167
qgsmeasuretool.h
166168
qgsmeasuredialog.h
167169
qgsmergeattributesdialog.h
@@ -172,6 +174,7 @@ SET (QGIS_APP_MOC_HDRS
172174
qgsprojectproperties.h
173175
qgsrasterlayerproperties.h
174176
qgssearchquerybuilder.h
177+
qgstextannotationdialog.h
175178
qgswmssourceselect.h
176179
qgssinglesymboldialog.h
177180
qgssnappingdialog.h
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/app/qgsmaptoolannotation.cpp

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
***************************************************************************/
1717

1818
#include "qgsmaptoolannotation.h"
19+
#include "qgsformannotationdialog.h"
1920
#include "qgsformannotationitem.h"
2021
#include "qgslogger.h"
2122
#include "qgsmapcanvas.h"
23+
#include "qgstextannotationdialog.h"
2224
#include "qgstextannotationitem.h"
2325
#include <QDialog>
2426
#include <QMouseEvent>
@@ -39,6 +41,28 @@ QgsAnnotationItem* QgsMapToolAnnotation::createItem( QMouseEvent* e )
3941
return 0;
4042
}
4143

44+
QDialog* QgsMapToolAnnotation::createItemEditor( QgsAnnotationItem* item )
45+
{
46+
if ( !item )
47+
{
48+
return 0;
49+
}
50+
51+
QgsTextAnnotationItem* tItem = dynamic_cast<QgsTextAnnotationItem*>( item );
52+
if ( tItem )
53+
{
54+
return new QgsTextAnnotationDialog( tItem );
55+
}
56+
57+
QgsFormAnnotationItem* fItem = dynamic_cast<QgsFormAnnotationItem*>( item );
58+
if ( fItem )
59+
{
60+
return new QgsFormAnnotationDialog( fItem );
61+
}
62+
63+
return 0;
64+
}
65+
4266
void QgsMapToolAnnotation::canvasReleaseEvent( QMouseEvent * e )
4367
{
4468
mCurrentMoveAction = QgsAnnotationItem::NoAction;
@@ -193,7 +217,7 @@ void QgsMapToolAnnotation::canvasDoubleClickEvent( QMouseEvent * e )
193217
{
194218
return;
195219
}
196-
QDialog* itemEditor = item->createEditor();
220+
QDialog* itemEditor = createItemEditor( item );
197221
if ( itemEditor )
198222
{
199223
itemEditor->exec();

src/app/qgsmaptoolannotation.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ class QgsMapToolAnnotation: public QgsMapTool
3636
protected:
3737
/**Creates a new item. To be implemented by subclasses. Returns 0 by default*/
3838
virtual QgsAnnotationItem* createItem( QMouseEvent* e );
39+
/**Creates an editor widget (caller takes ownership)*/
40+
QDialog* createItemEditor( QgsAnnotationItem* item );
3941

4042
private:
4143
/**Returns the topmost annotation item at the position (or 0 if none)*/
File renamed without changes.

src/gui/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ symbology-ng/characterwidget.cpp
2222
qgisgui.cpp
2323
qgisinterface.cpp
2424
qgsannotationitem.cpp
25-
qgsannotationwidget.cpp
2625
qgsattributeeditor.cpp
2726
qgslegendinterface.cpp
2827
qgscolorbutton.cpp
@@ -33,7 +32,6 @@ qgsdetaileditemwidget.cpp
3332
qgsdetaileditemdata.cpp
3433
qgsencodingfiledialog.cpp
3534
qgsfiledropedit.cpp
36-
qgsformannotationdialog.cpp
3735
qgsformannotationitem.cpp
3836
qgsgenericprojectionselector.cpp
3937
qgsmapcanvas.cpp
@@ -52,7 +50,6 @@ qgsprojectbadlayerguihandler.cpp
5250
qgsprojectionselector.cpp
5351
qgsquickprint.cpp
5452
qgsrubberband.cpp
55-
qgstextannotationdialog.cpp
5653
qgstextannotationitem.cpp
5754
qgsvertexmarker.cpp
5855
qgsludialog.cpp
@@ -75,15 +72,13 @@ symbology-ng/qgsvectorrandomcolorrampv2dialog.h
7572
symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h
7673
symbology-ng/characterwidget.h
7774

78-
qgsannotationwidget.h
7975
qgsattributeeditor.h
8076
qgscomposerview.h
8177
qgsdetaileditemdelegate.h
8278
qgsdetaileditemwidget.h
8379
qgslegendinterface.h
8480
qgisinterface.h
8581
qgsencodingfiledialog.h
86-
qgsformannotationdialog.h
8782
qgsformannotationitem.h
8883
qgsgenericprojectionselector.h
8984
qgsmapcanvas.h
@@ -93,7 +88,6 @@ qgsmessageviewer.h
9388
qgscredentialdialog.h
9489
qgsprojectionselector.h
9590
qgsquickprint.h
96-
qgstextannotationdialog.h
9791
qgsludialog.h
9892
qgsprojectbadlayerguihandler.h
9993
)

src/gui/qgsannotationitem.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ class GUI_EXPORT QgsAnnotationItem: public QgsMapCanvasItem
5050
QgsAnnotationItem( QgsMapCanvas* mapCanvas );
5151
virtual ~QgsAnnotationItem();
5252

53-
/**Creates an editor widget (caller takes ownership)*/
54-
virtual QDialog* createEditor() = 0;
55-
5653
void updatePosition();
5754

5855
QRectF boundingRect() const;

src/gui/qgsformannotationitem.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
***************************************************************************/
1717

1818
#include "qgsformannotationitem.h"
19-
#include "qgsformannotationdialog.h"
2019
#include "qgsattributeeditor.h"
2120
#include "qgsfeature.h"
2221
#include "qgslogger.h"
@@ -142,11 +141,6 @@ void QgsFormAnnotationItem::paint( QPainter * painter, const QStyleOptionGraphic
142141
}
143142
}
144143

145-
QDialog* QgsFormAnnotationItem::createEditor()
146-
{
147-
return new QgsFormAnnotationDialog( this );
148-
}
149-
150144
QSizeF QgsFormAnnotationItem::minimumFrameSize() const
151145
{
152146
if ( mDesignerWidget )

src/gui/qgsformannotationitem.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ class GUI_EXPORT QgsFormAnnotationItem: public QObject, public QgsAnnotationItem
3636
//! paint function called by map canvas
3737
void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
3838

39-
/**Create a configuration dialog*/
40-
QDialog* createEditor();
41-
4239
QSizeF minimumFrameSize() const;
4340
/**Returns the optimal frame size*/
4441
QSizeF preferredFrameSize() const;

src/gui/qgstextannotationitem.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
***************************************************************************/
1717

1818
#include "qgstextannotationitem.h"
19-
#include "qgstextannotationdialog.h"
2019
#include <QDomDocument>
2120
#include <QPainter>
2221

@@ -46,11 +45,6 @@ void QgsTextAnnotationItem::setDocument( const QTextDocument* doc )
4645
mDocument = doc->clone();
4746
}
4847

49-
QDialog* QgsTextAnnotationItem::createEditor()
50-
{
51-
return new QgsTextAnnotationDialog( this );
52-
}
53-
5448
void QgsTextAnnotationItem::paint( QPainter * painter )
5549
{
5650
if ( !painter || !mDocument )

src/gui/qgstextannotationitem.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class GUI_EXPORT QgsTextAnnotationItem: public QgsAnnotationItem
2828
QgsTextAnnotationItem( QgsMapCanvas* canvas );
2929
~QgsTextAnnotationItem();
3030

31-
QDialog* createEditor();
32-
3331
/**Returns document (caller takes ownership)*/
3432
QTextDocument* document() const;
3533
/**Sets document (does not take ownership)*/

0 commit comments

Comments
 (0)