Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-27 06:36:37 +02:00
Code Issues Projects Releases Wiki Activity

2019-05-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdgpimon(1) that caused GPIO status
	to fail to be displayed in the status widgets.
This commit is contained in:
Fred Gleason 2019-05-24 13:57:19 -04:00
parent 4a59a80fe2
commit f6fa420cfd
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18693,3 +18693,6 @@
* Added an 'RDSocketStrings()' function in * Added an 'RDSocketStrings()' function in
'lib/rdsocketstrings.[cpp|h]'. 'lib/rdsocketstrings.[cpp|h]'.
* Fixed a bug in 'RDLiveWire' that caused false watchdog triggers. * Fixed a bug in 'RDLiveWire' that caused false watchdog triggers.
2019-05-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdgpimon(1) that caused GPIO status
to fail to be displayed in the status widgets.

5
utils/rdgpimon/gpi_label.cpp
View File

@ -41,6 +41,7 @@ GpiLabel::GpiLabel(QWidget *parent)
gpi_line_label->setFont(line_font); gpi_line_label->setFont(line_font);
gpi_line_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); gpi_line_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
gpi_line_label->setPalette(Qt::gray); gpi_line_label->setPalette(Qt::gray);
gpi_line_label->setStyleSheet("background-color:"+QColor(Qt::gray).name());
// //
// On Cart Label // On Cart Label
@ -98,9 +99,13 @@ void GpiLabel::setState(bool state)
{ {
if(state) { if(state) {
gpi_line_label->setPalette(Qt::green); gpi_line_label->setPalette(Qt::green);
gpi_line_label->
setStyleSheet("background-color:"+QColor(Qt::green).name());
} }
else { else {
gpi_line_label->setPalette(Qt::gray); gpi_line_label->setPalette(Qt::gray);
gpi_line_label->
setStyleSheet("background-color:"+QColor(Qt::gray).name());
} }
} }

4
utils/rdgpimon/rdgpimon.cpp
View File

@ -435,7 +435,7 @@ void MainWidget::eventsReportData()
void MainWidget::gpiStateChangedData(int matrix,int line,bool state) void MainWidget::gpiStateChangedData(int matrix,int line,bool state)
{ {
// printf("gpiStateChanged(%d,%d,%d)\n",matrix,line,state); // printf("gpiStateChanged(%d,%d,%d)\n",matrix,line,state);
if(gpi_type_box->currentItem()!=RDMatrix::GpioInput) { if(gpi_type_box->currentItem()!=RDMatrix::GpioInput) {
return; return;
@ -454,7 +454,7 @@ void MainWidget::gpiStateChangedData(int matrix,int line,bool state)
void MainWidget::gpoStateChangedData(int matrix,int line,bool state) void MainWidget::gpoStateChangedData(int matrix,int line,bool state)
{ {
// printf("gpoStateChanged(%d,%d,%d)\n",matrix,line,state); // printf("gpoStateChanged(%d,%d,%d)\n",matrix,line,state);
if(gpi_type_box->currentItem()!=RDMatrix::GpioOutput) { if(gpi_type_box->currentItem()!=RDMatrix::GpioOutput) {
return; return;