mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 18:50:44 +00:00
Various fixes and renaming Favourites & Summary.
S9 missing str.edf data workaround Humidifier setting displayed wrong in daily. Wrong EPR value in Overview, Summary renamed to Statistics. Favourites renamed to Bookmarks. Calendar highlighting fix when bookmarks selected
This commit is contained in:
Mark Watkins
parent
39da7b22eb
commit
8891514635
@ -1230,7 +1230,9 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
|
||||
double w2=m_lastbounds.width()-right-left; //-(right+m_marginright)-(m_marginleft+left);
|
||||
if (m_blockzoom) {
|
||||
xmult=(rmax_x-rmin_x)/w2;
|
||||
} else xmult=(max_x-min_x)/w2;
|
||||
} else {
|
||||
xmult=(max_x-min_x)/w2;
|
||||
}
|
||||
qint64 a=double(a2-a1)*xmult;
|
||||
float d=double(a)/86400000.0;
|
||||
int h=a/3600000;
|
||||
@ -2050,7 +2052,11 @@ void gGraphView::ResetBounds(bool refresh) //short group)
|
||||
int ms(xx % 1000);
|
||||
QString str;
|
||||
if (d>1) {
|
||||
str.sprintf("%1.0f days",ceil(double(xx)/86400000.0));
|
||||
/*QDate d1=QDateTime::fromTime_t(m_minx/1000).toUTC().date();
|
||||
QDate d2=QDateTime::fromTime_t(m_maxx/1000).toUTC().date();
|
||||
d=PROFILE.countDays(MT_CPAP,d1,d2); */
|
||||
|
||||
str.sprintf("%1.0f days",ceil(d));
|
||||
} else {
|
||||
str.sprintf("%02i:%02i:%02i:%03i",h,m,s,ms);
|
||||
}
|
||||
|
||||
@ -169,6 +169,10 @@ void SummaryChart::SetDay(Day * nullday)
|
||||
m_goodcodes[j]=true;
|
||||
fnd=true;
|
||||
break;
|
||||
} else {
|
||||
if (code==CPAP_PressureMin) {
|
||||
int i=5;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -113,20 +113,21 @@ EventDataType Day::settings_avg(ChannelID code)
|
||||
}
|
||||
EventDataType Day::settings_wavg(ChannelID code)
|
||||
{
|
||||
double s0=0,s1=0,s2=0;
|
||||
double s0=0,s1=0,s2=0,tmp;
|
||||
for (QVector<Session *>::iterator s=sessions.begin();s!=sessions.end();s++) {
|
||||
Session & sess=*(*s);
|
||||
|
||||
QHash<ChannelID,QVariant>::iterator i=sess.settings.find(code);
|
||||
if (i!=sess.settings.end()) {
|
||||
s0=sess.hours();
|
||||
s1+=i.value().toDouble()*s0;
|
||||
tmp=i.value().toDouble();
|
||||
s1+=tmp*s0;
|
||||
s2+=s0;
|
||||
}
|
||||
}
|
||||
if (s2==0) return 0;
|
||||
return (s1/s2);
|
||||
|
||||
tmp=(s1/s2);
|
||||
return tmp;
|
||||
}
|
||||
EventDataType Day::percentile(ChannelID code,EventDataType percentile)
|
||||
{
|
||||
|
||||
@ -25,6 +25,7 @@ extern QProgressBar *qprogress;
|
||||
QHash<int,QString> RMS9ModelMap;
|
||||
QHash<ChannelID, QVector<QString> > resmed_codes;
|
||||
|
||||
// Looks up foreign language Signal names that match this channelID
|
||||
EDFSignal * EDFParser::lookupSignal(ChannelID ch)
|
||||
{
|
||||
QHash<ChannelID, QVector<QString> >::iterator ci;
|
||||
@ -177,7 +178,7 @@ bool EDFParser::Parse()
|
||||
memcpy((char *)&sig.data[sig.pos],(char *)&buffer[pos],sig.nr*2);
|
||||
sig.pos+=sig.nr;
|
||||
pos+=sig.nr*2;
|
||||
// big endian will screw up without this..
|
||||
// big endian will probably screw up without this..
|
||||
/*for (int j=0;j<sig.nr;j++) {
|
||||
qint16 t=Read16();
|
||||
sig.data[sig.pos++]=t;
|
||||
@ -329,9 +330,12 @@ int ResmedLoader::Open(QString & path,Profile *profile)
|
||||
|
||||
rest=filename.section(".",0,0);
|
||||
datestr=filename.section("_",0,1);
|
||||
// Take the filename's date, and convert it to epoch to form the sessionID.
|
||||
date=QDateTime::fromString(datestr,"yyyyMMdd_HHmmss");
|
||||
sessionid=date.toTime_t();
|
||||
// Resmed bugs up on the session filenames.. 1 second either way
|
||||
|
||||
// Resmed bugs up on the session filenames.. 1 or 2 seconds either way
|
||||
// Moral of the story, when writing firmware and saving in batches, use the same datetimes.
|
||||
if (sessfiles.find(sessionid)==sessfiles.end()) {
|
||||
if (sessfiles.find(sessionid+2)!=sessfiles.end()) sessionid+=2;
|
||||
else if (sessfiles.find(sessionid+1)!=sessfiles.end()) sessionid++;
|
||||
@ -377,7 +381,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
|
||||
}
|
||||
} else if (i.key()=="PNA") {
|
||||
//m->properties[STR_PROP_Model]=""; //i.value();
|
||||
} else if (i.key()=="PCD") {
|
||||
} else if (i.key()=="PCD") { // Product Code..
|
||||
bool ok;
|
||||
int j=i.value().toInt(&ok);
|
||||
if (RMS9ModelMap.find(j)!=RMS9ModelMap.end()) {
|
||||
@ -405,7 +409,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
|
||||
//}
|
||||
}
|
||||
}
|
||||
if (qprogress) qprogress->setValue(33.0+(float(++cnt)/float(size)*33.0));
|
||||
if (qprogress) qprogress->setValue(33.0+(float(++cnt)/float(size)*66.0));
|
||||
QApplication::processEvents();
|
||||
|
||||
EDFSignal *sig;
|
||||
@ -441,11 +445,6 @@ int ResmedLoader::Open(QString & path,Profile *profile)
|
||||
if (sig) {
|
||||
EventDataType pressure=sig->data[dn]*sig->gain;
|
||||
sess->settings[CPAP_PressureMin]=pressure;
|
||||
//sess->setWavg(CPAP_Pressure,pressure);
|
||||
//sess->setAvg(CPAP_Pressure,pressure);
|
||||
//sess->set90p(CPAP_Pressure,pressure);
|
||||
//sess->setMax(CPAP_Pressure,pressure);
|
||||
//sess->setMin(CPAP_Pressure,pressure);
|
||||
}
|
||||
} else {
|
||||
if (mode>5) {
|
||||
@ -469,6 +468,32 @@ int ResmedLoader::Open(QString & path,Profile *profile)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
// The following only happens when the STR.edf file is not up to date..
|
||||
// This will only happen when the user fails to back up their SDcard properly.
|
||||
// Basically takes a guess.
|
||||
if (!sess->settings.contains(CPAP_Mode)) {
|
||||
//The following is a lame assumption if 50th percentile == max, then it's CPAP
|
||||
EventDataType p50=sess->percentile(CPAP_Pressure,0.50);
|
||||
EventDataType max=sess->Max(CPAP_Pressure);
|
||||
if (max==p50) {
|
||||
sess->settings[CPAP_Mode]=MODE_CPAP;
|
||||
sess->settings[CPAP_PressureMin]=p50;
|
||||
} else {
|
||||
// It's not cpap, so just take the highest setting for this machines history.
|
||||
// This may fail if the missing str data is at the beginning of a fresh import.
|
||||
CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,sess->machine()->FirstDay(),sess->machine()->LastDay());
|
||||
if (mode<MODE_APAP) mode=MODE_APAP;
|
||||
sess->settings[CPAP_Mode]=mode;
|
||||
// Assuming 10th percentile should cover for ramp/warmup
|
||||
sess->settings[CPAP_PressureMin]=sess->percentile(CPAP_Pressure,0.10);
|
||||
sess->settings[CPAP_PressureMax]=sess->Max(CPAP_Pressure);
|
||||
}
|
||||
}
|
||||
//Rather than take a dodgy guess, EPR settings can take a hit, and this data can simply be missed..
|
||||
|
||||
// Add the session to the machine & profile objects
|
||||
m->AddSession(sess,profile); // Adding earlier than I really like here..
|
||||
}
|
||||
}
|
||||
|
||||
@ -533,6 +533,9 @@ void Daily::UpdateCalendarDay(QDate date)
|
||||
void Daily::LoadDate(QDate date)
|
||||
{
|
||||
ui->calendar->blockSignals(true);
|
||||
if (date.month()!=previous_date.month()) {
|
||||
on_calendar_currentPageChanged(date.year(),date.month());
|
||||
}
|
||||
ui->calendar->setSelectedDate(date);
|
||||
ui->calendar->blockSignals(false);
|
||||
on_calendar_selectionChanged();
|
||||
@ -900,8 +903,9 @@ void Daily::Load(QDate date)
|
||||
|
||||
html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Flex"))
|
||||
.arg(flexstr);
|
||||
int humid=cpap->settings_max(PRS1_HumidSetting);
|
||||
html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Humidifier"))
|
||||
.arg(cpap->settings_max(PRS1_HumidSetting)==0 ? STR_GEN_Off : "x"+QString::number(i));
|
||||
.arg(humid==0 ? STR_GEN_Off : "x"+QString::number(humid));
|
||||
} else if (cpap->machine->GetClass()==STR_MACH_ResMed) {
|
||||
int epr=cpap->settings_max(RMS9_EPR);
|
||||
int epr2=cpap->settings_max(RMS9_EPRSet);
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
<list>
|
||||
<li>Auto-Updater for Windows & Mac Platforms</li>
|
||||
<li>SleepLib database improvements, and lots of other underneath stuff and code cleanups you don't see.</li>
|
||||
<li>New Summary page showing some useful text statistics.</li>
|
||||
<li>New Statistics page showing some more useful data.</li>
|
||||
<li>Welcome page has become a Help Browser.</li>
|
||||
<li>New Navigation Panel on the right side, now accessible from all tabs. It can be hidden to reclaim screen space.</li>
|
||||
<li>New Favourites tab in this right panel for bookmarking days and quickly finding them again.</li>
|
||||
<li>New Records tab to show some best/worst entries, which have links going directly to the related day or overview range.</li>
|
||||
<li>Daily reports bookmarked areas show oximetry data when available.</li>
|
||||
<li>Can print from both the Summary & Help Browser pages.</li>
|
||||
<li>Can print from both the Statistics & Help Browser pages.</li>
|
||||
<li>New Context cube can be switched on to make empty pages more attractive.</li>
|
||||
<li>Plenty of other bug fixes, including more oximetry fixes.</li>
|
||||
</list></p>
|
||||
|
||||
154
mainwindow.cpp
154
mainwindow.cpp
@ -742,14 +742,14 @@ void MainWindow::on_summaryButton_clicked()
|
||||
EventDataType cmin=0,cmax=0,min,max;
|
||||
QDate date=lastcpap;
|
||||
Day * day;
|
||||
bool lastchanged;
|
||||
bool lastchanged=false;
|
||||
int cnt=0;
|
||||
QVector<RXChange> rxchange;
|
||||
do {
|
||||
day=PROFILE.GetDay(date,MT_CPAP);
|
||||
|
||||
lastchanged=false;
|
||||
if (day) {
|
||||
lastchanged=false;
|
||||
|
||||
EventDataType hours=day->hours();
|
||||
|
||||
@ -766,6 +766,7 @@ void MainWindow::on_summaryButton_clicked()
|
||||
bestAHIdate=date;
|
||||
}
|
||||
}
|
||||
|
||||
mode=(CPAPMode)round(day->settings_wavg(CPAP_Mode));
|
||||
min=day->settings_min(CPAP_PressureMin);
|
||||
if (mode==MODE_CPAP) {
|
||||
@ -836,11 +837,6 @@ void MainWindow::on_summaryButton_clicked()
|
||||
if (rx.days>rxthresh)
|
||||
tmpRX.push_back(&rx);
|
||||
}
|
||||
RXsort=RX_ahi;
|
||||
qSort(tmpRX.begin(),tmpRX.end(),RXSort);
|
||||
tmpRX[0]->highlight=4; // worst
|
||||
int ls=tmpRX.size()-1;
|
||||
tmpRX[ls]->highlight=1; //best
|
||||
|
||||
QString recbox="<html><head><style type='text/css'>"
|
||||
"p,a,td,body { font-family: '"+QApplication::font().family()+"'; }"
|
||||
@ -855,84 +851,77 @@ void MainWindow::on_summaryButton_clicked()
|
||||
recbox+=QString("<tr><td><b><a href='daily=%1'>%2</a></b></td><td><b>%3</b></td></tr>").arg(worstAHIdate.toString(Qt::ISODate)).arg(tr("Worst %1").arg(ahitxt)).arg(worstAHI,0,'f',2);
|
||||
recbox+=QString("<tr><td colspan=2>%1</td></tr>").arg(worstAHIdate.toString(Qt::SystemLocaleShortDate));
|
||||
recbox+=QString("<tr><td colspan=2> </td></tr>");
|
||||
QString minstr,maxstr,modestr;
|
||||
|
||||
|
||||
{
|
||||
CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,tmpRX[ls]->first,tmpRX[ls]->first);
|
||||
if (tmpRX.size()>0) {
|
||||
RXsort=RX_ahi;
|
||||
QString minstr,maxstr,modestr;
|
||||
qSort(tmpRX.begin(),tmpRX.end(),RXSort);
|
||||
tmpRX[0]->highlight=4; // worst
|
||||
int ls=tmpRX.size()-1;
|
||||
tmpRX[ls]->highlight=1; //best
|
||||
CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,tmpRX[ls]->first,tmpRX[ls]->first);
|
||||
|
||||
if (mode<MODE_APAP) { // is CPAP?
|
||||
minstr="Pressure";
|
||||
maxstr="";
|
||||
modestr=tr("CPAP");
|
||||
} else if (mode<MODE_BIPAP) { // is AUTO?
|
||||
minstr="Min";
|
||||
maxstr="Max";
|
||||
modestr=tr("APAP");
|
||||
} else { // BIPAP or greater
|
||||
minstr="EPAP";
|
||||
maxstr="IPAP";
|
||||
modestr=tr("Bi-Level/ASV");
|
||||
if (mode<MODE_APAP) { // is CPAP?
|
||||
minstr="Pressure";
|
||||
maxstr="";
|
||||
modestr=tr("CPAP");
|
||||
} else if (mode<MODE_BIPAP) { // is AUTO?
|
||||
minstr="Min";
|
||||
maxstr="Max";
|
||||
modestr=tr("APAP");
|
||||
} else { // BIPAP or greater
|
||||
minstr="EPAP";
|
||||
maxstr="IPAP";
|
||||
modestr=tr("Bi-Level/ASV");
|
||||
}
|
||||
|
||||
recbox+=QString("<tr><td colspan=2><b><a href='overview=%1,%2'>%3</a></b></td></tr>")
|
||||
.arg(tmpRX[ls]->first.toString(Qt::ISODate))
|
||||
.arg(tmpRX[ls]->last.toString(Qt::ISODate))
|
||||
.arg(tr("Best RX Setting"));
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(ahitxt).arg(tmpRX[ls]->ahi,0,'f',2);
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Mode")).arg(modestr);
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2").arg(minstr).arg(tmpRX[ls]->min,0,'f',1);
|
||||
if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[ls]->max,0,'f',1);
|
||||
recbox+="</td></tr>";
|
||||
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Start")).arg(tmpRX[ls]->first.toString(Qt::SystemLocaleShortDate));
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("End")).arg(tmpRX[ls]->last.toString(Qt::SystemLocaleShortDate));
|
||||
recbox+=QString("<tr><td colspan=2> </td></tr>");
|
||||
|
||||
mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,tmpRX[0]->first,tmpRX[0]->first);
|
||||
if (mode<MODE_APAP) { // is CPAP?
|
||||
minstr="Pressure";
|
||||
maxstr="";
|
||||
modestr=tr("CPAP");
|
||||
} else if (mode<MODE_BIPAP) { // is AUTO?
|
||||
minstr="Min";
|
||||
maxstr="Max";
|
||||
modestr=tr("APAP");
|
||||
} else { // BIPAP or greater
|
||||
minstr="EPAP";
|
||||
maxstr="IPAP";
|
||||
modestr=tr("Bi-Level/ASV");
|
||||
}
|
||||
|
||||
recbox+=QString("<tr><td colspan=2><b><a href='overview=%1,%2'>%3</a></b></td></tr>")
|
||||
.arg(tmpRX[0]->first.toString(Qt::ISODate))
|
||||
.arg(tmpRX[0]->last.toString(Qt::ISODate))
|
||||
.arg(tr("Worst RX Setting"));
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(ahitxt).arg(tmpRX[0]->ahi,0,'f',2);
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Mode")).arg(modestr);
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2").arg(minstr).arg(tmpRX[0]->min,0,'f',1);
|
||||
if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[0]->max,0,'f',1);
|
||||
recbox+="</td></tr>";
|
||||
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Start")).arg(tmpRX[0]->first.toString(Qt::SystemLocaleShortDate));
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("End")).arg(tmpRX[0]->last.toString(Qt::SystemLocaleShortDate));
|
||||
}
|
||||
|
||||
recbox+=QString("<tr><td colspan=2><b><a href='overview=%1,%2'>%3</a></b></td></tr>")
|
||||
.arg(tmpRX[ls]->first.toString(Qt::ISODate))
|
||||
.arg(tmpRX[ls]->last.toString(Qt::ISODate))
|
||||
.arg(tr("Best RX Setting"));
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(ahitxt).arg(tmpRX[ls]->ahi,0,'f',2);
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Mode")).arg(modestr);
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2").arg(minstr).arg(tmpRX[ls]->min,0,'f',1);
|
||||
if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[ls]->max,0,'f',1);
|
||||
recbox+="</td></tr>";
|
||||
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Start")).arg(tmpRX[ls]->first.toString(Qt::SystemLocaleShortDate));
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("End")).arg(tmpRX[ls]->last.toString(Qt::SystemLocaleShortDate));
|
||||
recbox+=QString("<tr><td colspan=2> </td></tr>");
|
||||
|
||||
mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,tmpRX[0]->first,tmpRX[0]->first);
|
||||
if (mode<MODE_APAP) { // is CPAP?
|
||||
minstr="Pressure";
|
||||
maxstr="";
|
||||
modestr=tr("CPAP");
|
||||
} else if (mode<MODE_BIPAP) { // is AUTO?
|
||||
minstr="Min";
|
||||
maxstr="Max";
|
||||
modestr=tr("APAP");
|
||||
} else { // BIPAP or greater
|
||||
minstr="EPAP";
|
||||
maxstr="IPAP";
|
||||
modestr=tr("Bi-Level/ASV");
|
||||
}
|
||||
|
||||
recbox+=QString("<tr><td colspan=2><b><a href='overview=%1,%2'>%3</a></b></td></tr>")
|
||||
.arg(tmpRX[0]->first.toString(Qt::ISODate))
|
||||
.arg(tmpRX[0]->last.toString(Qt::ISODate))
|
||||
.arg(tr("Worst RX Setting"));
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(ahitxt).arg(tmpRX[0]->ahi,0,'f',2);
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Mode")).arg(modestr);
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2").arg(minstr).arg(tmpRX[0]->min,0,'f',1);
|
||||
if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[0]->max,0,'f',1);
|
||||
recbox+="</td></tr>";
|
||||
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("Start")).arg(tmpRX[0]->first.toString(Qt::SystemLocaleShortDate));
|
||||
recbox+=QString("<tr><td colspan=2>%1: %2</td></tr>").arg(tr("End")).arg(tmpRX[0]->last.toString(Qt::SystemLocaleShortDate));
|
||||
}
|
||||
recbox+=QString("</table>");
|
||||
recbox+="</table>";
|
||||
recbox+="</body></html>";
|
||||
ui->recordsBox->setHtml(recbox);
|
||||
|
||||
// ui->recordsBox->append("<a href='overview'><b>Best RX Setting</b></a>");
|
||||
// ui->recordsBox->append("Start: "+tmpRX[ls]->first.toString(Qt::SystemLocaleShortDate)+"<br/>End: "+tmpRX[ls]->last.toString(Qt::SystemLocaleShortDate)+"\n\n");
|
||||
// ui->recordsBox->append("<a href='overview'><b>Worst RX Setting</b></a>");
|
||||
// ui->recordsBox->append("Start: "+tmpRX[0]->first.toString(Qt::SystemLocaleShortDate)+"<br/>End: "+tmpRX[0]->last.toString(Qt::SystemLocaleShortDate)+"\n\n");
|
||||
|
||||
//show the second best and worst..
|
||||
//if (tmpRX.size()>4) {
|
||||
// tmpRX[1]->highlight=3; // worst
|
||||
// tmpRX[tmpRX.size()-2]->highlight=2; //best
|
||||
// }
|
||||
//RXsort=RX_first;
|
||||
//qSort(rxchange);
|
||||
html+="<div align=center>";
|
||||
html+=QString("<br/><b>Changes to Prescription Settings</b>");
|
||||
html+=QString("<table cellpadding=2 cellspacing=0 border=1 width=90%>");
|
||||
@ -1026,6 +1015,8 @@ void MainWindow::updateFavourites()
|
||||
ui->favouritesList->clear();
|
||||
|
||||
QDate date=PROFILE.LastDay();
|
||||
if (!date.isValid())
|
||||
return;
|
||||
|
||||
do {
|
||||
Day * journal=PROFILE.GetDay(date,MT_JOURNAL);
|
||||
@ -1038,6 +1029,13 @@ void MainWindow::updateFavourites()
|
||||
QStringList notes=sess->settings[Bookmark_Notes].toStringList();
|
||||
if (notes.size()>0) {
|
||||
QListWidgetItem *item=new QListWidgetItem(date.toString());
|
||||
/*QString tooltip;
|
||||
for (int i=0;i<notes.size();i++) {
|
||||
QDate d=start[i].toDate();
|
||||
tooltip+=d.toString(Qt::SystemLocaleShortDate)+":"+notes[i];
|
||||
if (i<notes.size()-1) tooltip+="\n";
|
||||
}
|
||||
item->setToolTip(tooltip);*/
|
||||
item->setData(Qt::UserRole,date);
|
||||
ui->favouritesList->addItem(item);
|
||||
}
|
||||
|
||||
@ -103,8 +103,13 @@ public:
|
||||
\brief Returns the current snapshotGraph object used by the report printing system */
|
||||
gGraphView *snapshotGraph() { return SnapshotGraph; }
|
||||
|
||||
//! \brief Returns the Daily Tab object
|
||||
Daily *getDaily() { return daily; }
|
||||
|
||||
//! \brief Returns the Overview Tab object
|
||||
Overview *getOverview() { return overview; }
|
||||
|
||||
//! \brief Returns the Oximetry Tab object
|
||||
Oximetry *getOximetry() { return oximetry; }
|
||||
|
||||
/*! \fn void RestartApplication(bool force_login=false);
|
||||
@ -239,10 +244,9 @@ private slots:
|
||||
//! \brief Destroy ALL the CPAP data for the currently selected machine, so it can be freshly imported again
|
||||
void on_actionAll_Data_for_current_CPAP_machine_triggered();
|
||||
|
||||
//! \brief Populates the statistics with information.
|
||||
void on_summaryButton_clicked();
|
||||
|
||||
|
||||
|
||||
void on_summaryButton_2_clicked();
|
||||
|
||||
void on_action_Sidebar_Toggle_toggled(bool arg1);
|
||||
@ -261,6 +265,7 @@ private slots:
|
||||
|
||||
void on_webView_statusBarMessage(const QString &text);
|
||||
|
||||
//! \brief Display Help WebView Link in statusbar.
|
||||
void LinkHovered(const QString & link, const QString & title, const QString & textContent);
|
||||
private:
|
||||
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
<enum>QTabWidget::North</enum>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="documentMode">
|
||||
<bool>false</bool>
|
||||
@ -91,7 +91,7 @@
|
||||
</property>
|
||||
<widget class="QWidget" name="summaryTab">
|
||||
<attribute name="title">
|
||||
<string>&Summary</string>
|
||||
<string>&Statistics</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<property name="spacing">
|
||||
@ -405,7 +405,7 @@
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="tabSpacing">
|
||||
<number>0</number>
|
||||
@ -414,7 +414,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>-211</y>
|
||||
<y>0</y>
|
||||
<width>143</width>
|
||||
<height>524</height>
|
||||
</rect>
|
||||
@ -518,7 +518,7 @@
|
||||
<normaloff>:/docs/sheep.png</normaloff>:/docs/sheep.png</iconset>
|
||||
</attribute>
|
||||
<attribute name="label">
|
||||
<string>Navigation</string>
|
||||
<string>&Navigation</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
@ -762,7 +762,7 @@
|
||||
<normaloff>:/icons/bookmark.png</normaloff>:/icons/bookmark.png</iconset>
|
||||
</attribute>
|
||||
<attribute name="label">
|
||||
<string>Favourites</string>
|
||||
<string>&Bookmarks</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_5">
|
||||
<property name="spacing">
|
||||
@ -836,7 +836,7 @@
|
||||
<normaloff>:/icons/trophy.png</normaloff>:/icons/trophy.png</iconset>
|
||||
</attribute>
|
||||
<attribute name="label">
|
||||
<string>Records</string>
|
||||
<string>&Records</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||
<property name="spacing">
|
||||
|
||||
@ -180,7 +180,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
|
||||
//set->addSlice(PRS1_SysOneResistSet,QColor("grey"),ST_SETAVG);
|
||||
set->addSlice(PRS1_HumidSetting,QColor("blue"),ST_SETWAVG,true);
|
||||
set->addSlice(PRS1_FlexSet,QColor("red"),ST_SETWAVG,true);
|
||||
set->addSlice(RMS9_EPR,QColor("green"),ST_SETWAVG,true);
|
||||
set->addSlice(RMS9_EPRSet,QColor("green"),ST_SETWAVG,true);
|
||||
set->addSlice(INTP_SmartFlex,QColor("purple"),ST_SETWAVG,true);
|
||||
SET->setRecMinY(0);
|
||||
SET->setRecMaxY(5);
|
||||
@ -230,6 +230,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
|
||||
//pr->addSlice(CPAP_Pressure,QColor("grey"),ST_90P,true);
|
||||
pr->addSlice(CPAP_Pressure,QColor("grey"),ST_PERC,true,0.95);
|
||||
} else {
|
||||
|
||||
pr->addSlice(CPAP_PressureMin,QColor("grey"),ST_SETWAVG,true);
|
||||
}
|
||||
PR->AddLayer(pr);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user