mirror of
https://git.libcamera.org/libcamera/libcamera.git
synced 2025-07-23 16:45:07 +03:00
qcam: CamSelectDialog: Display Location and Model propety of camera
The camera selection dialog currently only displays the camera Id. Display the camera location and camera model if available. Signed-off-by: Utkarsh Tiwari <utkarsh02t@gmail.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
parent
b63519d201
commit
d598e77aa5
2 changed files with 57 additions and 0 deletions
|
@ -7,12 +7,15 @@
|
||||||
|
|
||||||
#include "cam_select_dialog.h"
|
#include "cam_select_dialog.h"
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
#include <libcamera/camera.h>
|
#include <libcamera/camera.h>
|
||||||
#include <libcamera/camera_manager.h>
|
#include <libcamera/camera_manager.h>
|
||||||
|
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QDialogButtonBox>
|
#include <QDialogButtonBox>
|
||||||
#include <QFormLayout>
|
#include <QFormLayout>
|
||||||
|
#include <QLabel>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManager,
|
CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManager,
|
||||||
|
@ -27,6 +30,14 @@ CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManag
|
||||||
for (const auto &cam : cm_->cameras())
|
for (const auto &cam : cm_->cameras())
|
||||||
cameraIdComboBox_->addItem(QString::fromStdString(cam->id()));
|
cameraIdComboBox_->addItem(QString::fromStdString(cam->id()));
|
||||||
|
|
||||||
|
/* Set camera information labels. */
|
||||||
|
cameraLocation_ = new QLabel;
|
||||||
|
cameraModel_ = new QLabel;
|
||||||
|
|
||||||
|
updateCameraInfo(cameraIdComboBox_->currentText());
|
||||||
|
connect(cameraIdComboBox_, &QComboBox::currentTextChanged,
|
||||||
|
this, &CameraSelectorDialog::updateCameraInfo);
|
||||||
|
|
||||||
/* Setup the QDialogButton Box */
|
/* Setup the QDialogButton Box */
|
||||||
QDialogButtonBox *buttonBox =
|
QDialogButtonBox *buttonBox =
|
||||||
new QDialogButtonBox(QDialogButtonBox::Ok |
|
new QDialogButtonBox(QDialogButtonBox::Ok |
|
||||||
|
@ -39,6 +50,8 @@ CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManag
|
||||||
|
|
||||||
/* Set the layout. */
|
/* Set the layout. */
|
||||||
layout->addRow("Camera:", cameraIdComboBox_);
|
layout->addRow("Camera:", cameraIdComboBox_);
|
||||||
|
layout->addRow("Location:", cameraLocation_);
|
||||||
|
layout->addRow("Model:", cameraModel_);
|
||||||
layout->addWidget(buttonBox);
|
layout->addWidget(buttonBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,3 +73,39 @@ void CameraSelectorDialog::removeCamera(QString cameraId)
|
||||||
int cameraIndex = cameraIdComboBox_->findText(cameraId);
|
int cameraIndex = cameraIdComboBox_->findText(cameraId);
|
||||||
cameraIdComboBox_->removeItem(cameraIndex);
|
cameraIdComboBox_->removeItem(cameraIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Camera Information */
|
||||||
|
void CameraSelectorDialog::updateCameraInfo(QString cameraId)
|
||||||
|
{
|
||||||
|
const std::shared_ptr<libcamera::Camera> &camera =
|
||||||
|
cm_->get(cameraId.toStdString());
|
||||||
|
|
||||||
|
if (!camera)
|
||||||
|
return;
|
||||||
|
|
||||||
|
const libcamera::ControlList &properties = camera->properties();
|
||||||
|
|
||||||
|
const auto &location = properties.get(libcamera::properties::Location);
|
||||||
|
if (location) {
|
||||||
|
switch (*location) {
|
||||||
|
case libcamera::properties::CameraLocationFront:
|
||||||
|
cameraLocation_->setText("Internal front camera");
|
||||||
|
break;
|
||||||
|
case libcamera::properties::CameraLocationBack:
|
||||||
|
cameraLocation_->setText("Internal back camera");
|
||||||
|
break;
|
||||||
|
case libcamera::properties::CameraLocationExternal:
|
||||||
|
cameraLocation_->setText("External camera");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
cameraLocation_->setText("Unknown");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
cameraLocation_->setText("Unknown");
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto &model = properties.get(libcamera::properties::Model)
|
||||||
|
.value_or("Unknown");
|
||||||
|
|
||||||
|
cameraModel_->setText(QString::fromStdString(model));
|
||||||
|
}
|
||||||
|
|
|
@ -11,11 +11,14 @@
|
||||||
|
|
||||||
#include <libcamera/camera.h>
|
#include <libcamera/camera.h>
|
||||||
#include <libcamera/camera_manager.h>
|
#include <libcamera/camera_manager.h>
|
||||||
|
#include <libcamera/controls.h>
|
||||||
|
#include <libcamera/property_ids.h>
|
||||||
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
class QComboBox;
|
class QComboBox;
|
||||||
|
class QLabel;
|
||||||
|
|
||||||
class CameraSelectorDialog : public QDialog
|
class CameraSelectorDialog : public QDialog
|
||||||
{
|
{
|
||||||
|
@ -31,9 +34,14 @@ public:
|
||||||
void addCamera(QString cameraId);
|
void addCamera(QString cameraId);
|
||||||
void removeCamera(QString cameraId);
|
void removeCamera(QString cameraId);
|
||||||
|
|
||||||
|
/* Camera Information */
|
||||||
|
void updateCameraInfo(QString cameraId);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
libcamera::CameraManager *cm_;
|
libcamera::CameraManager *cm_;
|
||||||
|
|
||||||
/* UI elements. */
|
/* UI elements. */
|
||||||
QComboBox *cameraIdComboBox_;
|
QComboBox *cameraIdComboBox_;
|
||||||
|
QLabel *cameraLocation_;
|
||||||
|
QLabel *cameraModel_;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue