[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3611] trunk/py/scripts/addons/ io_anim_c3d: fix for problem reported by Jens Meisner

[Daniel M. Basso]

Revision: 3611
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3611
Author:   dmbasso
Date:     2012-07-10 14:22:10 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
fix for problem reported by Jens Meisner

Cortex from Motion Analysis exports the LABELS parameter
in a different group (not POINT); now the importer searches
all groups for a LABELS parameter.

Modified Paths:
--------------
    trunk/py/scripts/addons/io_anim_c3d/__init__.py
    trunk/py/scripts/addons/io_anim_c3d/import_c3d.py

Modified: trunk/py/scripts/addons/io_anim_c3d/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_anim_c3d/__init__.py	2012-07-10 13:59:06 UTC (rev 3610)
+++ trunk/py/scripts/addons/io_anim_c3d/__init__.py	2012-07-10 14:22:10 UTC (rev 3611)
@@ -25,8 +25,8 @@
 bl_info = {
     'name': "C3D Graphics Lab Motion Capture file (.c3d)",
     'author': "Daniel Monteiro Basso <daniel at basso.inf.br>",
-    'version': (2011, 11, 3, 1),
-    'blender': (2, 6, 0),
+    'version': (2012, 7, 10, 1),
+    'blender': (2, 6, 3),
     'location': "File > Import",
     'description': "Imports C3D Graphics Lab Motion Capture files",
     'wiki_url': "http://wiki.blender.org/index.php/Extensions:2.6/Py/"

Modified: trunk/py/scripts/addons/io_anim_c3d/import_c3d.py
===================================================================
--- trunk/py/scripts/addons/io_anim_c3d/import_c3d.py	2012-07-10 13:59:06 UTC (rev 3610)
+++ trunk/py/scripts/addons/io_anim_c3d/import_c3d.py	2012-07-10 14:22:10 UTC (rev 3611)
@@ -47,7 +47,8 @@
         if not nameLength:
             self.name = ''
             return
-        if nameLength < 0 or nameLength > 64:
+        nameLength = abs(nameLength)  # negative flags something
+        if nameLength > 64:
             raise ValueError
         self.name = infile.read(nameLength).decode('ascii')
         (offset, b) = struct.unpack('hb', infile.read(3))
@@ -195,7 +196,14 @@
             if not g.name:
                 break
             self.paramGroups[g.name] = g
-        self.markerLabels = self.paramGroups['POINT'].params['LABELS'].decode()
+        for pg in self.paramGroups:
+            #print("group: " + pg)
+            #for p in self.paramGroups[pg].params:
+            #    print("   * " + p)
+            if 'LABELS' in self.paramGroups[pg].params:
+                break
+        # pg should be 'POINT', but let's be liberal and accept any group
+        self.markerLabels = self.paramGroups[pg].params['LABELS'].decode()
 
     def readMarker(self, infile):
         pass  # ...