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

Fix layout picture rotation

Browse Source
This commit is contained in:
Yoann Quenach de Quivillic 2024-11-10 15:29:29 +01:00 committed by Nyall Dawson
parent 9251f486a0
commit fc7afe83c1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/layout/qgslayoutitempicture.cpp
View File

@ -575,9 +575,11 @@ void QgsLayoutItemPicture::loadPicture( const QVariant &data )
loadPictureUsingCache( mEvaluatedPath );
}
mLoaded = false;
if ( mMode != Qgis::PictureFormat::Unknown ) //make sure we start with a new QImage
{
recalculateSize();
mLoaded = true;
}
else if ( mHasExpressionError || !mEvaluatedPath.isEmpty() )
{
@ -662,11 +664,15 @@ void QgsLayoutItemPicture::setPictureRotation( double rotation )
{
const double oldRotation = mPictureRotation;
mPictureRotation = rotation;
const QSizeF currentPictureSize = pictureSize();
// If the picture is not loaded yet, do not compute its rotated size
if ( !mLoaded || currentPictureSize == QSizeF( 0, 0 ) )
return;
if ( mResizeMode == Zoom )
{
//find largest scaling of picture with this rotation which fits in item
const QSizeF currentPictureSize = pictureSize();
const QRectF rotatedImageRect = QgsLayoutUtils::largestRotatedRectWithinBounds( QRectF( 0, 0, currentPictureSize.width(), currentPictureSize.height() ), rect(), mPictureRotation );
mPictureWidth = rotatedImageRect.width();
mPictureHeight = rotatedImageRect.height();
@ -674,7 +680,6 @@ void QgsLayoutItemPicture::setPictureRotation( double rotation )
}
else if ( mResizeMode == ZoomResizeFrame )
{
const QSizeF currentPictureSize = pictureSize();
const QRectF oldRect = QRectF( pos().x(), pos().y(), rect().width(), rect().height() );
//calculate actual size of image inside frame