Skip to content
Permalink
Browse files

Clean up the last commit

  • Loading branch information
Hugo Mercier
Hugo Mercier committed Sep 24, 2012
1 parent 4c82ade commit 6a1c2808d49c26373fa992a27de0088eab33a396
@@ -977,7 +977,6 @@ void QgsComposerMapWidget::on_mIsAtlasCheckBox_stateChanged( int state )
composition->setAtlasMap( 0 );
}
}
// TODO: warn
}

void QgsComposerMapWidget::on_mAtlasCoverageLayerComboBox_currentIndexChanged( int index )
@@ -53,8 +53,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
ComposerTable,
ComposerAttributeTable,
ComposerTextTable,
ComposerFrame,
ComposerAtlasMap
ComposerFrame
};

/**Describes the action (move or resize in different directon) to be done during mouse move*/
@@ -46,6 +46,9 @@
#include <QSettings>
#include <QDir>

/**
* Private members of the QgsAtlasRendering class
*/
struct QgsAtlasRendering::QgsAtlasRenderingImpl
{
QgsComposition* composition;
@@ -139,7 +142,6 @@ void QgsAtlasRendering::prepareForFeature( size_t featureI )
throw std::runtime_error( "Filename eval error: " + impl->filenameExpr->evalErrorString().toStdString() );
}

// FIXME resolve labels
impl->currentFilename = filenameRes.toString();
}

@@ -179,8 +181,6 @@ void QgsAtlasRendering::prepareForFeature( size_t featureI )
// auto scale

double geom_ratio = geom_rect.width() / geom_rect.height();
// QRectF map_rect = mAtlasMap->boundingRect();
// double map_ratio = map_rect.width() / map_rect.height();
double map_ratio = impl->origExtent.width() / impl->origExtent.height();

// geometry height is too big
@@ -49,6 +49,11 @@ class QgsComposerAttributeTable;
class QgsComposerMultiFrame;
class QgsComposerMultiFrameCommand;

/** \ingroup MapComposer
* Class used to render an Atlas, iterating over geometry features.
* prepareForFeature() modifies the atlas map's extent to zoom on the given feature.
* This class is used for printing, exporting to PDF and images.
* */
class QgsAtlasRendering
{
public:
@@ -62,6 +67,7 @@ class QgsAtlasRendering
QString currentFilename() const;

private:
// Use the PImpl idiom for private members.
struct QgsAtlasRenderingImpl;
std::auto_ptr<QgsAtlasRenderingImpl> impl;
};

0 comments on commit 6a1c280

Please sign in to comment.
You can’t perform that action at this time.