From 360a64737697d80ec592cd28d99a9d0b0c2bf81f Mon Sep 17 00:00:00 2001
From: Caiyishuai <39987654+Caiyishuai@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=20scene?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 robowaiter/behavior_lib/act/MoveTo.py        | 31 +++-----------------
 robowaiter/scene/scene.py                    |  2 +-
 robowaiter/scene/tasks/VLN/VLN_greet_lead.py |  4 +--
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/robowaiter/behavior_lib/act/MoveTo.py b/robowaiter/behavior_lib/act/MoveTo.py
index 1f79829..215a627 100644
--- a/robowaiter/behavior_lib/act/MoveTo.py
+++ b/robowaiter/behavior_lib/act/MoveTo.py
@@ -32,9 +32,11 @@ class MoveTo(Act):
         # goal = self.scene.state['map']['obj_pos'][self.args[0]]
         # navigator.navigate_old(goal, animation=False)
 
+        # 拍照片
         if self.scene.take_picture:
             self.scene.get_obstacle_point(self.scene.db, self.status, map_ratio=self.scene.map_ratio)
 
+        # #####################################
         # 走到固定的地点
         if self.target_place in Act.place_xy_yaw_dic:
             goal = Act.place_xy_yaw_dic[self.target_place]
@@ -59,42 +61,17 @@ class MoveTo(Act):
                         if dis<min_dis:
                             min_dis = dis
                             obj_id = id
-            # if self.target_place == "CoffeeCup":
-            #     # obj_id = 273
-            #     obj_id = 275
             if obj_id == -1:
                 return ptree.common.Status.FAILURE
-
-            # print("self.target_place:",self.target_place,"id:",obj_id,"dis:",min_dis)
             self.scene.move_to_obj(obj_id=obj_id)
+            # #####################################
+
 
-            # 为了演示，写死咖啡位置
-            # if self.target_place=="Coffee":
-            #     obj_id = 273
-            # obj_id = -1
-            # obj_dict = self.scene.status.objects
-            # if len(obj_dict)!=0:
-            #     # 获取obj_id
-            #     for id,obj in enumerate(obj_dict):
-            #         if obj.name == self.target_place:
-            #             obj_id = id
-            #             break
-            #     # 为了演示，写死咖啡位置
-            #     if self.target_place=="Coffee":
-            #         obj_id = 273
-            # if obj_id == -1:
-            #     return ptree.common.Status.FAILURE
-            # obj_info = obj_dict[obj_id]
-            # obj_x, obj_y, obj_z = obj_info.location.X, obj_info.location.Y, obj_info.location.Z
-            # self.scene.walk_to(obj_x,obj_y)
-            # print("MoveTo",obj_x, obj_y, obj_z," obj_id:",obj_id," obj_info:",obj_info.name)
 
 
         if self.scene.take_picture:
             self.scene.get_obstacle_point(self.scene.db, self.status, map_ratio=self.scene.map_ratio)
 
-        # goal = self.scene.state['map']['obj_pos'][self.args[0]]
-        # self.scene.walk_to(goal[0],goal[1]) # X, Y, Yaw=None, velocity=200, dis_limit=0
 
         self.scene.state["condition_set"] |= (self.info["add"])
         self.scene.state["condition_set"] -= self.info["del_set"]
diff --git a/robowaiter/scene/scene.py b/robowaiter/scene/scene.py
index 18a024b..dddbd1f 100644
--- a/robowaiter/scene/scene.py
+++ b/robowaiter/scene/scene.py
@@ -116,7 +116,7 @@ class Scene:
 
         self.show_bubble = True
         # 图像分割
-        self.take_picture = False
+        self.take_picture = True
         self.map_ratio = 5
         self.map_map = np.zeros((math.ceil(950 / self.map_ratio), math.ceil(1850 / self.map_ratio)))
         self.db = DBSCAN(eps=self.map_ratio, min_samples=int(self.map_ratio / 2))
diff --git a/robowaiter/scene/tasks/VLN/VLN_greet_lead.py b/robowaiter/scene/tasks/VLN/VLN_greet_lead.py
index 965a4aa..90f66d0 100644
--- a/robowaiter/scene/tasks/VLN/VLN_greet_lead.py
+++ b/robowaiter/scene/tasks/VLN/VLN_greet_lead.py
@@ -11,8 +11,8 @@ class SceneVLM(Scene):
         super().__init__(robot)
         # 在这里加入场景中发生的事件， (事件发生的时间，事件函数)
         self.new_event_list = [
-            (2, self.customer_say, (0, "请问哪里有空位啊？")),
-            (6, self.customer_say, (0, "我想坐高凳子。")),
+            # (2, self.customer_say, (0, "请问哪里有空位啊？")),
+            # (6, self.customer_say, (0, "我想坐高凳子。")),
             (6, self.customer_say, (0, "你带我去吧。")),
             (13, self.control_walker, (0, False,100, -250, 480,-90)),
             (-1, self.customer_say, (0, "谢谢你！这儿还不错！")),