From f6fa420cfd8bd553a0af5a92593344f7e7b78aaa Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 24 May 2019 13:57:19 -0400 Subject: [PATCH] 2019-05-24 Fred Gleason * Fixed a regression in rdgpimon(1) that caused GPIO status to fail to be displayed in the status widgets. --- ChangeLog | 3 +++ utils/rdgpimon/gpi_label.cpp | 5 +++++ utils/rdgpimon/rdgpimon.cpp | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 491c7cdf..2e5566e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18693,3 +18693,6 @@ * Added an 'RDSocketStrings()' function in 'lib/rdsocketstrings.[cpp|h]'. * Fixed a bug in 'RDLiveWire' that caused false watchdog triggers. +2019-05-24 Fred Gleason + * Fixed a regression in rdgpimon(1) that caused GPIO status + to fail to be displayed in the status widgets. diff --git a/utils/rdgpimon/gpi_label.cpp b/utils/rdgpimon/gpi_label.cpp index faea128e..7016941d 100644 --- a/utils/rdgpimon/gpi_label.cpp +++ b/utils/rdgpimon/gpi_label.cpp @@ -41,6 +41,7 @@ GpiLabel::GpiLabel(QWidget *parent) gpi_line_label->setFont(line_font); gpi_line_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); gpi_line_label->setPalette(Qt::gray); + gpi_line_label->setStyleSheet("background-color:"+QColor(Qt::gray).name()); // // On Cart Label @@ -98,9 +99,13 @@ void GpiLabel::setState(bool state) { if(state) { gpi_line_label->setPalette(Qt::green); + gpi_line_label-> + setStyleSheet("background-color:"+QColor(Qt::green).name()); } else { gpi_line_label->setPalette(Qt::gray); + gpi_line_label-> + setStyleSheet("background-color:"+QColor(Qt::gray).name()); } } diff --git a/utils/rdgpimon/rdgpimon.cpp b/utils/rdgpimon/rdgpimon.cpp index e13b8a0d..67c85e9e 100644 --- a/utils/rdgpimon/rdgpimon.cpp +++ b/utils/rdgpimon/rdgpimon.cpp @@ -435,7 +435,7 @@ void MainWidget::eventsReportData() 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) { return; @@ -454,7 +454,7 @@ void MainWidget::gpiStateChangedData(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) { return;