From 367cbb021f02086acb9faeaad6c768f45a3df2c0 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Fri, 21 Feb 2025 11:02:29 +0100 Subject: [PATCH] [tracks] fix unsetting of userlabeled status ... --- fixtracks/widgets/tracks.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/fixtracks/widgets/tracks.py b/fixtracks/widgets/tracks.py index d86612f..02ca094 100644 --- a/fixtracks/widgets/tracks.py +++ b/fixtracks/widgets/tracks.py @@ -143,7 +143,6 @@ class FixTracks(QWidget): def on_autoClassify(self, tracks): self._data.setSelectionRange("index", 0, self._data.numDetections) self._data.assignTracks(tracks) - self._timeline.setDetectionData(self._data.data) self.update() def on_dataSelection(self): @@ -172,7 +171,8 @@ class FixTracks(QWidget): ids = df.index.values.astype(int) frames = df["frame"].values.astype(int) self._detectionView.addDetections(coords, tracks, ids, frames, keypoint, self._brushes[name]) - + + self._timeline.setData(self._data) start_frame = self._currentWindowPos stop_frame = start_frame + self._currentWindowWidth self._controls_widget.setWindow(start_frame, stop_frame) @@ -238,13 +238,11 @@ class FixTracks(QWidget): self._currentWindowWidth = self._windowspinner.value() self._maxframes = self._data.max("frame") self.populateKeypointCombo(self._data.numKeypoints()) - self._timeline.setDetectionData(self._data.data) + self._timeline.setData(self._data) self._timeline.setWindow(self._currentWindowPos / self._maxframes, self._currentWindowWidth / self._maxframes) coordinates = self._data.coordinates() positions = self._data.centerOfGravity() - tracks = self._data["track"] - frames = self._data["frame"] self._classifier.size_classifier.setCoordinates(coordinates) self._classifier.consistency_tracker.setData(self._data) self.update() @@ -280,19 +278,16 @@ class FixTracks(QWidget): def on_assignOne(self): logging.debug("Assigning user selection to track One") self._data.assignUserSelection(self.trackone_id) - self._timeline.setDetectionData(self._data.data) self.update() def on_assignTwo(self): logging.debug("Assigning user selection to track Two") self._data.assignUserSelection(self.tracktwo_id) - self._timeline.setDetectionData(self._data.data) self.update() def on_assignOther(self): logging.debug("Assigning user selection to track Other") self._data.assignUserSelection(self.trackother_id, False) - self._timeline.setDetectionData(self._data.data) self.update() def on_setUserFlag(self): @@ -305,8 +300,9 @@ class FixTracks(QWidget): self.update() def on_revertUserFlags(self): - logging.debug("Tracks:revert ALL UserFlags") + logging.debug("Tracks:revert ALL UserFlags and track assignments") self._data.revertAssignmentStatus() + self._data.revertTrackAssignments() self.update() def on_deleteDetection(self):