moved id getter

Author: anna-grim

src/segmentation_skeleton_metrics/utils/swc_util.py

@@ -261,7 +261,7 @@ def load_from_zipped_file(self, zipfile, path):
 
     def confirm_load(self, filename):
         if len(self.selected_ids) > 0:
-            segment_id = get_segment_id(filename)
+            segment_id = util.get_segment_id(filename)
             return True if segment_id in self.selected_ids else False
         else:
             return True
@@ -354,10 +354,6 @@ def read_voxel(self, xyz_str, offset):
 
 
 # --- Helpers ---
-def get_segment_id(filename):
-    return int(filename.split(".")[0])
-
-
 def to_zipped_swc(zip_writer, graph, color=None):
     """
     Writes a graph to an swc file that is to be stored in a zip.

src/segmentation_skeleton_metrics/utils/util.py

@@ -106,25 +106,6 @@ def list_paths(directory, extension=None):
     return paths
 
 
-def get_id(path):
-    """
-    Gets segment id of the swc file at "path".
-
-    Parameters
-    ----------
-    path : str
-        Path to an swc file
-
-    Return
-    ------
-    int or str
-        Segment id of swc file.
-
-    """
-    filename = os.path.basename(path).split(".")[0]
-    return int(filename) if filename.isdigit() else filename
-
-
 # --- io utils ---
 def read_zip(zip_file, path):
     """
@@ -208,6 +189,10 @@ def list_files_in_zip(zip_content):
 
 
 # --- Miscellaneous ---
+def get_segment_id(filename):
+    return int(filename.split(".")[0])
+
+
 def load_merged_labels(path):
     """
     Loads a list of merged label IDs from a text file.