no OUTLINECOLOR if outlinestyle is None (thanks Michele De Santis)

git-svn-id: http://svn.osgeo.org/qgis/trunk@14547 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
rduivenvoorde 2010-11-11 19:02:29 +00:00
parent c47217fb1d
commit 28605e9358

View File

@ -748,9 +748,10 @@ class Qgis2Map:
def writeClassStyleContent(self, symbolNode, geometry):
outlinecolor = self.getRgbFromNode(symbolNode, 'outlinecolor')
outlinestyle = self.getSymbolProperty(symbolNode, 'outlinestyle')
outlinewidth = self.getSizeStringFromNode(symbolNode, 'outlinewidth')
fillcolor = self.getRgbFromNode(symbolNode, 'fillcolor')
pointsize = self.getSizeStringFromNode(symbolNode, 'pointsize')
outlinewidth = self.getSizeStringFromNode(symbolNode, 'outlinewidth')
fillpattern = self.getSymbolProperty(symbolNode, 'fillpattern');
class_def = " STYLE\n"
@ -769,7 +770,8 @@ class Qgis2Map:
class_def += " COLOR " + outlinecolor + "\n"
# for POLYGON and POINT defined by COLOR from fillcolor and OUTLINECOLOR from outlinecolor
else:
class_def += " OUTLINECOLOR " + outlinecolor + "\n"
if 'NoPen' != outlinestyle:
class_def += " OUTLINECOLOR " + outlinecolor + "\n"
if 'NoBrush' != fillpattern:
class_def += " COLOR " + fillcolor + "\n"