39
39
40
40
#define FONT_WORKAROUND_SCALE 10 // scale factor for upscaling fontsize and downscaling painter
41
41
42
- QgsComposerItem::QgsComposerItem ( QgsComposition* composition, bool manageZValue ): QObject( 0 ), QGraphicsRectItem( 0 ), mComposition( composition ), mBoundingResizeRectangle( 0 ), \
43
- mFrame( true ), mItemPositionLocked( false ), mLastValidViewScaleFactor( -1 ), mRotation( 0 )
42
+ QgsComposerItem::QgsComposerItem ( QgsComposition* composition, bool manageZValue )
43
+ : QObject( 0 )
44
+ , QGraphicsRectItem( 0 )
45
+ , mComposition( composition )
46
+ , mBoundingResizeRectangle( 0 )
47
+ , mFrame( true )
48
+ , mItemPositionLocked( false )
49
+ , mLastValidViewScaleFactor( -1 )
50
+ , mRotation( 0 )
44
51
{
45
52
setFlag ( QGraphicsItem::ItemIsSelectable, true );
46
53
setAcceptsHoverEvents ( true );
@@ -58,9 +65,15 @@ QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue
58
65
}
59
66
}
60
67
61
- QgsComposerItem::QgsComposerItem ( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition, bool manageZValue ): \
62
- QObject( 0 ), QGraphicsRectItem( 0 , 0 , width, height, 0 ), mComposition( composition ), mBoundingResizeRectangle( 0 ), mFrame( true ), \
63
- mItemPositionLocked( false ), mLastValidViewScaleFactor( -1 ), mRotation( 0 )
68
+ QgsComposerItem::QgsComposerItem ( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition, bool manageZValue )
69
+ : QObject( 0 )
70
+ , QGraphicsRectItem( 0 , 0 , width, height, 0 )
71
+ , mComposition( composition )
72
+ , mBoundingResizeRectangle( 0 )
73
+ , mFrame( true )
74
+ , mItemPositionLocked( false )
75
+ , mLastValidViewScaleFactor( -1 )
76
+ , mRotation( 0 )
64
77
{
65
78
setFlag ( QGraphicsItem::ItemIsSelectable, true );
66
79
setAcceptsHoverEvents ( true );
@@ -530,8 +543,8 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const
530
543
}
531
544
else // for composer items, we prefer setSceneRect as subclasses can implement custom behaviour (e.g. item group)
532
545
{
533
- changeComposerItem->setSceneRect ( QRectF ( originalItem->transform ().dx () + moveRectX, \
534
- originalItem->transform ().dy () + moveRectY, \
546
+ changeComposerItem->setSceneRect ( QRectF ( originalItem->transform ().dx () + moveRectX,
547
+ originalItem->transform ().dy () + moveRectY,
535
548
originalItem->rect ().width (), originalItem->rect ().height () ) );
536
549
}
537
550
}
@@ -550,7 +563,7 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const
550
563
}
551
564
else // for composer items, we prefer setSceneRect as subclasses can implement custom behaviour (e.g. item group)
552
565
{
553
- changeComposerItem->setSceneRect ( QRectF ( originalItem->transform ().dx () + mx, originalItem->transform ().dy () + my, \
566
+ changeComposerItem->setSceneRect ( QRectF ( originalItem->transform ().dx () + mx, originalItem->transform ().dy () + my,
554
567
originalItem->rect ().width () + rx, originalItem->rect ().height () + ry ) );
555
568
}
556
569
}
0 commit comments