replaced "-" to "_" in the interp_att_g extension name to be usable as module and...

diff --git a/share/extensions/Makefile.am b/share/extensions/Makefile.am
index 01577acf5d28a5cb4c01fb056405d49b72fdf038..3d08ee798e1461520a9c27f514d74cbf9e65b2eb 100644 (file)
--- a/share/extensions/Makefile.am
+++ b/share/extensions/Makefile.am
@@ -71,7 +71,7 @@ extensions = \
        inkwebeffect.py \
        inkweb.js \
        interp.py \
-       interp-att-g.py \
+       interp_att_g.py \
        launch_webbrowser.py \
        lindenmayer.py \
        lorem_ipsum.py \
@@ -194,7 +194,7 @@ modules = \
        inkscape_help_svgspec.inx \
        inkscape_help_keys.inx \
        interp.inx \
-       interp-att-g.inx \
+       interp_att_g.inx \
        lindenmayer.inx \
        lorem_ipsum.inx \
        markers_strokepaint.inx \

diff --git a/share/extensions/interp-att-g.inx b/share/extensions/interp-att-g.inx
deleted file mode 100644 (file)
index 504833d..0000000
--- a/share/extensions/interp-att-g.inx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>Interpolate Attribute in a group</_name>
-  <id>org.inkscape.filter.interp-att-g</id>
-  <dependency type="executable" location="extensions">interp-att-g.py</dependency>
-  <dependency type="executable" location="extensions">inkex.py</dependency>
-  <_param name="intro" type="description">This effect applies a value for any interpolatable attribute for all elements inside the selected group or for all elements in a multiple selection</_param>
-  <param name="att" type="enum" _gui-text="Attribute to Interpolate">
-    <_item value="width">Width</_item>
-    <_item value="height">Height</_item>
-    <_item value="scale">Scale</_item>
-    <_item value="trans-x">Translate X</_item>
-    <_item value="trans-y">Translate Y</_item>
-    <_item value="fill">Fill</_item>
-    <_item value="opacity">Opacity</_item>
-    <_item value="other">Other</_item>
-  </param>
-  <_param name="other-info" type="description">If you select "Other", you must know the SVG attributes to identify here this "other":</_param>
-  <param name="att-other" type="string" _gui-text="Other Attribute"></param>
-  <param name="att-other-type" type="enum" _gui-text="Other Attribute type">
-    <_item value="color">Color</_item>
-    <_item value="int">Integer Number</_item>
-    <_item value="float">Float Number</_item>
-  </param>
-  <param name="att-other-where" type="enum" _gui-text="Where to apply?">
-    <_item value="tag">Tag</_item>
-    <_item value="style">Style</_item>
-    <_item value="transform">Transformation</_item>
-  </param>
-  <_param name="sep" type="description">••••••••••••••••••••••••••••••••••••••••••••••••</_param>
-  <param name="start-val" type="string" _gui-text="Start Value"></param>
-  <param name="end-val" type="string" _gui-text="End Value"></param>
-  <param name="unit" type="enum" _gui-text="Unit">
-    <_item value="none">No Unit</_item>
-    <_item value="color">Color</_item>
-    <item>px</item>
-    <item>pt</item>
-    <item>in</item>
-    <item>cm</item>
-    <item>mm</item>
-  </param>
-  <effect>
-    <object-type>all</object-type>
-    <effects-menu>
-      <submenu _name="Modify Path"/>
-    </effects-menu>
-  </effect>
-  <script>
-    <command reldir="extensions" interpreter="python">interp-att-g.py</command>
-  </script>
-</inkscape-extension>

