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

QExtSerialPort qt5 library name fix, fix some more warnings

Browse Source
This commit is contained in:
Mark Watkins 2013-10-10 02:32:54 +10:00
parent 9ae5cdd422
commit 966980b6d3
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SleepLib/calcs.cpp
View File

@ -327,7 +327,7 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// Respiratory Rate setup // Respiratory Rate setup
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
EventDataType minrr,maxrr; EventDataType minrr=0,maxrr=0;
EventList * RR=NULL; EventList * RR=NULL;
quint32 * rr_tptr=NULL; quint32 * rr_tptr=NULL;
EventStoreType * rr_dptr=NULL; EventStoreType * rr_dptr=NULL;
@ -368,11 +368,11 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// Tidal Volume setup // Tidal Volume setup
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
EventList * TV; EventList * TV=NULL;
EventDataType mintv, maxtv, tv; EventDataType mintv=0, maxtv=0, tv=0;
double val1, val2; double val1, val2;
quint32 * tv_tptr; quint32 * tv_tptr=NULL;
EventStoreType * tv_dptr; EventStoreType * tv_dptr=NULL;
int tv_count=0; int tv_count=0;
if (calcTv) { if (calcTv) {
TV=m_session->AddEventList(CPAP_TidalVolume,EVL_Event); TV=m_session->AddEventList(CPAP_TidalVolume,EVL_Event);

4
src/SleepLib/session.cpp
View File

@ -1044,7 +1044,7 @@ double Session::rangeSum(ChannelID id, qint64 first,qint64 last)
qint64 t,start; qint64 t,start;
EventStoreType * dptr, * eptr; EventStoreType * dptr, * eptr;
quint32 * tptr; quint32 * tptr;
int cnt,idx; int cnt,idx=0;
qint64 rate; qint64 rate;
for (int i=0;i < evec.size();i++) { for (int i=0;i < evec.size();i++) {
@ -1338,7 +1338,7 @@ EventDataType Session::percentile(ChannelID id,EventDataType percent)
EventStoreType * dptr, * sptr, *eptr; EventStoreType * dptr, * sptr, *eptr;
int tt=0,cnt; int tt=0,cnt=0;
for (int i=0;i<size;i++) { for (int i=0;i<size;i++) {
EventList & ev=*evec[i]; EventList & ev=*evec[i];
cnt=ev.count(); cnt=ev.count();

12
src/src.pro
View File

@ -230,9 +230,15 @@ else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lquazip
INCLUDEPATH += $$PWD/../3rdparty/quazip INCLUDEPATH += $$PWD/../3rdparty/quazip
DEPENDPATH += $$PWD/../3rdparty/quazip DEPENDPATH += $$PWD/../3rdparty/quazip
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport greaterThan(QT_MAJOR_VERSION,4) {
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1
else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialport else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1
else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialport
} else {
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialport
}
INCLUDEPATH += $$PWD/../3rdparty/qextserialport INCLUDEPATH += $$PWD/../3rdparty/qextserialport
DEPENDPATH += $$PWD/../3rdparty/qextserialport DEPENDPATH += $$PWD/../3rdparty/qextserialport