[QGIS Commit] r14547 - trunk/qgis/python/plugins/mapserver_export

[svn_qgis at osgeo.org]

Author: rduivenvoorde
Date: 2010-11-11 11:02:29 -0800 (Thu, 11 Nov 2010)
New Revision: 14547

Modified:
   trunk/qgis/python/plugins/mapserver_export/ms_export.py
Log:
no OUTLINECOLOR if outlinestyle is None (thanks Michele De Santis) 

Modified: trunk/qgis/python/plugins/mapserver_export/ms_export.py
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/ms_export.py	2010-11-11 18:38:54 UTC (rev 14546)
+++ trunk/qgis/python/plugins/mapserver_export/ms_export.py	2010-11-11 19:02:29 UTC (rev 14547)
@@ -748,9 +748,10 @@
 
   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_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"