Skip to content

Commit

Permalink
Restore resampler from xml
Browse files Browse the repository at this point in the history
  • Loading branch information
mhugent committed Jan 19, 2012
1 parent f93beaf commit ab911fe
Showing 1 changed file with 29 additions and 22 deletions.
51 changes: 29 additions & 22 deletions src/core/raster/qgsrasterlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2942,28 +2942,6 @@ bool QgsRasterLayer::readSymbology( const QDomNode& layer_node, QString& errorMe
Q_UNUSED( errorMessage );
QDomNode mnl = layer_node.namedItem( "rasterproperties" );

#if 0
//resampler
QDomElement resamplerElem = mnl.firstChildElement( "resampler" );
if ( !resamplerElem.isNull() )
{
delete mResampler;
QString rText = resamplerElem.text();
if ( rText == "bilinear" )
{
mResampler = new QgsBilinearRasterResampler();
}
else if ( rText == "cubic" )
{
mResampler = new QgsCubicRasterResampler();
}
else //nearest neighbour
{
mResampler = 0;
}
}
#endif //0

QDomNode snode = mnl.namedItem( "mDrawingStyle" );
QDomElement myElement = snode.toElement();
setDrawingStyle( myElement.text() );
Expand Down Expand Up @@ -3151,6 +3129,35 @@ bool QgsRasterLayer::readSymbology( const QDomNode& layer_node, QString& errorMe
}
myColorRampShader->setColorRampItemList( myColorRampItemList );
}

//resampler
QDomElement zoomedInResamplerElem = mnl.firstChildElement( "zoomedInResampler" );
if ( mRenderer && !zoomedInResamplerElem.isNull() )
{
QgsRasterResampler* zoomedInResampler = 0;
QString zoomedInResamplerType = zoomedInResamplerElem.text();
if ( zoomedInResamplerType == "bilinear" )
{
zoomedInResampler = new QgsBilinearRasterResampler();
}
else if ( zoomedInResamplerType == "cubic" )
{
zoomedInResampler = new QgsCubicRasterResampler();
}
mRenderer->setZoomedInResampler( zoomedInResampler );
}
QDomElement zoomedOutResamplerElem = mnl.firstChildElement( "zoomedOutResampler" );
if ( mRenderer && !zoomedOutResamplerElem.isNull() )
{
QgsRasterResampler* zoomedOutResampler = 0;
QString zoomedOutResamplerType = zoomedOutResamplerElem.text();
if ( zoomedOutResamplerType == "bilinear" )
{
zoomedOutResampler = new QgsBilinearRasterResampler();
}
mRenderer->setZoomedOutResampler( zoomedOutResampler );
}

return true;
} //readSymbology

Expand Down

0 comments on commit ab911fe

Please sign in to comment.