sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

[layouts] Fix rotated items move when refreshing layout

Browse Source 
Fixes #18037
This commit is contained in:
Nyall Dawson 2018-02-05 12:22:28 +10:00
parent 345dd0c376
commit 4287ce489d
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/layout/qgslayoutitem.cpp
View File

@ -487,7 +487,7 @@ int QgsLayoutItem::page() const
QPointF QgsLayoutItem::pagePos() const QPointF QgsLayoutItem::pagePos() const
{ {
QPointF p = pos(); QPointF p = positionAtReferencePoint( mReferencePoint );
if ( !mLayout ) if ( !mLayout )
return p; return p;

2
src/core/layout/qgslayoutpagecollection.cpp
View File

@ -77,7 +77,7 @@ void QgsLayoutPageCollection::endPageSizeChange()
{ {
if ( !mBlockUndoCommands ) if ( !mBlockUndoCommands )
item->beginCommand( QString() ); item->beginCommand( QString() );
item->attemptMove( it.value().second, false, false, it.value().first ); item->attemptMove( it.value().second, true, false, it.value().first );
if ( !mBlockUndoCommands ) if ( !mBlockUndoCommands )
item->endCommand(); item->endCommand();
} }

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

@ -1386,6 +1386,16 @@ void TestQgsLayoutItem::page()
QCOMPARE( item->page(), 2 ); QCOMPARE( item->page(), 2 );
QCOMPARE( item->pagePositionWithUnits(), QgsLayoutPoint( 5, 6, QgsUnitTypes::LayoutCentimeters ) ); QCOMPARE( item->pagePositionWithUnits(), QgsLayoutPoint( 5, 6, QgsUnitTypes::LayoutCentimeters ) );
QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 5, 38, QgsUnitTypes::LayoutCentimeters ) ); QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 5, 38, QgsUnitTypes::LayoutCentimeters ) );
// non-top-left reference
item->setReferencePoint( QgsLayoutItem::Middle );
item->attemptMove( QgsLayoutPoint( 5, 6 ), true, false, 0 );
QCOMPARE( item->pagePos(), QPointF( 5, 6 ) );
QCOMPARE( item->pagePositionWithUnits(), QgsLayoutPoint( 5, 6 ) );
item->attemptMove( QgsLayoutPoint( 5, 6 ), true, false, 1 );
QCOMPARE( item->page(), 1 );
QCOMPARE( item->pagePos(), QPointF( 5, 6 ) );
QCOMPARE( item->pagePositionWithUnits(), QgsLayoutPoint( 5, 6, QgsUnitTypes::LayoutMillimeters ) );
} }
void TestQgsLayoutItem::itemVariablesFunction() void TestQgsLayoutItem::itemVariablesFunction()
@ -1525,6 +1535,24 @@ void TestQgsLayoutItem::rotation()
QCOMPARE( item2->pos().x(), 7.0 ); QCOMPARE( item2->pos().x(), 7.0 );
QCOMPARE( item2->pos().y(), 16.0 ); QCOMPARE( item2->pos().y(), 16.0 );
// test that refresh rotation doesn't move item (#18037)
item2 = qgis::make_unique< TestItem >( &l );
item2->setReferencePoint( QgsLayoutItem::Middle );
item2->attemptMove( QgsLayoutPoint( 5.0, 8.0 ) );
item2->attemptResize( QgsLayoutSize( 10.0, 6.0 ) );
item2->setItemRotation( 45 );
QCOMPARE( item2->positionWithUnits().x(), 5.0 );
QCOMPARE( item2->positionWithUnits().y(), 8.0 );
QGSCOMPARENEAR( item2->pos().x(), 3.58, 0.01 );
QGSCOMPARENEAR( item2->pos().y(), 2.343146, 0.01 );
QCOMPARE( item2->rotation(), 45.0 );
item2->refresh();
QCOMPARE( item2->positionWithUnits().x(), 5.0 );
QCOMPARE( item2->positionWithUnits().y(), 8.0 );
QGSCOMPARENEAR( item2->pos().x(), 3.58, 0.01 );
QGSCOMPARENEAR( item2->pos().y(), 2.343146, 0.01 );
QCOMPARE( item2->rotation(), 45.0 );
//TODO also changing size? //TODO also changing size?