diff --git a/share/extensions/interp-att-g.py b/share/extensions/interp-att-g.py
deleted file mode 100755 (executable)
index 021d7b7..0000000
--- a/share/extensions/interp-att-g.py
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/usr/bin/env python
-'''
-Copyright (C) 2009 Aurelio A. Heckert, aurium (a) gmail dot com
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-'''
-import inkex, simplestyle, math, re, string
-
-class InterpAttG(inkex.Effect):
-
-    def __init__(self):
-        inkex.Effect.__init__(self)
-        self.OptionParser.add_option("-a", "--att",
-                        action="store", type="string",
-                        dest="att", default="fill",
-                        help="Attribute to be interpolated.")
-        self.OptionParser.add_option("-o", "--att-other",
-                        action="store", type="string",
-                        dest="att_other",
-                        help="Other atribute (for a limited UI).")
-        self.OptionParser.add_option("-t", "--att-other-type",
-                        action="store", type="string",
-                        dest="att_other_type",
-                        help="The other attribute type.")
-        self.OptionParser.add_option("-w", "--att-other-where",
-                        action="store", type="string",
-                        dest="att_other_where",
-                        help="That is a tag attribute or a style attribute?")
-        self.OptionParser.add_option("-s", "--start-val",
-                        action="store", type="string",
-                        dest="start_val", default="#F00",
-                        help="Initial interpolation value.")
-        self.OptionParser.add_option("-e", "--end-val",
-                        action="store", type="string",
-                        dest="end_val", default="#00F",
-                        help="End interpolation value.")
-        self.OptionParser.add_option("-u", "--unit",
-                        action="store", type="string",
-                        dest="unit", default="color",
-                        help="Values unit.")
-
-    def getColorValues(self):
-      sv = string.replace( self.options.start_val, '#', '' )
-      ev = string.replace( self.options.end_val, '#', '' )
-      if re.search('\s|,', sv):
-        # There are separators. That must be a integer RGB color definition.
-        sv = re.split( '[\s,]+', sv )
-        ev = re.split( '[\s,]+', ev )
-        self.R_ini = int( sv[0] )
-        self.G_ini = int( sv[1] )
-        self.B_ini = int( sv[2] )
-        self.R_end = int( ev[0] )
-        self.G_end = int( ev[1] )
-        self.B_end = int( ev[2] )
-      else:
-        # There is no separator. That must be a Hex RGB color definition.
-        if len(sv) == 3:
-          self.R_ini = int( sv[0] + sv[0], 16 )
-          self.G_ini = int( sv[1] + sv[1], 16 )
-          self.B_ini = int( sv[2] + sv[2], 16 )
-          self.R_end = int( ev[0] + ev[0], 16 )
-          self.G_end = int( ev[1] + ev[1], 16 )
-          self.B_end = int( ev[2] + ev[2], 16 )
-        else: #the len must be 6
-          self.R_ini = int( sv[0] + sv[1], 16 )
-          self.G_ini = int( sv[2] + sv[3], 16 )
-          self.B_ini = int( sv[4] + sv[5], 16 )
-          self.R_end = int( ev[0] + ev[1], 16 )
-          self.G_end = int( ev[2] + ev[3], 16 )
-          self.B_end = int( ev[4] + ev[5], 16 )
-      self.R_inc = ( self.R_end - self.R_ini ) / float( self.tot_el - 1 )
-      self.G_inc = ( self.G_end - self.G_ini ) / float( self.tot_el - 1 )
-      self.B_inc = ( self.B_end - self.B_ini ) / float( self.tot_el - 1 )
-      self.R_cur = self.R_ini
-      self.G_cur = self.G_ini
-      self.B_cur = self.B_ini
-
-    def getNumberValues(self):
-      sv = self.options.start_val
-      ev = self.options.end_val
-      if self.inte_att_type and self.inte_att_type != 'none':
-        sv = inkex.unittouu( sv + self.inte_att_type )
-        ev = inkex.unittouu( ev + self.inte_att_type )
-      self.val_cur = self.val_ini = sv
-      self.val_end = ev
-      self.val_inc = ( ev - sv ) / float( self.tot_el - 1 )
-
-    def getTotElements(self):
-      self.tot_el = 0
-      if len( self.selected ) > 1:
-        # multiple selection
-        self.collection = self.options.ids
-        for i in self.options.ids:
-          path = '//*[@id="%s"]' % i
-          self.collection[self.tot_el] = self.document.xpath(path, namespaces=inkex.NSS)[0]
-          self.tot_el += 1
-      else:
-        # must be a group
-        self.collection = self.selected[ self.options.ids[0] ]
-        for i in self.collection:
-          self.tot_el += 1
-
-    def effect(self):
-      if self.options.att == 'other':
-        self.inte_att = self.options.att_other
-        self.inte_att_type = self.options.att_other_type
-        self.where = self.options.att_other_where
-      else:
-        self.inte_att = self.options.att
-        if   self.inte_att == 'width':
-          self.inte_att_type = 'float'
-          self.where = 'tag'
-        elif self.inte_att == 'height':
-          self.inte_att_type = 'float'
-          self.where = 'tag'
-        elif self.inte_att == 'scale':
-          self.inte_att_type = 'float'
-          self.where = 'transform'
-        elif self.inte_att == 'trans-x':
-          self.inte_att_type = 'float'
-          self.where = 'transform'
-        elif self.inte_att == 'trans-y':
-          self.inte_att_type = 'float'
-          self.where = 'transform'
-        elif self.inte_att == 'fill':
-          self.inte_att_type = 'color'
-          self.where = 'style'
-        elif self.inte_att == 'opacity':
-          self.inte_att_type = 'float'
-          self.where = 'style'
-
-      self.getTotElements()
-
-      if self.inte_att_type == 'color':
-        self.getColorValues()
-      else:
-        self.getNumberValues()
-
-      #inkex.errormsg( 'R+: '+ str( self.R_inc ) )
-      #inkex.errormsg( 'G+: '+ str( self.G_inc ) )
-      #inkex.errormsg( 'B+: '+ str( self.B_inc ) )
-
-      for node in self.collection:
-        if self.inte_att_type == 'color':
-          val = 'rgb('+ \
-                  str(int(round(self.R_cur))) +','+ \
-                  str(int(round(self.G_cur))) +','+ \
-                  str(int(round(self.B_cur))) +')'
-        else:
-          if self.inte_att_type == 'float':
-            val = self.val_cur
-          else: # inte_att_type == 'int'
-            val = round(self.val_cur)
-
-        if self.where == 'style':
-          s = node.get('style')
-          re_find = '(^|;)'+ self.inte_att +':[^;]*(;|$)'
-          if re.search( re_find, s ):
-            s = re.sub( re_find, '\\1'+ self.inte_att +':'+ str(val) +'\\2', s )
-          else:
-            s += ';'+ self.inte_att +':'+ str(val)
-          node.set( 'style', s )
-        elif self.where == 'transform':
-          t = node.get('transform')
-          if t == None: t = ""
-          if self.inte_att == 'trans-x':
-            val = "translate("+ str(val) +",0)"
-          elif self.inte_att == 'trans-y':
-            val = "translate(0,"+ str(val) +")"
-          else:
-            val = self.inte_att + "("+ str(val) +")"
-          node.set( 'transform', t +" "+ val )
-        else: # self.where == 'tag':
-          node.set( self.inte_att, str(val) )
-
-        if self.inte_att_type == 'color':
-          self.R_cur += self.R_inc
-          self.G_cur += self.G_inc
-          self.B_cur += self.B_inc
-        else:
-          self.val_cur += self.val_inc
-
-if __name__ == '__main__':
-    e = InterpAttG()
-    e.affect()

