sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make a correct copy of QgsCoordinateTransform for labeling (hope it fixes #9600)

Browse Source
This commit is contained in:
Marco Hugentobler 2014-02-19 16:41:16 +01:00
parent 42a4e75536
commit 34f79cf1ff
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/qgscoordinatetransform.cpp
View File

@ -127,6 +127,15 @@ QgsCoordinateTransform::~QgsCoordinateTransform()
}
}
QgsCoordinateTransform* QgsCoordinateTransform::clone() const
{
QgsCoordinateTransform* tr = new QgsCoordinateTransform( sourceCrs(), destCRS() );
tr->setSourceDatumTransform( sourceDatumTransform() );
tr->setDestinationDatumTransform( destinationDatumTransform() );
tr->initialise();
return tr;
}
void QgsCoordinateTransform::setSourceCrs( const QgsCoordinateReferenceSystem& theCRS )
{
mSourceCRS = theCRS;

2
src/core/qgscoordinatetransform.h
View File

@ -88,6 +88,8 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
//! destructor
~QgsCoordinateTransform();
QgsCoordinateTransform* clone() const;
//! Enum used to indicate the direction (forward or inverse) of the transform
enum TransformDirection
{

22
src/core/qgspallabeling.cpp
View File

@ -3297,10 +3297,15 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices,
lyr.fieldIndex = fldIndex;
lyr.xform = mMapRenderer->coordinateTransform();
lyr.ct = 0;
if ( mMapRenderer->hasCrsTransformEnabled() )
lyr.ct = new QgsCoordinateTransform( layer->crs(), mMapRenderer->destinationCrs() );
else
lyr.ct = NULL;
{
const QgsCoordinateTransform* tr = mMapRenderer->transformation( layer );
if ( tr )
{
lyr.ct = tr->clone();
}
}
lyr.ptZero = lyr.xform->toMapCoordinates( 0, 0 );
lyr.ptOne = lyr.xform->toMapCoordinates( 1, 0 );
@ -3318,10 +3323,15 @@ int QgsPalLabeling::addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSetti
l->setArrangementFlags( s->placementFlags );
s->palLayer = l;
s->ct = 0;
if ( mMapRenderer->hasCrsTransformEnabled() )
s->ct = new QgsCoordinateTransform( layer->crs(), mMapRenderer->destinationCrs() );
else
s->ct = NULL;
{
const QgsCoordinateTransform* tr = mMapRenderer->transformation( layer );
if ( tr )
{
s->ct = tr->clone();
}
}
s->xform = mMapRenderer->coordinateTransform();
mActiveDiagramLayers.insert( layer, *s );
return 1;