sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when deleting multiframe item child frames

Browse Source
This commit is contained in:
Nyall Dawson 2018-01-07 17:48:54 +10:00
parent 3f414e2999
commit 1b969267fc
7 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/layout/qgslayoutframe.sip
View File

@ -43,6 +43,9 @@ Creates a new QgsLayoutFrame belonging to the specified ``layout``.
virtual QString displayName() const;
virtual void cleanup();
void setContentSection( const QRectF &section );
%Docstring
Sets the visible part of the multiframe's content which is visible within

14
python/core/layout/qgslayoutmultiframe.sip
View File

@ -383,20 +383,6 @@ in finalizeRestoreFromXml(), not readPropertiesFromElement().
protected slots:
void handlePageChange();
%Docstring
Adapts to changed number of layout pages if resize type is RepeatOnEveryPage.
%End
void handleFrameRemoval();
%Docstring
Called when a frame is removed. Updates frame list and recalculates
content of remaining frames.
%End
};

8
src/core/layout/qgslayoutframe.cpp
View File

@ -192,6 +192,14 @@ QString QgsLayoutFrame::displayName() const
return tr( "<Frame>" );
}
void QgsLayoutFrame::cleanup()
{
if ( mMultiFrame )
mMultiFrame->handleFrameRemoval( this );
QgsLayoutItem::cleanup();
}
void QgsLayoutFrame::draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle )
{
if ( mMultiFrame )

2
src/core/layout/qgslayoutframe.h
View File

@ -52,6 +52,8 @@ class CORE_EXPORT QgsLayoutFrame: public QgsLayoutItem
//Overridden to allow multiframe to set display name
QString displayName() const override;
void cleanup() override;
/**
* Sets the visible part of the multiframe's content which is visible within
* this frame (relative to the total multiframe extent in layout units).

8
src/core/layout/qgslayoutmultiframe.cpp
View File

@ -60,7 +60,10 @@ void QgsLayoutMultiFrame::addFrame( QgsLayoutFrame *frame, bool recalcFrameSizes
mFrameItems.push_back( frame );
frame->mMultiFrame = this;
connect( frame, &QgsLayoutItem::sizePositionChanged, this, &QgsLayoutMultiFrame::recalculateFrameSizes );
connect( frame, &QgsLayoutFrame::destroyed, this, &QgsLayoutMultiFrame::handleFrameRemoval );
connect( frame, &QgsLayoutFrame::destroyed, this, [this, frame ]
{
handleFrameRemoval( frame );
} );
if ( mLayout )
{
mLayout->addLayoutItem( frame );
@ -306,12 +309,11 @@ void QgsLayoutMultiFrame::refresh()
refreshDataDefinedProperty();
}
void QgsLayoutMultiFrame::handleFrameRemoval()
void QgsLayoutMultiFrame::handleFrameRemoval( QgsLayoutFrame *frame )
{
if ( mBlockUpdates )
return;
QgsLayoutFrame *frame = qobject_cast<QgsLayoutFrame *>( sender() );
if ( !frame )
{
return;

5
src/core/layout/qgslayoutmultiframe.h
View File

@ -370,7 +370,7 @@ class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutU
ResizeMode mResizeMode = UseExistingFrames;
protected slots:
private slots:
/**
* Adapts to changed number of layout pages if resize type is RepeatOnEveryPage.
@ -381,7 +381,7 @@ class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutU
* Called when a frame is removed. Updates frame list and recalculates
* content of remaining frames.
*/
void handleFrameRemoval();
void handleFrameRemoval( QgsLayoutFrame *frame );
private:
@ -394,6 +394,7 @@ class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutU
//! Unique id
QString mUuid;
friend class QgsLayoutFrame;
};

24
tests/src/core/testqgslayoutmultiframe.cpp
View File

@ -47,6 +47,7 @@ class TestQgsLayoutMultiFrame : public QObject
void undoRedoRemovedFrame(); //test that undo doesn't crash with removed frames
void undoRedoRemovedFrame2();
void registry();
void deleteFrame();
private:
QgsLayout *mLayout = nullptr;
@ -556,5 +557,28 @@ void TestQgsLayoutMultiFrame::registry()
QVERIFY( props.isEmpty() );
}
void TestQgsLayoutMultiFrame::deleteFrame()
{
QgsLayout l( QgsProject::instance() );
l.initializeDefaults();
QgsLayoutItemHtml *htmlItem = new QgsLayoutItemHtml( &l );
QgsLayoutFrame *frame1 = new QgsLayoutFrame( &l, htmlItem );
frame1->attemptSetSceneRect( QRectF( 0, 0, 100, 200 ) );
htmlItem->addFrame( frame1 );
QgsLayoutFrame *frame2 = new QgsLayoutFrame( &l, htmlItem );
frame2->attemptSetSceneRect( QRectF( 0, 0, 100, 200 ) );
htmlItem->addFrame( frame2 );
QCOMPARE( htmlItem->frameCount(), 2 );
QCOMPARE( htmlItem->frames(), QList< QgsLayoutFrame * >() << frame1 << frame2 );
l.removeLayoutItem( frame1 );
QCOMPARE( htmlItem->frameCount(), 1 );
QCOMPARE( htmlItem->frames(), QList< QgsLayoutFrame * >() << frame2 );
l.removeLayoutItem( frame2 );
QCOMPARE( htmlItem->frameCount(), 0 );
QVERIFY( htmlItem->frames().empty() );
}
QGSTEST_MAIN( TestQgsLayoutMultiFrame )
#include "testqgslayoutmultiframe.moc"