Skip to content

Commit f24d105

Browse files
committed
Fixed a few slider enable/disable bugs in QtCaptureText
1 parent 33da1da commit f24d105

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

QtCaptureTest/mainwindow.cpp

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ void MainWindow::readCameraSettings()
239239
m_hasFocus = false;
240240
m_hasZoom = false;
241241

242-
ui->exposureSlider->setEnabled(true);
243-
ui->gainSlider->setEnabled(true);
244-
ui->whitebalanceSlider->setEnabled(true);
242+
ui->exposureSlider->setEnabled(false);
243+
ui->gainSlider->setEnabled(false);
244+
ui->whitebalanceSlider->setEnabled(false);
245245

246246
// ********************************************************************************
247247
// AUTO EXPOSURE
@@ -287,7 +287,6 @@ void MainWindow::readCameraSettings()
287287
{
288288
ui->autoWhiteBalance->setEnabled(true);
289289
ui->autoWhiteBalance->setCheckState((bValue==0) ? Qt::Unchecked : Qt::Checked);
290-
ui->whitebalanceSlider->setEnabled(false);
291290
}
292291

293292
// ********************************************************************************
@@ -302,6 +301,10 @@ void MainWindow::readCameraSettings()
302301
qDebug() << "Exposure default: " << edefault;
303302
ui->exposureSlider->setRange(emin, emax);
304303
m_hasExposure = true;
304+
if (!ui->autoExposure->isChecked())
305+
{
306+
ui->exposureSlider->setEnabled(true);
307+
}
305308
}
306309
else
307310
{
@@ -333,6 +336,10 @@ void MainWindow::readCameraSettings()
333336
qDebug() << "White balance default: " << edefault;
334337
ui->whitebalanceSlider->setRange(emin, emax);
335338
m_hasWhiteBalance = true;
339+
if (!ui->autoWhiteBalance->isChecked())
340+
{
341+
ui->whitebalanceSlider->setEnabled(true);
342+
}
336343
}
337344
else
338345
{
@@ -362,9 +369,12 @@ void MainWindow::readCameraSettings()
362369
qDebug() << "Gain min: " << emin;
363370
qDebug() << "Gain max: " << emax;
364371
qDebug() << "Gain default: " << edefault;
365-
ui->gainSlider->setEnabled(true);
366372
ui->gainSlider->setRange(emin, emax);
367373
m_hasGain = true;
374+
if (!ui->autoGain->isChecked())
375+
{
376+
ui->gainSlider->setEnabled(true);
377+
}
368378
}
369379
else
370380
{

0 commit comments

Comments
 (0)