Skip to content

Commit 59c28db

Browse files
author
marco
committedDec 4, 2011
Move loading of items to qgscomposition to avoid duplicated code
·
ltr-3_40Before-merge-new_vector_api
1 parent bde0427 commit 59c28db

File tree

5 files changed

+287
-101
lines changed

5 files changed

+287
-101
lines changed
 

‎src/app/composer/qgscomposer.cpp

100755100644
Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow(),
201201

202202
//create composer view
203203
mView = new QgsComposerView( mViewFrame );
204-
connectSlots();
205204

206205
//init undo/redo buttons
207206
mComposition = new QgsComposition( mQgis->mapCanvas()->mapRenderer() );
207+
208208
mActionUndo->setEnabled( false );
209209
mActionRedo->setEnabled( false );
210210
if ( mComposition->undoStack() )
@@ -213,6 +213,8 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow(),
213213
connect( mComposition->undoStack(), SIGNAL( canRedoChanged( bool ) ), mActionRedo, SLOT( setEnabled( bool ) ) );
214214
}
215215

216+
connectSlots();
217+
216218

217219
mComposition->setParent( mView );
218220
mView->setComposition( mComposition );
@@ -324,6 +326,15 @@ void QgsComposer::connectSlots()
324326
connect( mView, SIGNAL( composerArrowAdded( QgsComposerArrow* ) ), this, SLOT( addComposerArrow( QgsComposerArrow* ) ) );
325327
connect( mView, SIGNAL( composerTableAdded( QgsComposerAttributeTable* ) ), this, SLOT( addComposerTable( QgsComposerAttributeTable* ) ) );
326328
connect( mView, SIGNAL( actionFinished() ), this, SLOT( setSelectionTool() ) );
329+
330+
connect( mComposition, SIGNAL( composerArrowAdded( QgsComposerArrow* ) ), this, SLOT( addComposerArrow( QgsComposerArrow* ) ) );
331+
connect( mComposition, SIGNAL( composerLabelAdded( QgsComposerLabel* ) ), this, SLOT( addComposerLabel( QgsComposerLabel* ) ) );
332+
connect( mComposition, SIGNAL( composerMapAdded( QgsComposerMap* ) ), this, SLOT( addComposerMap( QgsComposerMap* ) ) );
333+
connect( mComposition, SIGNAL( composerScaleBarAdded( QgsComposerScaleBar* ) ), this, SLOT( addComposerScaleBar( QgsComposerScaleBar* ) ) );
334+
connect( mComposition, SIGNAL( composerLegendAdded( QgsComposerLegend* ) ), this, SLOT( addComposerLegend( QgsComposerLegend* ) ) );
335+
connect( mComposition, SIGNAL( composerPictureAdded( QgsComposerPicture* ) ), this, SLOT( addComposerPicture( QgsComposerPicture* ) ) );
336+
connect( mComposition, SIGNAL( composerShapeAdded( QgsComposerShape* ) ), this, SLOT( addComposerShape( QgsComposerShape* ) ) );
337+
connect( mComposition, SIGNAL( composerTableAdded( QgsComposerAttributeTable* ) ), this, SLOT( addComposerTable( QgsComposerAttributeTable* ) ) );
327338
}
328339

329340
void QgsComposer::open( void )
@@ -1306,7 +1317,6 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
13061317
mCompositionOptionsLayout = 0;
13071318

13081319
mView = new QgsComposerView( mViewFrame );
1309-
connectSlots();
13101320

13111321
//read composition settings
13121322
mComposition = new QgsComposition( mQgis->mapCanvas()->mapRenderer() );
@@ -1317,6 +1327,8 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
13171327
mComposition->readXML( compositionElem, doc );
13181328
}
13191329

1330+
connectSlots();
1331+
13201332
QGridLayout *l = new QGridLayout( mViewFrame );
13211333
l->setMargin( 0 );
13221334
l->addWidget( mView, 0, 0 );
@@ -1331,7 +1343,12 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
13311343
mCompositionOptionsLayout->addWidget( compositionWidget );
13321344

13331345
//read and restore all the items
1346+
if ( mComposition )
1347+
{
1348+
mComposition->addItemsFromXML( composerElem, doc );
1349+
}
13341350