diff --git a/share/extensions/interp_att_g.inx b/share/extensions/interp_att_g.inx
new file mode 100644 (file)
index 0000000..cd78abc
--- /dev/null
+++ b/share/extensions/interp_att_g.inx
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+  <_name>Interpolate Attribute in a group</_name>
+  <id>org.inkscape.filter.interp-att-g</id>
+  <dependency type="executable" location="extensions">interp_att_g.py</dependency>
+  <dependency type="executable" location="extensions">inkex.py</dependency>
+  <_param name="intro" type="description">This effect applies a value for any interpolatable attribute for all elements inside the selected group or for all elements in a multiple selection</_param>
+  <param name="att" type="enum" _gui-text="Attribute to Interpolate">
+    <_item value="width">Width</_item>
+    <_item value="height">Height</_item>
+    <_item value="scale">Scale</_item>
+    <_item value="trans-x">Translate X</_item>
+    <_item value="trans-y">Translate Y</_item>
+    <_item value="fill">Fill</_item>
+    <_item value="opacity">Opacity</_item>
+    <_item value="other">Other</_item>
+  </param>
+  <_param name="other-info" type="description">If you select "Other", you must know the SVG attributes to identify here this "other":</_param>
+  <param name="att-other" type="string" _gui-text="Other Attribute"></param>
+  <param name="att-other-type" type="enum" _gui-text="Other Attribute type">
+    <_item value="color">Color</_item>
+    <_item value="int">Integer Number</_item>
+    <_item value="float">Float Number</_item>
+  </param>
+  <param name="att-other-where" type="enum" _gui-text="Where to apply?">
+    <_item value="tag">Tag</_item>
+    <_item value="style">Style</_item>
+    <_item value="transform">Transformation</_item>
+  </param>
+  <_param name="sep" type="description">••••••••••••••••••••••••••••••••••••••••••••••••</_param>
+  <param name="start-val" type="string" _gui-text="Start Value"></param>
+  <param name="end-val" type="string" _gui-text="End Value"></param>
+  <param name="unit" type="enum" _gui-text="Unit">
+    <_item value="none">No Unit</_item>
+    <_item value="color">Color</_item>
+    <item>px</item>
+    <item>pt</item>
+    <item>in</item>
+    <item>cm</item>
+    <item>mm</item>
+  </param>
+  <effect>
+    <object-type>all</object-type>
+    <effects-menu>
+      <submenu _name="Modify Path"/>
+    </effects-menu>
+  </effect>
+  <script>
+    <command reldir="extensions" interpreter="python">interp_att_g.py</command>
+  </script>
+</inkscape-extension>

