diff --git a/scripts/Eye.py b/scripts/Eye.py index d04a6ea82f824c7b2d05dca8232399156d1ab214..3d5d3394d8d7133f594dc6536372e677d7d0641a 100755 --- a/scripts/Eye.py +++ b/scripts/Eye.py @@ -13,7 +13,7 @@ class Eye: def __init__(self): self.robot_gender = rospy.get_param("/gender") - self.eyes = Image.open("data/"+self.robot_gender+"/baxter_eye.png") # eye image + self.eyes = Image.open("test/pupil.png") # eye image self.positionX = 0 # keeps the x position as a coordinate self.positionY = 0 # keeps the y position as a coordinate diff --git a/scripts/Eyelid.py b/scripts/Eyelid.py index ec601ccc001aec01e4e0cc76443a56d8f1ca8394..bb8c4288afadd2a72758ca78d82e07e21def4bd3 100755 --- a/scripts/Eyelid.py +++ b/scripts/Eyelid.py @@ -12,7 +12,7 @@ class Eyelid: def __init__(self): self.robot_gender = rospy.get_param("/gender") - self.eyelid = Image.open("data/"+self.robot_gender+"/baxter_eyelid.png") # eyelid image + self.eyelid = Image.open("test/eyelid.png") # eyelid image self.position = 0 # y position, we don't need x position because of vertical movment. def moveCalculation(self, position, destinationPosition, totalTime, instantTime): diff --git a/scripts/Face.py b/scripts/Face.py index c5f22bc44364cf9bad17945bb722f87ab240adac..ee922249ac4f846b1596f827aa6fd7b05ef58fbb 100755 --- a/scripts/Face.py +++ b/scripts/Face.py @@ -63,7 +63,7 @@ class Face: # Face partions objects self.skin = Skin.Skin(5) # range: [0, 5] self.mouth = Mouth.Mouth(2) # range: [0, 6] - self.eyebrow = Eyebrow.Eyebrow(1) # range: [0, 3] + self.eyebrow = Eyebrow.Eyebrow(2) # range: [0, 3] self.eye = Eye.Eye() self.eyelid = Eyelid.Eyelid() self.eyelid.setPosition(-330) @@ -227,7 +227,7 @@ class Face: self.winkMove(cv2, -330, 0.3, publish) # Eyelids are not seen. self.skin.setSkin(2) mouthIndex = 5 # random.choice(mouthArray) - eyebrowIndex = random.choice(eyeBrowArray) + eyebrowIndex = 0#random.choice(eyeBrowArray) self.showEmotion(mouthIndex, eyebrowIndex, cv2, publish) def emotion_angry(self, cv2, publish): @@ -236,7 +236,7 @@ class Face: self.winkMove(cv2, -330, 0.3, publish) # Eyelids are not seen. self.skin.setSkin(4) mouthIndex = random.choice(mouthArray) - eyebrowIndex = random.choice(eyeBrowArray) + eyebrowIndex = 2#random.choice(eyeBrowArray) self.showEmotion(mouthIndex, eyebrowIndex, cv2, publish) def emotion_confused(self, cv2, publish): @@ -253,8 +253,8 @@ class Face: eyeBrowArray = [4] self.winkMove(cv2, -330, 0.3, publish) # Eyelids are not seen. self.skin.setSkin(1) - mouthIndex = 3#random.choice(mouthArray) - eyebrowIndex = random.choice(eyeBrowArray) + mouthIndex = 1#random.choice(mouthArray) + eyebrowIndex = 1#random.choice(eyeBrowArray) self.showEmotion(mouthIndex, eyebrowIndex, cv2, publish) def emotion_panic(self, cv2, publish): diff --git a/scripts/Skin.py b/scripts/Skin.py index 258cba91bdf76ebdf67afc27cfc992fc43a64260..d2131b50d19c80286d12d51c86f520ca6c8a1386 100755 --- a/scripts/Skin.py +++ b/scripts/Skin.py @@ -17,12 +17,13 @@ class Skin: # This array keeps the diffirent colour version of skin self.skins = [ - Image.open("data/"+self.robot_gender+"/skin/baxter_skin_0_1.png"), - Image.open("data/"+self.robot_gender+"/skin/baxter_skin_0_1.png"), - Image.open("data/"+self.robot_gender+"/skin/baxter_skin_0_1.png"), - Image.open("data/"+self.robot_gender+"/skin/baxter_skin_3.png"), - Image.open("data/"+self.robot_gender+"/skin/baxter_skin_4.png"), - Image.open("data/"+self.robot_gender+"/skin/baxter_skin_5.png") + Image.open("test/skin.png"), + Image.open("test/skin.png"), + Image.open("test/skin.png"), + Image.open("test/skin.png"), + Image.open("test/skin.png"), + Image.open("test/skin.png") + ] diff --git a/scripts/test/Glasses.png b/scripts/test/Glasses.png new file mode 100644 index 0000000000000000000000000000000000000000..0efa9ba65c75856bb2fadf7e08a07aef1708b56b Binary files /dev/null and b/scripts/test/Glasses.png differ diff --git a/scripts/test/eye_brow_angry.png b/scripts/test/eye_brow_angry.png new file mode 100644 index 0000000000000000000000000000000000000000..72e12b3a46e0955d3a5e47df6a388833b311eb23 Binary files /dev/null and b/scripts/test/eye_brow_angry.png differ diff --git a/scripts/test/eye_brow_angry.xcf b/scripts/test/eye_brow_angry.xcf new file mode 100644 index 0000000000000000000000000000000000000000..b1c2b098f5cd4ca12a068b2e14d0dba51373a91a Binary files /dev/null and b/scripts/test/eye_brow_angry.xcf differ diff --git a/scripts/test/eye_brow_happy.png b/scripts/test/eye_brow_happy.png new file mode 100644 index 0000000000000000000000000000000000000000..3f451558b59811c1c4b0fc38405c27e9bce35d5b Binary files /dev/null and b/scripts/test/eye_brow_happy.png differ diff --git a/scripts/test/eye_brow_happy.xcf b/scripts/test/eye_brow_happy.xcf new file mode 100644 index 0000000000000000000000000000000000000000..e6d78f5b9ceb7e1cee0e9fdf205a83620e7453fd Binary files /dev/null and b/scripts/test/eye_brow_happy.xcf differ diff --git a/scripts/test/eye_brow_sad.png b/scripts/test/eye_brow_sad.png new file mode 100644 index 0000000000000000000000000000000000000000..450c0095215e439d795882ff7e7786642c06ce8e Binary files /dev/null and b/scripts/test/eye_brow_sad.png differ diff --git a/scripts/test/eye_brow_sad.xcf b/scripts/test/eye_brow_sad.xcf new file mode 100644 index 0000000000000000000000000000000000000000..071ef7e5bcbfb3ee704c1a4d876507fe51f03cc4 Binary files /dev/null and b/scripts/test/eye_brow_sad.xcf differ diff --git a/scripts/test/eyelid.png b/scripts/test/eyelid.png new file mode 100644 index 0000000000000000000000000000000000000000..8ab4016078e3e4193fd852e085c5256d1ad932ef Binary files /dev/null and b/scripts/test/eyelid.png differ diff --git a/scripts/test/eyelid.xcf b/scripts/test/eyelid.xcf new file mode 100644 index 0000000000000000000000000000000000000000..1c2f1d22cb842dda7edfcabe1032889289dae164 Binary files /dev/null and b/scripts/test/eyelid.xcf differ diff --git a/scripts/test/eyes.png b/scripts/test/eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..891ab92a7f0e5414b843f126b9e04cbca86afc49 Binary files /dev/null and b/scripts/test/eyes.png differ diff --git a/scripts/test/eyes_shapexcf.xcf b/scripts/test/eyes_shapexcf.xcf new file mode 100644 index 0000000000000000000000000000000000000000..7730d1e9b75278802591ec43b827cc1c39caae55 Binary files /dev/null and b/scripts/test/eyes_shapexcf.xcf differ diff --git a/scripts/test/fichero.PDF b/scripts/test/fichero.PDF new file mode 100644 index 0000000000000000000000000000000000000000..308ce8a74ee508aef931a1ee76dd0cd5b4d141f9 Binary files /dev/null and b/scripts/test/fichero.PDF differ diff --git a/scripts/test/pupil.png b/scripts/test/pupil.png new file mode 100644 index 0000000000000000000000000000000000000000..5ba39f7e580ae67e5d2a0094796dc26cbddb0ffb Binary files /dev/null and b/scripts/test/pupil.png differ diff --git a/scripts/test/pupil.xcf b/scripts/test/pupil.xcf new file mode 100644 index 0000000000000000000000000000000000000000..631b7ea10bc8f08b2396cf72112fd94e1e5c6267 Binary files /dev/null and b/scripts/test/pupil.xcf differ diff --git a/scripts/test/skin.png b/scripts/test/skin.png new file mode 100644 index 0000000000000000000000000000000000000000..5ab9bb8fbc69ef147189f9e32fe8c1da37cdad74 Binary files /dev/null and b/scripts/test/skin.png differ diff --git a/scripts/test/skin.xcf b/scripts/test/skin.xcf new file mode 100644 index 0000000000000000000000000000000000000000..5637e932634ae4294671b46247d825f5719c0aed Binary files /dev/null and b/scripts/test/skin.xcf differ