sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #2744

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@13631 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
wonder 2010-06-03 10:49:26 +00:00
parent f20f1db31a
commit 29e146c3f3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/symbology-ng/qgsfillsymbollayerv2.cpp
View File

@ -52,6 +52,14 @@ void QgsSimpleFillSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context
{ {
mColor.setAlphaF( context.alpha() ); mColor.setAlphaF( context.alpha() );
mBrush = QBrush( mColor, mBrushStyle ); mBrush = QBrush( mColor, mBrushStyle );
// scale brush content for printout
double rasterScaleFactor = context.renderContext().rasterScaleFactor();
if ( rasterScaleFactor != 1.0 )
{
mBrush.setMatrix( QMatrix().scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor ) );
}
QColor selColor = context.selectionColor(); QColor selColor = context.selectionColor();
// selColor.setAlphaF( context.alpha() ); // selColor.setAlphaF( context.alpha() );
mSelBrush = QBrush( selColor ); mSelBrush = QBrush( selColor );

10
tests/src/core/CMakeLists.txt
View File

@ -7,8 +7,11 @@ SET (util_SRCS qgsrenderchecker.cpp)
# the UI file won't be wrapped! # the UI file won't be wrapped!
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core ${CMAKE_SOURCE_DIR}/src/core
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster ${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/renderer
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR} ${PROJ_INCLUDE_DIR}
@ -113,3 +116,6 @@ ADD_QGIS_TEST(geometrytest testqgsgeometry.cpp)
ADD_QGIS_TEST(coordinatereferencesystemtest testqgscoordinatereferencesystem.cpp) ADD_QGIS_TEST(coordinatereferencesystemtest testqgscoordinatereferencesystem.cpp)
ADD_QGIS_TEST(pointtest testqgspoint.cpp) ADD_QGIS_TEST(pointtest testqgspoint.cpp)
ADD_QGIS_TEST(searchstringtest testqgssearchstring.cpp) ADD_QGIS_TEST(searchstringtest testqgssearchstring.cpp)
ADD_QGIS_TEST(renderingbenchmark rendering_benchmark.cpp)