diff --git a/src/oneat/NEATUtils/HolovizNapari.py b/src/oneat/NEATUtils/HolovizNapari.py index bfb485a..93e5fb0 100644 --- a/src/oneat/NEATUtils/HolovizNapari.py +++ b/src/oneat/NEATUtils/HolovizNapari.py @@ -102,7 +102,7 @@ def showNapari(self): self.oneat_widget = OneatWidget( self.viewer, self.csvdir, - "Name", + self.key_categories, segimagedir=self.segimagedir, heatimagedir=self.heatmapimagedir, @@ -345,8 +345,8 @@ def headlesscall( confidence_locations = [] event_locations_dict = {} event_locations_size_dict = {} - savename = Path(csvname).stem - savename = 'non_maximal_' + savename + savename = 'non_maximal_' + Path(csvname).stem + savename = os.path.join(csvdir, savename) print(savename) dataset = pd.read_csv(csvname, delimiter=",") # Data is written as T, Y, X, Score, Size, Confidence @@ -491,8 +491,8 @@ def headlessvolumecall( confidence_locations = [] event_locations_dict = {} event_locations_size_dict = {} - savename = Path(csvname).stem - savename = 'non_maximal_' + savename + savename = 'non_maximal_' + Path(csvname).stem + savename = os.path.join(csvdir, savename) print(f'performing non maximal supression on {csvname}') dataset = pd.read_csv(csvname, delimiter=",") # Data is written as T, Y, X, Score, Size, Confidence diff --git a/src/oneat/NEATUtils/oneat_animation/_qt/oneat_widget.py b/src/oneat/NEATUtils/oneat_animation/_qt/oneat_widget.py index f694ed2..e4c46e8 100644 --- a/src/oneat/NEATUtils/oneat_animation/_qt/oneat_widget.py +++ b/src/oneat/NEATUtils/oneat_animation/_qt/oneat_widget.py @@ -27,7 +27,6 @@ def __init__( self, viewer: "napari.viewer.Viewer", csvdir: str, - savename: str, key_categories: dict, segimagedir: str = None, heatimagedir: str = None,