From 89e5e479eb0c16de08f41dc1150bba423a8c11a8 Mon Sep 17 00:00:00 2001 From: ChenXL97 <908926798@qq.com> Date: Thu, 23 Nov 2023 10:26:14 +0800 Subject: [PATCH] ui --- robowaiter/scene/__init__.py | 12 +-- robowaiter/scene/ui/pyqt5.py | 2 +- robowaiter/scene/ui/scene_ui.py | 73 +++++++++++-------- {tasks => tasks_no_ui}/AEM/AEM.py | 0 {tasks => tasks_no_ui}/AEM/__init__.py | 0 {tasks => tasks_no_ui}/AT/Auto_tasks_light.py | 0 {tasks => tasks_no_ui}/AT/__init__.py | 0 .../CafeDailyOperations/CafeOneDay.py | 0 .../CafeDailyOperations/VLN_all.py | 0 .../VLN_greet_and_order.py | 0 .../VLN_greet_and_order_1118.py | 0 .../VLN_greet_and_order_1119.py | 0 .../CafeDailyOperations/__init__.py | 0 {tasks => tasks_no_ui}/GQA/GQA.py | 0 .../GQA/GQA_1_ask_order_place.py | 0 {tasks => tasks_no_ui}/GQA/GQA_NLP.py | 0 {tasks => tasks_no_ui}/GQA/__init__.py | 0 {tasks => tasks_no_ui}/Interact/__init__.py | 0 {tasks => tasks_no_ui}/Interact/system.py | 0 .../OT/OT_coffee_water_dessert.py | 0 {tasks => tasks_no_ui}/OT/Open_tasks.py | 0 .../OT/Open_tasks_bright_table.py | 0 {tasks => tasks_no_ui}/OT/Open_tasks_test.py | 0 .../OT/Open_tasks_walkers.py | 0 {tasks => tasks_no_ui}/OT/__init__.py | 0 {tasks => tasks_no_ui}/VLM/VLM.py | 0 {tasks => tasks_no_ui}/VLM/VLM3.py | 0 {tasks => tasks_no_ui}/VLM/VLM_1_order.py | 0 {tasks => tasks_no_ui}/VLM/VLM_2_AC.py | 0 {tasks => tasks_no_ui}/VLM/VLM_AC.py | 0 .../VLM/VLM_cafe_shutdown.py | 0 {tasks => tasks_no_ui}/VLM/VLM_order.py | 0 {tasks => tasks_no_ui}/VLM/VLN_greet_lead.py | 0 {tasks => tasks_no_ui}/VLM/__init__.py | 0 {tasks => tasks_no_ui}/VLN/VLN_edge_map.py | 0 {tasks => tasks_no_ui}/VLN/VLN_edge_obj.py | 0 {tasks => tasks_no_ui}/VLN/VLN_greet_lead.py | 0 {tasks => tasks_no_ui}/VLN/VLN_oda_eazy.py | 0 {tasks => tasks_no_ui}/VLN/VLN_oda_hard.py | 0 {tasks => tasks_no_ui}/VLN/VLN_oda_normal.py | 0 {tasks => tasks_no_ui}/VLN/__init__.py | 0 {tasks => tasks_no_ui}/__init__.py | 0 42 files changed, 50 insertions(+), 37 deletions(-) rename {tasks => tasks_no_ui}/AEM/AEM.py (100%) rename {tasks => tasks_no_ui}/AEM/__init__.py (100%) rename {tasks => tasks_no_ui}/AT/Auto_tasks_light.py (100%) rename {tasks => tasks_no_ui}/AT/__init__.py (100%) rename {tasks => tasks_no_ui}/CafeDailyOperations/CafeOneDay.py (100%) rename {tasks => tasks_no_ui}/CafeDailyOperations/VLN_all.py (100%) rename {tasks => tasks_no_ui}/CafeDailyOperations/VLN_greet_and_order.py (100%) rename {tasks => tasks_no_ui}/CafeDailyOperations/VLN_greet_and_order_1118.py (100%) rename {tasks => tasks_no_ui}/CafeDailyOperations/VLN_greet_and_order_1119.py (100%) rename {tasks => tasks_no_ui}/CafeDailyOperations/__init__.py (100%) rename {tasks => tasks_no_ui}/GQA/GQA.py (100%) rename {tasks => tasks_no_ui}/GQA/GQA_1_ask_order_place.py (100%) rename {tasks => tasks_no_ui}/GQA/GQA_NLP.py (100%) rename {tasks => tasks_no_ui}/GQA/__init__.py (100%) rename {tasks => tasks_no_ui}/Interact/__init__.py (100%) rename {tasks => tasks_no_ui}/Interact/system.py (100%) rename {tasks => tasks_no_ui}/OT/OT_coffee_water_dessert.py (100%) rename {tasks => tasks_no_ui}/OT/Open_tasks.py (100%) rename {tasks => tasks_no_ui}/OT/Open_tasks_bright_table.py (100%) rename {tasks => tasks_no_ui}/OT/Open_tasks_test.py (100%) rename {tasks => tasks_no_ui}/OT/Open_tasks_walkers.py (100%) rename {tasks => tasks_no_ui}/OT/__init__.py (100%) rename {tasks => tasks_no_ui}/VLM/VLM.py (100%) rename {tasks => tasks_no_ui}/VLM/VLM3.py (100%) rename {tasks => tasks_no_ui}/VLM/VLM_1_order.py (100%) rename {tasks => tasks_no_ui}/VLM/VLM_2_AC.py (100%) rename {tasks => tasks_no_ui}/VLM/VLM_AC.py (100%) rename {tasks => tasks_no_ui}/VLM/VLM_cafe_shutdown.py (100%) rename {tasks => tasks_no_ui}/VLM/VLM_order.py (100%) rename {tasks => tasks_no_ui}/VLM/VLN_greet_lead.py (100%) rename {tasks => tasks_no_ui}/VLM/__init__.py (100%) rename {tasks => tasks_no_ui}/VLN/VLN_edge_map.py (100%) rename {tasks => tasks_no_ui}/VLN/VLN_edge_obj.py (100%) rename {tasks => tasks_no_ui}/VLN/VLN_greet_lead.py (100%) rename {tasks => tasks_no_ui}/VLN/VLN_oda_eazy.py (100%) rename {tasks => tasks_no_ui}/VLN/VLN_oda_hard.py (100%) rename {tasks => tasks_no_ui}/VLN/VLN_oda_normal.py (100%) rename {tasks => tasks_no_ui}/VLN/__init__.py (100%) rename {tasks => tasks_no_ui}/__init__.py (100%) diff --git a/robowaiter/scene/__init__.py b/robowaiter/scene/__init__.py index 4a2d484..eca84a2 100644 --- a/robowaiter/scene/__init__.py +++ b/robowaiter/scene/__init__.py @@ -1,11 +1,11 @@ # from .scene import Scene -# from robowaiter.scene.tasks.AEM import SceneAEM -# from robowaiter.scene.tasks.GQA import SceneGQA -# from robowaiter.scene.tasks.VLN import SceneVLN -# from robowaiter.scene.tasks.VLM import SceneVLM -# from robowaiter.scene.tasks.Open_tasks import SceneOT -# from robowaiter.scene.tasks.Auto_tasks import SceneAT +# from robowaiter.scene.tasks_no_ui.AEM import SceneAEM +# from robowaiter.scene.tasks_no_ui.GQA import SceneGQA +# from robowaiter.scene.tasks_no_ui.VLN import SceneVLN +# from robowaiter.scene.tasks_no_ui.VLM import SceneVLM +# from robowaiter.scene.tasks_no_ui.Open_tasks import SceneOT +# from robowaiter.scene.tasks_no_ui.Auto_tasks import SceneAT # task_map = { # "AEM": SceneAEM, diff --git a/robowaiter/scene/ui/pyqt5.py b/robowaiter/scene/ui/pyqt5.py index 68264f7..ed4be9d 100644 --- a/robowaiter/scene/ui/pyqt5.py +++ b/robowaiter/scene/ui/pyqt5.py @@ -102,7 +102,7 @@ class UI(QMainWindow, Ui_MainWindow): self.thread = TaskThread(run_scene, self.scene_cls, self.robot_cls,self.scene_queue,self.ui_queue) self.thread.start() - self.scene_func((f"run_example",name)) + self.scene_func((f"run_{name}",)) return btn_example_on_click def btn_say_on_click(self): diff --git a/robowaiter/scene/ui/scene_ui.py b/robowaiter/scene/ui/scene_ui.py index 6b905fc..d5d3cdb 100644 --- a/robowaiter/scene/ui/scene_ui.py +++ b/robowaiter/scene/ui/scene_ui.py @@ -33,39 +33,52 @@ class SceneUI(Scene): while not self.stoped: self.step() - def run_example(self,example_name): - if example_name == 'VLN': - self.gen_obj() - self.add_walkers([ - [29, 60, 520], # 顾客 0 - [23, 0, 220], # 秃头老头子 1 - [0, -55, 150], # 小男孩d走来走去 2 - [10, -55, 750], # 3 - [19, 70, -200], # 后门站着不动的 4 - [21, 65, 1000, -90], # 大胖男占了一号桌 5 - [5, 230, 1200], # 小女孩 6 - [26, -28, -10, 90], - # [26, 60, 0, 90], - # [26, -28, 0, 90] , #在设置一个在后门随机游走的 7 - # 设置为 26, 60, 0, 90] - [31, 280, 1200, -45] # 8 - ]) - self.control_walker(2, True, 200, -55, 155, 90) # 飞速奔跑的小男孩 - # self.control_walker(7, True, 80, -25, -150, 90) - self.control_walker(5, True, 65, 995, 520, 90) - self.control_walker(4, True, 65, 70, -200, 90) + def run_AEM(self): + pass - self.new_event_list = [ - (5, self.customer_say, (0, "请问哪里有空位啊？")), - (13, self.customer_say, (0, "我想坐高凳子。")), - (3, self.customer_say, (0, "你带我去吧。")), - (45, self.control_walker, (0, False, 100, -250, 480, -90)), - (-1, self.customer_say, (0, "谢谢你！这儿还不错！")), - ] + def run_VLN(self): + self.gen_obj() + self.add_walkers([ + [29, 60, 520], # 顾客 0 + [23, 0, 220], # 秃头老头子 1 + [0, -55, 150], # 小男孩d走来走去 2 + [10, -55, 750], # 3 + [19, 70, -200], # 后门站着不动的 4 + [21, 65, 1000, -90], # 大胖男占了一号桌 5 + [5, 230, 1200], # 小女孩 6 + [26, -28, -10, 90], + # [26, 60, 0, 90], + # [26, -28, 0, 90] , #在设置一个在后门随机游走的 7 + # 设置为 26, 60, 0, 90] + [31, 280, 1200, -45] # 8 + ]) + self.control_walker(2, True, 200, -55, 155, 90) # 飞速奔跑的小男孩 + # self.control_walker(7, True, 80, -25, -150, 90) + self.control_walker(5, True, 65, 995, 520, 90) + self.control_walker(4, True, 65, 70, -200, 90) - if example_name == 'AEM': - pass + self.new_event_list = [ + (5, self.customer_say, (0, "请问哪里有空位啊？")), + (13, self.customer_say, (0, "我想坐高凳子。")), + (3, self.customer_say, (0, "你带我去吧。")), + (45, self.control_walker, (0, False, 100, -250, 480, -90)), + (-1, self.customer_say, (0, "谢谢你！这儿还不错！")), + ] + def run_VLM(self): + pass + + def run_GQA(self): + pass + + def run_OT(self): + pass + + def run_AT(self): + pass + + def run_reset(self): + pass def init_robot(self): # init robot diff --git a/tasks/AEM/AEM.py b/tasks_no_ui/AEM/AEM.py similarity index 100% rename from tasks/AEM/AEM.py rename to tasks_no_ui/AEM/AEM.py diff --git a/tasks/AEM/__init__.py b/tasks_no_ui/AEM/__init__.py similarity index 100% rename from tasks/AEM/__init__.py rename to tasks_no_ui/AEM/__init__.py diff --git a/tasks/AT/Auto_tasks_light.py b/tasks_no_ui/AT/Auto_tasks_light.py similarity index 100% rename from tasks/AT/Auto_tasks_light.py rename to tasks_no_ui/AT/Auto_tasks_light.py diff --git a/tasks/AT/__init__.py b/tasks_no_ui/AT/__init__.py similarity index 100% rename from tasks/AT/__init__.py rename to tasks_no_ui/AT/__init__.py diff --git a/tasks/CafeDailyOperations/CafeOneDay.py b/tasks_no_ui/CafeDailyOperations/CafeOneDay.py similarity index 100% rename from tasks/CafeDailyOperations/CafeOneDay.py rename to tasks_no_ui/CafeDailyOperations/CafeOneDay.py diff --git a/tasks/CafeDailyOperations/VLN_all.py b/tasks_no_ui/CafeDailyOperations/VLN_all.py similarity index 100% rename from tasks/CafeDailyOperations/VLN_all.py rename to tasks_no_ui/CafeDailyOperations/VLN_all.py diff --git a/tasks/CafeDailyOperations/VLN_greet_and_order.py b/tasks_no_ui/CafeDailyOperations/VLN_greet_and_order.py similarity index 100% rename from tasks/CafeDailyOperations/VLN_greet_and_order.py rename to tasks_no_ui/CafeDailyOperations/VLN_greet_and_order.py diff --git a/tasks/CafeDailyOperations/VLN_greet_and_order_1118.py b/tasks_no_ui/CafeDailyOperations/VLN_greet_and_order_1118.py similarity index 100% rename from tasks/CafeDailyOperations/VLN_greet_and_order_1118.py rename to tasks_no_ui/CafeDailyOperations/VLN_greet_and_order_1118.py diff --git a/tasks/CafeDailyOperations/VLN_greet_and_order_1119.py b/tasks_no_ui/CafeDailyOperations/VLN_greet_and_order_1119.py similarity index 100% rename from tasks/CafeDailyOperations/VLN_greet_and_order_1119.py rename to tasks_no_ui/CafeDailyOperations/VLN_greet_and_order_1119.py diff --git a/tasks/CafeDailyOperations/__init__.py b/tasks_no_ui/CafeDailyOperations/__init__.py similarity index 100% rename from tasks/CafeDailyOperations/__init__.py rename to tasks_no_ui/CafeDailyOperations/__init__.py diff --git a/tasks/GQA/GQA.py b/tasks_no_ui/GQA/GQA.py similarity index 100% rename from tasks/GQA/GQA.py rename to tasks_no_ui/GQA/GQA.py diff --git a/tasks/GQA/GQA_1_ask_order_place.py b/tasks_no_ui/GQA/GQA_1_ask_order_place.py similarity index 100% rename from tasks/GQA/GQA_1_ask_order_place.py rename to tasks_no_ui/GQA/GQA_1_ask_order_place.py diff --git a/tasks/GQA/GQA_NLP.py b/tasks_no_ui/GQA/GQA_NLP.py similarity index 100% rename from tasks/GQA/GQA_NLP.py rename to tasks_no_ui/GQA/GQA_NLP.py diff --git a/tasks/GQA/__init__.py b/tasks_no_ui/GQA/__init__.py similarity index 100% rename from tasks/GQA/__init__.py rename to tasks_no_ui/GQA/__init__.py diff --git a/tasks/Interact/__init__.py b/tasks_no_ui/Interact/__init__.py similarity index 100% rename from tasks/Interact/__init__.py rename to tasks_no_ui/Interact/__init__.py diff --git a/tasks/Interact/system.py b/tasks_no_ui/Interact/system.py similarity index 100% rename from tasks/Interact/system.py rename to tasks_no_ui/Interact/system.py diff --git a/tasks/OT/OT_coffee_water_dessert.py b/tasks_no_ui/OT/OT_coffee_water_dessert.py similarity index 100% rename from tasks/OT/OT_coffee_water_dessert.py rename to tasks_no_ui/OT/OT_coffee_water_dessert.py diff --git a/tasks/OT/Open_tasks.py b/tasks_no_ui/OT/Open_tasks.py similarity index 100% rename from tasks/OT/Open_tasks.py rename to tasks_no_ui/OT/Open_tasks.py diff --git a/tasks/OT/Open_tasks_bright_table.py b/tasks_no_ui/OT/Open_tasks_bright_table.py similarity index 100% rename from tasks/OT/Open_tasks_bright_table.py rename to tasks_no_ui/OT/Open_tasks_bright_table.py diff --git a/tasks/OT/Open_tasks_test.py b/tasks_no_ui/OT/Open_tasks_test.py similarity index 100% rename from tasks/OT/Open_tasks_test.py rename to tasks_no_ui/OT/Open_tasks_test.py diff --git a/tasks/OT/Open_tasks_walkers.py b/tasks_no_ui/OT/Open_tasks_walkers.py similarity index 100% rename from tasks/OT/Open_tasks_walkers.py rename to tasks_no_ui/OT/Open_tasks_walkers.py diff --git a/tasks/OT/__init__.py b/tasks_no_ui/OT/__init__.py similarity index 100% rename from tasks/OT/__init__.py rename to tasks_no_ui/OT/__init__.py diff --git a/tasks/VLM/VLM.py b/tasks_no_ui/VLM/VLM.py similarity index 100% rename from tasks/VLM/VLM.py rename to tasks_no_ui/VLM/VLM.py diff --git a/tasks/VLM/VLM3.py b/tasks_no_ui/VLM/VLM3.py similarity index 100% rename from tasks/VLM/VLM3.py rename to tasks_no_ui/VLM/VLM3.py diff --git a/tasks/VLM/VLM_1_order.py b/tasks_no_ui/VLM/VLM_1_order.py similarity index 100% rename from tasks/VLM/VLM_1_order.py rename to tasks_no_ui/VLM/VLM_1_order.py diff --git a/tasks/VLM/VLM_2_AC.py b/tasks_no_ui/VLM/VLM_2_AC.py similarity index 100% rename from tasks/VLM/VLM_2_AC.py rename to tasks_no_ui/VLM/VLM_2_AC.py diff --git a/tasks/VLM/VLM_AC.py b/tasks_no_ui/VLM/VLM_AC.py similarity index 100% rename from tasks/VLM/VLM_AC.py rename to tasks_no_ui/VLM/VLM_AC.py diff --git a/tasks/VLM/VLM_cafe_shutdown.py b/tasks_no_ui/VLM/VLM_cafe_shutdown.py similarity index 100% rename from tasks/VLM/VLM_cafe_shutdown.py rename to tasks_no_ui/VLM/VLM_cafe_shutdown.py diff --git a/tasks/VLM/VLM_order.py b/tasks_no_ui/VLM/VLM_order.py similarity index 100% rename from tasks/VLM/VLM_order.py rename to tasks_no_ui/VLM/VLM_order.py diff --git a/tasks/VLM/VLN_greet_lead.py b/tasks_no_ui/VLM/VLN_greet_lead.py similarity index 100% rename from tasks/VLM/VLN_greet_lead.py rename to tasks_no_ui/VLM/VLN_greet_lead.py diff --git a/tasks/VLM/__init__.py b/tasks_no_ui/VLM/__init__.py similarity index 100% rename from tasks/VLM/__init__.py rename to tasks_no_ui/VLM/__init__.py diff --git a/tasks/VLN/VLN_edge_map.py b/tasks_no_ui/VLN/VLN_edge_map.py similarity index 100% rename from tasks/VLN/VLN_edge_map.py rename to tasks_no_ui/VLN/VLN_edge_map.py diff --git a/tasks/VLN/VLN_edge_obj.py b/tasks_no_ui/VLN/VLN_edge_obj.py similarity index 100% rename from tasks/VLN/VLN_edge_obj.py rename to tasks_no_ui/VLN/VLN_edge_obj.py diff --git a/tasks/VLN/VLN_greet_lead.py b/tasks_no_ui/VLN/VLN_greet_lead.py similarity index 100% rename from tasks/VLN/VLN_greet_lead.py rename to tasks_no_ui/VLN/VLN_greet_lead.py diff --git a/tasks/VLN/VLN_oda_eazy.py b/tasks_no_ui/VLN/VLN_oda_eazy.py similarity index 100% rename from tasks/VLN/VLN_oda_eazy.py rename to tasks_no_ui/VLN/VLN_oda_eazy.py diff --git a/tasks/VLN/VLN_oda_hard.py b/tasks_no_ui/VLN/VLN_oda_hard.py similarity index 100% rename from tasks/VLN/VLN_oda_hard.py rename to tasks_no_ui/VLN/VLN_oda_hard.py diff --git a/tasks/VLN/VLN_oda_normal.py b/tasks_no_ui/VLN/VLN_oda_normal.py similarity index 100% rename from tasks/VLN/VLN_oda_normal.py rename to tasks_no_ui/VLN/VLN_oda_normal.py diff --git a/tasks/VLN/__init__.py b/tasks_no_ui/VLN/__init__.py similarity index 100% rename from tasks/VLN/__init__.py rename to tasks_no_ui/VLN/__init__.py diff --git a/tasks/__init__.py b/tasks_no_ui/__init__.py similarity index 100% rename from tasks/__init__.py rename to tasks_no_ui/__init__.py