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

fix QgsComposerItem API

Browse Source
This commit is contained in:
Juergen E. Fischer 2012-03-12 22:47:12 +01:00
parent 8acbea9d6a
commit 5f771a6ffe
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/core/qgscomposeritem.sip
View File

@ -222,13 +222,13 @@ class QgsComposerItem: QObject, QGraphicsRectItem
* @param none
* @return void
* @note deprecated since 1.8 don't use!
* @see hasFrame
* @see setFrameEnabled
*/
void setFrame( bool drawFrame );
/** Set whether this item has a frame drawn around it or not.
* @param none
* @return void
* @note deprecated since 1.8
* @note introduced in 1.8
* @see hasFrame
*/
void setFrameEnabled( bool drawFrame );

6
src/app/composer/qgscomposeritemwidget.cpp
View File

@ -130,11 +130,11 @@ void QgsComposerItemWidget::on_mFrameCheckBox_stateChanged( int state )
mItem->beginCommand( tr( "Item frame toggled" ) );
if ( state == Qt::Checked )
{
mItem->setFrame( true );
mItem->setFrameEnabled( true );
}
else
{
mItem->setFrame( false );
mItem->setFrameEnabled( false );
}
mItem->update();
mItem->endCommand();
@ -155,7 +155,7 @@ void QgsComposerItemWidget::setValuesForGuiElements()
mOpacitySlider->setValue( mItem->brush().color().alpha() );
mOutlineWidthSpinBox->setValue( mItem->pen().widthF() );
mItemIdLineEdit->setText( mItem->id() );
if ( mItem->frame() )
if ( mItem->hasFrame() )
{
mFrameCheckBox->setCheckState( Qt::Checked );
}

7
src/core/composer/qgscomposeritem.h
View File

@ -167,22 +167,21 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
/** Whether this item has a frame or not.
* @returns true if there is a frame around this item, otherwise false.
* @note introduced since 1.8
* @see hasFrame
*/
bool hasFrame() const {return mFrame;}
/** Set whether this item has a frame drawn around it or not.
* @returns void
* @note deprecated since 1.8 don't use!
* @see hasFrame
* @see setFrameEnabled
*/
Q_DECL_DEPRECATED void setFrame( bool drawFrame ) { setFrameEnabled( drawFrame );}
/** Set whether this item has a frame drawn around it or not.
* @param drawFrame draw frame
* @returns nothing
* @note deprecated since 1.8
* @note introduced in 1.8
* @see hasFrame
*/
Q_DECL_DEPRECATED void setFrameEnabled( bool drawFrame ) {mFrame = drawFrame;}
void setFrameEnabled( bool drawFrame ) {mFrame = drawFrame;}
/**Composite operations for item groups do nothing per default*/
virtual void addItem( QgsComposerItem* item ) { Q_UNUSED( item ); }

6
src/plugins/georeferencer/qgsgeorefplugingui.cpp
View File

@ -1494,7 +1494,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
titleLabel->setText( rasterFi.fileName() );
composition->addItem( titleLabel );
titleLabel->setSceneRect( QRectF( leftMargin, 5, contentWidth, 8 ) );
titleLabel->setFrame( false );
titleLabel->setFrameEnabled( false );
//composer map
QgsRectangle canvasExtent = mCanvas->extent();
@ -1549,7 +1549,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
parameterLabel->adjustSizeToText();
composition->addItem( parameterLabel );
parameterLabel->setSceneRect( QRectF( leftMargin, composerMap->rect().bottom() + composerMap->transform().dy() + 5, contentWidth, 8 ) );
parameterLabel->setFrame( false );
parameterLabel->setFrameEnabled( false );
//calculate mean error
double meanError = 0;
@ -1581,7 +1581,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
residualLabel->setText( tr( "Residuals" ) );
composition->addItem( residualLabel );
residualLabel->setSceneRect( QRectF( leftMargin, previousItem->rect().bottom() + previousItem->transform().dy() + 5, contentWidth, 6 ) );
residualLabel->setFrame( false );
residualLabel->setFrameEnabled( false );
//residual plot
QgsResidualPlotItem* resPlotItem = new QgsResidualPlotItem( composition );