[composer] Add frameOutlineWidth property for composer items (sponsor…

…ed by City of Uster, Switzerland)
qgis · Apr 28, 2014 · de301e9 · de301e9
1 parent e9b253d
commit de301e9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip
@@ -236,6 +236,14 @@ class QgsComposerItem : QObject, QGraphicsRectItem
      * @see setFrameEnabled
      */
     virtual void setFrameOutlineWidth( double outlineWidth );
+
+    /** Returns the frame's outline width. Only used if hasFrame is true.
+     * @returns Frame outline width
+     * @note introduced in 2.3
+     * @see hasFrame
+     * @see setFrameOutlineWidth
+     */
+    double frameOutlineWidth() const;    
 
     /** Returns the join style used for drawing the item's frame
      * @returns Join style for outline frame

diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp
@@ -357,7 +357,7 @@ void QgsComposerItemWidget::setValuesForGuiNonPositionElements()
 
   mBackgroundColorButton->setColor( mItem->brush().color() );
   mFrameColorButton->setColor( mItem->pen().color() );
-  mOutlineWidthSpinBox->setValue( mItem->pen().widthF() );
+  mOutlineWidthSpinBox->setValue( mItem->frameOutlineWidth() );
   mFrameJoinStyleCombo->setPenJoinStyle( mItem->frameJoinStyle() );
   mItemIdLineEdit->setText( mItem->id() );
   mFrameGroupBox->setChecked( mItem->hasFrame() );

diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h
@@ -197,6 +197,14 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
      */
     virtual void setFrameOutlineWidth( double outlineWidth );
 
+    /** Returns the frame's outline width. Only used if hasFrame is true.
+     * @returns Frame outline width
+     * @note introduced in 2.3
+     * @see hasFrame
+     * @see setFrameOutlineWidth
+     */
+    double frameOutlineWidth() const { return pen().widthF(); }
+
     /** Returns the join style used for drawing the item's frame
      * @returns Join style for outline frame
      * @note introduced in 2.3