1351+
#if 0
13351352
//composer labels
13361353
QDomNodeList composerLabelList = composerElem.elementsByTagName( "ComposerLabel" );
13371354
for ( int i = 0; i < composerLabelList.size(); ++i )
@@ -1465,6 +1482,7 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
14651482
newTable->setSelected( true );
14661483
showItemOptions( newTable );
14671484
}
1485+
#endif //0
14681486

14691487
mComposition->sortZList();
14701488
mView->setComposition( mComposition );

‎src/core/composer/qgscomposition.cpp

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
#include "qgscomposeritem.h"
1919
#include "qgscomposermap.h"
2020
#include "qgspaperitem.h"
21+
#include "qgscomposerarrow.h"
22+
#include "qgscomposerlabel.h"
23+
#include "qgscomposerlegend.h"
24+
#include "qgscomposermap.h"
25+
#include "qgscomposeritemgroup.h"
26+
#include "qgscomposerpicture.h"
27+
#include "qgscomposerscalebar.h"
28+
#include "qgscomposershape.h"
29+
#include "qgscomposerattributetable.h"
2130
#include "qgslogger.h"
2231
#include <QDomDocument>
2332
#include <QDomElement>
@@ -252,6 +261,113 @@ bool QgsComposition::readXML( const QDomElement& compositionElem, const QDomDocu
252261
return true;
253262
}
254263

