Skip to content

Fix reading filtered state #2844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maximpavliv merged 2 commits into from
Jan 24, 2025
Merged

Fix reading filtered state #2844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff6f050
Fix checkboxes state reading
maximpavliv Jan 24, 2025
951d35b
Refactoring
maximpavliv Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions deeplabcut/gui/tabs/analyze_videos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,15 +269,15 @@ def analyze_videos(self):
shuffle = self.root.shuffle_value

videos = list(self.files)
save_as_csv = self.save_as_csv.checkState() == Qt.Checked
save_as_csv = self.save_as_csv.isChecked()
videotype = self.video_selection_widget.videotype_widget.currentText()

if self.root.is_multianimal:
calibrate_assembly = (
self.calibrate_assembly_checkbox.checkState() == Qt.Checked
self.calibrate_assembly_checkbox.isChecked()
)
assemble_with_ID_only = (
self.assemble_with_ID_only_checkbox.checkState() == Qt.Checked
self.assemble_with_ID_only_checkbox.isChecked()
)
track_method = self.tracker_type_widget.currentText()
edit_config(self.root.config, {"default_track_method": track_method})
Expand Down Expand Up @@ -332,13 +332,13 @@ def run_enabled(self):
shuffle = self.root.shuffle_value

videos = list(self.files)
save_as_csv = self.save_as_csv.checkState() == Qt.Checked
save_as_nwb = self.save_as_nwb.checkState() == Qt.Checked
filter_data = self.filter_predictions.checkState() == Qt.Checked
save_as_csv = self.save_as_csv.isChecked()
save_as_nwb = self.save_as_nwb.isChecked()
filter_data = self.filter_predictions.isChecked()
videotype = self.video_selection_widget.videotype_widget.currentText()
try:
create_video_all_detections = (
self.create_detections_video_checkbox.checkState() == Qt.Checked
self.create_detections_video_checkbox.isChecked()
)
except AttributeError:
create_video_all_detections = False
Expand All @@ -361,12 +361,12 @@ def run_enabled(self):
save_as_csv=save_as_csv,
)

if self.plot_trajectories.checkState() == Qt.Checked:
if self.plot_trajectories.isChecked():
bdpts = self.bodyparts_list_widget.selected_bodyparts
self.root.logger.debug(
f"Selected body parts for plot_trajectories: {bdpts}"
)
showfig = self.show_trajectory_plots.checkState() == Qt.Checked
showfig = self.show_trajectory_plots.isChecked()
deeplabcut.plot_trajectories(
config,
videos=videos,
Expand Down
10 changes: 5 additions & 5 deletions deeplabcut/gui/tabs/create_videos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,12 @@ def create_videos(self):
# Single animal scenario.
# Color is based on bodypart.
color_by = "bodypart"
filtered = bool(self.use_filtered_data_checkbox.checkState())
filtered = self.use_filtered_data_checkbox.isChecked()

bodyparts = "all"
if (
len(self.bodyparts_to_use) != 0
and self.plot_all_bodyparts.checkState() != Qt.Checked
and not self.plot_all_bodyparts.isChecked()
):
self.update_selected_bodyparts()
bodyparts = self.bodyparts_to_use
Expand All @@ -258,9 +258,9 @@ def create_videos(self):
videos=videos,
shuffle=shuffle,
filtered=filtered,
save_frames=bool(self.create_high_quality_video.checkState()),
save_frames=self.create_high_quality_video.isChecked(),
displayedbodyparts=bodyparts,
draw_skeleton=bool(self.draw_skeleton_checkbox.checkState()),
draw_skeleton=self.draw_skeleton_checkbox.isChecked(),
trailpoints=trailpoints,
color_by=color_by,
)
Expand All @@ -273,7 +273,7 @@ def create_videos(self):
failed_videos_str = ", ".join(failed_videos)
self.root.writer.write(f"Failed to create videos from {failed_videos_str}.")

if self.plot_trajectories.checkState():
if self.plot_trajectories.isChecked():
deeplabcut.plot_trajectories(
config=config,
videos=videos,
Expand Down
4 changes: 2 additions & 2 deletions deeplabcut/gui/tabs/evaluate_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ def evaluate_network(self):
config = self.root.config

Shuffles = [self.root.shuffle_value]
plotting = self.plot_predictions.checkState() == Qt.Checked
plotting = self.plot_predictions.isChecked()

bodyparts_to_use = "all"
if (
len(self.root.all_bodyparts)
!= len(self.bodyparts_list_widget.selected_bodyparts)
) and self.use_all_bodyparts.checkState() == False:
) and not self.use_all_bodyparts.isChecked():
bodyparts_to_use = self.bodyparts_list_widget.selected_bodyparts

deeplabcut.evaluate_network(
Expand Down