chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace BRICK! with better message. Improve appearance of "no data" messages.

Browse Source
This commit is contained in:
Guy Scharf 2021-11-27 13:20:48 -07:00
parent 09753cc50c
commit a8a56dff02
3 changed files with 20 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
oscar/Graphs/gGraphView.cpp
View File

@ -1432,81 +1432,47 @@ void gGraphView::paintGL()
graphs_drawn = renderGraphs(painter); graphs_drawn = renderGraphs(painter);
// qDebug() << "Finished call renderGraphs from paintGL()"; //
// sleep(3); // Show message to user if no graphs available
//
if (!graphs_drawn) { // No graphs drawn? show something useful :) if (!graphs_drawn) {
qDebug() << "No graphs drawn"; qDebug() << "gGraphView: No graphs drawn";
// sleep(3);
QString txt; QString txt;
if (m_showAuthorMessage) { if (m_showAuthorMessage) {
if (emptyText() == STR_Empty_Brick) { if (emptyText() == STR_Empty_Brick) {
txt = QObject::tr("I'm very sorry your machine doesn't record useful data to graph in Daily View :("); txt = QObject::tr("Your machine doesn't record data to graph in Daily View");
} else { } else {
// not proud of telling them their machine is a Brick.. ;) // not proud of telling them their machine is a Brick.. ;)
txt = QObject::tr("There is no data to graph"); txt = QObject::tr("There is no data to graph");
} }
} }
qDebug() << txt; qDebug() << "gGraphView:" + txt;
// sleep(3);
// int x2, y2;
// GetTextExtent(m_emptytext, x2, y2, bigfont);
// int tp2, tp1;
if (this->m_emptyimage.isNull() )
qDebug() << "m_emptyimage is NULL";
else
qDebug() << "m_emptyimage is not NULL";
// sleep(3);
/*** This doesn't seem to do anything?
if (! this->m_emptyimage.isNull()) { if (! this->m_emptyimage.isNull()) {
int x = width()/2 - this->m_emptyimage.width()/2; int x = width()/2 - this->m_emptyimage.width()/2;
int y = height()/2 - this->m_emptyimage.height()/2; int y = height()/2 - this->m_emptyimage.height()/2;
// qDebug() << "size is " + QString::number(m_emptyimage.width()) + " by " + QString::number(m_emptyimage.height());
// qDebug() << "x-pos: " + QString::number(x) + " y-pos: " + QString::number(y);
// sleep(3);
QRectF target(QRect(x, y, this->m_emptyimage.width(), this->m_emptyimage.height())); QRectF target(QRect(x, y, this->m_emptyimage.width(), this->m_emptyimage.height()));
QRectF source(QRect(0, 0, this->m_emptyimage.width(), this->m_emptyimage.height())); QRectF source(QRect(0, 0, this->m_emptyimage.width(), this->m_emptyimage.height()));
}
// painter.drawPixmap(target, this->m_emptyimage, source); // this is segfaulting! WHY ?? ***/
// tp2 = height() /2 + m_emptyimage.height()/2 + y2;
} /*else {
tp2 = height() / 2 + y2;
}*/
// qDebug() << "Break 9";
// sleep(3);
QColor col = Qt::black; QColor col = Qt::black;
painter.setPen(col); painter.setPen(col);
// painter.setFont(*bigfont);
// painter.drawText((width() / 2) - x2 / 2, tp2, m_emptytext);
QRectF rec(0,0,width(),0); QRectF rec(0,0,width(),0);
// if (defaultfont == nullptr) // To put text in center of screen:
// qDebug() << "Default font is NULL"; // QRectF rec(0,0,width(),height(0));
// else
// qDebug() << "Default font is not NULL";
// sleep(3);
painter.setFont(*defaultfont); painter.setFont(*mediumfont);
// rec = painter.boundingRect(rec, Qt::AlignCenter, txt);
rec = painter.boundingRect(rec, Qt::AlignHCenter | Qt::AlignBottom, txt); rec = painter.boundingRect(rec, Qt::AlignHCenter | Qt::AlignBottom, txt);
rec.moveBottom(height()-5); rec.moveBottom(height()-15);
// qDebug() << "Break 8";
// sleep(3);
painter.drawText(rec, Qt::AlignHCenter | Qt::AlignBottom, txt);
// qDebug() << "Break 7";
// sleep(3);
painter.drawText(rec, Qt::AlignCenter, txt);
} }
// qDebug() << "Break 1";
// sleep(3);
if (AppSetting->lineCursorMode()) { if (AppSetting->lineCursorMode()) {
emit updateCurrentTime(graphs_drawn ? m_currenttime : 0.0F); emit updateCurrentTime(graphs_drawn ? m_currenttime : 0.0F);
@ -1515,14 +1481,8 @@ void gGraphView::paintGL()
} }
AppSetting->usePixmapCaching() ? DrawTextQueCached(painter) :DrawTextQue(painter); AppSetting->usePixmapCaching() ? DrawTextQueCached(painter) :DrawTextQue(painter);
// qDebug() << "Break 2";
// sleep(3);
m_tooltip->paint(painter); m_tooltip->paint(painter);
// qDebug() << "Break 3";
// sleep(3);
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
const int rs = 20; const int rs = 20;
static double ring[rs] = {0}; static double ring[rs] = {0};

4
oscar/SleepLib/common.cpp
View File

@ -698,9 +698,9 @@ void initializeStrings()
STR_MessageBox_PleaseNote = QObject::tr("Please Note"); STR_MessageBox_PleaseNote = QObject::tr("Please Note");
STR_Empty_NoData = QObject::tr("No Data Available"); STR_Empty_NoData = QObject::tr("No Data Available");
STR_Empty_Brick = QObject::tr("Compliance Only :("); STR_Empty_Brick = QObject::tr("Only Settings and Compliance Data Available");
STR_Empty_NoGraphs = QObject::tr("Graphs Switched Off"); STR_Empty_NoGraphs = QObject::tr("Graphs Switched Off");
STR_Empty_SummaryOnly = QObject::tr("Summary Only :("); STR_Empty_SummaryOnly = QObject::tr("Summary Data Only");
STR_Empty_NoSessions = QObject::tr("Sessions Switched Off"); STR_Empty_NoSessions = QObject::tr("Sessions Switched Off");

4
oscar/daily.cpp
View File

@ -1701,8 +1701,8 @@ void Daily::Load(QDate date)
htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><p title='%4'><font size=+3 color='%2'><b>%3</b></font></p> &nbsp; <font size=+3 color='%2'><b>%5</b></font></td>\n") htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><p title='%4'><font size=+3 color='%2'><b>%3</b></font></p> &nbsp; <font size=+3 color='%2'><b>%5</b></font></td>\n")
.arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2); .arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2);
} else { } else {
htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><font size=+3 color='yellow'>%2</font></td>\n") htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><font size=+3 color='yellow'><b>%2</b></font></td>\n")
.arg("#F88017").arg(tr("BRICK! :(")); .arg("#F88017").arg(tr("This CPAP machine does NOT record detailed data"));
} }
htmlLeftAHI+="</tr>\n"; htmlLeftAHI+="</tr>\n";
htmlLeftAHI+="</table>\n"; htmlLeftAHI+="</table>\n";