diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 56249f8..6ef4907 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,11 +6,8 @@ - - - - - + + - { - "keyToString": { - "DefaultHtmlFileTemplate": "HTML File", - "Python.calculator.executor": "Run", - "Python.callback_test.executor": "Run", - "Python.create_project_test.executor": "Run", - "Python.critical_exit_test.executor": "Run", - "Python.executor_one_file.executor": "Run", - "Python.screen_test.executor": "Run", - "Python.screenshot_test.executor": "Run", - "Python.video_recording.executor": "Run", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.git.unshallow": "true", - "WebServerToolWindowFactoryState": "false", - "git-widget-placeholder": "dev", - "ignore.virus.scanning.warn.message": "true", - "last_opened_file_path": "C:/CodeWorkspace/Python/AutoControlGUI", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "discord-application", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -250,8 +247,8 @@ - @@ -576,6 +573,11 @@ + + + + + diff --git a/dev.toml b/dev.toml index 6e70478..01b4bd3 100644 --- a/dev.toml +++ b/dev.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "je_auto_control_dev" -version = "0.0.107" +version = "0.0.110" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] @@ -16,7 +16,7 @@ license-files = ["LICENSE"] dependencies = [ "je_open_cv", "pillow", - "Pyside6==6.8.2.1", + "Pyside6==6.8.3", "pyobjc-core;platform_system=='Darwin'", "pyobjc;platform_system=='Darwin'", "python-Xlib;platform_system=='Linux'", diff --git a/je_auto_control/utils/cv2_utils/video_recording.py b/je_auto_control/utils/cv2_utils/video_recording.py index 17bbb54..7a03409 100644 --- a/je_auto_control/utils/cv2_utils/video_recording.py +++ b/je_auto_control/utils/cv2_utils/video_recording.py @@ -14,6 +14,8 @@ def __init__(self, video_name: str = "autocontrol_recoding"): super().__init__() self.recoding_flag = True self.video_name = video_name + self.daemon = True + self.fps = 20 def set_recoding_flag(self, recoding_flag: bool): autocontrol_logger.info(f"RecordingThread set_recoding_flag recoding_flag: {recoding_flag}") @@ -24,8 +26,7 @@ def run(self): resolution = sct.monitors[0] self.video_name = self.video_name + '.mp4' fourcc = cv2.VideoWriter_fourcc(*'mp4v') - desired_fps = 20 - video_writer = cv2.VideoWriter(self.video_name, fourcc, desired_fps, + video_writer = cv2.VideoWriter(self.video_name, fourcc, self.fps, (resolution['width'], resolution['height'])) while self.recoding_flag: screen_image = sct.grab(resolution) diff --git a/pyproject.toml b/pyproject.toml index 9ddfcb9..8bd423b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "je_auto_control" -version = "0.0.164" +version = "0.0.167" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] @@ -16,7 +16,7 @@ license-files = ["LICENSE"] dependencies = [ "je_open_cv", "pillow", - "Pyside6==6.8.2.1", + "Pyside6==6.8.3", "pyobjc-core;platform_system=='Darwin'", "pyobjc;platform_system=='Darwin'", "python-Xlib;platform_system=='Linux'",