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

Passing camera parameters through GUI in image reading.

Browse source
This commit is contained in:
Tadas Baltrusaitis 2018-01-31 21:08:54 +00:00
parent 738618455d
commit a15a8419ad
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/OpenFaceOffline/MainWindow.xaml.cs
View file

@ -737,7 +737,7 @@ namespace OpenFaceOffline
StopTracking(); StopTracking();
var image_files = openMediaDialog(true); var image_files = openMediaDialog(true);
ImageReader reader = new ImageReader(image_files); ImageReader reader = new ImageReader(image_files, fx, fy, cx, cy);
processing_thread = new Thread(() => ProcessIndividualImages(reader)); processing_thread = new Thread(() => ProcessIndividualImages(reader));
processing_thread.Start(); processing_thread.Start();
@ -754,7 +754,7 @@ namespace OpenFaceOffline
string directory = openDirectory(); string directory = openDirectory();
if(!string.IsNullOrWhiteSpace(directory)) if(!string.IsNullOrWhiteSpace(directory))
{ {
ImageReader reader = new ImageReader(directory); ImageReader reader = new ImageReader(directory, fx, fy, cx, cy);
processing_thread = new Thread(() => ProcessIndividualImages(reader)); processing_thread = new Thread(() => ProcessIndividualImages(reader));
processing_thread.Start(); processing_thread.Start();

8
lib/local/CppInerop/ImageReader.h
View file

@ -79,14 +79,14 @@ namespace UtilitiesOF {
public: public:
// Can provide a directory, or a list of files // Can provide a directory, or a list of files
ImageReader(System::String^ image_directory) ImageReader(System::String^ image_directory, float fx, float fy, float cx, float cy)
{ {
m_image_capture = new Utilities::ImageCapture(); m_image_capture = new Utilities::ImageCapture();
m_is_opened = new bool; m_is_opened = new bool;
std::string image_dir_std = msclr::interop::marshal_as<std::string>(image_directory); std::string image_dir_std = msclr::interop::marshal_as<std::string>(image_directory);
*m_is_opened = m_image_capture->OpenDirectory(image_dir_std); *m_is_opened = m_image_capture->OpenDirectory(image_dir_std, "", fx, fy, cx, cy);
if (!*m_is_opened) if (!*m_is_opened)
{ {
@ -94,7 +94,7 @@ namespace UtilitiesOF {
} }
} }
// Can provide a directory, or a list of files // Can provide a directory, or a list of files
ImageReader(System::Collections::Generic::List<System::String^>^ image_files) ImageReader(System::Collections::Generic::List<System::String^>^ image_files, float fx, float fy, float cx, float cy)
{ {
m_image_capture = new Utilities::ImageCapture(); m_image_capture = new Utilities::ImageCapture();
m_is_opened = new bool; m_is_opened = new bool;
@ -108,7 +108,7 @@ namespace UtilitiesOF {
} }
*m_is_opened = m_image_capture->OpenImageFiles(image_files_std); *m_is_opened = m_image_capture->OpenImageFiles(image_files_std, fx, fy, cx, cy);
if (!*m_is_opened) if (!*m_is_opened)
{ {