From 8f91928e7b95df23d2fd6c508f853a82fff8afdd Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 5 Jul 2011 15:33:06 +1000 Subject: [PATCH] Changing computers, html cleanups --- SleepLib/day.cpp | 4 +-- SleepLib/day.h | 2 +- daily.cpp | 86 ++++++++++++++++++++++-------------------------- mainwindow.cpp | 2 +- 4 files changed, 44 insertions(+), 50 deletions(-) diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index fd8fd4ab..e9e0a38c 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -204,9 +204,9 @@ EventDataType Day::sum(MachineCode code,int field) return val; } -EventDataType Day::count(MachineCode code) +int Day::count(MachineCode code) { - EventDataType val=0; + int val=0; for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); diff --git a/SleepLib/day.h b/SleepLib/day.h index ed304219..b98762c4 100644 --- a/SleepLib/day.h +++ b/SleepLib/day.h @@ -29,7 +29,7 @@ public: EventDataType max(MachineCode code,int field=0); EventDataType avg(MachineCode code,int field=0); EventDataType sum(MachineCode code,int field=0); - EventDataType count(MachineCode code); + int count(MachineCode code); EventDataType weighted_avg(MachineCode code,int field=0); EventDataType percentile(MachineCode mc,int field,double percent); diff --git a/daily.cpp b/daily.cpp index 6eba2abc..99b85d8c 100644 --- a/daily.cpp +++ b/daily.cpp @@ -410,6 +410,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) QTreeWidgetItem *root=NULL;//new QTreeWidgetItem((QTreeWidget *)0,QStringList("Stuff")); map mcroot; map mccnt; + int total_events=0; for (vector::iterator s=day->begin();s!=day->end();s++) { @@ -432,13 +433,15 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) if (code==PRS1_Unknown12) continue; QTreeWidgetItem *mcr; if (mcroot.find(code)==mcroot.end()) { + int cnt=day->count(code); + total_events+=cnt; QString st=DefaultMCLongNames[m->first]; if (st.isEmpty()) { - st=st.sprintf("Fixme: %i",code); + st="Fixme "+QString::number((int)code); } + st+=" ("+QString::number(cnt)+")"; QStringList l(st); l.append(""); - //QString g=""; mcroot[code]=mcr=new QTreeWidgetItem(root,l); mccnt[code]=0; } else { @@ -450,16 +453,8 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) t-=((*(*e))[0]/2)*1000; } QStringList a; - QString c,b; - c.sprintf("#%03i: ",++mccnt[code]); QDateTime d=QDateTime::fromMSecsSinceEpoch(t); - c+=d.toString(" HH:mm:ss"); - - //if ((*e)->fields()) { // Perhaps need a dedicated offset field - //b.sprintf(" %02.0f",(*(*e))[0]); - //c+=b; - //} - a.append(c); + a.append(QString("#%1: %2").arg((int)++mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss"))); a.append(d.toString("yyyy-MM-dd HH:mm:ss")); mcr->addChild(new QTreeWidgetItem(a)); } @@ -469,8 +464,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) for (map::iterator m=mcroot.begin();m!=mcroot.end();m++) { tree->insertTopLevelItem(cnt++,m->second); } - - + //tree->insertTopLevelItem(cnt++,new QTreeWidgetItem(QStringList("[Total Events ("+QString::number(total_events)+")]"))); tree->sortByColumn(0,Qt::AscendingOrder); //tree->expandAll(); } @@ -516,10 +510,10 @@ void Daily::Load(QDate date) Day *oxi=profile->GetDay(date,MT_OXIMETER); // Day *sleepstage=profile->GetDay(date,MT_SLEEPSTAGE); - QString html=""; - html+=""; - html+=""; - html+="\n"; + QString html="" + "" + "" + "
\n"; QString tmp; const int gwwidth=240; @@ -539,8 +533,7 @@ void Daily::Load(QDate date) if (pr==PR_NONE) epr=tr(" No Pressure Relief"); else { - a.sprintf(" x%i",(int)cpap->summary_max(CPAP_PressureReliefSetting)); - epr=PressureReliefNames[pr]+a; + epr=PressureReliefNames[pr]+QString(" x%1").arg((int)cpap->summary_max(CPAP_PressureReliefSetting)); } modestr=CPAPModeNames[mode]; @@ -571,30 +564,33 @@ void Daily::Load(QDate date) QDateTime date=QDateTime::fromMSecsSinceEpoch(cpap->first()); QDateTime date2=QDateTime::fromMSecsSinceEpoch(cpap->last()); - html+="\n"; - html+="\n"; + html+=QString("\n" + "\n") + .arg(date.date().toString(Qt::SystemLocaleShortDate)) + .arg(date.toString("HH:mm")) + .arg(date2.toString("HH:mm")) + .arg(QString().sprintf("%02i:%02i",tt/3600,tt%60)); QString cs; if (cpap->machine->GetClass()!="PRS1") { cs="4 align=center>"; } else cs="2>"; - html+=("\n"); - html+=("\n"); - html+=("\n"); - html+=("\n"); - html+="
"+date.date().toString(Qt::SystemLocaleShortDate)+""+date.toString("HH:mm")+""+date2.toString("HH:mm")+""+a.sprintf("%02i:%02i",tt/3600,tt%60)+"
%1%2%3%4
"); - html+=("
")+tr("AHI")+("")+a.sprintf("%.2f",ahi)+("
")+tr("Hypopnea")+("")+a.sprintf("%.2f",hi)+("
")+tr("Obstructive")+("")+a.sprintf("%.2f",oai)+("
")+tr("ClearAirway")+("")+a.sprintf("%.2f",cai)+("
"; - if (cpap->machine->GetClass()=="PRS1") { - html+=""; - html+="\n"); - html+="\n"); - html+="\n"); - html+="\n"); - html+="
"+tr("RERA")+("")+a.sprintf("%.2f",rei)+("
"+tr("FlowLimit")+("")+a.sprintf("%.2f",fli)+("
"+tr("Vsnore")+("")+a.sprintf("%.2f",vsi)+("
"+tr("PB/CSR")+("")+a.sprintf("%.2f",csr)+("%
"; - } - html+=""; + html+="" + ""+tr("AHI")+""+QString().sprintf("%.2f",ahi)+"\n" + ""+tr("Hypopnea")+""+QString().sprintf("%.2f",hi)+"\n" + ""+tr("Obstructive")+""+QString().sprintf("%.2f",oai)+"\n" + ""+tr("ClearAirway")+""+QString().sprintf("%.2f",cai)+"\n" + ""; - html+=("")+tr("Event Breakdown")+("\n"); + if (cpap->machine->GetClass()=="PRS1") { + html+="" + "\n" + "\n" + "\n" + "\n" + "
"+tr("RERA")+""+QString().sprintf("%.2f",rei)+"
"+tr("FlowLimit")+""+a.sprintf("%.2f",fli)+"
"+tr("Vsnore")+""+QString().sprintf("%.2f",vsi)+"
"+tr("PB/CSR")+""+QString().sprintf("%.2f",csr)+"%
"; + } + html+="\n"+tr("Event Breakdown")+"\n"; { G_AHI->setFixedSize(gwwidth,gwheight); QPixmap pixmap=G_AHI->renderPixmap(120,120,false); //gwwidth,gwheight,false); @@ -604,19 +600,17 @@ void Daily::Load(QDate date) pixmap.save(&buffer, "PNG"); html += "\n"; } - html+=(""); - html+=("\n"); - //html+=("\n"); - html+=("\n"); - //html+=wxT("\n"); + html+="
 
