diff --git a/opencv-webcam-demo/opencv-webcam-demo.cpp b/opencv-webcam-demo/opencv-webcam-demo.cpp index 144b5b8..9a7a960 100644 --- a/opencv-webcam-demo/opencv-webcam-demo.cpp +++ b/opencv-webcam-demo/opencv-webcam-demo.cpp @@ -47,21 +47,29 @@ std::string getAsJson(const std::map faces, const double timeStamp // << affdex::EmojiToString(f.emojis.dominantEmoji) << ","; float *values = (float *)&f.measurements.orientation; - for (std::string angle : PlottingImageListener.headAngles) + for (std::string angle : { "pitch", "yaw", "roll" }) { ss << "'" << angle << "':" << (*values) << ","; values++; } values = (float *)&f.emotions; - for (std::string emotion : PlottingImageListener.emotions) + for (std::string emotion : { + "joy", "fear", "disgust", "sadness", "anger", + "surprise", "contempt", "valence", "engagement" + }) { ss << "'" << emotion << "':" << (*values) << ","; values++; } values = (float *)&f.expressions; - for (std::string expression : PlottingImageListener.expressions) + for (std::string expression : expressions = { + "smile", "innerBrowRaise", "browRaise", "browFurrow", "noseWrinkle", + "upperLipRaise", "lipCornerDepressor", "chinRaise", "lipPucker", "lipPress", + "lipSuck", "mouthOpen", "smirk", "eyeClosure", "attention", "eyeWiden", "cheekRaise", + "lidTighten", "dimpler", "lipStretch", "jawDrop" + }) { ss << "'" << expression << "':" << (*values) << ","; values++;