This commit is contained in:
ChenXL97 2023-11-23 10:26:14 +08:00
parent 460e9ba991
commit 89e5e479eb
42 changed files with 50 additions and 37 deletions

View File

@ -1,11 +1,11 @@
# from .scene import Scene # from .scene import Scene
# from robowaiter.scene.tasks.AEM import SceneAEM # from robowaiter.scene.tasks_no_ui.AEM import SceneAEM
# from robowaiter.scene.tasks.GQA import SceneGQA # from robowaiter.scene.tasks_no_ui.GQA import SceneGQA
# from robowaiter.scene.tasks.VLN import SceneVLN # from robowaiter.scene.tasks_no_ui.VLN import SceneVLN
# from robowaiter.scene.tasks.VLM import SceneVLM # from robowaiter.scene.tasks_no_ui.VLM import SceneVLM
# from robowaiter.scene.tasks.Open_tasks import SceneOT # from robowaiter.scene.tasks_no_ui.Open_tasks import SceneOT
# from robowaiter.scene.tasks.Auto_tasks import SceneAT # from robowaiter.scene.tasks_no_ui.Auto_tasks import SceneAT
# task_map = { # task_map = {
# "AEM": SceneAEM, # "AEM": SceneAEM,

View File

@ -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 = TaskThread(run_scene, self.scene_cls, self.robot_cls,self.scene_queue,self.ui_queue)
self.thread.start() self.thread.start()
self.scene_func((f"run_example",name)) self.scene_func((f"run_{name}",))
return btn_example_on_click return btn_example_on_click
def btn_say_on_click(self): def btn_say_on_click(self):

View File

@ -33,8 +33,10 @@ class SceneUI(Scene):
while not self.stoped: while not self.stoped:
self.step() self.step()
def run_example(self,example_name): def run_AEM(self):
if example_name == 'VLN': pass
def run_VLN(self):
self.gen_obj() self.gen_obj()
self.add_walkers([ self.add_walkers([
[29, 60, 520], # 顾客 0 [29, 60, 520], # 顾客 0
@ -63,9 +65,20 @@ class SceneUI(Scene):
(-1, self.customer_say, (0, "谢谢你!这儿还不错!")), (-1, self.customer_say, (0, "谢谢你!这儿还不错!")),
] ]
if example_name == 'AEM': def run_VLM(self):
pass 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): def init_robot(self):
# init robot # init robot