mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-17 00:04:02 -04:00
Use preferred naming conventions for enums
git-svn-id: http://svn.osgeo.org/qgis/trunk@9535 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
e8d10906b9
commit
0e4c6a17db
@ -51,7 +51,7 @@ QgsMapRenderer::QgsMapRenderer()
|
|||||||
mProjectionsEnabled = FALSE;
|
mProjectionsEnabled = FALSE;
|
||||||
mDestCRS = new QgsCoordinateReferenceSystem( GEO_EPSG_CRS_ID, QgsCoordinateReferenceSystem::EpsgCrsId ); //WGS 84
|
mDestCRS = new QgsCoordinateReferenceSystem( GEO_EPSG_CRS_ID, QgsCoordinateReferenceSystem::EpsgCrsId ); //WGS 84
|
||||||
|
|
||||||
mOutputUnits = QgsMapRenderer::MM;
|
mOutputUnits = QgsMapRenderer::Millimeters;
|
||||||
}
|
}
|
||||||
|
|
||||||
QgsMapRenderer::~QgsMapRenderer()
|
QgsMapRenderer::~QgsMapRenderer()
|
||||||
@ -241,7 +241,7 @@ void QgsMapRenderer::render( QPainter* painter )
|
|||||||
//because sometimes QPainter units are in a local coord sys (e.g. in case of QGraphicsScene)
|
//because sometimes QPainter units are in a local coord sys (e.g. in case of QGraphicsScene)
|
||||||
double sceneDpi = mScaleCalculator->dpi();
|
double sceneDpi = mScaleCalculator->dpi();
|
||||||
double scaleFactor = 1.0;
|
double scaleFactor = 1.0;
|
||||||
if ( mOutputUnits == QgsMapRenderer::MM )
|
if ( mOutputUnits == QgsMapRenderer::Millimeters )
|
||||||
{
|
{
|
||||||
scaleFactor = sceneDpi / 25.4;
|
scaleFactor = sceneDpi / 25.4;
|
||||||
}
|
}
|
||||||
|
@ -47,8 +47,8 @@ class CORE_EXPORT QgsMapRenderer : public QObject
|
|||||||
/**Output units for pen width and point marker width/height*/
|
/**Output units for pen width and point marker width/height*/
|
||||||
enum OutputUnits
|
enum OutputUnits
|
||||||
{
|
{
|
||||||
MM, //millimeters
|
Millimeters,
|
||||||
PIXEL
|
Pixels
|
||||||
//MAP_UNITS probably supported in future versions
|
//MAP_UNITS probably supported in future versions
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user