- GPL license block

- new id separator
- drop debug message
- simplification & cleanup

diff --git a/utils/Modeller/uv_export_svg.py b/utils/Modeller/uv_export_svg.py
index 1af31a5a67ed3ec60249192eb6608d1c4f7e0118..51a96519ec43f0536b8032747cb50ec36cb28345 100644 (file)
--- a/utils/Modeller/uv_export_svg.py
+++ b/utils/Modeller/uv_export_svg.py
@@ -8,7 +8,7 @@
 # """
 
 __author__ = "Melchior FRANZ < mfranz # aon : at >"
-__url__ = "http://members.aon.at/mfranz/flightgear/"
+__url__ = "http://www.flightgear.org/"
 __version__ = "0.1"
 __bpydoc__ = """\
 Saves the UV mappings of all selected objects to an SVG file. The uv_import_svg.py
@@ -16,8 +16,27 @@ script can be used to re-import such a file. Each object and each group of adjac
 faces therein will be made a separate SVG group.
 """
 
-FILL_COLOR = ''  # 'yellow' or '#ffa000' e.g. for uni-color, empty string for random color
-ID_SEPARATOR = '_.._'
+#--------------------------------------------------------------------------------
+# Copyright (C) 2008  Melchior FRANZ  < mfranz # aon : at >
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#--------------------------------------------------------------------------------
+
+
+FILL_COLOR = None  # 'yellow' or '#ffa000' e.g. for uni-color, None for random color
+ID_SEPARATOR = '_.:._'
 
 
 import Blender, BPyMessages, sys, random
@@ -46,15 +65,15 @@ class UVFaceGroups:
                face = faces.popitem()[1]
                group = [face]
                for c in face.uv:
-                       uvcoords[(c[0], c[1])] = True
+                       uvcoords[tuple(c)] = True
 
                while True:
                        found = []
                        for face in faces.itervalues():
                                for c in face.uv:
-                                       if (c[0], c[1]) in uvcoords:
+                                       if (tuple(c)) in uvcoords:
                                                for c in face.uv:
-                                                       uvcoords[(c[0], c[1])] = True
+                                                       uvcoords[tuple(c)] = True
                                                found.append(face)
                                                break
                        if not found:
@@ -68,7 +87,7 @@ def hashcolor(name):
        random.seed(hash(name))
        c = [random.randint(220, 255), random.randint(120, 220), random.randint(120, 220)]
        random.shuffle(c)
-       return "#%02x%02x%02x" % (c[0], c[1], c[2])
+       return "#%02x%02x%02x" % tuple(c)
 
 
 def write_svg(path):
@@ -77,7 +96,6 @@ def write_svg(path):
                raise Abort('no image size chosen')
        size = 1 << (size + 6)
 
-       print "exporting to '%s' (size %d) ... " % (path, size),
        svg = open(path, "w")
        svg.write('<?xml version="1.0" standalone="no"?>\n')
        svg.write('<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n\n')
@@ -122,7 +140,6 @@ def write_svg(path):
 
        svg.write('</svg>\n')
        svg.close()
-       print "done."
 
 
 def export(path):

diff --git a/utils/Modeller/uv_import_svg.py b/utils/Modeller/uv_import_svg.py
index 23bf1f3f3ddfb5eae14a38fbe9b83af00c4db77d..25fe8c2fa6fd9bcf703649217cb9acf98fbca640 100755 (executable)
--- a/utils/Modeller/uv_import_svg.py
+++ b/utils/Modeller/uv_import_svg.py
@@ -8,7 +8,7 @@
 # """
 
 __author__ = "Melchior FRANZ < mfranz # aon : at >"
-__url__ = "http://members.aon.at/mfranz/flightgear/"
+__url__ = "http://www.flightgear.org/"
 __version__ = "0.1"
 __bpydoc__ = """\
 Imports an SVG file containing UV maps, which has been saved by the
@@ -19,14 +19,32 @@ The choice has been made when the file was saved!
 """
 
 
-ID_SEPARATOR = '_.._'
+#--------------------------------------------------------------------------------
+# Copyright (C) 2008  Melchior FRANZ  < mfranz # aon : at >
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#--------------------------------------------------------------------------------
+
+
+ID_SEPARATOR = '_.:._'
 
 
 import Blender, BPyMessages, sys, math, re
 from xml.sax import saxexts
 
 
-registry = {}
 numwsp = re.compile('(?<=[\d.])\s+(?=[-+.\d])')
 commawsp = re.compile('\s+|\s*,\s*')
 istrans = re.compile('^\s*(skewX|skewY|scale|translate|rotate|matrix)\s*\(([^\)]*)\)\s*')

diff --git a/utils/Modeller/uv_pack.py b/utils/Modeller/uv_pack.py
index f9158b7240543108ccab502ce8db7c64a66a23f9..245a429c8e6778f620e44509309b329b455a9854 100644 (file)
--- a/utils/Modeller/uv_pack.py
+++ b/utils/Modeller/uv_pack.py
@@ -33,6 +33,26 @@ Usage:
 (7) export UV layout to SVG (UVs->Scripts->Save UV Face Layout)
 """
 
+
+#--------------------------------------------------------------------------------
+# Copyright (C) 2008  Melchior FRANZ  < mfranz # aon : at >
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#--------------------------------------------------------------------------------
+
+
 MARGIN = 10 # px
 GAP = 10    # px