From 5ed6c4a6f395f33d63025a6b6eee1ccd299fd158 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Sat, 24 Mar 2018 10:30:30 +0000 Subject: [PATCH] Starting integration of AU visualization in CLI code. --- exe/FaceLandmarkVid/FaceLandmarkVid.cpp | 2 +- gui/OpenFaceOffline/MainWindow.xaml.cs | 4 ++-- lib/local/CppInerop/VisualizerInterop.h | 4 ++-- lib/local/Utilities/include/Visualizer.h | 2 +- lib/local/Utilities/src/Visualizer.cpp | 4 +++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.cpp b/exe/FaceLandmarkVid/FaceLandmarkVid.cpp index 6f6fc09..2666579 100644 --- a/exe/FaceLandmarkVid/FaceLandmarkVid.cpp +++ b/exe/FaceLandmarkVid/FaceLandmarkVid.cpp @@ -108,7 +108,7 @@ int main (int argc, char **argv) Utilities::SequenceCapture sequence_reader; // A utility for visualizing the results (show just the tracks) - Utilities::Visualizer visualizer(true, false, false); + Utilities::Visualizer visualizer(true, false, false, false); // Tracking FPS for visualization Utilities::FpsTracker fps_tracker; diff --git a/gui/OpenFaceOffline/MainWindow.xaml.cs b/gui/OpenFaceOffline/MainWindow.xaml.cs index 6900fa1..4ed0f2d 100644 --- a/gui/OpenFaceOffline/MainWindow.xaml.cs +++ b/gui/OpenFaceOffline/MainWindow.xaml.cs @@ -185,7 +185,7 @@ namespace OpenFaceOffline face_model_params.optimiseForVideo(); // Setup the visualization - Visualizer visualizer_of = new Visualizer(ShowTrackedVideo || RecordTracked, ShowAppearance, ShowAppearance); + Visualizer visualizer_of = new Visualizer(ShowTrackedVideo || RecordTracked, ShowAppearance, ShowAppearance, false); // Initialize the face analyser face_analyser = new FaceAnalyserManaged(AppDomain.CurrentDomain.BaseDirectory, DynamicAUModels, image_output_size, MaskAligned); @@ -273,7 +273,7 @@ namespace OpenFaceOffline face_model_params.optimiseForImages(); // Setup the visualization - Visualizer visualizer_of = new Visualizer(ShowTrackedVideo || RecordTracked, ShowAppearance, ShowAppearance); + Visualizer visualizer_of = new Visualizer(ShowTrackedVideo || RecordTracked, ShowAppearance, ShowAppearance, false); // Initialize the face detector if it has not been initialized yet if (face_detector == null) diff --git a/lib/local/CppInerop/VisualizerInterop.h b/lib/local/CppInerop/VisualizerInterop.h index db8b2ca..0769ffe 100644 --- a/lib/local/CppInerop/VisualizerInterop.h +++ b/lib/local/CppInerop/VisualizerInterop.h @@ -54,9 +54,9 @@ namespace UtilitiesOF { public: - Visualizer(bool vis_track, bool vis_hog, bool vis_aligned) + Visualizer(bool vis_track, bool vis_hog, bool vis_aligned, bool vis_aus) { - m_visualizer = new Utilities::Visualizer(vis_track, vis_hog, vis_aligned); + m_visualizer = new Utilities::Visualizer(vis_track, vis_hog, vis_aligned, vis_aus); } void SetObservationGaze(System::Tuple^ gaze_direction0, System::Tuple^ gaze_direction1, diff --git a/lib/local/Utilities/include/Visualizer.h b/lib/local/Utilities/include/Visualizer.h index bfe6ff2..852bf7d 100644 --- a/lib/local/Utilities/include/Visualizer.h +++ b/lib/local/Utilities/include/Visualizer.h @@ -54,7 +54,7 @@ namespace Utilities // The constructor for the visualizer that specifies what to visualize Visualizer(std::vector arguments); - Visualizer(bool vis_track, bool vis_hog, bool vis_align); + Visualizer(bool vis_track, bool vis_hog, bool vis_align, bool vis_aus); // Adding observations to the visualizer diff --git a/lib/local/Utilities/src/Visualizer.cpp b/lib/local/Utilities/src/Visualizer.cpp index 3df3593..ded10c6 100644 --- a/lib/local/Utilities/src/Visualizer.cpp +++ b/lib/local/Utilities/src/Visualizer.cpp @@ -86,6 +86,7 @@ Visualizer::Visualizer(std::vector arguments) vis_track = true; vis_align = true; vis_hog = true; + vis_aus = true; } else if (arguments[i].compare("-vis-align") == 0) { @@ -107,11 +108,12 @@ Visualizer::Visualizer(std::vector arguments) } -Visualizer::Visualizer(bool vis_track, bool vis_hog, bool vis_align) +Visualizer::Visualizer(bool vis_track, bool vis_hog, bool vis_align, bool vis_aus) { this->vis_track = vis_track; this->vis_hog = vis_hog; this->vis_align = vis_align; + this->vis_aus = vis_aus; }