Added name to Bscan. If B-Scans are save as individual files, this is…

… the respective filename, else it becomes a string version of the B-Scan index

eyepy/core/base.py

@@ -105,7 +105,7 @@ def bscan(self, value: "Bscan"):
 
 class Bscan:
     def __new__(cls, data, annotation=None, meta=None, data_processing=None,
-                oct_obj=None, *args, **kwargs):
+                oct_obj=None, name=None, *args, **kwargs):
 
         def annotation_func_builder(x):
             return lambda self: self.annotation[x]
@@ -129,7 +129,8 @@ def __init__(self,
                  annotation: Optional[Annotation] = None,
                  meta: Optional[Union[Dict, Meta]] = None,
                  data_processing: Optional[Callable] = None,
-                 oct_obj: Optional["Oct"] = None):
+                 oct_obj: Optional["Oct"] = None,
+                 name: Optional[str] = None):
         """
 
         Parameters
@@ -156,6 +157,7 @@ def __init__(self,
         else:
             self._data_processing = data_processing
 
+        self._name = name
         self._layer_indices = None
 
     @property
@@ -168,6 +170,12 @@ def oct_obj(self):
     def oct_obj(self, value):
         self._oct_obj = value
 
+    @property
+    def name(self):
+        if self._name is None:
+            self._name = str(self.index)
+        return self._name
+
     @property
     def index(self):
         return self.oct_obj.bscans.index(self)
@@ -406,7 +414,7 @@ def from_folder(cls, path):
         def read_func(p):
             return lambda: imageio.imread(p)
 
-        bscans = [Bscan(read_func(p)) for p in img_paths]
+        bscans = [Bscan(read_func(p), name=p.name) for p in img_paths]
         return cls(bscans=bscans)
 
     def estimate_bscan_distance(self):

eyepy/io/heyex/xml_export.py

@@ -56,8 +56,8 @@ def bscans(self):
         if self._bscans is None:
             self._bscans = []
 
-            def bscan_builder(d, a, bmeta, p):
-                return lambda: Bscan(d, a, bmeta, p)
+            def bscan_builder(d, a, bmeta, p, n):
+                return lambda: Bscan(d, a, bmeta, p, name=n)
 
             def scan_reader(path):
                 return lambda: imageio.imread(path)
@@ -71,7 +71,7 @@ def scan_reader(path):
                     bscan, HEXML_BSCAN_VERSIONS(self.version)))
 
                 self._bscans.append(bscan_builder(
-                    data, annotation, bscan_meta, self._data_processing))
+                    data, annotation, bscan_meta, self._data_processing, scan_name))
 
         return self._bscans