diff --git a/share/extensions/interp_att_g.py b/share/extensions/interp_att_g.py
new file mode 100755 (executable)
index 0000000..503e4ec
--- /dev/null
+++ b/share/extensions/interp_att_g.py
@@ -0,0 +1,205 @@
+#!/usr/bin/env python
+'''
+Copyright (C) 2009 Aurelio A. Heckert, aurium (a) gmail dot com
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+'''
+import inkex, simplestyle, math, re, string
+
+class InterpAttG(inkex.Effect):
+
+    def __init__(self):
+        inkex.Effect.__init__(self)
+        self.OptionParser.add_option("-a", "--att",
+                        action="store", type="string",
+                        dest="att", default="fill",
+                        help="Attribute to be interpolated.")
+        self.OptionParser.add_option("-o", "--att-other",
+                        action="store", type="string",
+                        dest="att_other",
+                        help="Other atribute (for a limited UI).")
+        self.OptionParser.add_option("-t", "--att-other-type",
+                        action="store", type="string",
+                        dest="att_other_type",
+                        help="The other attribute type.")
+        self.OptionParser.add_option("-w", "--att-other-where",
+                        action="store", type="string",
+                        dest="att_other_where",
+                        help="That is a tag attribute or a style attribute?")
+        self.OptionParser.add_option("-s", "--start-val",
+                        action="store", type="string",
+                        dest="start_val", default="#F00",
+                        help="Initial interpolation value.")
+        self.OptionParser.add_option("-e", "--end-val",
+                        action="store", type="string",
+                        dest="end_val", default="#00F",
+                        help="End interpolation value.")
+        self.OptionParser.add_option("-u", "--unit",
+                        action="store", type="string",
+                        dest="unit", default="color",
+                        help="Values unit.")
+
+    def getColorValues(self):
+      sv = string.replace( self.options.start_val, '#', '' )
+      ev = string.replace( self.options.end_val, '#', '' )
+      if re.search('\s|,', sv):
+        # There are separators. That must be a integer RGB color definition.
+        sv = re.split( '[\s,]+', sv )
+        ev = re.split( '[\s,]+', ev )
+        self.R_ini = int( sv[0] )
+        self.G_ini = int( sv[1] )
+        self.B_ini = int( sv[2] )
+        self.R_end = int( ev[0] )
+        self.G_end = int( ev[1] )
+        self.B_end = int( ev[2] )
+      else:
+        # There is no separator. That must be a Hex RGB color definition.
+        if len(sv) == 3:
+          self.R_ini = int( sv[0] + sv[0], 16 )
+          self.G_ini = int( sv[1] + sv[1], 16 )
+          self.B_ini = int( sv[2] + sv[2], 16 )
+          self.R_end = int( ev[0] + ev[0], 16 )
+          self.G_end = int( ev[1] + ev[1], 16 )
+          self.B_end = int( ev[2] + ev[2], 16 )
+        else: #the len must be 6
+          self.R_ini = int( sv[0] + sv[1], 16 )
+          self.G_ini = int( sv[2] + sv[3], 16 )
+          self.B_ini = int( sv[4] + sv[5], 16 )
+          self.R_end = int( ev[0] + ev[1], 16 )
+          self.G_end = int( ev[2] + ev[3], 16 )
+          self.B_end = int( ev[4] + ev[5], 16 )
+      self.R_inc = ( self.R_end - self.R_ini ) / float( self.tot_el - 1 )
+      self.G_inc = ( self.G_end - self.G_ini ) / float( self.tot_el - 1 )
+      self.B_inc = ( self.B_end - self.B_ini ) / float( self.tot_el - 1 )
+      self.R_cur = self.R_ini
+      self.G_cur = self.G_ini
+      self.B_cur = self.B_ini
+
+    def getNumberValues(self):
+      sv = self.options.start_val
+      ev = self.options.end_val
+      if self.inte_att_type and self.inte_att_type != 'none':
+        sv = inkex.unittouu( sv + self.inte_att_type )
+        ev = inkex.unittouu( ev + self.inte_att_type )
+      self.val_cur = self.val_ini = sv
+      self.val_end = ev
+      self.val_inc = ( ev - sv ) / float( self.tot_el - 1 )
+
+    def getTotElements(self):
+      self.tot_el = 0
+      self.collection = None
+      if len( self.selected ) == 0:
+        return False
+      if len( self.selected ) > 1:
+        # multiple selection
+        self.collection = self.options.ids
+        for i in self.options.ids:
+          path = '//*[@id="%s"]' % i
+          self.collection[self.tot_el] = self.document.xpath(path, namespaces=inkex.NSS)[0]
+          self.tot_el += 1
+      else:
+        # must be a group
+        self.collection = self.selected[ self.options.ids[0] ]
+        for i in self.collection:
+          self.tot_el += 1
+
+    def effect(self):
+      if self.options.att == 'other':
+        self.inte_att = self.options.att_other
+        self.inte_att_type = self.options.att_other_type
+        self.where = self.options.att_other_where
+      else:
+        self.inte_att = self.options.att
+        if   self.inte_att == 'width':
+          self.inte_att_type = 'float'
+          self.where = 'tag'
+        elif self.inte_att == 'height':
+          self.inte_att_type = 'float'
+          self.where = 'tag'
+        elif self.inte_att == 'scale':
+          self.inte_att_type = 'float'
+          self.where = 'transform'
+        elif self.inte_att == 'trans-x':
+          self.inte_att_type = 'float'
+          self.where = 'transform'
+        elif self.inte_att == 'trans-y':
+          self.inte_att_type = 'float'
+          self.where = 'transform'
+        elif self.inte_att == 'fill':
+          self.inte_att_type = 'color'
+          self.where = 'style'
+        elif self.inte_att == 'opacity':
+          self.inte_att_type = 'float'
+          self.where = 'style'
+
+      self.getTotElements()
+
+      if self.inte_att_type == 'color':
+        self.getColorValues()
+      else:
+        self.getNumberValues()
+
+      if self.collection is None:
+        inkex.errormsg( 'There is no selection to interpolate' )
+        return False
+
+      for node in self.collection:
+        if self.inte_att_type == 'color':
+          val = 'rgb('+ \
+                  str(int(round(self.R_cur))) +','+ \
+                  str(int(round(self.G_cur))) +','+ \
+                  str(int(round(self.B_cur))) +')'
+        else:
+          if self.inte_att_type == 'float':
+            val = self.val_cur
+          else: # inte_att_type == 'int'
+            val = round(self.val_cur)
+
+        if self.where == 'style':
+          s = node.get('style')
+          re_find = '(^|;)'+ self.inte_att +':[^;]*(;|$)'
+          if re.search( re_find, s ):
+            s = re.sub( re_find, '\\1'+ self.inte_att +':'+ str(val) +'\\2', s )
+          else:
+            s += ';'+ self.inte_att +':'+ str(val)
+          node.set( 'style', s )
+        elif self.where == 'transform':
+          t = node.get('transform')
+          if t == None: t = ""
+          if self.inte_att == 'trans-x':
+            val = "translate("+ str(val) +",0)"
+          elif self.inte_att == 'trans-y':
+            val = "translate(0,"+ str(val) +")"
+          else:
+            val = self.inte_att + "("+ str(val) +")"
+          node.set( 'transform', t +" "+ val )
+        else: # self.where == 'tag':
+          node.set( self.inte_att, str(val) )
+
+        if self.inte_att_type == 'color':
+          self.R_cur += self.R_inc
+          self.G_cur += self.G_inc
+          self.B_cur += self.B_inc
+        else:
+          self.val_cur += self.val_inc
+
+      return True
+
+if __name__ == '__main__':   #pragma: no cover
+    e = InterpAttG()
+    if e.affect():
+      exit(0)
+    else:
+      exit(1)

