From 5d4d02dbeac60a7c31a3b461a6c26c0e28b7eff9 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@g-node.org>
Date: Fri, 24 Nov 2023 16:18:55 +0100
Subject: [PATCH] tiny fix

---
 camconfig.cpp     |  5 -----
 camerasetup.cpp   |  4 ++++
 pylonrecorder.cpp |  3 ++-
 util.h            | 11 +++++++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/camconfig.cpp b/camconfig.cpp
index 19e67b1..2d78246 100644
--- a/camconfig.cpp
+++ b/camconfig.cpp
@@ -45,8 +45,6 @@ CamConfigurator::CamConfigurator(Pylon::DeviceInfoList_t &deviceList, QWidget *p
     connect(buttonbox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttonbox, &QDialogButtonBox::rejected, this, &QDialog::reject);
     vbox->addWidget(buttonbox);
-    //this->setLayout(vbox);
-    // qInfo() << "Create Camera configuration!";
 }
 
 
@@ -106,9 +104,6 @@ void CamConfigurator::modeChanged(int idx) {
         qDebug() << "Mode changed mode selection";
         stack->setCurrentIndex(0);
     }
-    // stack->setCurrentIndex(idx);
-    // TODO release camera?
-    // orientation_combo->setEnabled(idx == 1);
 }
 
 
diff --git a/camerasetup.cpp b/camerasetup.cpp
index aca7885..10972c3 100644
--- a/camerasetup.cpp
+++ b/camerasetup.cpp
@@ -73,9 +73,13 @@ CameraLayout DualCamera::cameraLayout() {
     if (camera1Preview->device() == primary_device) {
         l.rois.push_back(camera1Preview->getRoi());
         l.rois.push_back(camera2Preview->getRoi());
+        l.devices.push_back(camera1Preview->device().toStdString());
+        l.devices.push_back(camera2Preview->device().toStdString());
     } else {
         l.rois.push_back(camera2Preview->getRoi());
         l.rois.push_back(camera1Preview->getRoi());
+        l.devices.push_back(camera2Preview->device().toStdString());
+        l.devices.push_back(camera1Preview->device().toStdString());
     }
     return l;
 }
diff --git a/pylonrecorder.cpp b/pylonrecorder.cpp
index 1c30811..7969a81 100644
--- a/pylonrecorder.cpp
+++ b/pylonrecorder.cpp
@@ -610,8 +610,9 @@ void PylonRecorder::camerasetup() {
   std::cerr << d->result() << std::endl;
   std::cerr << "camera settings accepted" << std::endl;
   CameraLayout l = d->layout();
+  std::cerr << l.layout << l.mode << l.rois.size() << l.devices.size() << std::endl;
   std::cerr << "camera settings accepted" << std::endl;
-  
+
   delete d;
 }
 
diff --git a/util.h b/util.h
index 2bcb204..7c3ba2c 100644
--- a/util.h
+++ b/util.h
@@ -4,8 +4,15 @@
 #include <vector>
 #include <iostream>
 
-enum Layout { horizontal, vertical };
-enum CameraMode {single, dual};
+enum class Layout { 
+    horizontal,
+    vertical
+};
+
+enum class CameraMode {
+    single,
+    dual
+};
 
 struct ROI {
     int x, y, width, height;