Merge pull request #47 from hugohadfield/fix_len_rebase

hugohadfield · web-flow · commit a39a0be1f940 · 2020-06-29T15:21:26.000+01:00
Moved call to len until after an mv is a list
diff --git a/pyganja/GanjaScene.py b/pyganja/GanjaScene.py
@@ -43,12 +43,13 @@ def __add__(self, other):
             raise ValueError('The objects being added are not both GanjaScenes...')
 
     def add_object(self, mv_array, color=0xAA000000, label=None, static=False):
-        self.mv_length = len(mv_array)
+        mv_list = _as_list(mv_array)
+        self.mv_length = len(mv_list)
         self.internal_list.append(_color.as_hex(color))
         if static:
-            self.internal_list.append({'data': [_as_list(mv_array)]})
+            self.internal_list.append({'data': [mv_list]})
         else:
-            self.internal_list.append(_as_list(mv_array))
+            self.internal_list.append(mv_list)
         if label is not None:
             try:
                 assert isinstance(label, str)
@@ -58,10 +59,11 @@ def add_object(self, mv_array, color=0xAA000000, label=None, static=False):
 
     def add_facet(self, mv_list, color=0xAA000000, label=None, static=False):
         self.internal_list.append(_color.as_hex(color))
-        self.mv_length = len(mv_list[0])
         facet_list = []
         for mv_array in mv_list:
-            facet_list.append(_as_list(mv_array))
+            mv_list = _as_list(mv_array)
+            facet_list.append(mv_list)
+            self.mv_length = len(mv_list)
         if static:
             self.internal_list.append({'data': [facet_list]})
         else:
@@ -73,25 +75,26 @@ def add_facet(self, mv_list, color=0xAA000000, label=None, static=False):
             except:
                 raise ValueError('Labels must be strings')
 
-    def add_facets(self, mv_list, color=0xAA000000, label=None, static=False):
-        for mv_array in mv_list:
-            self.add_facet(mv_array,color=color, label=label, static=static)
+    def add_facets(self, mv_vertex_list, color=0xAA000000, label=None, static=False):
+        for mv_array in mv_vertex_list:
+            self.add_facet(mv_array, color=color, label=label, static=static)
         if label is not None:
             try:
                 assert isinstance(label, str)
                 self.internal_list.append(label)
             except:
                 raise ValueError('Labels must be strings')
 
-    def add_objects(self, mv_list, color=0xAA000000, label=None, static=False):
+    def add_objects(self, mv_object_list, color=0xAA000000, label=None, static=False):
         self.internal_list.append(_color.as_hex(color))
         static_list = []
-        self.mv_length = len(mv_list[0])
-        for mv_array in mv_list:
+        for mv_array in mv_object_list:
+            mv_list = _as_list(mv_array)
+            self.mv_length = len(mv_list)
             if static:
-                static_list.append(_as_list(mv_array))
+                static_list.append(mv_list)
             else:
-                self.internal_list.append(_as_list(mv_array))
+                self.internal_list.append(mv_list)
         if static:
             self.internal_list.append({'data': static_list})
         if label is not None:
