ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-05-22 15:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Integrating OpenFace 1.0.0 changes into CE-CLM branch

Browse Source
This commit is contained in:
Tadas Baltrusaitis
2018-04-04 17:48:44 +01:00
parent d26107b219
commit 937e2de488
25 changed files with 501 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/OpenFaceOffline/MainWindow.xaml
View File

@@ -63,23 +63,23 @@
<MenuItem IsCheckable="True" Header="Show AUs" Click="VisualisationChange" IsChecked="{Binding ShowAUs}"/>
</MenuItem>
<MenuItem Header="Face Detector">
<MenuItem Header="Face Detector" Name="FaceDetectorMenu">
<MenuItem x:Name="FaceDetHaar" Header="OpenCV (Haar)" IsCheckable="true" IsChecked="{Binding DetectorHaar}"></MenuItem>
<MenuItem x:Name="FaceDetHOG" Header="dlib (HOG-SVM)" IsCheckable="true" IsChecked="{Binding DetectorHOG}"></MenuItem>
<MenuItem x:Name="FaceDetCNN" Header="OpenFace (MTCNN)" IsCheckable="true" IsChecked="{Binding DetectorCNN}"></MenuItem>
<i:Interaction.Behaviors>
<local:ExclusiveMenuItemBehavior></local:ExclusiveMenuItemBehavior>
<OpenFaceOffline:ExclusiveMenuItemBehavior></OpenFaceOffline:ExclusiveMenuItemBehavior>
</i:Interaction.Behaviors>
</MenuItem>
<MenuItem Header="Landmark Detector">
<MenuItem Header="Landmark Detector" Name="LandmarkDetectorMenu">
<MenuItem x:Name="LandmarkDetCLM" Header="CLM" IsCheckable="true" IsChecked="{Binding LandmarkDetectorCLM}"></MenuItem>
<MenuItem x:Name="LandmarkDetCLNF" Header="CLNF" IsCheckable="true" IsChecked="{Binding LandmarkDetectorCLNF}"></MenuItem>
<MenuItem x:Name="LandmarkDetCECLM" Header="CE-CLM" IsCheckable="true" IsChecked="{Binding LandmarkDetectorCECLM}"></MenuItem>
<i:Interaction.Behaviors>
<local:ExclusiveMenuItemBehavior></local:ExclusiveMenuItemBehavior>
<OpenFaceOffline:ExclusiveMenuItemBehavior></OpenFaceOffline:ExclusiveMenuItemBehavior>
</i:Interaction.Behaviors>
</MenuItem>

10
gui/OpenFaceOffline/MainWindow.xaml.cs
View File

@@ -162,7 +162,6 @@ namespace OpenFaceOffline
gaze_analyser = new GazeAnalyserManaged();
}
// ----------------------------------------------------------
@@ -202,7 +201,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);
@@ -241,6 +240,7 @@ namespace OpenFaceOffline
// The face analysis step (for AUs and eye gaze)
face_analyser.AddNextFrame(frame, landmark_detector.CalculateAllLandmarks(), detection_succeeding, false);
gaze_analyser.AddNextFrame(landmark_detector, detection_succeeding, reader.GetFx(), reader.GetFy(), reader.GetCx(), reader.GetCy());
// Only the final face will contain the details
@@ -295,7 +295,7 @@ namespace OpenFaceOffline
// 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)
@@ -630,6 +630,8 @@ namespace OpenFaceOffline
SettingsMenu.IsEnabled = false;
RecordingMenu.IsEnabled = false;
AUSetting.IsEnabled = false;
FaceDetectorMenu.IsEnabled = false;
LandmarkDetectorMenu.IsEnabled = false;
PauseButton.IsEnabled = true;
StopButton.IsEnabled = true;
@@ -659,6 +661,8 @@ namespace OpenFaceOffline
SettingsMenu.IsEnabled = true;
RecordingMenu.IsEnabled = true;
AUSetting.IsEnabled = true;
FaceDetectorMenu.IsEnabled = true;
LandmarkDetectorMenu.IsEnabled = true;
PauseButton.IsEnabled = false;
StopButton.IsEnabled = false;