jgrewe/PylonRecorder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tiny fix

Browse Source
This commit is contained in:
Jan Grewe 2023-11-24 16:18:55 +01:00
parent 2ed9b22123
commit 5d4d02dbea
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
camconfig.cpp
View File

@ -45,8 +45,6 @@ CamConfigurator::CamConfigurator(Pylon::DeviceInfoList_t &deviceList, QWidget *p
connect(buttonbox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(buttonbox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonbox, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(buttonbox, &QDialogButtonBox::rejected, this, &QDialog::reject);
vbox->addWidget(buttonbox); vbox->addWidget(buttonbox);
//this->setLayout(vbox);
// qInfo() << "Create Camera configuration!";
} }
@ -106,9 +104,6 @@ void CamConfigurator::modeChanged(int idx) {
qDebug() << "Mode changed mode selection"; qDebug() << "Mode changed mode selection";
stack->setCurrentIndex(0); stack->setCurrentIndex(0);
} }
// stack->setCurrentIndex(idx);
// TODO release camera?
// orientation_combo->setEnabled(idx == 1);
} }

4
camerasetup.cpp
View File

@ -73,9 +73,13 @@ CameraLayout DualCamera::cameraLayout() {
if (camera1Preview->device() == primary_device) { if (camera1Preview->device() == primary_device) {
l.rois.push_back(camera1Preview->getRoi()); l.rois.push_back(camera1Preview->getRoi());
l.rois.push_back(camera2Preview->getRoi()); l.rois.push_back(camera2Preview->getRoi());
l.devices.push_back(camera1Preview->device().toStdString());
l.devices.push_back(camera2Preview->device().toStdString());
} else { } else {
l.rois.push_back(camera2Preview->getRoi()); l.rois.push_back(camera2Preview->getRoi());
l.rois.push_back(camera1Preview->getRoi()); l.rois.push_back(camera1Preview->getRoi());
l.devices.push_back(camera2Preview->device().toStdString());
l.devices.push_back(camera1Preview->device().toStdString());
} }
return l; return l;
} }

1
pylonrecorder.cpp
View File

@ -610,6 +610,7 @@ void PylonRecorder::camerasetup() {
std::cerr << d->result() << std::endl; std::cerr << d->result() << std::endl;
std::cerr << "camera settings accepted" << std::endl; std::cerr << "camera settings accepted" << std::endl;
CameraLayout l = d->layout(); 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; std::cerr << "camera settings accepted" << std::endl;
delete d; delete d;

11
util.h
View File

@ -4,8 +4,15 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
enum Layout { horizontal, vertical }; enum class Layout {
enum CameraMode {single, dual}; horizontal,
vertical
};
enum class CameraMode {
single,
dual
};
struct ROI { struct ROI {
int x, y, width, height; int x, y, width, height;