264+
void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, QPointF* pos )
265+
{
266+
QDomNodeList composerLabelList = elem.elementsByTagName( "ComposerLabel" );
267+
for ( int i = 0; i < composerLabelList.size(); ++i )
268+
{
269+
QDomElement currentComposerLabelElem = composerLabelList.at( i ).toElement();
270+
QgsComposerLabel* newLabel = new QgsComposerLabel( this );
271+
newLabel->readXML( currentComposerLabelElem, doc );
272+
if ( pos )
273+
{
274+
newLabel->setItemPosition( pos->x(), pos->y() );
275+
}
276+
addComposerLabel( newLabel );
277+
}
278+
// map
279+
QDomNodeList composerMapList = elem.elementsByTagName( "ComposerMap" );
280+
for ( int i = 0; i < composerMapList.size(); ++i )
281+
{
282+
QDomElement currentComposerMapElem = composerMapList.at( i ).toElement();
283+
QgsComposerMap* newMap = new QgsComposerMap( this );
284+
newMap->readXML( currentComposerMapElem, doc );
285+
if ( pos )
286+
{
287+
newMap->setItemPosition( pos->x(), pos->y() );
288+
}
289+
addComposerMap( newMap );
290+
}
291+
// arrow
292+
QDomNodeList composerArrowList = elem.elementsByTagName( "ComposerArrow" );
293+
for ( int i = 0; i < composerArrowList.size(); ++i )
294+
{
295+
QDomElement currentComposerArrowElem = composerArrowList.at( i ).toElement();
296+
QgsComposerArrow* newArrow = new QgsComposerArrow( this );
297+
newArrow->readXML( currentComposerArrowElem, doc );
298+
if ( pos )
299+
{
300+
newArrow->setItemPosition( pos->x(), pos->y() );
301+
}
302+
addComposerArrow( newArrow );
303+
}
304+
// scalebar
305+
QDomNodeList composerScaleBarList = elem.elementsByTagName( "ComposerScaleBar" );
306+
for ( int i = 0; i < composerScaleBarList.size(); ++i )
307+
{
308+
QDomElement currentComposerScaleBarElem = composerScaleBarList.at( i ).toElement();
309+
QgsComposerScaleBar* newScaleBar = new QgsComposerScaleBar( this );
310+
newScaleBar->readXML( currentComposerScaleBarElem, doc );
311+
if ( pos )
312+
{
313+
newScaleBar->setItemPosition( pos->x(), pos->y() );
314+
}
315+
addComposerScaleBar( newScaleBar );
316+
}
317+
// shape
318+
QDomNodeList composerShapeList = elem.elementsByTagName( "ComposerShape" );
319+
for ( int i = 0; i < composerShapeList.size(); ++i )
320+
{
321+
QDomElement currentComposerShapeElem = composerShapeList.at( i ).toElement();
322+
QgsComposerShape* newShape = new QgsComposerShape( this );
323+
newShape->readXML( currentComposerShapeElem, doc );
324+
if ( pos )
325+
{
326+
newShape->setItemPosition( pos->x(), pos->y() );
327+
}
328+
addComposerShape( newShape );
329+
}
330+
// picture
331+
QDomNodeList composerPictureList = elem.elementsByTagName( "ComposerPicture" );
332+
for ( int i = 0; i < composerPictureList.size(); ++i )
333+
{
334+
QDomElement currentComposerPictureElem = composerPictureList.at( i ).toElement();
335+
QgsComposerPicture* newPicture = new QgsComposerPicture( this );
336+
newPicture->readXML( currentComposerPictureElem, doc );
337+
if ( pos )
338+
{
339+
newPicture->setItemPosition( pos->x(), pos->y() );
340+
}
341+
addComposerPicture( newPicture );
342+
}
343+
// legend
344+
QDomNodeList composerLegendList = elem.elementsByTagName( "ComposerLegend" );
345+
for ( int i = 0; i < composerLegendList.size(); ++i )
346+
{
347+
QDomElement currentComposerLegendElem = composerLegendList.at( i ).toElement();
348+
QgsComposerLegend* newLegend = new QgsComposerLegend( this );
349+
newLegend->readXML( currentComposerLegendElem, doc );
350+
if ( pos )
351+
{
352+
newLegend->setItemPosition( pos->x(), pos->y() );
353+
}
354+
addComposerLegend( newLegend );
355+
}
356+
// table
357+
QDomNodeList composerTableList = elem.elementsByTagName( "ComposerAttributeTable" );
358+
for ( int i = 0; i < composerTableList.size(); ++i )
359+
{
360+
QDomElement currentComposerTableElem = composerTableList.at( i ).toElement();
361+
QgsComposerAttributeTable* newTable = new QgsComposerAttributeTable( this );
362+
newTable->readXML( currentComposerTableElem, doc );
363+
if ( pos )
364+
{
365+
newTable->setItemPosition( pos->x(), pos->y() );
366+
}
367+
addComposerTable( newTable );
368+
}
369+
}
370+
255371
void QgsComposition::addItemToZList( QgsComposerItem* item )
256372
{
257373
if ( !item )
@@ -833,3 +949,99 @@ void QgsComposition::cancelCommand()
833949
delete mActiveCommand;
834950
mActiveCommand = 0;
835951
}
952+
953+
void QgsComposition::addComposerArrow( QgsComposerArrow* arrow )
954+
{
955+
addItem( arrow );
956+
emit composerArrowAdded( arrow );
957+
clearSelection();
958+
arrow->setSelected( true );
959+
emit selectedItemChanged( arrow );
960+
//pushAddRemoveCommand( arrow, tr( "Arrow added" ) );
961+
}
962+
963+
void QgsComposition::addComposerLabel( QgsComposerLabel* label )
964+
{
965+
addItem( label );
966+
emit composerLabelAdded( label );
967+
clearSelection();
968+
label->setSelected( true );
969+
emit selectedItemChanged( label );
970+
//pushAddRemoveCommand( label, tr( "Label added" ) );
971+
}
972+
973+
void QgsComposition::addComposerMap( QgsComposerMap* map )
974+
{
975+
addItem( map );
976+
//set default preview mode to cache. Must be done here between adding composer map to scene and emiting signal
977+
map->setPreviewMode( QgsComposerMap::Cache );
978+
map->cache();
979+
emit composerMapAdded( map );
980+
clearSelection();
981+
map->setSelected( true );
982+
emit selectedItemChanged( map );
983+
//pushAddRemoveCommand( map, tr( "Map added" ) );
984+
}
985+
986+
void QgsComposition::addComposerScaleBar( QgsComposerScaleBar* scaleBar )
987+
{
988+
//take first available map
989+
QList<const QgsComposerMap*> mapItemList = composerMapItems();
990+
if ( mapItemList.size() > 0 )
991+
{
992+
scaleBar->setComposerMap( mapItemList.at( 0 ) );
993+
}
994+
scaleBar->applyDefaultSize(); //4 segments, 1/5 of composer map width
995+
addItem( scaleBar );
996+
emit composerScaleBarAdded( scaleBar );
997+
clearSelection();
998+
scaleBar->setSelected( true );
999+
emit selectedItemChanged( scaleBar );
1000+
//pushAddRemoveCommand( scaleBar, tr( "Scale bar added" ) );
1001+
}
1002+
1003+
void QgsComposition::addComposerLegend( QgsComposerLegend* legend )
1004+
{
1005+
//take first available map
1006+
QList<const QgsComposerMap*> mapItemList = composerMapItems();
1007+
if ( mapItemList.size() > 0 )
1008+
{
1009+
legend->setComposerMap( mapItemList.at( 0 ) );
1010+
}
1011+
addItem( legend );
1012+
emit composerLegendAdded( legend );
1013+
clearSelection();
1014+
legend->setSelected( true );
1015+
emit selectedItemChanged( legend );
1016+
//pushAddRemoveCommand( legend, tr( "Legend added" ) );
1017+
}
1018+
1019+
void QgsComposition::addComposerPicture( QgsComposerPicture* picture )
1020+
{
1021+
addItem( picture );
1022+
emit composerPictureAdded( picture );
1023+
clearSelection();
1024+
picture->setSelected( true );
1025+
emit selectedItemChanged( picture );
1026+
//pushAddRemoveCommand( picture, tr( "Picture added" ) );
1027+
}
1028+
1029+
void QgsComposition::addComposerShape( QgsComposerShape* shape )
1030+
{
1031+
addItem( shape );
1032+
emit composerShapeAdded( shape );
1033+
clearSelection();
1034+
shape->setSelected( true );
1035+
emit selectedItemChanged( shape );
1036+
//pushAddRemoveCommand( shape, tr( "Shape added" ) );
1037+
}
1038+
1039+
void QgsComposition::addComposerTable( QgsComposerAttributeTable* table )
1040+
{
1041+
addItem( table );
1042+
emit composerTableAdded( table );
1043+
clearSelection();
1044+
table->setSelected( true );
1045+
emit selectedItemChanged( table );
1046+
//pushAddRemoveCommand( table, tr( "Table added" ) );
1047+
}

