diff --git a/developement.txt b/developement.txt index 5d2dc0759d9ba5b63cff6f3b50a65dea57f672ed..ba244050386e6e4933ec7e9ba37a9360b095beba 100644 --- a/developement.txt +++ b/developement.txt @@ -5,4 +5,14 @@ Móni 2024. 11. 10.: Amit lehetne fejleszteni: - drag-nél lehessen mozgatni is, mert jelenleg csak egy helyben van az egér - definiálni az ablakokat amikről beszéltünk. Jelenleg nagyon kicsi a mozgás tere az egérnek (legalábbis közelről irányítva) - - parameter tune-ing: Mouse class elején: __init__() function paramétereit \ No newline at end of file + - parameter tune-ing: Mouse class elején: __init__() function paramétereit + +Megbeszélés 2024. 11. 31: + - fine-tuning: + scrolling_distance: 10 az lassú + probléma: szaggatott az egész -> egér pozíció ne legyen az action length-hez kötve + ablak vs pyautogui.move + + mozdulatok: + drag: nyitott tenyér -> drop sima cursor stop if előtte drag + \ No newline at end of file diff --git a/Virtual Mouse Using Hand Gesture Recognition/main.py b/example_project/main.py similarity index 100% rename from Virtual Mouse Using Hand Gesture Recognition/main.py rename to example_project/main.py diff --git a/Virtual Mouse Using Hand Gesture Recognition/util.py b/example_project/util.py similarity index 100% rename from Virtual Mouse Using Hand Gesture Recognition/util.py rename to example_project/util.py diff --git a/control_mouse.py b/final_project/control_mouse.py similarity index 98% rename from control_mouse.py rename to final_project/control_mouse.py index 45aad11b600fe33d747ea60a3e37f16aafa00ffb..cbd798ff19782f35dc4cbb4fd416bfc02c77d102 100644 --- a/control_mouse.py +++ b/final_project/control_mouse.py @@ -21,9 +21,9 @@ class Mouse: # parameters to fine-tune self.action_length = 5 - self.move_distance = 10 - self.scroll_distance = 10 - self.time_checking = 0.5 + #self.move_distance = 10 + self.scroll_distance = 50 + #self.time_checking = 0.5 self.stop_pos = None def get_hand_pos(self, hand_pos): @@ -82,10 +82,9 @@ class Mouse: pyautogui.hscroll(self.scroll_distance) # Scroll left # THIS FUNCTION NOT WORKS ON WINDOWS elif prediction == "drag": - pyautogui.mouseDown() if self.previous_action == "stop moving": pyautogui.moveTo(*self.stop_pos) - + pyautogui.mouseDown() hand_x = np.clip(int(self.hand_pos_x*WIDTH), 0, WIDTH-1) hand_y = np.clip(int(self.hand_pos_y*HEIGHT), 0, HEIGHT-1) pyautogui.moveTo(hand_x, hand_y) diff --git a/Moni_train_data_all.pickle b/merged_training_data/Moni_train_data_all.pickle similarity index 100% rename from Moni_train_data_all.pickle rename to merged_training_data/Moni_train_data_all.pickle diff --git a/mouse_train_data_all.pickle b/merged_training_data/mouse_train_data_all.pickle similarity index 100% rename from mouse_train_data_all.pickle rename to merged_training_data/mouse_train_data_all.pickle diff --git a/numbers.pickle b/merged_training_data/numbers.pickle similarity index 100% rename from numbers.pickle rename to merged_training_data/numbers.pickle diff --git a/hand detection discovery.py b/preparations/hand detection discovery.py similarity index 100% rename from hand detection discovery.py rename to preparations/hand detection discovery.py diff --git a/moni_dev/move_mouse.py b/preparations/moni_dev/move_mouse.py similarity index 100% rename from moni_dev/move_mouse.py rename to preparations/moni_dev/move_mouse.py diff --git a/moni_dev/test_manipulations.py b/preparations/moni_dev/test_manipulations.py similarity index 100% rename from moni_dev/test_manipulations.py rename to preparations/moni_dev/test_manipulations.py diff --git a/moni_dev/use_keyboard.py b/preparations/moni_dev/use_keyboard.py similarity index 100% rename from moni_dev/use_keyboard.py rename to preparations/moni_dev/use_keyboard.py diff --git a/realtime_video.py b/preparations/realtime_video.py similarity index 100% rename from realtime_video.py rename to preparations/realtime_video.py diff --git a/Moni_train_data/double_click_Bazsi.pickle b/train_data/double_click_Bazsi.pickle similarity index 100% rename from Moni_train_data/double_click_Bazsi.pickle rename to train_data/double_click_Bazsi.pickle diff --git a/Moni_train_data/double_click_Moni.pickle b/train_data/double_click_Moni.pickle similarity index 100% rename from Moni_train_data/double_click_Moni.pickle rename to train_data/double_click_Moni.pickle diff --git a/Moni_train_data/drag_Moni.pickle b/train_data/drag_Moni.pickle similarity index 100% rename from Moni_train_data/drag_Moni.pickle rename to train_data/drag_Moni.pickle diff --git a/Moni_train_data/drop_Bazsi.pickle b/train_data/drop_Bazsi.pickle similarity index 100% rename from Moni_train_data/drop_Bazsi.pickle rename to train_data/drop_Bazsi.pickle diff --git a/Moni_train_data/drop_Moni.pickle b/train_data/drop_Moni.pickle similarity index 100% rename from Moni_train_data/drop_Moni.pickle rename to train_data/drop_Moni.pickle diff --git a/Moni_train_data/left_click_Bazsi.pickle b/train_data/left_click_Bazsi.pickle similarity index 100% rename from Moni_train_data/left_click_Bazsi.pickle rename to train_data/left_click_Bazsi.pickle diff --git a/Moni_train_data/left_click_Moni.pickle b/train_data/left_click_Moni.pickle similarity index 100% rename from Moni_train_data/left_click_Moni.pickle rename to train_data/left_click_Moni.pickle diff --git a/Moni_train_data/move_cursor_Bazsi.pickle b/train_data/move_cursor_Bazsi.pickle similarity index 100% rename from Moni_train_data/move_cursor_Bazsi.pickle rename to train_data/move_cursor_Bazsi.pickle diff --git a/Moni_train_data/move_cursor_Moni.pickle b/train_data/move_cursor_Moni.pickle similarity index 100% rename from Moni_train_data/move_cursor_Moni.pickle rename to train_data/move_cursor_Moni.pickle diff --git a/Moni_train_data/right_click_Bazsi.pickle b/train_data/right_click_Bazsi.pickle similarity index 100% rename from Moni_train_data/right_click_Bazsi.pickle rename to train_data/right_click_Bazsi.pickle diff --git a/Moni_train_data/right_click_Moni.pickle b/train_data/right_click_Moni.pickle similarity index 100% rename from Moni_train_data/right_click_Moni.pickle rename to train_data/right_click_Moni.pickle diff --git a/Moni_train_data/scrolling_down_Moni.pickle b/train_data/scrolling_down_Moni.pickle similarity index 100% rename from Moni_train_data/scrolling_down_Moni.pickle rename to train_data/scrolling_down_Moni.pickle diff --git a/Moni_train_data/scrolling_left_Moni.pickle b/train_data/scrolling_left_Moni.pickle similarity index 100% rename from Moni_train_data/scrolling_left_Moni.pickle rename to train_data/scrolling_left_Moni.pickle diff --git a/Moni_train_data/scrolling_right_Moni.pickle b/train_data/scrolling_right_Moni.pickle similarity index 100% rename from Moni_train_data/scrolling_right_Moni.pickle rename to train_data/scrolling_right_Moni.pickle diff --git a/Moni_train_data/scrolling_up_Moni.pickle b/train_data/scrolling_up_Moni.pickle similarity index 100% rename from Moni_train_data/scrolling_up_Moni.pickle rename to train_data/scrolling_up_Moni.pickle diff --git a/Moni_train_data/stop_execution_Moni.pickle b/train_data/stop_execution_Moni.pickle similarity index 100% rename from Moni_train_data/stop_execution_Moni.pickle rename to train_data/stop_execution_Moni.pickle diff --git a/Moni_train_data/stop_moving_Bazsi.pickle b/train_data/stop_moving_Bazsi.pickle similarity index 100% rename from Moni_train_data/stop_moving_Bazsi.pickle rename to train_data/stop_moving_Bazsi.pickle diff --git a/Moni_train_data/stop_moving_Moni.pickle b/train_data/stop_moving_Moni.pickle similarity index 100% rename from Moni_train_data/stop_moving_Moni.pickle rename to train_data/stop_moving_Moni.pickle diff --git a/numbers_model.p b/trained_models/numbers_model.p similarity index 100% rename from numbers_model.p rename to trained_models/numbers_model.p diff --git a/trained_Moni_data.p b/trained_models/trained_Moni_data.p similarity index 100% rename from trained_Moni_data.p rename to trained_models/trained_Moni_data.p diff --git a/trained_mouse_data.p b/trained_models/trained_mouse_data.p similarity index 100% rename from trained_mouse_data.p rename to trained_models/trained_mouse_data.p diff --git a/data_collector.py b/training/data_collector.py similarity index 100% rename from data_collector.py rename to training/data_collector.py diff --git a/test_model.py b/training/test_model.py similarity index 100% rename from test_model.py rename to training/test_model.py diff --git a/train_model.py b/training/train_model.py similarity index 100% rename from train_model.py rename to training/train_model.py diff --git a/view_picke_data.ipynb b/training/view_picke_data.ipynb similarity index 100% rename from view_picke_data.ipynb rename to training/view_picke_data.ipynb