" + "\n" + "\n"; if (mode==MODE_BIPAP) { - html+=("\n"; - html+=("\n"; + html+="\n" + "\n"; } else if (mode==MODE_APAP) { - html+=("\n"); + html+=("\n"); } else if (mode==MODE_CPAP) { - html+=("\n"); + html+=("\n"); } //html+=("\n"); diff --git a/mainwindow.cpp b/mainwindow.cpp index c7e2c224..78374d28 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -145,7 +145,7 @@ void MainWindow::on_homeButton_clicked() QString file="qrc:/docs/index.html"; QUrl url(file); ui->webView->setUrl(url); - ui->webView->load(url); + //ui->webView->load(url); } void MainWindow::on_backButton_clicked()
")+tr("90% EPAP ")+a.sprintf("%.2f",eap90)+tr("cmH2O")+"
")+tr("90% IPAP ")+a.sprintf("%.2f",iap90)+"
"+tr("90% EPAP ")+QString().sprintf("%.2f",eap90)+tr("cmH2O")+"
"+tr("90% IPAP ")+QString().sprintf("%.2f",iap90)+"
")+tr("90% Pressure ")+a.sprintf("%.2f",cpap->summary_weighted_avg(CPAP_PressurePercentValue))+("
")+tr("90% Pressure ")+QString().sprintf("%.2f",cpap->summary_weighted_avg(CPAP_PressurePercentValue))+("
")+tr("Pressure ")+a.sprintf("%.2f",cpap->summary_min(CPAP_PressureMin))+("
")+tr("Pressure ")+QString().sprintf("%.2f",cpap->summary_min(CPAP_PressureMin))+("