From 032ed8b1d0ef31bf64de290627211ffd1f501b80 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 30 Jul 2011 01:10:02 -0700 Subject: [PATCH] Windows build fixes, plus added ResMed plain apnea info/overlays/pie --- SleepLib/preferences.cpp | 10 +++++++--- SleepLib/session.cpp | 8 -------- daily.cpp | 26 +++++++++++++++++--------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/SleepLib/preferences.cpp b/SleepLib/preferences.cpp index 48e013c9..940d1ee5 100644 --- a/SleepLib/preferences.cpp +++ b/SleepLib/preferences.cpp @@ -16,6 +16,10 @@ License: GPL #include #include #include +#ifdef Q_WS_WIN32 +#include "windows.h" +#include "lmcons.h" +#endif #include "preferences.h" @@ -29,11 +33,11 @@ const QString & getUserName() #if defined (Q_WS_WIN32) #if defined(UNICODE) - if ( qWinVersion() & Qt::WV_NT_based ) { + if (QSysInfo::WindowsVersion >= QSysInfo::WV_NT) { TCHAR winUserName[UNLEN + 1]; // UNLEN is defined in LMCONS.H DWORD winUserNameSize = sizeof(winUserName); - GetUserName( winUserName, &winUserNameSize ); - userName = qt_winQString( winUserName ); + GetUserNameW( winUserName, &winUserNameSize ); + userName = QString::fromStdWString( winUserName ); } else #endif { diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 3a488ef4..d2264bed 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -107,14 +107,6 @@ const quint16 filetype_summary=0; const quint16 filetype_data=1; const quint32 magic=0xC73216AB; - -bool IsPlatformLittleEndian() -{ - quint32 j=1; - *((char*)&j) = 0; - return j!=1; -} - bool Session::StoreSummary(QString filename) { diff --git a/daily.cpp b/daily.cpp index a6b45d99..b1188cec 100644 --- a/daily.cpp +++ b/daily.cpp @@ -56,7 +56,9 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) gSplitter=new QSplitter(Qt::Vertical,ui->scrollArea); gSplitter->setStyleSheet("QSplitter::handle { background-color: 'light grey'; }"); gSplitter->setHandleWidth(3); +#ifdef Q_WS_MAC gSplitter->setOpaqueResize(false); +#endif ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); @@ -159,6 +161,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) FRW->AddLayer(AddCPAP(new gLineOverlayBar(PRS1_Unknown0E,QColor("yellow"),"0E",FT_Dot))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_RERA,QColor("gold"),"RE"))); //FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Unknown0E,QColor("dark green"),"U0E"))); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Apnea,QColor("dark green"),"A"))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_VSnore,QColor("red"),"VS"))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_FlowLimit,QColor("black"),"FL"))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Obstructive,QColor("#40c0ff"),"OA"))); @@ -235,6 +238,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) G_AHI->SetMargins(0,0,0,0); seg=new gSegmentChart(GST_Pie); seg->AddSlice(CPAP_Hypopnea,QColor(0x40,0x40,0xff,0xff),"H"); + seg->AddSlice(CPAP_Apnea,QColor(0x20,0x80,0x20,0xff),"A"); seg->AddSlice(CPAP_Obstructive,QColor(0x40,0xaf,0xbf,0xff),"OA"); seg->AddSlice(CPAP_ClearAirway,QColor(0xb2,0x54,0xcd,0xff),"CA"); seg->AddSlice(CPAP_RERA,QColor(0xff,0xff,0x80,0xff),"RE"); @@ -366,7 +370,6 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) map mccnt; int total_events=0; - for (vector::iterator s=day->begin();s!=day->end();s++) { map >::iterator m; @@ -392,7 +395,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) if (st.isEmpty()) { st="Fixme "+QString::number((int)code); } - st+=" ("+QString::number(cnt)+")"; + st+=" ("+QString::number(cnt)+" event"+((cnt>1)?"s":"")+")"; QStringList l(st); l.append(""); mcroot[code]=mcr=new QTreeWidgetItem(root,l); @@ -409,7 +412,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) } QStringList a; QDateTime d=QDateTime::fromMSecsSinceEpoch(t); - QString s=QString("#%1: %2 (%3)").arg((int)mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")).arg(m->second[z]->raw(o)); + QString s=QString("#%1: %2 (%3)").arg((int)++mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")).arg(m->second[z]->raw(o)); a.append(s); a.append(d.toString("yyyy-MM-dd HH:mm:ss")); mcr->addChild(new QTreeWidgetItem(a)); @@ -573,8 +576,9 @@ void Daily::Load(QDate date) } modestr=CPAPModeNames[mode]; - float ahi=(cpap->count(CPAP_Obstructive)+cpap->count(CPAP_Hypopnea)+cpap->count(CPAP_ClearAirway))/cpap->hours(); + float ahi=(cpap->count(CPAP_Obstructive)+cpap->count(CPAP_Hypopnea)+cpap->count(CPAP_ClearAirway)+cpap->count(CPAP_Apnea))/cpap->hours(); float csr=(100.0/cpap->hours())*(cpap->sum(CPAP_CSR)/3600.0); + float uai=cpap->count(CPAP_Apnea)/cpap->hours(); float oai=cpap->count(CPAP_Obstructive)/cpap->hours(); float hi=cpap->count(CPAP_Hypopnea)/cpap->hours(); float cai=cpap->count(CPAP_ClearAirway)/cpap->hours(); @@ -613,9 +617,12 @@ void Daily::Load(QDate date) } else cs="2>"; 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" + ""+tr("Hypopnea")+""+QString().sprintf("%.2f",hi)+"\n"; + if (cpap->machine->GetClass()=="ResMed") { + html+=""+tr("Apnea")+""+QString().sprintf("%.2f",uai)+"\n"; + } + html+=""+tr("Obstructive")+""+QString().sprintf("%.2f",oai)+"\n" + ""+tr("Clear Airway")+""+QString().sprintf("%.2f",cai)+"\n" ""; if (cpap->machine->GetClass()=="PRS1") { @@ -626,6 +633,7 @@ void Daily::Load(QDate date) ""+tr("PB/CSR")+""+QString().sprintf("%.2f",csr)+"%\n" ""; } + html+="\n"+tr("Event Breakdown")+"\n"; if (1) { // AHI Pie Chart G_AHI->setFixedSize(gwwidth,120); @@ -960,8 +968,8 @@ void Daily::on_treeWidget_itemSelectionChanged() QDateTime d; if (!item->text(1).isEmpty()) { d=d.fromString(item->text(1),"yyyy-MM-dd HH:mm:ss"); - double st=(d.addSecs(-180)).toMSecsSinceEpoch(); - double et=(d.addSecs(180)).toMSecsSinceEpoch(); + double st=(d.addSecs(-120)).toMSecsSinceEpoch(); + double et=(d.addSecs(120)).toMSecsSinceEpoch(); FRW->SetXBounds(st,et); MP->SetXBounds(st,et); SF->SetXBounds(st,et);