Skip to content

Commit 9d41f4a

Browse files
author
arch
committed
fix warnings
1 parent d6c64f8 commit 9d41f4a

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

funscript_editor/algorithms/kalmanfilter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def init(self, x: float, y: float) -> None:
5656
self.prediction_counter += 1
5757

5858

59-
def update(self, x: float, y: float) -> np.ndarray:
59+
def update(self, x: float, y: float) -> list:
6060
""" Update the 2D Kalman Filter
6161
6262
Args:

funscript_editor/ui/settings_dialog.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ class SettingsDialog(QtWidgets.QDialog):
1111
1212
Args:
1313
settings (dict): dict where to store the settings
14+
include_vr (bool): include vr options
1415
"""
1516

1617
def __init__(self, settings: dict, include_vr: bool = True):
@@ -24,7 +25,7 @@ def __init__(self, settings: dict, include_vr: bool = True):
2425
self.__setup_ui_bindings()
2526
self.__setup_combo_boxes()
2627

27-
#: apply settiongs event
28+
#: apply settings event
2829
applySettings = QtCore.pyqtSignal()
2930

3031
def show(self):
@@ -43,7 +44,9 @@ def __setup_ui_bindings(self):
4344
self.ui.trackingMethodComboBox.currentTextChanged.connect(lambda value: self.__set_setting('trackingMethod', value))
4445

4546
def __setup_combo_boxes(self):
46-
self.ui.videoTypeComboBox.addItems([PROJECTION[key]['name'] for key in PROJECTION.keys() if 'vr' not in key.lower() or self.include_vr])
47+
self.ui.videoTypeComboBox.addItems([PROJECTION[key]['name'] \
48+
for key in PROJECTION.keys() \
49+
if 'vr' not in key.lower() or self.include_vr])
4750
self.ui.trackingMetricComboBox.addItems(['y (up-down)', 'x (left-right)', 'euclideanDistance', 'pitch'])
4851
self.ui.trackingMethodComboBox.addItems(['Woman', 'Woman + Men'])
4952

funscript_editor/ui/video_player.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import time
66
import os
77
import logging
8+
import typing
89

910
from typing import Callable
1011
from PIL import Image, ImageDraw, ImageFont
@@ -193,12 +194,12 @@ def __ctrl_n_binding():
193194
self.key_callback('ctrl+n')
194195

195196
@self.player.on_key_press('ctrl+o')
196-
def __ctrl_n_binding():
197+
def __ctrl_o_binding():
197198
if self.key_callback is not None:
198199
self.key_callback('ctrl+o')
199200

200201
@self.player.on_key_press('ctrl+c')
201-
def __ctrl_n_binding():
202+
def __ctrl_c_binding():
202203
if self.key_callback is not None:
203204
self.key_callback('ctrl+c')
204205

@@ -256,7 +257,7 @@ def get_fps(self) -> float:
256257

257258

258259
@property
259-
def get_video_file(self) -> str:
260+
def get_video_file(self) -> typing.Union[str, None]:
260261
""" Get current video file path
261262
262263
Returns:
@@ -299,16 +300,20 @@ def get_current_frame(self) -> int:
299300

300301
def increase_speed(self) -> None:
301302
""" Increase the playback speed """
302-
self.player.speed += 0.2
303-
if 0.9 < self.player.speed < 1.1: self.player.speed = 1.0
304-
self.show_message('Speed: ' + str(self.player.speed))
303+
try:
304+
self.player.speed += 0.2
305+
if 0.9 < self.player.speed < 1.1: self.player.speed = 1.0
306+
self.show_message('Speed: ' + str(self.player.speed))
307+
except: pass
305308

306309

307310
def decrease_speed(self) -> None:
308311
""" Decrease the playback speed """
309-
if self.player.speed > 0.21: self.player.speed -= 0.2
310-
if 0.9 < self.player.speed < 1.1: self.player.speed = 1.0
311-
self.show_message('Speed: ' + str(self.player.speed))
312+
try:
313+
if self.player.speed > 0.21: self.player.speed -= 0.2
314+
if 0.9 < self.player.speed < 1.1: self.player.speed = 1.0
315+
self.show_message('Speed: ' + str(self.player.speed))
316+
except: pass
312317

313318

314319
def show_message(self, message :str) -> None:

0 commit comments

Comments
 (0)