Add preview button to Image tab in settings

src/cameraclient.cpp

@@ -20,11 +20,21 @@ CameraClient::CameraClient(QObject *parent): QObject(parent) {
 	connect(m_pollingNam, &QNetworkAccessManager::finished, this, &CameraClient::handlePollResponse);
 }
 
+void CameraClient::setPresetVC(int preset, VideoConfig const&vc) {
+	if (preset > 0 && preset < MaxCameraPresets) {
+		get(QString("/cgi-bin/ptzctrl.cgi?ptzcmd&poscall&%1").arg(preset));
+		setBrightness(vc.brightness);
+		setSaturation(vc.saturation);
+		setContrast(vc.contrast);
+		setSharpness(vc.sharpness);
+		setHue(vc.hue);
+	}
+}
+
 void CameraClient::setPreset(int preset) {
 	if (preset > 0 && preset < MaxCameraPresets) {
 		get(QString("/cgi-bin/ptzctrl.cgi?ptzcmd&poscall&%1").arg(preset));
-		--preset;
+		auto const vc = getVideoConfig()[preset - 1];
-		auto const vc = getVideoConfig()[preset];
 		setBrightness(vc.brightness);
 		setSaturation(vc.saturation);
 		setContrast(vc.contrast);

src/cameraclient.hpp

@@ -25,6 +25,8 @@ class CameraClient: public QObject {
 	public:
 		explicit CameraClient(QObject *parent = nullptr);
 
+		void setPresetVC(int preset, struct VideoConfig const&vc);
+
 		void setPreset(int preset);
 
 		void setBrightness(int val);

src/mainwindow.cpp

@@ -198,6 +198,7 @@ void MainWindow::setupViewControls(QVBoxLayout *rootLyt) {
 
 void MainWindow::openSettings() {
 	SettingsDialog d(this);
+	connect(&d, &SettingsDialog::previewPreset, &m_cameraClient, &CameraClient::setPreset);
 	auto const result = d.exec();
 	if (result == QDialog::Accepted) {
 		m_cameraClient.setBaseUrl();

src/settingsdata.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QHash>
+#include <cstdint>
 #include <QString>
 #include <QVector>
 
@@ -24,7 +24,7 @@ void setVideoConfig(class QSettings &settings, QVector<VideoConfig> const&vc);
 
 void setVideoConfig(QVector<VideoConfig> const&vc);
 
-QVector<VideoConfig> getVideoConfig(QSettings &settings);
+QVector<VideoConfig> getVideoConfig(class QSettings &settings);
 
 QVector<VideoConfig> getVideoConfig();
 

src/settingsdialog.cpp

@@ -15,7 +15,6 @@
 #include <QLineEdit>
 #include <QPushButton>
 #include <QSettings>
-#include <QSlider>
 #include <QSpacerItem>
 #include <QSpinBox>
 #include <QTabWidget>
@@ -87,37 +86,56 @@ QWidget *SettingsDialog::setupNetworkInputs(QWidget *parent) {
 
 QWidget *SettingsDialog::setupImageConfig(QWidget *parent) {
 	auto const root = new QWidget(parent);
-	auto const lyt = new QFormLayout(root);
+	auto const lyt = new QVBoxLayout(root);
-	m_videoConfig = getVideoConfig();
+	{
-	auto const mkSb = [parent, lyt](QString lbl) {
+		auto const formRoot = new QWidget(parent);
-		auto const s = new QSpinBox(parent);
+		auto const formLyt = new QFormLayout(formRoot);
-		s->setAlignment(Qt::AlignRight);
+		lyt->addWidget(formRoot);
-		s->setRange(0, 14);
+		m_videoConfig = getVideoConfig();
-		lyt->addRow(lbl, s);
+		auto const mkSb = [parent, formLyt](QString const&lbl) {
-		return s;
+			auto const s = new QSpinBox(parent);
-	};
+			s->setAlignment(Qt::AlignRight);
-	auto const presetNo = new QComboBox(parent);
+			s->setRange(0, 14);
-	connect(presetNo, &QComboBox::currentIndexChanged, this, &SettingsDialog::updateVidConfigPreset);
+			formLyt->addRow(lbl, s);
-	for (auto i = 0; i < MaxCameraPresets; ++i) {
+			return s;
-		presetNo->addItem(tr("Camera Preset %1").arg(i + 1));
+		};
+		auto const presetNo = new QComboBox(parent);
+		connect(presetNo, &QComboBox::currentIndexChanged, this, &SettingsDialog::updateVidConfigPreset);
+		for (auto i = 0; i < MaxCameraPresets; ++i) {
+			presetNo->addItem(tr("Camera Preset %1").arg(i + 1));
+		}
+		formLyt->addRow(presetNo);
+		m_vidBrightness = mkSb(tr("&Brightness:"));
+		m_vidSaturation = mkSb(tr("&Saturation:"));
+		m_vidContrast = mkSb(tr("Con&trast:"));
+		m_vidSharpness = mkSb(tr("Sh&arpness:"));
+		m_vidHue = mkSb(tr("&Hue:"));
+		updateVidConfigPreset(0);
+	}
+	{
+		auto const btnRoot = new QWidget(parent);
+		auto const btnLyt = new QHBoxLayout(btnRoot);
+		lyt->addWidget(btnRoot);
+		btnLyt->setAlignment(Qt::AlignRight);
+		auto const previewBtn = new QPushButton(tr("&Preview"), btnRoot);
+		btnLyt->addWidget(previewBtn);
+		connect(previewBtn, &QPushButton::clicked, this, [this] {
+			this->collectVideoConfig();
+			auto const &vc = m_videoConfig[m_vidCurrentPreset];
+			emit previewPreset(m_vidCurrentPreset + 1, vc);
+		});
 	}
-	lyt->addRow(presetNo);
-	m_vidBrightness = mkSb(tr("&Brightness:"));
-	m_vidSaturation = mkSb(tr("&Saturation:"));
-	m_vidContrast = mkSb(tr("Con&trast:"));
-	m_vidSharpness = mkSb(tr("Sh&arpness:"));
-	m_vidHue = mkSb(tr("&Hue:"));
-	updateVidConfigPreset(0);
 	return root;
 }
 
 QWidget *SettingsDialog::setupViewConfig(QWidget *parent) {
 	auto const root = new QWidget(parent);
 	auto const lyt = new QVBoxLayout(root);
-	// table
+	auto const btnsRoot = new QWidget(root);
-	m_viewTable = new QTableWidget(parent);
+	m_viewTable = new QTableWidget(root);
-	{
+	lyt->addWidget(btnsRoot);
-		lyt->addWidget(m_viewTable);
+	lyt->addWidget(m_viewTable);
+	{ // table
 		QStringList columns;
 		columns.resize(ViewColumn::Count);
 		columns[ViewColumn::Name] = tr("Name");
@@ -134,19 +152,16 @@ QWidget *SettingsDialog::setupViewConfig(QWidget *parent) {
 		m_viewTable->setColumnWidth(3, 70);
 		hdr->setStretchLastSection(true);
 	}
-	// add/removes buttons
+	{ // add/removes buttons
-	{
-		auto const btnsRoot = new QWidget(root);
 		auto const btnsLyt = new QHBoxLayout(btnsRoot);
-		auto const addBtn = new QPushButton("+", btnsRoot);
+		auto const addBtn = new QPushButton("&Add", btnsRoot);
-		auto const rmBtn = new QPushButton("-", btnsRoot);
+		auto const rmBtn = new QPushButton("&Remove", btnsRoot);
-		addBtn->setFixedWidth(20);
+		addBtn->setFixedWidth(70);
-		rmBtn->setFixedWidth(20);
+		rmBtn->setFixedWidth(70);
 		rmBtn->setDisabled(true);
-		lyt->addWidget(btnsRoot);
 		btnsLyt->addWidget(addBtn);
 		btnsLyt->addWidget(rmBtn);
-		btnsLyt->addSpacerItem(new QSpacerItem(1000, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
+		btnsLyt->setAlignment(Qt::AlignLeft);
 		connect(addBtn, &QPushButton::clicked, this, [this, addBtn] {
 			auto const row = m_viewTable->rowCount();
 			m_viewTable->setRowCount(row + 1);

src/settingsdialog.hpp

@@ -49,4 +49,6 @@ class SettingsDialog: public QDialog {
 		void collectVideoConfig();
 		void updateVidConfigPreset(int preset);
 		void updateVidConfigPresetCollect(int preset);
+	signals:
+		void previewPreset(int, VideoConfig const&);
 };