Extensions. Color marker improvements (Bug #692582, Color markers to match stroke...

[inkscape.git] / share / extensions / markers_strokepaint.py

diff --git a/share/extensions/markers_strokepaint.py b/share/extensions/markers_strokepaint.py
index 350c87f28fa581eafd882742ed7c5804d41911b3..bf5b530351f690b817f6c7fb4ff22f5d166e0d1d 100644 (file)
--- a/share/extensions/markers_strokepaint.py
+++ b/share/extensions/markers_strokepaint.py
@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 '''
 import random, inkex, simplestyle, copy
+import gettext
+_ = gettext.gettext
 
 class MyEffect(inkex.Effect):
     def __init__(self):
@@ -24,11 +26,19 @@ class MyEffect(inkex.Effect):
         self.OptionParser.add_option("-m", "--modify",
                         action="store", type="inkbool", 
                         dest="modify", default=False,
-                        help="do not create a copy, modify the markers")
-        
+                        help="Do not create a copy, modify the markers")
+        self.OptionParser.add_option("-t", "--type",
+                        action="store", type="string", 
+                        dest="fill_type", default="stroke",
+                        help="Replace the marker fill with the object stroke or fill color")
+        self.OptionParser.add_option("-a", "--alpha",
+                        action="store", type="inkbool", 
+                        dest="assign_alpha", default=True,
+                        help="Assign the object fill and stroke alpha to the marker")
+
     def effect(self):
         defs = self.xpathSingle('/svg:svg//svg:defs')
-        if not defs:
+        if defs == None:
             defs = inkex.etree.SubElement(self.document.getroot(),inkex.addNS('defs','svg'))
         
         for id, node in self.selected.iteritems():
@@ -36,14 +46,22 @@ class MyEffect(inkex.Effect):
             try:
                 style = simplestyle.parseStyle(node.get('style'))
             except:
-                inkex.debug("No style attribute found for id: %s" % id)
+                inkex.errormsg(_("No style attribute found for id: %s") % id)
                 continue
             
             stroke = style.get('stroke', '#000000')
-            
+            stroke_opacity = style.get('stroke-opacity', '1')
+            if (self.options.fill_type == "white"):
+                fill = "#FFFFFF"
+                fill_opacity = "1"
+            else:
+                fill = style.get('fill', '#000000')
+                fill_opacity = style.get('fill-opacity', '1')
+
             for mprop in mprops:
                 if style.has_key(mprop) and style[mprop] != 'none'and style[mprop][:5] == 'url(#':
                     marker_id = style[mprop][5:-1]
+
                     try:
                         old_mnode = self.xpathSingle('/svg:svg//svg:marker[@id="%s"]' % marker_id)
                         if not self.options.modify:
@@ -51,7 +69,7 @@ class MyEffect(inkex.Effect):
                         else:
                             mnode = old_mnode
                     except:
-                        inkex.debug("unable to locate marker: %s" % marker_id)
+                        inkex.errormsg(_("unable to locate marker: %s") % marker_id)
                         continue
                         
                     new_id = self.uniqueId(marker_id, not self.options.modify)
@@ -66,10 +84,26 @@ class MyEffect(inkex.Effect):
                         cstyle = simplestyle.parseStyle(child.get('style'))
                         if ('stroke' in cstyle and cstyle['stroke'] != 'none') or 'stroke' not in cstyle:
                             cstyle['stroke'] = stroke
+                            if (self.options.assign_alpha):
+                                cstyle['stroke-opacity'] = stroke_opacity
                         if ('fill' in cstyle and cstyle['fill'] != 'none') or 'fill' not in cstyle:
-                            cstyle['fill'] = stroke
+                            if (self.options.fill_type == "fill" or self.options.fill_type == "white" ):
+                                cstyle['fill'] = fill
+                                if (self.options.assign_alpha):
+                                    cstyle['fill-opacity'] = fill_opacity
+                            elif (self.options.fill_type == "stroke"):
+                                cstyle['fill'] = stroke
+                                if (self.options.assign_alpha):
+                                    cstyle['fill-opacity'] = stroke_opacity
+                            else:
+                                cstyle['fill'] = "none";
+                                cstyle['fill-opacity'] = "0"
                         child.set('style',simplestyle.formatStyle(cstyle))
             node.set('style',simplestyle.formatStyle(style))
 
-e = MyEffect()
-e.affect()
+if __name__ == '__main__':
+    e = MyEffect()
+    e.affect()
+
+
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99