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

Merge pull request #4727 from aaime/stroke_hairline

Browse Source 
Fixes 16707, export of hairline results in a different visual thickness
This commit is contained in:
Nyall Dawson 2017-06-27 06:12:12 +10:00 committed by GitHub
commit 65a5669b25
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/symbology-ng/qgssymbollayerutils.cpp
View File

@ -1845,7 +1845,14 @@ void QgsSymbolLayerUtils::lineToSld( QDomDocument &doc, QDomElement &element,
element.appendChild( createSvgParameterElement( doc, QStringLiteral( "stroke-opacity" ), encodeSldAlpha( color.alpha() ) ) );
}
if ( width > 0 )
{
element.appendChild( createSvgParameterElement( doc, QStringLiteral( "stroke-width" ), qgsDoubleToString( width ) ) );
}
else if ( width == 0 )
{
// hairline, yet not zero. it's actually painted in qgis
element.appendChild( createSvgParameterElement( doc, QStringLiteral( "stroke-width" ), QStringLiteral( "0.5" ) ) );
}
if ( penJoinStyle )
element.appendChild( createSvgParameterElement( doc, QStringLiteral( "stroke-linejoin" ), encodeSldLineJoinStyle( *penJoinStyle ) ) );
if ( penCapStyle )

9
tests/src/python/test_qgssymbollayer_createsld.py
View File

@ -231,6 +231,15 @@ class TestQgsSymbolLayerCreateSld(unittest.TestCase):
self.assertStrokeWidth(root, 2, 1)
self.assertStaticDisplacement(root, 5, 10)
def testSimpleLineHairline(self):
symbol = QgsSimpleLineSymbolLayer(QColor("black"), 0)
dom, root = self.symbolToSld(symbol)
# print ("Simple line px: \n" + dom.toString())
# Hairline is turned into 0.5px
self.assertStrokeWidth(root, 1, 0.5)
def testSimpleLineUnitDefault(self):
symbol = QgsSimpleLineSymbolLayer(QColor("black"), 1)
symbol.setCustomDashVector([10, 10])

1
tests/testdata/qgis_server/getstyles.txt vendored
View File

@ -19,6 +19,7 @@ Content-Type: text/xml; charset=utf-8
</se:Fill>
<se:Stroke>
<se:SvgParameter name="stroke">#000000</se:SvgParameter>
<se:SvgParameter name="stroke-width">0.5</se:SvgParameter>
</se:Stroke>
</se:Mark>
<se:Size>7</se:Size>