diff --git a/FilmLightController/lightmux.cpp b/FilmLightController/lightmux.cpp index c4ffa77..6fc45ff 100644 --- a/FilmLightController/lightmux.cpp +++ b/FilmLightController/lightmux.cpp @@ -6,6 +6,7 @@ LightMux::LightMux() brightness = 50; power_cold = 0; power_warm = 0; + power_combined = 0; } @@ -42,10 +43,10 @@ void LightMux::mux(){ power_cold = static_cast(double(power_cold * (double(brightness/100.0))) + .5); power_warm = static_cast(double(power_warm * (double(brightness/100.0))) + .5); - - qDebug("cold color: %i\nwarm color: %i\n", power_cold, power_warm); + power_combined = static_cast(double(power_cold+power_warm) / 2.0); + } @@ -126,6 +127,16 @@ void LightMux::setTemperature(int requested_val){ } } +void LightMux::toogleAdaptiveBrightness(){ + adaptive_brightness = !adaptive_brightness; + + if(adaptive_brightness){ + qDebug("adaptive brightness enabled\n"); + } else{ + qDebug("adaptive brightness disabled\n"); + } +} + int LightMux::getBrightness(){ return brightness; } @@ -149,3 +160,7 @@ int LightMux::getPowerCold(){ int LightMux::getPowerWarm(){ return power_warm; } + +int LightMux::getPowerCombined(){ + return power_combined; +} diff --git a/FilmLightController/lightmux.h b/FilmLightController/lightmux.h index a26bfc8..78b7102 100644 --- a/FilmLightController/lightmux.h +++ b/FilmLightController/lightmux.h @@ -15,6 +15,9 @@ private: int power_cold; // power of the cold LEDs of Panels in percent int power_warm; // power of the warm LEDs of Panels in percent + int power_combined; //combined power of both LEDs in percent + + bool adaptive_brightness; // true indecates adaptive brightness is enabled public: LightMux(); @@ -41,6 +44,10 @@ public: int getPowerCold(); int getPowerWarm(); + int getPowerCombined(); + + void toogleAdaptiveBrightness(); + }; #endif // LIGHTMUX_H diff --git a/FilmLightController/mainwindow.cpp b/FilmLightController/mainwindow.cpp index e631a5b..c37cbde 100644 --- a/FilmLightController/mainwindow.cpp +++ b/FilmLightController/mainwindow.cpp @@ -37,17 +37,23 @@ void MainWindow::updateUI() setLablePowerCold(lmux->getPowerCold()); setLablePowerWarm(lmux->getPowerWarm()); + setLablePowerCombined(lmux->getPowerCombined()); } void MainWindow::setLablePowerCold(int val) { - ui->labelPowerCold->setText("Output Power Cold: " + QString::number(val) + " %"); + ui->labelPowerCold->setText("Output Power Cold: " + QString::number(val) + "%"); } void MainWindow::setLablePowerWarm(int val) { - ui->labelPowerWarm->setText("Output Power Warm: " + QString::number(val) + " %"); + ui->labelPowerWarm->setText("Output Power Warm: " + QString::number(val) + "%"); +} + +void MainWindow::setLablePowerCombined(int val) +{ + ui->labelPowerCombined->setText("Combined Power: " + QString::number(val) + "%"); } void MainWindow::on_BtnIncreaseBrightness_clicked() @@ -104,3 +110,8 @@ void MainWindow::on_lineTemperature_returnPressed() } + +void MainWindow::on_checkBox_stateChanged() +{ + lmux->toogleAdaptiveBrightness(); +} diff --git a/FilmLightController/mainwindow.h b/FilmLightController/mainwindow.h index 8be85d3..3d4f5c5 100644 --- a/FilmLightController/mainwindow.h +++ b/FilmLightController/mainwindow.h @@ -18,6 +18,7 @@ public: ~MainWindow(); void setLablePowerCold(int val); void setLablePowerWarm(int val); + void setLablePowerCombined(int val); private slots: void on_BtnIncreaseBrightness_clicked(); @@ -36,6 +37,8 @@ private slots: void on_lineTemperature_returnPressed(); + void on_checkBox_stateChanged(); + private: Ui::MainWindow *ui; LightMux *lmux; diff --git a/FilmLightController/mainwindow.ui b/FilmLightController/mainwindow.ui index a72e8ed..ae6319f 100644 --- a/FilmLightController/mainwindow.ui +++ b/FilmLightController/mainwindow.ui @@ -230,7 +230,7 @@ 10 - 220 + 240 201 18 @@ -243,7 +243,7 @@ 10 - 250 + 270 211 18 @@ -272,6 +272,32 @@ + + + + 10 + 300 + 211 + 18 + + + + Combined Power: + + + + + + 10 + 210 + 151 + 24 + + + + adaptive brightness + + diff --git a/Screenshot/Screenshot_20190128_220642.png b/Screenshot/Screenshot_20190128_220642.png index 2f77cf1..0070257 100644 Binary files a/Screenshot/Screenshot_20190128_220642.png and b/Screenshot/Screenshot_20190128_220642.png differ