diff --git a/share/extensions/test/interp-att-g.test.py b/share/extensions/test/interp-att-g.test.py
deleted file mode 100755 (executable)
index f35a7a1..0000000
--- a/share/extensions/test/interp-att-g.test.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-
-# This is only the automatic generated test file for ../interp-att-g.py
-# This must be filled with real tests and this commentary
-# must be cleared.
-# If you want to help, read the python unittest documentation:
-# http://docs.python.org/library/unittest.html
-
-import sys
-sys.path.append('..') # this line allows to import the extension code
-
-import unittest
-from interp-att-g import *
-
-class InterpAttGBasicTest(unittest.TestCase):
-
-  #def setUp(self):
-
-  def test_run_without_parameters(self):
-    args = [ 'minimal-blank.svg' ]
-    e = InterpAttG()
-    e.affect( args, False )
-    #self.assertEqual( e.something, 'some value', 'A commentary about that.' )
-
-if __name__ == '__main__':
-  unittest.main()

diff --git a/share/extensions/test/interp_att_g.test.py b/share/extensions/test/interp_att_g.test.py
new file mode 100755 (executable)
index 0000000..d7cec12
--- /dev/null
+++ b/share/extensions/test/interp_att_g.test.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+
+# This is only the automatic generated test file for ../interp-att-g.py
+# This must be filled with real tests and this commentary
+# must be cleared.
+# If you want to help, read the python unittest documentation:
+# http://docs.python.org/library/unittest.html
+
+import sys
+sys.path.append('..') # this line allows to import the extension code
+
+import unittest
+from interp_att_g import *
+
+class InterpAttGBasicTest(unittest.TestCase):
+
+  #def setUp(self):
+
+  def test_run_without_parameters(self):
+    args = [ 'minimal-blank.svg' ]
+    e = InterpAttG()
+    e.affect( args, False )
+    #self.assertEqual( e.something, 'some value', 'A commentary about that.' )
+
+if __name__ == '__main__':
+  unittest.main()