tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some rework for custom brightness & slider

Browse Source
This commit is contained in:
hawkeyexp 2018-08-08 14:52:30 +02:00
parent b7ce5de716
commit dcc0c01586
3 changed files with 49 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/f1x/openauto/autoapp/UI/MainWindow.hpp
View File

@ -84,7 +84,7 @@ private:
QString brightnessFilenameAlt = "/tmp/custombrightness";
QFile *brightnessFile;
QFile *brightnessFileAlt;
char brightness_str[5];
char brightness_str[6];
bool customBrightnessControl = false;
bool wifiButtonForce = false;

26
src/autoapp/UI/MainWindow.cpp
View File

@ -220,13 +220,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
ui_->pushButtonBrightness->hide();
}
QFileInfo brightnessFileAlt(brightnessFilenameAlt);
if (brightnessFileAlt.exists()) {
ui_->pushButtonBrightness->show();
this->customBrightnessControl = true;
system("/usr/local/bin/autoapp_helper startcustombrightness &");
}
ui_->kodiBG->hide();
if (!this->kodiButtonForce) {
@ -236,6 +229,7 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
}
ui_->horizontalSliderBrightness->hide();
ui_->horizontalSliderLabel->hide();
if (!configuration->showClock()) {
ui_->Digital_clock->hide();
@ -283,7 +277,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
system("/usr/local/bin/autoapp_helper getbrightnessvalues");
// read and set brightness values
if (this->customBrightnessControl) {
QFile paramFile(QString("/tmp/br_values"));
paramFile.open(QIODevice::ReadOnly);
QTextStream data_param(&paramFile);
@ -293,8 +286,12 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
ui_->horizontalSliderBrightness->setMaximum(getparams[1].toInt());
ui_->horizontalSliderBrightness->setSingleStep(getparams[2].toInt());
ui_->horizontalSliderBrightness->setTickInterval(getparams[2].toInt());
ui_->versionString->setText(getparams[0] + getparams[1] + getparams[2]);
if (getparams[3] == "1") {
ui_->pushButtonBrightness->show();
this->customBrightnessControl = true;
system("/usr/local/bin/autoapp_helper startcustombrightness &");
}
}
MainWindow::~MainWindow()
@ -309,6 +306,7 @@ MainWindow::~MainWindow()
void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonBrightness_clicked()
{
this->brightnessFile = new QFile(this->brightnessFilename);
this->brightnessFileAlt = new QFile(this->brightnessFilenameAlt);
@ -337,14 +335,16 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonBrightness_clicked()
}
}
ui_->horizontalSliderBrightness->show();
ui_->horizontalSliderLabel->show();
} else {
ui_->horizontalSliderLabel->hide();
ui_->horizontalSliderBrightness->hide();
}
}
void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderBrightness_valueChanged(int value)
{
int n = snprintf(this->brightness_str, 4, "%d", value);
int n = snprintf(this->brightness_str, 5, "%d", value);
this->brightnessFile = new QFile(this->brightnessFilename);
this->brightnessFileAlt = new QFile(this->brightnessFilenameAlt);
@ -364,6 +364,7 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderBrightness_value
this->brightnessFileAlt->close();
}
}
ui_->horizontalSliderLabel->setText(this->brightness_str);
}
void f1x::openauto::autoapp::ui::MainWindow::switchGuiToNight()
@ -385,6 +386,7 @@ void f1x::openauto::autoapp::ui::MainWindow::switchGuiToNight()
ui_->pushButtonNight->hide();
if (this->brightnessSliderVisible) {
ui_->horizontalSliderBrightness->hide();
ui_->horizontalSliderLabel->hide();
this->brightnessSliderVisible = false;
}
}
@ -408,6 +410,7 @@ void f1x::openauto::autoapp::ui::MainWindow::switchGuiToDay()
ui_->pushButtonDay->hide();
if (this->brightnessSliderVisible) {
ui_->horizontalSliderBrightness->hide();
ui_->horizontalSliderLabel->hide();
this->brightnessSliderVisible = false;
}
}
@ -443,6 +446,7 @@ void f1x::openauto::autoapp::ui::MainWindow::cameraControlShow()
ui_->pushButtonCameraHide->show();
if (this->brightnessSliderVisible) {
ui_->horizontalSliderBrightness->hide();
ui_->horizontalSliderLabel->hide();
this->brightnessSliderVisible = false;
}
}
@ -454,6 +458,7 @@ void f1x::openauto::autoapp::ui::MainWindow::toggleExit()
f1x::openauto::autoapp::ui::MainWindow::cameraControlHide();
if (this->brightnessSliderVisible) {
ui_->horizontalSliderBrightness->hide();
ui_->horizontalSliderLabel->hide();
this->brightnessSliderVisible = false;
}
ui_->pushButtonShutdown->show();
@ -478,6 +483,7 @@ void f1x::openauto::autoapp::ui::MainWindow::showRearCamBG()
ui_->pushButtonRearcamBack->show();
if (this->brightnessSliderVisible) {
ui_->horizontalSliderBrightness->hide();
ui_->horizontalSliderLabel->hide();
this->brightnessSliderVisible = false;
}
}

23
src/autoapp/UI/mainwindow.ui
View File

@ -641,6 +641,28 @@
<number>25</number>
</property>
</widget>
<widget class="QLabel" name="horizontalSliderLabel">
<property name="geometry">
<rect>
<x>198</x>
<y>212</y>
<width>400</width>
<height>12</height>
</rect>
</property>
<property name="font">
<font>
<family>Roboto</family>
<pointsize>8</pointsize>
<weight>75</weight>
<bold>true</bold>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
</property>
</widget>
<widget class="QLabel" name="systemConfigInProgress">
<property name="geometry">
<rect>
@ -787,6 +809,7 @@ QPushButton:pressed { background: orange; border: none; }</string>
<zorder>systemConfigInProgress</zorder>
<zorder>systemDebugging</zorder>
<zorder>horizontalSliderBrightness</zorder>
<zorder>horizontalSliderLabel</zorder>
<zorder>kodiBG</zorder>
<zorder>pushButtonRearcamBack</zorder>
</widget>