some bugfixes. tested against spherical shell

This commit is contained in:
Michael Krayer 2021-08-09 18:03:17 +02:00
parent bfab713bb0
commit 0c2db9fa79
1 changed files with 6 additions and 6 deletions

View File

@ -787,24 +787,24 @@ class Features3d:
return return
@property @property
def faces(self): return np.split(self._faces,self.offset) def faces(self): return np.split(self._faces,self._offset)
@property @property
def points(self): return self._points def points(self): return self._points
@property @property
def cell_areas(self): return np.split(self._cellarea,self.offset) def cell_areas(self): return np.split(self._cell_areas,self._offset)
@property @property
def cell_volumes(self): return np.split(self._cellvol,self.offset) def cell_volumes(self): return np.split(self._cell_volumes,self._offset)
def area(self,feature): def area(self,feature):
'''Returns the surface area of feature. If feature is None, total surface '''Returns the surface area of feature. If feature is None, total surface
area of all features is returned.''' area of all features is returned.'''
if label is None: if feature is None:
return np.sum(self._cell_areas) return np.sum(self._cell_areas)
else: else:
return np.sum(self.cell_areas[label-1]) return np.sum(self.cell_areas[feature-1])
def areas(self): def areas(self):
'''Returns a tuple with surface areas of all features.''' '''Returns a tuple with surface areas of all features.'''
@ -817,7 +817,7 @@ class Features3d:
if self._faces is None: if self._faces is None:
self.triangulate(contour_method=self.__TRI_CONTMETH, self.triangulate(contour_method=self.__TRI_CONTMETH,
cellvol_normal_component=self.__TRI_NORMCOMP) cellvol_normal_component=self.__TRI_NORMCOMP)
if label is None: if feature is None:
return np.sum(self._cell_volumes) return np.sum(self._cell_volumes)
else: else:
return np.sum(self.cell_volumes[feature-1]) return np.sum(self.cell_volumes[feature-1])