From 0267349b8180a6dac43cdeee69fe840fffaff021 Mon Sep 17 00:00:00 2001
From: Thiago Santini <thiago.santini@uni-tuebingen.de>
Date: Mon, 27 Nov 2017 08:54:44 +0100
Subject: [PATCH] Allows camera widget to be larger than the actual image

---
 EyeRecToo/src/CameraWidget.cpp | 10 ++++++++--
 EyeRecToo/src/Synchronizer.cpp |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/EyeRecToo/src/CameraWidget.cpp b/EyeRecToo/src/CameraWidget.cpp
index ed3787f..4dd8af7 100644
--- a/EyeRecToo/src/CameraWidget.cpp
+++ b/EyeRecToo/src/CameraWidget.cpp
@@ -476,9 +476,15 @@ void CameraWidget::updateWidgetSize(const int &width, const int &height)
 		return;
 
 	frameSize = newFrameSize;
+	QSize minMaxSize = { 640 , 480 };
 	QSize maxSize = { 960 , 540 };
-	if (frameSize.width() < maxSize.width() && frameSize.height() < maxSize.height() )
+	if (frameSize.width() < maxSize.width() && frameSize.height() < maxSize.height() ) {
+		if (frameSize.width() < minMaxSize.width() && frameSize.height() < minMaxSize.height()) {
+			float ratio = minMaxSize.width() / (float) frameSize.width();
+			frameSize.setWidth(minMaxSize.width());
+			frameSize.setHeight(ratio * minMaxSize.height());
+		}
 		this->setMaximumSize( frameSize );
-	else
+	} else
 		this->setMaximumSize( maxSize );
 }
diff --git a/EyeRecToo/src/Synchronizer.cpp b/EyeRecToo/src/Synchronizer.cpp
index d8e3034..d239432 100644
--- a/EyeRecToo/src/Synchronizer.cpp
+++ b/EyeRecToo/src/Synchronizer.cpp
@@ -42,7 +42,7 @@ Synchronizer::~Synchronizer()
 
 void Synchronizer::newRightEyeData(EyeData eyeData)
 {
-    rEyeList.push_back(eyeData);
+	rEyeList.emplace_back(eyeData);
     if (rEyeList.size() > maxListSize)
         rEyeList.pop_front();
     updated = true;
@@ -52,7 +52,7 @@ void Synchronizer::newRightEyeData(EyeData eyeData)
 
 void Synchronizer::newLeftEyeData(EyeData eyeData)
 {
-    lEyeList.push_back(eyeData);
+	lEyeList.emplace_back(eyeData);
     if (lEyeList.size() > maxListSize)
         lEyeList.pop_front();
     updated = true;
@@ -63,7 +63,7 @@ void Synchronizer::newLeftEyeData(EyeData eyeData)
 
 void Synchronizer::newFieldData(FieldData fieldData)
 {
-    fieldList.push_back(fieldData);
+	fieldList.emplace_back(fieldData);
     if (fieldList.size() > maxListSize)
         fieldList.pop_front();
     updated = true;
-- 
GitLab