prepare for callbacks on modification of ctrlpts and weights arrays

Author: cshorler

geomdl/NURBS.py

@@ -127,8 +127,8 @@ def ctrlpts(self):
         # Populate the cache, if necessary
         if not self._cache['ctrlpts']:
             c, w = compatibility.separate_ctrlpts_weights(self._control_points)
-            self._cache['ctrlpts'] = [crd for crd in c]
-            self._cache['weights'] = w
+            self._cache['ctrlpts'] = self._array_type(iter(c))
+            self._cache['weights'] = self._array_type(iter(w))
         return self._cache['ctrlpts']
 
     @ctrlpts.setter
@@ -159,8 +159,8 @@ def weights(self):
         # Populate the cache, if necessary
         if not self._cache['weights']:
             c, w = compatibility.separate_ctrlpts_weights(self._control_points)
-            self._cache['ctrlpts'] = [crd for crd in c]
-            self._cache['weights'] = w
+            self._cache['ctrlpts'] = self._array_type(iter(c))
+            self._cache['weights'] = self._array_type(iter(w))
         return self._cache['weights']
 
     @weights.setter
@@ -192,6 +192,7 @@ def reset(self, **kwargs):
         if reset_ctrlpts:
             # Delete the caches
             self._cache['ctrlpts'] = self._init_array()
+            # TODO: why is this reset differently from the initialisation?
             self._cache['weights'][:] = self._init_array()
 
 
@@ -330,8 +331,8 @@ def ctrlpts(self):
         """
         if not self._cache['ctrlpts']:
             c, w = compatibility.separate_ctrlpts_weights(self._control_points)
-            self._cache['ctrlpts'] = [crd for crd in c]
-            self._cache['weights'] = w
+            self._cache['ctrlpts'] = self._array_type(iter(c))
+            self._cache['weights'] = self._array_type(iter(w))
         return self._cache['ctrlpts']
 
     @ctrlpts.setter
@@ -361,8 +362,8 @@ def weights(self):
         """
         if not self._cache['weights']:
             c, w = compatibility.separate_ctrlpts_weights(self._control_points)
-            self._cache['ctrlpts'] = [crd for crd in c]
-            self._cache['weights'] = w
+            self._cache['ctrlpts'] = self._array_type(iter(c))
+            self._cache['weights'] = self._array_type(iter(w))
         return self._cache['weights']
 
     @weights.setter
@@ -518,8 +519,8 @@ def ctrlpts(self):
         """
         if not self._cache['ctrlpts']:
             c, w = compatibility.separate_ctrlpts_weights(self._control_points)
-            self._cache['ctrlpts'] = [crd for crd in c]
-            self._cache['weights'] = w
+            self._cache['ctrlpts'] = self._array_type(iter(c))
+            self._cache['weights'] = self._array_type(iter(w))
         return self._cache['ctrlpts']
 
     @ctrlpts.setter
@@ -549,8 +550,8 @@ def weights(self):
         """
         if not self._cache['weights']:
             c, w = compatibility.separate_ctrlpts_weights(self._control_points)
-            self._cache['ctrlpts'] = [crd for crd in c]
-            self._cache['weights'] = w
+            self._cache['ctrlpts'] = self._array_type(iter(c))
+            self._cache['weights'] = self._array_type(iter(w))
         return self._cache['weights']
 
     @weights.setter

geomdl/abstract.py

@@ -11,6 +11,7 @@
 from .six import add_metaclass
 from . import vis, helpers, knotvector, voxelize, utilities, tessellate
 from .base import GeomdlBase, GeomdlEvaluator, GeomdlError, GeomdlWarning, GeomdlTypeSequence
+from ._collections import NotifyList
 
 
 @add_metaclass(abc.ABCMeta)
@@ -34,9 +35,9 @@ class Geometry(GeomdlBase):
     # __slots__ = ('_iter_index', '_array_type', '_eval_points')
 
     def __init__(self, *args, **kwargs):
-        self._geometry_type = "default" if not hasattr(self, '_geometry_type') else self._geometry_type  # geometry type
         super(Geometry, self).__init__(*args, **kwargs)
-        self._array_type = list if not hasattr(self, '_array_type') else self._array_type  # array storage type
+        self._geometry_type = getattr(self, '_geometry_type', 'default') # geometry type
+        self._array_type = getattr(self, '_array_type', NotifyList) # array storage type
         self._eval_points = self._init_array()  # evaluated points
 
     def __iter__(self):