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

Fix handling of overlapping item commands

Browse Source
This commit is contained in:
Nyall Dawson 2017-10-10 09:06:02 +10:00
parent 8fb2c3cf6e
commit 30eab10619
3 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/layout/qgslayoutundostack.cpp
View File

@ -44,19 +44,20 @@ void QgsLayoutUndoStack::beginCommand( QgsLayoutUndoObjectInterface *object, con
return; return;
} }
mActiveCommand.reset( object->createCommand( commandText, id, nullptr ) ); mActiveCommands.emplace_back( std::unique_ptr< QgsAbstractLayoutUndoCommand >( object->createCommand( commandText, id, nullptr ) ) );
mActiveCommand->saveBeforeState(); mActiveCommands.back()->saveBeforeState();
} }
void QgsLayoutUndoStack::endCommand() void QgsLayoutUndoStack::endCommand()
{ {
if ( !mActiveCommand ) if ( mActiveCommands.empty() )
return; return;
mActiveCommand->saveAfterState(); mActiveCommands.back()->saveAfterState();
if ( mActiveCommand->containsChange() ) //protect against empty commands if ( mActiveCommands.back()->containsChange() ) //protect against empty commands
{ {
mUndoStack->push( mActiveCommand.release() ); mUndoStack->push( mActiveCommands.back().release() );
mActiveCommands.pop_back();
mLayout->project()->setDirty( true ); mLayout->project()->setDirty( true );
} }
@ -64,7 +65,10 @@ void QgsLayoutUndoStack::endCommand()
void QgsLayoutUndoStack::cancelCommand() void QgsLayoutUndoStack::cancelCommand()
{ {
mActiveCommand.reset(); if ( mActiveCommands.empty() )
return;
mActiveCommands.pop_back();
} }
QUndoStack *QgsLayoutUndoStack::stack() QUndoStack *QgsLayoutUndoStack::stack()

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

@ -104,7 +104,7 @@ class CORE_EXPORT QgsLayoutUndoStack
std::unique_ptr< QUndoStack > mUndoStack; std::unique_ptr< QUndoStack > mUndoStack;
std::unique_ptr< QgsAbstractLayoutUndoCommand > mActiveCommand; std::vector< std::unique_ptr< QgsAbstractLayoutUndoCommand > > mActiveCommands;
#ifdef SIP_RUN #ifdef SIP_RUN
QgsLayoutUndoStack( const QgsLayoutUndoStack &other ); QgsLayoutUndoStack( const QgsLayoutUndoStack &other );

31
tests/src/core/testqgslayoutitem.cpp
View File

@ -149,6 +149,7 @@ class TestQgsLayoutItem: public QObject
void writeReadXmlProperties(); void writeReadXmlProperties();
void undoRedo(); void undoRedo();
void multiItemUndo(); void multiItemUndo();
void overlappingUndo();
private: private:
@ -1481,6 +1482,36 @@ void TestQgsLayoutItem::multiItemUndo()
QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 10, 10 ) ); QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 10, 10 ) );
} }
void TestQgsLayoutItem::overlappingUndo()
{
QgsProject proj;
QgsLayout l( &proj );
QgsLayoutItemRectangularShape *item = new QgsLayoutItemRectangularShape( &l );
l.addLayoutItem( item );
item->attemptMove( QgsLayoutPoint( 10, 10 ) );
QgsLayoutItemRectangularShape *item2 = new QgsLayoutItemRectangularShape( &l );
l.addLayoutItem( item2 );
item2->attemptMove( QgsLayoutPoint( 20, 20 ) );
//commands overlap
l.undoStack()->beginCommand( item, tr( "Item moved" ), QgsLayoutItem::UndoIncrementalMove );
item->attemptMove( QgsLayoutPoint( 1, 1 ) );
l.undoStack()->beginCommand( item2, tr( "Item moved" ), QgsLayoutItem::UndoIncrementalMove );
item2->attemptMove( QgsLayoutPoint( 21, 21 ) );
l.undoStack()->endCommand();
l.undoStack()->endCommand();
// undo should remove item move
l.undoStack()->stack()->undo();
QCOMPARE( item2->positionWithUnits(), QgsLayoutPoint( 21, 21 ) );
QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 10, 10 ) );
l.undoStack()->stack()->undo();
QCOMPARE( item2->positionWithUnits(), QgsLayoutPoint( 20, 20 ) );
QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 10, 10 ) );
}
QgsLayoutItem *TestQgsLayoutItem::createCopyViaXml( QgsLayout *layout, QgsLayoutItem *original ) QgsLayoutItem *TestQgsLayoutItem::createCopyViaXml( QgsLayout *layout, QgsLayoutItem *original )
{ {
//save original item to xml //save original item to xml