[camsetup] better messaging,
This commit is contained in:
parent
6916899620
commit
63dbc21df8
@ -10,6 +10,7 @@ SingleCamera::SingleCamera (QWidget *parent) :
|
|||||||
this->layout()->addWidget(camera1Preview);
|
this->layout()->addWidget(camera1Preview);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
CameraLayout SingleCamera::cameraLayout(){
|
CameraLayout SingleCamera::cameraLayout(){
|
||||||
CameraLayout l;
|
CameraLayout l;
|
||||||
qDebug() << "Request layout";
|
qDebug() << "Request layout";
|
||||||
@ -20,6 +21,7 @@ CameraLayout SingleCamera::cameraLayout(){
|
|||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SingleCamera::~SingleCamera(){
|
SingleCamera::~SingleCamera(){
|
||||||
if (camera1Preview != nullptr) {
|
if (camera1Preview != nullptr) {
|
||||||
delete camera1Preview;
|
delete camera1Preview;
|
||||||
@ -33,7 +35,8 @@ DualCamera::DualCamera (QWidget *parent) :
|
|||||||
camera1Preview(nullptr),
|
camera1Preview(nullptr),
|
||||||
camera2Preview(nullptr),
|
camera2Preview(nullptr),
|
||||||
primary_device("") {
|
primary_device("") {
|
||||||
qDebug() << "DualCamera View ... ";
|
qDebug() << "DualCamera View constructor... ";
|
||||||
|
std::cerr << "DualCamera View constructor... " << std::endl;
|
||||||
this->setLayout(new QHBoxLayout(this));
|
this->setLayout(new QHBoxLayout(this));
|
||||||
camera1Preview = new CameraPreview();
|
camera1Preview = new CameraPreview();
|
||||||
camera2Preview = new CameraPreview();
|
camera2Preview = new CameraPreview();
|
||||||
@ -46,11 +49,17 @@ DualCamera::DualCamera (QWidget *parent) :
|
|||||||
|
|
||||||
|
|
||||||
void DualCamera::updateROI1(int x, int y, int w, int h) {
|
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) {
|
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() {
|
void DualCamera::switchArrangement() {
|
||||||
|
@ -62,7 +62,7 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
void setPrimaryCamera(QString &device) {
|
void setPrimaryCamera(QString &device) {
|
||||||
qDebug() << "Update primary camera";
|
qDebug() << "Update primary camera to " << device;
|
||||||
if (camera1Preview != nullptr) {
|
if (camera1Preview != nullptr) {
|
||||||
camera1Preview->setCamera(device);
|
camera1Preview->setCamera(device);
|
||||||
primary_device = device;
|
primary_device = device;
|
||||||
@ -71,7 +71,7 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
void setSecondaryCamera(QString &device) {
|
void setSecondaryCamera(QString &device) {
|
||||||
qDebug()<< "Update secondary camera";
|
qDebug()<< "Update secondary camera to " << device;
|
||||||
if (camera2Preview != nullptr) {
|
if (camera2Preview != nullptr) {
|
||||||
camera2Preview->setCamera(device);
|
camera2Preview->setCamera(device);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user