r/sustaining_gazes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adding missing OpenBLAS refs, also unifying csv output precision between GUI and console versions of code.

Browse source
This commit is contained in:
Tadas Baltrusaitis 2017-10-28 22:03:12 +01:00
parent b668facb00
commit 9db16cbb60
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gui/OpenFaceOffline/Recorder.cs
View file

@ -214,10 +214,10 @@ namespace OpenFaceOffline
List<Tuple<double, double>> landmarks_2d = clnf_model.CalculateAllEyeLandmarks();
for (int i = 0; i < landmarks_2d.Count; ++i)
output_features_file.Write(", {0:F2}", landmarks_2d[i].Item1);
output_features_file.Write(", {0:F3}", landmarks_2d[i].Item1);
for (int i = 0; i < landmarks_2d.Count; ++i)
output_features_file.Write(", {0:F2}", landmarks_2d[i].Item2);
output_features_file.Write(", {0:F3}", landmarks_2d[i].Item2);
}
@ -229,10 +229,10 @@ namespace OpenFaceOffline
List<Tuple<double, double>> landmarks_2d = clnf_model.CalculateAllLandmarks();
for (int i = 0; i < landmarks_2d.Count; ++i)
output_features_file.Write(", {0:F2}", landmarks_2d[i].Item1);
output_features_file.Write(", {0:F3}", landmarks_2d[i].Item1);
for (int i = 0; i < landmarks_2d.Count; ++i)
output_features_file.Write(", {0:F2}", landmarks_2d[i].Item2);
output_features_file.Write(", {0:F3}", landmarks_2d[i].Item2);
}
if (output_3D_landmarks)
@ -240,13 +240,13 @@ namespace OpenFaceOffline
List<System.Windows.Media.Media3D.Point3D> landmarks_3d = clnf_model.Calculate3DLandmarks(fx, fy, cx, cy);
for (int i = 0; i < landmarks_3d.Count; ++i)
output_features_file.Write(", {0:F2}", landmarks_3d[i].X);
output_features_file.Write(", {0:F3}", landmarks_3d[i].X);
for (int i = 0; i < landmarks_3d.Count; ++i)
output_features_file.Write(", {0:F2}", landmarks_3d[i].Y);
output_features_file.Write(", {0:F3}", landmarks_3d[i].Y);
for (int i = 0; i < landmarks_3d.Count; ++i)
output_features_file.Write(", {0:F2}", landmarks_3d[i].Z);
output_features_file.Write(", {0:F3}", landmarks_3d[i].Z);
}
if (output_model_params)
@ -296,5 +296,12 @@ namespace OpenFaceOffline
face_analyser.PostProcessOutputFile(out_filename);
}
static void RecordImg(string root, string filename, int width, int height, bool output_2D_landmarks, bool output_3D_landmarks, bool output_model_params,
bool output_pose, bool output_AUs, bool output_gaze, bool record_aligned, bool record_HOG,
CLNF clnf_model, FaceAnalyserManaged face_analyser, double fx, double fy, double cx, double cy, bool dynamic_AU_model)
{
}
}
}

4
lib/local/CppInerop/CppInerop.vcxproj
View file

@ -67,6 +67,7 @@
<Import Project="..\..\3rdParty\boost\boost_d.props" />
<Import Project="..\..\3rdParty\tbb\tbb_d.props" />
<Import Project="..\CamCom\CamCom.props" />
<Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -75,6 +76,7 @@
<Import Project="..\..\3rdParty\boost\boost.props" />
<Import Project="..\..\3rdParty\tbb\tbb.props" />
<Import Project="..\CamCom\CamCom.props" />
<Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -83,6 +85,7 @@
<Import Project="..\..\3rdParty\boost\boost_d.props" />
<Import Project="..\..\3rdParty\tbb\tbb_d.props" />
<Import Project="..\CamCom\CamCom.props" />
<Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -91,6 +94,7 @@
<Import Project="..\..\3rdParty\boost\boost.props" />
<Import Project="..\..\3rdParty\tbb\tbb.props" />
<Import Project="..\CamCom\CamCom.props" />
<Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">