diff --git a/scripts/Face.py b/scripts/Face.py index 143b4bc741151495519cc21d6f2067e1e251a80c..c5f22bc44364cf9bad17945bb722f87ab240adac 100755 --- a/scripts/Face.py +++ b/scripts/Face.py @@ -57,7 +57,7 @@ class Face: self.robot_gender = rospy.get_param("/gender") # determine the path and set the default path place - os.chdir(r'/home/{}/cognitive_game_ws/src/robot_facial_expression/scripts'.format(getpass.getuser())) + os.chdir(r'/home/{}/pal/cognitive_game_ws/src/robot_facial_expression/scripts'.format(getpass.getuser())) ''' Parts of the face of baxter are defined.''' self.backgroundImage = Image.open("data/"+self.robot_gender+"/baxter_background.png") # Background behind the eyes # Face partions objects @@ -77,7 +77,7 @@ class Face: faceImage.paste(self.eye.getEyes(), (int(self.eye.getPositionX()), int(self.eye.getPositionY())), self.eye.getEyes()) faceImage.paste(self.eyelid.getEyelid(), (0, self.eyelid.getPosition()), self.eyelid.getEyelid()) faceImage.paste(self.skin.getSkin(), (0, 0), self.skin.getSkin()) - faceImage.paste(self.mouth.getMouth(), (0, 0), self.mouth.getMouth()) + #faceImage.paste(self.mouth.getMouth(), (0, 0), self.mouth.getMouth()) faceImage.paste(self.eyebrow.getEyebrow(), (0, 0), self.eyebrow.getEyebrow()) image = array(faceImage) return image @@ -194,7 +194,7 @@ class Face: # Emotions def showEmotion(self, mouthIndex, eyebrowIndex, cv2, publish): - self.mouth.setMouth(mouthIndex) + #self.mouth.setMouth(mouthIndex) self.eyebrow.setEyebrow(eyebrowIndex) self.show(publish) diff --git a/scripts/data/male/skin/baxter_skin_0_1.png b/scripts/data/male/skin/baxter_skin_0_1.png index a08d8e7d31bcff9b9ff34955d5f1c6a4205f15c1..aae14b979ccd767820b4611e536f64a635cab2c1 100644 Binary files a/scripts/data/male/skin/baxter_skin_0_1.png and b/scripts/data/male/skin/baxter_skin_0_1.png differ