‎src/core/composer/qgscomposition.h

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,16 @@ class QgsComposerMap;
2828
class QgsPaperItem;
2929
class QGraphicsRectItem;
3030
class QgsMapRenderer;
31-
3231
class QDomElement;
32+
class QgsComposerArrow;
33+
class QgsComposerItem;
34+
class QgsComposerLabel;
35+
class QgsComposerLegend;
36+
class QgsComposerMap;
37+
class QgsComposerPicture;
38+
class QgsComposerScaleBar;
39+
class QgsComposerShape;
40+
class QgsComposerAttributeTable;
3341

3442
/** \ingroup MapComposer
3543
* Graphics scene for map printing. The class manages the paper item which always
@@ -132,6 +140,12 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
132140
/**Reads settings from xml file*/
133141
bool readXML( const QDomElement& compositionElem, const QDomDocument& doc );
134142

143+
/**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)
144+
@param elem items parent element, e.g. <Composer> or <ComposerItemClipboard>
145+
@param doc xml document
146+
@param pos item position. Optional, take position from xml if 0*/
147+
void addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, QPointF* pos = 0 );
148+
135149
/**Adds item to z list. Usually called from constructor of QgsComposerItem*/
136150
void addItemToZList( QgsComposerItem* item );
137151
/**Removes item from z list. Usually called from destructor of QgsComposerItem*/
@@ -173,6 +187,22 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
173187
/**Deletes current command*/
174188
void cancelCommand();
175189

190+
/**Adds an arrow item to the graphics scene and advices composer to create a widget for it (through signal)*/
191+
void addComposerArrow( QgsComposerArrow* arrow );
192+
/**Adds label to the graphics scene and advices composer to create a widget for it (through signal)*/
193+
void addComposerLabel( QgsComposerLabel* label );
194+
/**Adds map to the graphics scene and advices composer to create a widget for it (through signal)*/
195+
void addComposerMap( QgsComposerMap* map );
196+
/**Adds scale bar to the graphics scene and advices composer to create a widget for it (through signal)*/
197+
void addComposerScaleBar( QgsComposerScaleBar* scaleBar );
198+
/**Adds legend to the graphics scene and advices composer to create a widget for it (through signal)*/
199+
void addComposerLegend( QgsComposerLegend* legend );
200+
/**Adds picture to the graphics scene and advices composer to create a widget for it (through signal)*/
201+
void addComposerPicture( QgsComposerPicture* picture );
202+
/**Adds a composer shape to the graphics scene and advices composer to create a widget for it (through signal)*/
203+
void addComposerShape( QgsComposerShape* shape );
204+
/**Adds a composer table to the graphics scene and advices composer to create a widget for it (through signal)*/
205+
void addComposerTable( QgsComposerAttributeTable* table );
176206

