Merge branch 'master' of https://github.com/Eomys/SciDataTool

Eomys · Sep 28, 2020 · 4e5914f · 4e5914f
2 parents 2c1359f + ed8d95a
commit 4e5914f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/SciDataTool/Classes/DataND.py b/SciDataTool/Classes/DataND.py
@@ -407,9 +407,10 @@ def _set_None(self):
 
     def _get_axes(self):
         """getter of axes"""
-        for obj in self._axes:
-            if obj is not None:
-                obj.parent = self
+        if self._axes is not None:
+            for obj in self._axes:
+                if obj is not None:
+                    obj.parent = self
         return self._axes
 
     def _set_axes(self, value):
@@ -426,10 +427,6 @@ def _set_axes(self, value):
         check_var("axes", value, "[Data]")
         self._axes = value
 
-        for obj in self._axes:
-            if obj is not None:
-                obj.parent = self
-
     axes = property(
         fget=_get_axes,
         fset=_set_axes,

diff --git a/SciDataTool/Classes/VectorField.py b/SciDataTool/Classes/VectorField.py
@@ -353,9 +353,10 @@ def _set_symbol(self, value):
 
     def _get_components(self):
         """getter of components"""
-        for key, obj in self._components.items():
-            if obj is not None:
-                obj.parent = self
+        if self._components is not None:
+            for key, obj in self._components.items():
+                if obj is not None:
+                    obj.parent = self
         return self._components
 
     def _set_components(self, value):