sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename conversionFactor to scaleFactor

Browse Source
This commit is contained in:
Matthias Kuhn 2018-09-10 13:36:33 +02:00
parent 57677f6aab
commit cf82c13324
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/core/auto_generated/qgscoordinatetransform.sip.in
View File

@ -358,11 +358,11 @@ been modified in order to ensure that outdated CRS transforms are not created.
.. versionadded:: 3.0
%End
double conversionFactor( const QgsRectangle &referenceExtent ) const;
double scaleFactor( const QgsRectangle &referenceExtent ) const;
%Docstring
Computes an *estimated* conversion factor between source and destination units:
sourceUnits * conversionFactor = destinationUnits
sourceUnits * scaleFactor = destinationUnits
:param referenceExtent: A reference extent based on which to perform the computation

2
src/core/qgscoordinatetransform.cpp
View File

@ -799,7 +799,7 @@ void QgsCoordinateTransform::invalidateCache()
sCacheLock.unlock();
}
double QgsCoordinateTransform::conversionFactor( const QgsRectangle &ReferenceExtent ) const
double QgsCoordinateTransform::scaleFactor( const QgsRectangle &ReferenceExtent ) const
{
QgsPointXY source1( ReferenceExtent.xMinimum(), ReferenceExtent.yMinimum() );
QgsPointXY source2( ReferenceExtent.xMaximum(), ReferenceExtent.yMaximum() );

4
src/core/qgscoordinatetransform.h
View File

@ -408,13 +408,13 @@ class CORE_EXPORT QgsCoordinateTransform
/**
* Computes an *estimated* conversion factor between source and destination units:
*
* sourceUnits * conversionFactor = destinationUnits
* sourceUnits * scaleFactor = destinationUnits
*
* \param referenceExtent A reference extent based on which to perform the computation
*
* \since QGIS 3.4
*/
double conversionFactor( const QgsRectangle &referenceExtent ) const;
double scaleFactor( const QgsRectangle &referenceExtent ) const;
private:

2
src/core/qgsmapsettings.cpp
View File

@ -396,7 +396,7 @@ QgsCoordinateTransform QgsMapSettings::layerTransform( const QgsMapLayer *layer
double QgsMapSettings::layerToMapUnits( const QgsMapLayer *layer, const QgsRectangle &referenceExtent ) const
{
return layerTransform( layer ).conversionFactor( referenceExtent );
return layerTransform( layer ).scaleFactor( referenceExtent );
}

12
tests/src/core/testqgscoordinatetransform.cpp
View File

@ -36,8 +36,8 @@ class TestQgsCoordinateTransform: public QObject
void isValid();
void isShortCircuited();
void contextShared();
void conversionFactor();
void conversionFactor_data();
void scaleFactor();
void scaleFactor_data();
private:
@ -215,7 +215,7 @@ void TestQgsCoordinateTransform::contextShared()
QCOMPARE( copy2.sourceDestinationDatumTransforms(), expected );
}
void TestQgsCoordinateTransform::conversionFactor()
void TestQgsCoordinateTransform::scaleFactor()
{
QFETCH( QgsCoordinateReferenceSystem, sourceCrs );
QFETCH( QgsCoordinateReferenceSystem, destCrs );
@ -224,11 +224,11 @@ void TestQgsCoordinateTransform::conversionFactor()
QgsCoordinateTransform ct( sourceCrs, destCrs, QgsProject::instance() );
// qDebug() << QString::number(ct.conversionFactor( rect ), 'g', 17) ;
QVERIFY( qgsDoubleNear( ct.conversionFactor( rect ), factor ) );
// qDebug() << QString::number(ct.scaleFactor( rect ), 'g', 17) ;
QVERIFY( qgsDoubleNear( ct.scaleFactor( rect ), factor ) );
}
void TestQgsCoordinateTransform::conversionFactor_data()
void TestQgsCoordinateTransform::scaleFactor_data()
{
QTest::addColumn<QgsCoordinateReferenceSystem>( "sourceCrs" );
QTest::addColumn<QgsCoordinateReferenceSystem>( "destCrs" );