diff --git a/camerasetup.cpp b/camerasetup.cpp index 10972c3..1486985 100644 --- a/camerasetup.cpp +++ b/camerasetup.cpp @@ -10,6 +10,7 @@ SingleCamera::SingleCamera (QWidget *parent) : this->layout()->addWidget(camera1Preview); } + CameraLayout SingleCamera::cameraLayout(){ CameraLayout l; qDebug() << "Request layout"; @@ -20,6 +21,7 @@ CameraLayout SingleCamera::cameraLayout(){ return l; } + SingleCamera::~SingleCamera(){ if (camera1Preview != nullptr) { delete camera1Preview; @@ -33,7 +35,8 @@ DualCamera::DualCamera (QWidget *parent) : camera1Preview(nullptr), camera2Preview(nullptr), primary_device("") { - qDebug() << "DualCamera View ... "; + qDebug() << "DualCamera View constructor... "; + std::cerr << "DualCamera View constructor... " << std::endl; this->setLayout(new QHBoxLayout(this)); camera1Preview = new CameraPreview(); camera2Preview = new CameraPreview(); @@ -46,11 +49,17 @@ DualCamera::DualCamera (QWidget *parent) : void DualCamera::updateROI1(int x, int y, int w, int h) { - camera2Preview->setSize(w, h); + qDebug() << "Update ROI1: x " << x << " y " << y << " w " << w << " h " << h; + if (camera2Preview != nullptr) { + camera2Preview->setSize(w, h); + } } void DualCamera::updateROI2(int x, int y, int w, int h) { - camera1Preview->setSize(w, h); + qDebug() << "Update ROI2: x " << x << " y " << y << " w " << w << " h " << h; + if (camera1Preview != nullptr) { + camera1Preview->setSize(w, h); + } } void DualCamera::switchArrangement() { diff --git a/camerasetup.h b/camerasetup.h index de39834..99b5292 100644 --- a/camerasetup.h +++ b/camerasetup.h @@ -62,7 +62,7 @@ public: void setPrimaryCamera(QString &device) { - qDebug() << "Update primary camera"; + qDebug() << "Update primary camera to " << device; if (camera1Preview != nullptr) { camera1Preview->setCamera(device); primary_device = device; @@ -71,7 +71,7 @@ public: void setSecondaryCamera(QString &device) { - qDebug()<< "Update secondary camera"; + qDebug()<< "Update secondary camera to " << device; if (camera2Preview != nullptr) { camera2Preview->setCamera(device); }