Visitar URL original
Fix reading filtered state (#2844) · DeepLabCut/DeepLabCut@2da6615 · GitHub
Skip to content

Commit 2da6615

Browse files
authored
Fix reading filtered state (#2844)
* Fix checkboxes state reading * Refactoring
1 parent d4da23a commit 2da6615

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎deeplabcut/gui/tabs/analyze_videos.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,15 @@ def analyze_videos(self):
269269
shuffle = self.root.shuffle_value
270270

271271
videos = list(self.files)
272-
save_as_csv = self.save_as_csv.checkState() == Qt.Checked
272+
save_as_csv = self.save_as_csv.isChecked()
273273
videotype = self.video_selection_widget.videotype_widget.currentText()
274274

275275
if self.root.is_multianimal:
276276
calibrate_assembly = (
277-
self.calibrate_assembly_checkbox.checkState() == Qt.Checked
277+
self.calibrate_assembly_checkbox.isChecked()
278278
)
279279
assemble_with_ID_only = (
280-
self.assemble_with_ID_only_checkbox.checkState() == Qt.Checked
280+
self.assemble_with_ID_only_checkbox.isChecked()
281281
)
282282
track_method = self.tracker_type_widget.currentText()
283283
edit_config(self.root.config, {"default_track_method": track_method})
@@ -332,13 +332,13 @@ def run_enabled(self):
332332
shuffle = self.root.shuffle_value
333333

334334
videos = list(self.files)
335-
save_as_csv = self.save_as_csv.checkState() == Qt.Checked
336-
save_as_nwb = self.save_as_nwb.checkState() == Qt.Checked
337-
filter_data = self.filter_predictions.checkState() == Qt.Checked
335+
save_as_csv = self.save_as_csv.isChecked()
336+
save_as_nwb = self.save_as_nwb.isChecked()
337+
filter_data = self.filter_predictions.isChecked()
338338
videotype = self.video_selection_widget.videotype_widget.currentText()
339339
try:
340340
create_video_all_detections = (
341-
self.create_detections_video_checkbox.checkState() == Qt.Checked
341+
self.create_detections_video_checkbox.isChecked()
342342
)
343343
except AttributeError:
344344
create_video_all_detections = False
@@ -361,12 +361,12 @@ def run_enabled(self):
361361
save_as_csv=save_as_csv,
362362
)
363363

364-
if self.plot_trajectories.checkState() == Qt.Checked:
364+
if self.plot_trajectories.isChecked():
365365
bdpts = self.bodyparts_list_widget.selected_bodyparts
366366
self.root.logger.debug(
367367
f"Selected body parts for plot_trajectories: {bdpts}"
368368
)
369-
showfig = self.show_trajectory_plots.checkState() == Qt.Checked
369+
showfig = self.show_trajectory_plots.isChecked()
370370
deeplabcut.plot_trajectories(
371371
config,
372372
videos=videos,

‎deeplabcut/gui/tabs/create_videos.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@ def create_videos(self):
243243
# Single animal scenario.
244244
# Color is based on bodypart.
245245
color_by = "bodypart"
246-
filtered = bool(self.use_filtered_data_checkbox.checkState())
246+
filtered = self.use_filtered_data_checkbox.isChecked()
247247

248248
bodyparts = "all"
249249
if (
250250
len(self.bodyparts_to_use) != 0
251-
and self.plot_all_bodyparts.checkState() != Qt.Checked
251+
and not self.plot_all_bodyparts.isChecked()
252252
):
253253
self.update_selected_bodyparts()
254254
bodyparts = self.bodyparts_to_use
@@ -258,9 +258,9 @@ def create_videos(self):
258258
videos=videos,
259259
shuffle=shuffle,
260260
filtered=filtered,
261-
save_frames=bool(self.create_high_quality_video.checkState()),
261+
save_frames=self.create_high_quality_video.isChecked(),
262262
displayedbodyparts=bodyparts,
263-
draw_skeleton=bool(self.draw_skeleton_checkbox.checkState()),
263+
draw_skeleton=self.draw_skeleton_checkbox.isChecked(),
264264
trailpoints=trailpoints,
265265
color_by=color_by,
266266
)
@@ -273,7 +273,7 @@ def create_videos(self):
273273
failed_videos_str = ", ".join(failed_videos)
274274
self.root.writer.write(f"Failed to create videos from {failed_videos_str}.")
275275

276-
if self.plot_trajectories.checkState():
276+
if self.plot_trajectories.isChecked():
277277
deeplabcut.plot_trajectories(
278278
config=config,
279279
videos=videos,

‎deeplabcut/gui/tabs/evaluate_network.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ def evaluate_network(self):
186186
config = self.root.config
187187

188188
Shuffles = [self.root.shuffle_value]
189-
plotting = self.plot_predictions.checkState() == Qt.Checked
189+
plotting = self.plot_predictions.isChecked()
190190

191191
bodyparts_to_use = "all"
192192
if (
193193
len(self.root.all_bodyparts)
194194
!= len(self.bodyparts_list_widget.selected_bodyparts)
195-
) and self.use_all_bodyparts.checkState() == False:
195+
) and not self.use_all_bodyparts.isChecked():
196196
bodyparts_to_use = self.bodyparts_list_widget.selected_bodyparts
197197

198198
deeplabcut.evaluate_network(

0 commit comments

Comments
 (0)