177207
private:
178208
/**Pointer to map renderer of QGIS main map*/
@@ -218,6 +248,25 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
218248

219249
signals:
220250
void paperSizeChanged();
251+
252+
/**Is emitted when selected item changed. If 0, no item is selected*/
253+
void selectedItemChanged( QgsComposerItem* selected );
254+
/**Is emitted when new composer arrow has been added to the view*/
255+
void composerArrowAdded( QgsComposerArrow* arrow );
256+
/**Is emitted when new composer label has been added to the view*/
257+
void composerLabelAdded( QgsComposerLabel* label );
258+
/**Is emitted when new composer map has been added to the view*/
259+
void composerMapAdded( QgsComposerMap* map );
260+
/**Is emitted when new composer scale bar has been added*/
261+
void composerScaleBarAdded( QgsComposerScaleBar* scalebar );
262+
/**Is emitted when a new composer legend has been added*/
263+
void composerLegendAdded( QgsComposerLegend* legend );
264+
/**Is emitted when a new composer picture has been added*/
265+
void composerPictureAdded( QgsComposerPicture* picture );
266+
/**Is emitted when a new composer shape has been added*/
267+
void composerShapeAdded( QgsComposerShape* shape );
268+
/**Is emitted when a new composer table has been added*/
269+
void composerTableAdded( QgsComposerAttributeTable* table );
221270
};
222271

223272
#endif

‎src/gui/qgscomposerview.cpp

Lines changed: 5 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,11 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )
436436
QDomElement docElem = doc.documentElement();
437437
if ( docElem.tagName() == "ComposerItemClipboard" )
438438
{
439-
addItemsfromXML( docElem, doc );
439+
if ( composition() )
440+
{
441+
QPointF pt = mapToScene( mapFromGlobal( QCursor::pos() ) );
442+
composition()->addItemsFromXML( docElem, doc, &pt );
443+
}
440444
}
441445
}
442446
}
@@ -678,100 +682,6 @@ void QgsComposerView::removeItem( QgsComposerItem* item )
678682
}
679683
}
680684

