From 54da056efcbc55d8832e45deccc8f6e7d5cb9c3f Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 18 Dec 2011 00:38:15 +1000 Subject: [PATCH] VSC++2010 Compatability Fixes --- Graphs/gGraphView.cpp | 4 +- Graphs/gGraphView.h | 2 +- Graphs/gStatsLine.cpp | 4 +- Graphs/gSummaryChart.cpp | 4 +- Graphs/glcommon.cpp | 8 ++++ Graphs/glcommon.h | 6 +++ SleepLib/calcs.cpp | 8 ++-- SleepLib/day.cpp | 8 ++-- SleepLib/day.h | 4 +- SleepLib/event.h | 4 +- SleepLib/loader_plugins/prs1_loader.cpp | 14 +++--- SleepLib/loader_plugins/resmed_loader.cpp | 12 ++--- SleepLib/schema.h | 4 +- SleepLib/session.cpp | 20 ++++---- SleepLib/session.h | 4 +- SleepyHeadQT.pro | 5 ++ UpdaterWindow.cpp | 10 ++-- daily.cpp | 8 ++-- mainwindow.cpp | 3 -- oximetry.cpp | 56 +++++++++++------------ 20 files changed, 104 insertions(+), 84 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index d5c53d7c..25064386 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -756,8 +756,8 @@ void Layer::SetDay(Day * d) m_day=d; m_minx=d->first(m_code); m_maxx=d->last(m_code); - m_miny=d->min(m_code); - m_maxy=d->max(m_code); + m_miny=d->Min(m_code); + m_maxy=d->Max(m_code); } else m_day=NULL; } diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h index f97b97e3..9b9ee380 100644 --- a/Graphs/gGraphView.h +++ b/Graphs/gGraphView.h @@ -47,7 +47,7 @@ public: void scissor(GLshort x1, GLshort y1, GLshort x2, GLshort y2) { s1=x1; s2=y1; s3=x2; s4=y2; m_scissor=true; } virtual void draw(){} void reset() { m_cnt=0; } - int max() { return m_max; } + int Max() { return m_max; } int cnt() { return m_cnt; } bool full() { return m_cnt>=m_max; } float size() { return m_size; } diff --git a/Graphs/gStatsLine.cpp b/Graphs/gStatsLine.cpp index 7cd03bef..65c9e9b8 100644 --- a/Graphs/gStatsLine.cpp +++ b/Graphs/gStatsLine.cpp @@ -40,8 +40,8 @@ void gStatsLine::SetDay(Day *d) { Layer::SetDay(d); if (!m_day) return; - m_min=d->min(m_code); - m_max=d->max(m_code); + m_min=d->Min(m_code); + m_max=d->Max(m_code); m_avg=d->wavg(m_code); m_p90=d->p90(m_code); diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index deb0fc14..6c92ee62 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -141,8 +141,8 @@ void SummaryChart::SetDay(Day * nullday) case ST_SUM: tmp=day->sum(code); break; case ST_WAVG: tmp=day->wavg(code); break; case ST_90P: tmp=day->p90(code); break; - case ST_MIN: tmp=day->min(code); break; - case ST_MAX: tmp=day->max(code); break; + case ST_MIN: tmp=day->Min(code); break; + case ST_MAX: tmp=day->Max(code); break; case ST_CNT: tmp=day->count(code); break; case ST_CPH: tmp=day->cph(code); break; case ST_SPH: tmp=day->sph(code); break; diff --git a/Graphs/glcommon.cpp b/Graphs/glcommon.cpp index b592654f..85d0a76a 100644 --- a/Graphs/glcommon.cpp +++ b/Graphs/glcommon.cpp @@ -7,6 +7,14 @@ #include #include "glcommon.h" +#ifdef BUILD_WITH_MSVC +double round(double number) +{ + return number < 0.0 ? ceil(number - 0.5) : floor(number+0.5); +} +#endif + + void RoundedRectangle(int x,int y,int w,int h,int radius,const QColor color) { diff --git a/Graphs/glcommon.h b/Graphs/glcommon.h index 011b0763..92b4cf92 100644 --- a/Graphs/glcommon.h +++ b/Graphs/glcommon.h @@ -13,4 +13,10 @@ void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,QColor color); void RoundedRectangle(int x,int y,int w,int h,int radius,const QColor color); +#ifdef BUILD_WITH_MSVC +const double M_PI=3.141592653589793; + +double round(double number); +#endif + #endif // GLCOMMON_H diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp index b08349bb..b39959cc 100644 --- a/SleepLib/calcs.cpp +++ b/SleepLib/calcs.cpp @@ -559,8 +559,8 @@ int calcPulseChange(Session *session) return 0; } session->eventlist[OXI_PulseChange].push_back(pc); - session->setMin(OXI_PulseChange,pc->min()); - session->setMax(OXI_PulseChange,pc->max()); + session->setMin(OXI_PulseChange,pc->Min()); + session->setMax(OXI_PulseChange,pc->Max()); session->setCount(OXI_PulseChange,pc->count()); session->setFirst(OXI_PulseChange,pc->first()); session->setLast(OXI_PulseChange,pc->last()); @@ -678,8 +678,8 @@ int calcSPO2Drop(Session *session) return 0; } session->eventlist[OXI_SPO2Drop].push_back(pc); - session->setMin(OXI_SPO2Drop,pc->min()); - session->setMax(OXI_SPO2Drop,pc->max()); + session->setMin(OXI_SPO2Drop,pc->Min()); + session->setMax(OXI_SPO2Drop,pc->Max()); session->setCount(OXI_SPO2Drop,pc->count()); session->setFirst(OXI_SPO2Drop,pc->first()); session->setLast(OXI_SPO2Drop,pc->last()); diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index b9299ea2..41e97077 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -359,7 +359,7 @@ qint64 Day::last(ChannelID code) } return date; } -EventDataType Day::min(ChannelID code) +EventDataType Day::Min(ChannelID code) { EventDataType min=0; EventDataType tmp; @@ -367,7 +367,7 @@ EventDataType Day::min(ChannelID code) for (QVector::iterator s=sessions.begin();s!=sessions.end();s++) { if (!(*s)->m_min.contains(code)) continue; //if ((*s)->eventlist.find(code)==(*s)->eventlist.end()) continue; - tmp=(*s)->min(code); + tmp=(*s)->Min(code); if (first) { min=tmp; first=false; @@ -426,7 +426,7 @@ bool Day::hasData(ChannelID code, SummaryType type) return has; } -EventDataType Day::max(ChannelID code) +EventDataType Day::Max(ChannelID code) { EventDataType max=0; EventDataType tmp; @@ -434,7 +434,7 @@ EventDataType Day::max(ChannelID code) for (QVector::iterator s=sessions.begin();s!=sessions.end();s++) { if (!(*s)->m_max.contains(code)) continue; // if ((*s)->eventlist.find(code)==(*s)->eventlist.end()) continue; - tmp=(*s)->max(code); + tmp=(*s)->Max(code); if (first) { max=tmp; first=false; diff --git a/SleepLib/day.h b/SleepLib/day.h index 21b843fc..6e0e5fdb 100644 --- a/SleepLib/day.h +++ b/SleepLib/day.h @@ -28,8 +28,8 @@ public: MachineType machine_type(); int count(ChannelID code); - EventDataType min(ChannelID code); - EventDataType max(ChannelID code); + EventDataType Min(ChannelID code); + EventDataType Max(ChannelID code); EventDataType cph(ChannelID code); EventDataType sph(ChannelID code); EventDataType p90(ChannelID code); diff --git a/SleepLib/event.h b/SleepLib/event.h index 72f285e0..d72c7d1f 100644 --- a/SleepLib/event.h +++ b/SleepLib/event.h @@ -51,8 +51,8 @@ public: void setRate(EventDataType v) { m_rate=v; } //void setCode(ChannelID id) { m_code=id; } - inline const EventDataType & min() { return m_min; } - inline const EventDataType & max() { return m_max; } + inline const EventDataType & Min() { return m_min; } + inline const EventDataType & Max() { return m_max; } inline const EventDataType & min2() { return m_min2; } inline const EventDataType & max2() { return m_max2; } inline const EventDataType & gain() { return m_gain; } diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 23da379a..00ed967d 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -375,8 +375,8 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) sess->setAvg(CPAP_Pressure,(sess->avg(CPAP_EPAP)+sess->avg(CPAP_IPAP))/2.0); sess->setWavg(CPAP_Pressure,(sess->wavg(CPAP_EPAP)+sess->wavg(CPAP_IPAP))/2.0); - sess->setMin(CPAP_Pressure,sess->min(CPAP_EPAP)); - sess->setMax(CPAP_Pressure,sess->max(CPAP_IPAP)); + sess->setMin(CPAP_Pressure,sess->Min(CPAP_EPAP)); + sess->setMax(CPAP_Pressure,sess->Max(CPAP_IPAP)); sess->set90p(CPAP_Pressure,(sess->p90(CPAP_IPAP)+sess->p90(CPAP_EPAP))/2.0); //sess->p90(CPAP_EPAP); //sess->p90(CPAP_IPAP); @@ -384,14 +384,14 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) //sess->avg(CPAP_Pressure); //sess->wavg(CPAP_Pressure); //sess->p90(CPAP_Pressure); - //sess->min(CPAP_Pressure); - //sess->max(CPAP_Pressure); + //sess->Min(CPAP_Pressure); + //sess->Max(CPAP_Pressure); //sess->cph(CPAP_Pressure); if (!sess->settings.contains(CPAP_PressureMin)) { sess->settings[CPAP_BrokenSummary]=true; //sess->set_last(sess->first()); - if (sess->min(CPAP_Pressure)==sess->max(CPAP_Pressure)) { + if (sess->Min(CPAP_Pressure)==sess->Max(CPAP_Pressure)) { sess->settings[CPAP_Mode]=MODE_CPAP; // no ramp } else { sess->settings[CPAP_Mode]=MODE_UNKNOWN; @@ -1544,9 +1544,9 @@ bool PRS1Loader::OpenWaveforms(SessionID sid, QString filename) a->setMax(120); a->setMin(-120); } else if (wc[i]==CPAP_MaskPressure) { -// int v=ceil(a->max()/5); +// int v=ceil(a->Max()/5); // a->setMax(v*5); -// v=floor(a->min()/5); +// v=floor(a->Min()/5); // a->setMin(v*5); } diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index a966c5e3..4a6de110 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -625,8 +625,8 @@ bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf) EventList *a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate); a->setDimension(es.physical_dimension); a->AddWaveform(edf.startdate,es.data,recs,duration); - sess->setMin(code,a->min()); - sess->setMax(code,a->max()); + sess->setMin(code,a->Min()); + sess->setMax(code,a->Max()); //delete edf.edfsignals[s]->data; //edf.edfsignals[s]->data=NULL; // so it doesn't get deleted when edf gets trashed. } @@ -697,8 +697,8 @@ bool ResmedLoader::LoadSAD(Session *sess,EDFParser &edf) if (hasdata) { EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); if (a) { - sess->setMin(code,a->min()); - sess->setMax(code,a->max()); + sess->setMin(code,a->Min()); + sess->setMax(code,a->Max()); } } @@ -799,8 +799,8 @@ bool ResmedLoader::LoadPLD(Session *sess,EDFParser &edf) a=NULL; } if (a) { - sess->setMin(code,a->min()); - sess->setMax(code,a->max()); + sess->setMin(code,a->Min()); + sess->setMax(code,a->Max()); a->setDimension(es.physical_dimension); } } diff --git a/SleepLib/schema.h b/SleepLib/schema.h index 41fc3d2f..4d8bf477 100644 --- a/SleepLib/schema.h +++ b/SleepLib/schema.h @@ -120,8 +120,8 @@ public: Layer *addLayer(Layer *layer);// { m_layers.push_back(layer); return layer; } void setMin(EventDataType min) { m_min=min; m_hasmin=true; } void setMax(EventDataType max) { m_max=max; m_hasmax=true; } - EventDataType min() { return m_min; } - EventDataType max() { return m_max; } + EventDataType Min() { return m_min; } + EventDataType Max() { return m_max; } bool visible() { return m_visible; } void setVisible(bool b) { m_visible=b; } protected: diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 8300b454..d846d709 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -272,8 +272,8 @@ bool Session::StoreEvents(QString filename) out << e.rate(); out << e.gain(); out << e.offset(); - out << e.min(); - out << e.max(); + out << e.Min(); + out << e.Max(); out << e.dimension(); out << e.hasSecondField(); if (e.hasSecondField()) { @@ -465,8 +465,8 @@ void Session::UpdateSummaries() id=c.key(); if (schema::channel[id].type()==schema::DATA) { //sum(id); // avg calculates this and cnt. - min(id); - max(id); + Min(id); + Max(id); count(id); if ((id==CPAP_FlowRate) || (id==CPAP_MaskPressure)) continue; @@ -505,7 +505,7 @@ bool Session::SearchEvent(ChannelID code, qint64 time, qint64 dist) } -EventDataType Session::min(ChannelID id) +EventDataType Session::Min(ChannelID id) { QHash::iterator i=m_min.find(id); if (i!=m_min.end()) @@ -523,8 +523,8 @@ EventDataType Session::min(ChannelID id) for (int i=0;icount()==0) continue; - t1=evec[i]->min(); - if (t1==0 && t1==evec[i]->max()) continue; + t1=evec[i]->Min(); + if (t1==0 && t1==evec[i]->Max()) continue; if (first) { min=t1; first=false; @@ -535,7 +535,7 @@ EventDataType Session::min(ChannelID id) m_min[id]=min; return min; } -EventDataType Session::max(ChannelID id) +EventDataType Session::Max(ChannelID id) { QHash::iterator i=m_max.find(id); if (i!=m_max.end()) @@ -552,8 +552,8 @@ EventDataType Session::max(ChannelID id) EventDataType max=0,t1; for (int i=0;icount()==0) continue; - t1=evec[i]->max(); - if (t1==0 && t1==evec[i]->min()) continue; + t1=evec[i]->Max(); + if (t1==0 && t1==evec[i]->Min()) continue; if (first) { max=t1; first=false; diff --git a/SleepLib/session.h b/SleepLib/session.h index b6651c67..d51bb2cb 100644 --- a/SleepLib/session.h +++ b/SleepLib/session.h @@ -120,8 +120,8 @@ public: double sum(ChannelID id); EventDataType avg(ChannelID id); EventDataType wavg(ChannelID i); - EventDataType min(ChannelID id); - EventDataType max(ChannelID id); + EventDataType Min(ChannelID id); + EventDataType Max(ChannelID id); EventDataType p90(ChannelID id); EventDataType cph(ChannelID id); EventDataType sph(ChannelID id); diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index 1175f7cc..abecadce 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -95,6 +95,11 @@ win32 { SOURCES += qextserialport/win_qextserialport.cpp qextserialport/qextserialenumerator_win.cpp DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this LIBS += -lsetupapi + + if (win32-msvc2008|win32-msvc2010):equals(TEMPLATE_PREFIX, "vc") { + LIBS += -ladvapi32 + DEFINES += BUILD_WITH_MSVC + } } HEADERS += \ diff --git a/UpdaterWindow.cpp b/UpdaterWindow.cpp index 9a0fecfa..a3fb7919 100644 --- a/UpdaterWindow.cpp +++ b/UpdaterWindow.cpp @@ -394,11 +394,15 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply) qzf.close(); } zip.close(); - if (!errors) { + if (errors) { + // gone and wrecked the install here.. + // probably should wait till get here before replacing files.. + // but then again, this is probably what would screw up + mainwin->Notify("You may need to reinstall manually. Sorry :(",5000,"Ugh.. Something went wrong with unzipping."); + // TODO: Roll back from the backup folder + failed=true; } } - - } ui->tableWidget->item(current_row,0)->setCheckState(Qt::Checked); if (failed) { diff --git a/daily.cpp b/daily.cpp index 120e45fe..300e1714 100644 --- a/daily.cpp +++ b/daily.cpp @@ -811,20 +811,20 @@ void Daily::Load(QDate date) QString tooltip=schema::channel[code].description(); if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")"; html+=""+schema::channel[code].label()+""; - html+=""+a.sprintf("%.2f",cpap->min(code)-suboffset); + html+=""+a.sprintf("%.2f",cpap->Min(code)-suboffset); html+=""+a.sprintf("%.2f",cpap->wavg(code)-suboffset); html+=""+a.sprintf("%.2f",cpap->p90(code)-suboffset); - html+=""+a.sprintf("%.2f",cpap->max(code)-suboffset); + html+=""+a.sprintf("%.2f",cpap->Max(code)-suboffset); html+=""; } if (oxi && oxi->channelHasData(code)) { QString tooltip=schema::channel[code].description(); if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")"; html+=""+schema::channel[code].label()+""; - html+=""+a.sprintf("%.2f",oxi->min(code)); + html+=""+a.sprintf("%.2f",oxi->Min(code)); html+=""+a.sprintf("%.2f",oxi->wavg(code)); html+=""+a.sprintf("%.2f",oxi->p90(code)); - html+=""+a.sprintf("%.2f",oxi->max(code)); + html+=""+a.sprintf("%.2f",oxi->Max(code)); html+=""; } } diff --git a/mainwindow.cpp b/mainwindow.cpp index 8ade00ea..bba69560 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -229,9 +229,6 @@ void MainWindow::Startup() if (overview) overview->ReloadGraphs(); qprogress->hide(); qstatus->setText(""); - qDebug() << "applicationDirPath =" << QApplication::applicationDirPath(); - qDebug() << "applicationFilePath =" << QApplication::applicationFilePath(); - } void MainWindow::on_action_Import_Data_triggered() diff --git a/oximetry.cpp b/oximetry.cpp index 33454d0d..d69c09f9 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -249,8 +249,8 @@ void SerialOximeter::addPlethy(qint64 time, EventDataType pleth) { plethy->AddEvent(time,pleth); session->setCount(OXI_Plethy,plethy->count()); // update the cache - session->setMin(OXI_Plethy,plethy->min()); - session->setMax(OXI_Plethy,plethy->max()); + session->setMin(OXI_Plethy,plethy->Min()); + session->setMax(OXI_Plethy,plethy->Max()); session->setLast(OXI_Plethy,time); session->set_last(time); plethy->setLast(time); @@ -333,10 +333,10 @@ void SerialOximeter::compactAll() } else if (code==OXI_Plethy) { compactToWaveform(e); } - if (min > e->min()) - min=e->min(); - if (max < e->max()) - max=e->max(); + if (min > e->Min()) + min=e->Min(); + if (max < e->Max()) + max=e->Max(); if (!minx || (minx > e->first())) minx=e->first(); if (!maxx || (maxx < e->last())) @@ -1053,19 +1053,19 @@ void Oximetry::data_changed() spo2->setMinX(first); spo2->setMaxX(last); - plethy->setMinY((oximeter->Plethy())->min()); - plethy->setMaxY((oximeter->Plethy())->max()); - pulse->setMinY((oximeter->Pulse())->min()); - pulse->setMaxY((oximeter->Pulse())->max()); - spo2->setMinY((oximeter->Spo2())->min()); - spo2->setMaxY((oximeter->Spo2())->max()); + plethy->setMinY((oximeter->Plethy())->Min()); + plethy->setMaxY((oximeter->Plethy())->Max()); + pulse->setMinY((oximeter->Pulse())->Min()); + pulse->setMaxY((oximeter->Pulse())->Max()); + spo2->setMinY((oximeter->Spo2())->Min()); + spo2->setMaxY((oximeter->Spo2())->Max()); - PLETHY->SetMinY((oximeter->Plethy())->min()); - PLETHY->SetMaxY((oximeter->Plethy())->max()); - PULSE->SetMinY((oximeter->Pulse())->min()); - PULSE->SetMaxY((oximeter->Pulse())->max()); - SPO2->SetMinY((oximeter->Spo2())->min()); - SPO2->SetMaxY((oximeter->Spo2())->max()); + PLETHY->SetMinY((oximeter->Plethy())->Min()); + PLETHY->SetMaxY((oximeter->Plethy())->Max()); + PULSE->SetMinY((oximeter->Pulse())->Min()); + PULSE->SetMaxY((oximeter->Pulse())->Max()); + SPO2->SetMinY((oximeter->Spo2())->Min()); + SPO2->SetMaxY((oximeter->Spo2())->Max()); /*PLETHY->MinY(); PLETHY->MaxY(); @@ -1527,13 +1527,13 @@ void Oximetry::updateGraphs() qint64 first=session->first(); qint64 last=session->last(); - ui->pulseLCD->display(session->min(OXI_Pulse)); - ui->spo2LCD->display(session->min(OXI_SPO2)); + ui->pulseLCD->display(session->Min(OXI_Pulse)); + ui->spo2LCD->display(session->Min(OXI_SPO2)); - pulse->setMinY(session->min(OXI_Pulse)); - pulse->setMaxY(session->max(OXI_Pulse)); - spo2->setMinY(session->min(OXI_SPO2)); - spo2->setMaxY(session->max(OXI_SPO2)); + pulse->setMinY(session->Min(OXI_Pulse)); + pulse->setMaxY(session->Max(OXI_Pulse)); + spo2->setMinY(session->Min(OXI_SPO2)); + spo2->setMaxY(session->Max(OXI_SPO2)); PULSE->setRecMinY(60); PULSE->setRecMaxY(100); @@ -1542,10 +1542,10 @@ void Oximetry::updateGraphs() day->setFirst(first); day->setLast(last); - pulse->setMinY(session->min(OXI_Pulse)); - pulse->setMaxY(session->max(OXI_Pulse)); - spo2->setMinY(session->min(OXI_SPO2)); - spo2->setMaxY(session->max(OXI_SPO2)); + pulse->setMinY(session->Min(OXI_Pulse)); + pulse->setMaxY(session->Max(OXI_Pulse)); + spo2->setMinY(session->Min(OXI_SPO2)); + spo2->setMaxY(session->Max(OXI_SPO2)); PULSE->setRecMinY(60); PULSE->setRecMaxY(100);