Merging

MBTMBTMBT · Jun 24, 2024 · a24320e · a24320e
1 parent ae06cd2
commit a24320e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/skills/src/lasr_skills/describe_people.py b/skills/src/lasr_skills/describe_people.py
@@ -232,9 +232,9 @@ def execute(self, userdata):
                         rospy.logdebug(f"|> Person does not have {part} visible")
                         continue
 
-                    if part.name == "torso_front" or part.name == "torso_back":
+                    if part.part_name == "torso_front" or part.part_name == "torso_back":
                         torso_mask = np.logical_or(torso_mask, part_mask)
-                    elif part.name == "left_face" or part.name == "right_face":
+                    elif part.part_name == "left_face" or part.part_name == "right_face":
                         head_mask = np.logical_or(head_mask, part_mask)
 
                 torso_mask_data, torso_mask_shape, torso_mask_dtype = numpy2message(

diff --git a/tasks/receptionist/launch/setup.launch b/tasks/receptionist/launch/setup.launch
@@ -21,7 +21,7 @@
 
     <node pkg="lasr_vision_feature_extraction" type="service" name="torch_service" output="screen"/>
     <arg name="debug" default="true" />
-    <node pkg="lasr_vision_bodypix" type="service" name="bodypix_service" output="screen" args="--debug $(arg debug)"/>
+    <node pkg="lasr_vision_bodypix" type="mask_service.py" name="bodypix_service" output="screen" args="--debug $(arg debug)"/>
     <node pkg="lasr_vision_deepface" type="service" name="deepface_service" output="screen"/>
 
 </launch>
diff --git a/tasks/receptionist/src/receptionist/states/introduce.py b/tasks/receptionist/src/receptionist/states/introduce.py
@@ -65,19 +65,19 @@ def stringify_guest_data(guest_data: Dict[str, Any], guest_id: str) -> str:
         "down",
         "outwear",
         "dress",
-        "short sleeve top",
-        "long sleeve top",
-        "short sleeve outwear",
-        "long sleeve outwear",
-        "vest",
-        "sling",
+        # "short sleeve top",
+        # "long sleeve top",
+        # "short sleeve outwear",
+        # "long sleeve outwear",
+        # "vest",
+        # "sling",
         "shorts",
         "trousers",
         "skirt",
-        "short sleeve dress",
-        "long sleeve dress",
-        "vest dress",
-        "sling dress",
+        # "short sleeve dress",
+        # "long sleeve dress",
+        # "vest dress",
+        # "sling dress",
     ]
 
     ignored_attributes.append("male")