Skip to content
Permalink
Browse files
Follow up 2041fc2
  • Loading branch information
nyalldawson committed Jul 14, 2014
1 parent 2041fc2 commit 6f3cea12f0c8044b635094dbfa202284c7222c4a
@@ -348,7 +348,7 @@ class QgsComposerMap : QgsComposerItem
* or the current evaluated rotation (which may be affected by data driven rotation
* settings).
*/
// double mapRotation( QgsComposerBaseItem::PropertyValueType valueType = QgsComposerBaseItem::EvaluatedValue ) const;
double mapRotation( QgsComposerObject::PropertyValueType valueType = QgsComposerObject::EvaluatedValue ) const;

void updateItem();

@@ -28,7 +28,7 @@

//QgsComposerItemBaseWidget

QgsComposerItemBaseWidget::QgsComposerItemBaseWidget( QWidget* parent, QgsComposerObject *baseItem ): QWidget( parent ), mBaseItem( baseItem )
QgsComposerItemBaseWidget::QgsComposerItemBaseWidget( QWidget* parent, QgsComposerObject *composerObject ): QWidget( parent ), mComposerObject( composerObject )
{

}
@@ -54,18 +54,18 @@ void QgsComposerItemBaseWidget::updateDataDefinedProperty()

//set the data defined property and refresh the item
setDataDefinedProperty( ddButton, property );
mBaseItem->refreshDataDefinedProperty( property );
mComposerObject->refreshDataDefinedProperty( property );
}

void QgsComposerItemBaseWidget::setDataDefinedProperty( const QgsDataDefinedButton *ddBtn, QgsComposerObject::DataDefinedProperty p )
{
if ( !mBaseItem )
if ( !mComposerObject )
{
return;
}

const QMap< QString, QString >& map = ddBtn->definedProperty();
mBaseItem->setDataDefinedProperty( p, map.value( "active" ).toInt(), map.value( "useexpr" ).toInt(), map.value( "expression" ), map.value( "field" ) );
mComposerObject->setDataDefinedProperty( p, map.value( "active" ).toInt(), map.value( "useexpr" ).toInt(), map.value( "expression" ), map.value( "field" ) );
}

QgsComposerObject::DataDefinedProperty QgsComposerItemBaseWidget::ddPropertyForWidget( QgsDataDefinedButton *widget )
@@ -78,12 +78,12 @@ QgsComposerObject::DataDefinedProperty QgsComposerItemBaseWidget::ddPropertyForW

QgsAtlasComposition* QgsComposerItemBaseWidget::atlasComposition() const
{
if ( !mBaseItem )
if ( !mComposerObject )
{
return 0;
}

QgsComposition* composition = mBaseItem->composition();
QgsComposition* composition = mComposerObject->composition();

if ( !composition )
{
@@ -32,7 +32,7 @@ class QgsComposerItemBaseWidget: public QWidget
{
Q_OBJECT
public:
QgsComposerItemBaseWidget( QWidget* parent, QgsComposerObject* baseItem );
QgsComposerItemBaseWidget( QWidget* parent, QgsComposerObject* composerObject );
~QgsComposerItemBaseWidget();

protected slots:
@@ -52,7 +52,7 @@ class QgsComposerItemBaseWidget: public QWidget
/**Returns the atlas for the composition*/
QgsAtlasComposition *atlasComposition() const;

QgsComposerObject* mBaseItem;
QgsComposerObject* mComposerObject;
};

/**A class to enter generic properties for composer items (e.g. background, outline, frame).
@@ -1,5 +1,5 @@
/***************************************************************************
qgscomposerbaseitem.h
qgscomposerobject.cpp
-------------------
begin : July 2014
copyright : (C) 2014 by Nyall Dawson,Radim Blazek

0 comments on commit 6f3cea1

Please sign in to comment.