681-
void QgsComposerView::addItemsfromXML( const QDomElement& docElem, const QDomDocument& doc )
682-
{
683-
QPointF scenePoint = mapToScene( mapFromGlobal( QCursor::pos() ) );
684-
685-
// label
686-
QDomNodeList composerLabelList = docElem.elementsByTagName( "ComposerLabel" );
687-
for ( int i = 0; i < composerLabelList.size(); ++i )
688-
{
689-
QDomElement currentComposerLabelElem = composerLabelList.at( i ).toElement();
690-
QgsComposerLabel* newLabel = new QgsComposerLabel( composition() );
691-
newLabel->readXML( currentComposerLabelElem, doc );
692-
newLabel->setItemPosition( scenePoint.x(), scenePoint.y() );
693-
addComposerLabel( newLabel );
694-
emit actionFinished();
695-
}
696-
// map
697-
QDomNodeList composerMapList = docElem.elementsByTagName( "ComposerMap" );
698-
for ( int i = 0; i < composerMapList.size(); ++i )
699-
{
700-
QDomElement currentComposerMapElem = composerMapList.at( i ).toElement();
701-
QgsComposerMap* newMap = new QgsComposerMap( composition() );
702-
newMap->readXML( currentComposerMapElem, doc );
703-
newMap->setItemPosition( scenePoint.x(), scenePoint.y() );
704-
addComposerMap( newMap );
705-
emit actionFinished();
706-
}
707-
// arrow
708-
QDomNodeList composerArrowList = docElem.elementsByTagName( "ComposerArrow" );
709-
for ( int i = 0; i < composerArrowList.size(); ++i )
710-
{
711-
QDomElement currentComposerArrowElem = composerArrowList.at( i ).toElement();
712-
QgsComposerArrow* newArrow = new QgsComposerArrow( composition() );
713-
newArrow->readXML( currentComposerArrowElem, doc );
714-
newArrow->setItemPosition( scenePoint.x(), scenePoint.y() );
715-
addComposerArrow( newArrow );
716-
emit actionFinished();
717-
}
718-
// scalebar
719-
QDomNodeList composerScaleBarList = docElem.elementsByTagName( "ComposerScaleBar" );
720-
for ( int i = 0; i < composerScaleBarList.size(); ++i )
721-
{
722-
QDomElement currentComposerScaleBarElem = composerScaleBarList.at( i ).toElement();
723-
QgsComposerScaleBar* newScaleBar = new QgsComposerScaleBar( composition() );
724-
newScaleBar->readXML( currentComposerScaleBarElem, doc );
725-
newScaleBar->setItemPosition( scenePoint.x(), scenePoint.y() );
726-
addComposerScaleBar( newScaleBar );
727-
emit actionFinished();
728-
}
729-
// shape
730-
QDomNodeList composerShapeList = docElem.elementsByTagName( "ComposerShape" );
731-
for ( int i = 0; i < composerShapeList.size(); ++i )
732-
{
733-
QDomElement currentComposerShapeElem = composerShapeList.at( i ).toElement();
734-
QgsComposerShape* newShape = new QgsComposerShape( composition() );
735-
newShape->readXML( currentComposerShapeElem, doc );
736-
newShape->setItemPosition( scenePoint.x(), scenePoint.y() );
737-
addComposerShape( newShape );
738-
emit actionFinished();
739-
}
740-
// picture
741-
QDomNodeList composerPictureList = docElem.elementsByTagName( "ComposerPicture" );
742-
for ( int i = 0; i < composerPictureList.size(); ++i )
743-
{
744-
QDomElement currentComposerPictureElem = composerPictureList.at( i ).toElement();
745-
QgsComposerPicture* newPicture = new QgsComposerPicture( composition() );
746-
newPicture->readXML( currentComposerPictureElem, doc );
747-
newPicture->setItemPosition( scenePoint.x(), scenePoint.y() );
748-
addComposerPicture( newPicture );
749-
emit actionFinished();
750-
}
751-
// legend
752-
QDomNodeList composerLegendList = docElem.elementsByTagName( "ComposerLegend" );
753-
for ( int i = 0; i < composerLegendList.size(); ++i )
754-
{
755-
QDomElement currentComposerLegendElem = composerLegendList.at( i ).toElement();
756-
QgsComposerLegend* newLegend = new QgsComposerLegend( composition() );
757-
newLegend->readXML( currentComposerLegendElem, doc );
758-
newLegend->setItemPosition( scenePoint.x(), scenePoint.y() );
759-
addComposerLegend( newLegend );
760-
emit actionFinished();
761-
}
762-
// table
763-
QDomNodeList composerTableList = docElem.elementsByTagName( "ComposerAttributeTable" );
764-
for ( int i = 0; i < composerTableList.size(); ++i )
765-
{
766-
QDomElement currentComposerTableElem = composerTableList.at( i ).toElement();
767-
QgsComposerAttributeTable* newTable = new QgsComposerAttributeTable( composition() );
768-
newTable->readXML( currentComposerTableElem, doc );
769-
newTable->setItemPosition( scenePoint.x(), scenePoint.y() );
770-
addComposerTable( newTable );
771-
emit actionFinished();
772-
}
773-
}
774-
775685
void QgsComposerView::groupItems()
776686
{
777687
if ( !composition() )

‎src/gui/qgscomposerview.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ class GUI_EXPORT QgsComposerView: public QGraphicsView
100100
/**Remove item from the graphics scene*/
101101
void removeItem( QgsComposerItem* item );
102102

103-
/**Add items from XML representation to the graphics scene (for pasting items from clipboard)*/
104-
void addItemsfromXML( const QDomElement& docElem, const QDomDocument& doc );
105-
106103
/**Returns the composer main window*/
107104
QMainWindow* composerWindow();
108105

0 commit comments

Comments
 (0)
Please sign in to comment.