2018-08-02 Fred Gleason <fredg@paravelsystems.com>

* Modified reports in rdgpimon(1) to display UTF-8 strings
	correctly.
This commit is contained in:
Fred Gleason
2018-08-02 19:06:07 -04:00
parent c0930db2ac
commit 7881ec7770
2 changed files with 17 additions and 6 deletions

View File

@@ -17308,3 +17308,6 @@
2018-08-02 Fred Gleason <fredg@paravelsystems.com> 2018-08-02 Fred Gleason <fredg@paravelsystems.com>
* Modified reports in rdcastmanager(1) to display UTF-8 strings * Modified reports in rdcastmanager(1) to display UTF-8 strings
correctly. correctly.
2018-08-02 Fred Gleason <fredg@paravelsystems.com>
* Modified reports in rdgpimon(1) to display UTF-8 strings
correctly.

View File

@@ -37,6 +37,7 @@
#include <rddb.h> #include <rddb.h>
#include <rdescape_string.h> #include <rdescape_string.h>
#include <rdlistviewitem.h> #include <rdlistviewitem.h>
#include <rdreport.h>
#include <rdtextfile.h> #include <rdtextfile.h>
#include "rdgpimon.h" #include "rdgpimon.h"
@@ -385,14 +386,21 @@ void MainWidget::eventsReportData()
QString sql; QString sql;
RDSqlQuery *q; RDSqlQuery *q;
report=" Rivendell GPIO Event Report\n"; report=RDReport::center("Rivendell GPIO Event Report",78)+"\n";
report+=" Date: "+gpi_events_date_edit->date().toString("MM/dd/yyyy")+ report+=
" Station/Matrix: "+rda->station()->name()+":"+ RDReport::center(QString("Date: ")+
QString().sprintf("%d ",gpi_matrix_box->currentItem())+ gpi_events_date_edit->date().toString("MM/dd/yyyy")+
" State Filter: "+gpi_events_state_box->currentText()+"\n"; " "+rda->station()->name()+":"+
QString().sprintf("%d ",gpi_matrix_box->currentItem())+
" State Filter: "+
gpi_events_state_box->currentText(),78)+"\n";
report+="\n"; report+="\n";
sql=QString("select EVENT_DATETIME,NUMBER,EDGE from GPIO_EVENTS where ")+ sql=QString("select ")+
"EVENT_DATETIME,"+ // 00
"NUMBER,"+ // 01
"EDGE "+ // 02
"from GPIO_EVENTS where "+
"(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\")&&"+ "(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\")&&"+
QString().sprintf("(MATRIX=%d)&&",gpi_matrix_box->currentItem())+ QString().sprintf("(MATRIX=%d)&&",gpi_matrix_box->currentItem())+
QString().sprintf("(TYPE=%d)&&",gpi_type_box->currentItem())+ QString().sprintf("(TYPE=%d)&&",gpi_type_box->currentItem())+