[ogr] Fix simple markers' stroke width of embedded styling

qgis · Apr 22, 2023 · 4d2ffb2 · 4d2ffb2
1 parent 4baab6d
commit 4d2ffb2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/src/core/qgsogrutils.cpp b/src/core/qgsogrutils.cpp
@@ -1654,6 +1654,8 @@ std::unique_ptr<QgsSymbol> QgsOgrUtils::symbolFromStyleString( const QString &st
 
       std::unique_ptr< QgsSimpleMarkerSymbolLayer > simpleMarker = std::make_unique< QgsSimpleMarkerSymbolLayer >( shape, symbolSize, -angle );
       simpleMarker->setSizeUnit( symbolSizeUnit );
+      simpleMarker->setStrokeWidth( 1.0 );
+      simpleMarker->setStrokeWidthUnit( Qgis::RenderUnit::Points );
 
       if ( isFilled && QgsSimpleMarkerSymbolLayer::shapeIsFilled( shape ) )
       {

diff --git a/src/core/symbology/qgsmapinfosymbolconverter.cpp b/src/core/symbology/qgsmapinfosymbolconverter.cpp
@@ -1517,6 +1517,8 @@ QgsMarkerSymbol *QgsMapInfoSymbolConverter::convertMarkerSymbol( int identifier,
   simpleMarker->setSizeUnit( sizeUnit );
   simpleMarker->setAngle( angle );
   simpleMarker->setVerticalAnchorPoint( vertAlign );
+  simpleMarker->setStrokeWidth( 1.0 );
+  simpleMarker->setStrokeWidthUnit( Qgis::RenderUnit::Points );
 
   if ( isNull )
   {
@@ -1527,7 +1529,6 @@ QgsMarkerSymbol *QgsMapInfoSymbolConverter::convertMarkerSymbol( int identifier,
   {
     simpleMarker->setColor( color );
     simpleMarker->setStrokeColor( QColor( 0, 0, 0 ) );
-    simpleMarker->setStrokeWidth( 0 );
   }
   else
   {

diff --git a/...expected_embedded_mapinfo_markers/default/expected_embedded_mapinfo_markers.png b/...expected_embedded_mapinfo_markers/default/expected_embedded_mapinfo_markers.png
diff --git a/...ected_embedded_mapinfo_markers/newer_gdal/expected_embedded_mapinfo_markers.png b/...ected_embedded_mapinfo_markers/newer_gdal/expected_embedded_mapinfo_markers.png