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

Suppress duration on tooltip and event list if duration is zero (which usually means unknown duration as CPAP machine did not report it)

Browse Source
This commit is contained in:
Seeker4 2019-07-05 10:29:57 -07:00
parent 0d0a5550d0
commit dbabc4cd58
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oscar/Graphs/gFlagsLine.cpp
View File

@ -400,7 +400,10 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.drawRect(x1-2, bartop-2, 4, bottom-bartop+4); painter.drawRect(x1-2, bartop-2, 4, bottom-bartop+4);
int x,y; int x,y;
QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(*dptr); // QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(*dptr);
QString lab = QString("%1").arg(schema::channel[m_code].fullname());
if (*dptr != 0)
lab += QString(" (%2)").arg(*dptr);
GetTextExtent(lab, x, y); GetTextExtent(lab, x, y);
w.ToolTip(lab, x1 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, tooltipTimeout); w.ToolTip(lab, x1 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, tooltipTimeout);

9
oscar/daily.cpp
View File

@ -45,6 +45,8 @@ extern MainWindow * mainwin;
// This was Sean Stangl's idea.. but I couldn't apply that patch. // This was Sean Stangl's idea.. but I couldn't apply that patch.
inline QString channelInfo(ChannelID code) { inline QString channelInfo(ChannelID code) {
return schema::channel[code].fullname()+"\n"+schema::channel[code].description()+"\n("+schema::channel[code].units()+")"; return schema::channel[code].fullname()+"\n"+schema::channel[code].description()+"\n("+schema::channel[code].units()+")";
// return schema::channel[code].fullname()+"\n"+schema::channel[code].description()
// + (schema::channel[code].units() != "0" ? "\n("+schema::channel[code].units()+")" : "");
} }
void Daily::setCalendarVisible(bool visible) void Daily::setCalendarVisible(bool visible)
@ -658,7 +660,10 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
} }
QStringList a; QStringList a;
QDateTime d=QDateTime::fromMSecsSinceEpoch(t); // Localtime QDateTime d=QDateTime::fromMSecsSinceEpoch(t); // Localtime
QString s=QString("#%1: %2 (%3)").arg((int)(++mccnt[code]),(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")).arg(m.value()[z]->raw(o)); QString s=QString("#%1: %2").arg((int)(++mccnt[code]),(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss"));
if (m.value()[z]->raw(o) > 0)
s += QString(" (%3)").arg(m.value()[z]->raw(o));
a.append(s); a.append(s);
QTreeWidgetItem *item=new QTreeWidgetItem(a); QTreeWidgetItem *item=new QTreeWidgetItem(a);
item->setData(0,Qt::UserRole,t); item->setData(0,Qt::UserRole,t);
@ -1166,6 +1171,8 @@ QString Daily::getStatisticsInfo(Day * day)
QString tooltip=schema::channel[code].description(); QString tooltip=schema::channel[code].description();
if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")"; if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")";
// if (!schema::channel[code].units().isEmpty() && schema::channel[code].units() != "0")
// tooltip+=" ("+schema::channel[code].units()+")";
if (ST_max == ST_MAX) { if (ST_max == ST_MAX) {
mx=day->Max(code); mx=day->Max(code);