commit

faceAnalysis.py

@@ -3,15 +3,15 @@ import keras
 import numpy as np
 import cv2
 from utils import *
-from config import emotions, input_shape
+from config import emotions, input_shape, modelName
 
 def detectEmotion(face):
 	#Return the most likely emotion there is on a 48x48x1 gray face
-	#input = 48
 	
-	face = normAndResize(face, input_shape)
+	face = normAndResize(face, input_shape)		#Process our image for input of model
+
+	model = keras.models.load_model(modelName)	#Load our model
 
-	model = keras.models.load_model('firstModel')	#Load our model
 	emotionVect = predir(model, face)	
 	emotionNbr = np.argmax(emotionVect)			 
 	emotion = emotions[emotionNbr]

imageProcess.py

@@ -53,9 +53,9 @@ def selectFace(image):
         face = image[y:y+h, x:x+w]
         return face
 
-image = cv2.imread("cagnol.jpg", 1)  #Load Cagnol colored image
-imageProcess(image)
-cv2.imshow("Cagnol", image)
-cv2.waitKey(0)
-cv2.destroyAllWindows()
+# image = cv2.imread("cagnol.jpg", 1)  #Load Cagnol colored image
+# imageProcess(image)
+# cv2.imshow("Cagnol", image)
+# cv2.waitKey(0)
+# cv2.destroyAllWindows()