diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp index 1c4ad110..0de5141e 100644 --- a/sleepyhead/Graphs/MinutesAtPressure.cpp +++ b/sleepyhead/Graphs/MinutesAtPressure.cpp @@ -1,4 +1,4 @@ -/* MinutesAtPressure Graph Implementation +/* MinutesAtPressure Graph Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -702,7 +702,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r for (; it != times_end; ++it) { int p = it.key(); - Q_ASSERT(p < 255); + // No ASSERTS!!! (p < 255); float v = float(it.value()) / 60.0; P[p] = v; } @@ -897,7 +897,10 @@ void RecalcMAP::updateTimes(PressureInfo & info, Session * sess) time = EL->time(e); data = floor(float(EL->raw(e)) * gain * pressureMult); // pressure times ten, so can look at .1 intervals in an integer - Q_ASSERT(data < 300); + if (data>=300) { + qWarning() << "data >= 300 in RecalcMAP::updateTimes!"; + return; + } if ((time < minx) || first) { lasttime = time; diff --git a/sleepyhead/Graphs/gLineChart.h b/sleepyhead/Graphs/gLineChart.h index b71cb896..b5e89e55 100644 --- a/sleepyhead/Graphs/gLineChart.h +++ b/sleepyhead/Graphs/gLineChart.h @@ -1,4 +1,4 @@ -/* gLineChart Header +/* gLineChart Header * * Copyright (C) 2011-2018 Mark Watkins * @@ -43,7 +43,10 @@ public: code(code), type(type), available(available) {} EventDataType calc(Day * day) { - Q_ASSERT(day != nullptr); + if (day == nullptr) { + qWarning() << "DottedLine::calc called with null day object"; + return 0; + } available = day->channelExists(code); value = day->calc(code, type); diff --git a/sleepyhead/Graphs/gXAxis.cpp b/sleepyhead/Graphs/gXAxis.cpp index e6fc40b1..d4b75a28 100644 --- a/sleepyhead/Graphs/gXAxis.cpp +++ b/sleepyhead/Graphs/gXAxis.cpp @@ -1,4 +1,4 @@ -/* gXAxis Implementation +/* gXAxis Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -178,12 +178,10 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion ®ion) y = r2.height(); // Not sure when this was a problem... - Q_ASSERT(x > 0); -// if (x <= 0) { -// qWarning() << "gXAxis::Plot() x<=0 font size bug"; -// return; -// } - + if (x<=0) { + qWarning() << "gXAxis::Paint called with x<=0"; + return; + } // Max number of ticks that will fit, with a bit of room for a buffer int max_ticks = width / (x + 15); diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp index 4b39b6f8..70b4c29c 100644 --- a/sleepyhead/SleepLib/common.cpp +++ b/sleepyhead/SleepLib/common.cpp @@ -1,4 +1,4 @@ -/* SleepLib Common Functions +/* SleepLib Common Functions * * Copyright (c) 2011-2018 Mark Watkins * @@ -614,7 +614,10 @@ QByteArray gUncompress(const QByteArray &data) strm.next_out = (Bytef*)(out); ret = inflate(&strm, Z_NO_FLUSH); - Q_ASSERT(ret != Z_STREAM_ERROR); // state not clobbered + if (ret == Z_STREAM_ERROR) { + qWarning() << "ret == Z_STREAM_ERROR in gzUncompress in common.cpp"; + return QByteArray(); + } switch (ret) { case Z_NEED_DICT: diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp index 2b4d5680..3996df14 100644 --- a/sleepyhead/SleepLib/day.cpp +++ b/sleepyhead/SleepLib/day.cpp @@ -1,4 +1,4 @@ -/* SleepLib Day Class Implementation +/* SleepLib Day Class Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -11,6 +11,7 @@ #include #include #include +#include #include "day.h" #include "profiles.h" @@ -107,8 +108,11 @@ Session *Day::find(SessionID sessid) void Day::addSession(Session *s) { + if (s == nullptr) { + qDebug() << "addSession called with null session pointer"; + return; + } invalidate(); - Q_ASSERT(s!=nullptr); QHash::iterator mi = machines.find(s->type()); if (mi != machines.end()) { @@ -1528,7 +1532,10 @@ QString Day::getPressureRelief() QString Day::getPressureSettings() { - Q_ASSERT(machine(MT_CPAP) != nullptr); + if (machine(MT_CPAP) == nullptr) { + qCritical("getPressureSettings called with no CPAP machine record"); + return QString(); + } CPAPMode mode = (CPAPMode)(int)settings_max(CPAP_Mode); QString units = schema::channel[CPAP_Pressure].units(); diff --git a/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp index d65e6a6b..e807b876 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp @@ -1,4 +1,4 @@ -/* SleepLib CMS50X Loader Implementation +/* SleepLib CMS50X Loader Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -183,7 +183,7 @@ void CMS50Loader::processBytes(QByteArray bytes) int CMS50Loader::doImportMode() { int available = buffer.size(); - // Q_ASSERT(!finished_import); + int hour,minute; int idx = 0; while (idx < available) { @@ -385,7 +385,10 @@ int CMS50Loader::doImportMode() int CMS50Loader::doLiveMode() { - Q_ASSERT(oxirec != nullptr); + if (oxirec == nullptr) { + qWarning() << "CMS50Loader::doLiveMode() called when null oxirec object"; + return 0; + } int available = buffer.size(); int idx = 0; @@ -450,7 +453,10 @@ void CMS50Loader::startImportTimeout() if (started_import) { return; } - Q_ASSERT(finished_import == false); + if (finished_import != false) { + qWarning() << "CMS50Loader::startImportTimeout() called when finished_import != false"; + return; + } //qDebug() << "Starting oximeter import timeout"; diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp index b41bf64e..a9800025 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp @@ -1,4 +1,4 @@ -/* SleepLib CMS50X Loader Implementation +/* SleepLib CMS50X Loader Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -586,7 +586,8 @@ void CMS50F37Loader::processBytes(QByteArray bytes) //int CMS50F37Loader::doLiveMode() //{ -// Q_ASSERT(oxirec != nullptr); +// if (oxirec == nullptr) { // warn +//} // int available = buffer.size(); // int idx = 0; diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp index 69785513..42ae77dc 100644 --- a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp @@ -1,4 +1,4 @@ -/* SleepLib Fisher & Paykel Icon Loader Implementation +/* SleepLib Fisher & Paykel Icon Loader Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -325,7 +325,7 @@ quint32 convertDate(quint32 timestamp) QDateTime dt = QDateTime(QDate(year, month, day), QTime(hour, minute, second),Qt::UTC); -// Q_ASSERT(dt.isValid()); +// Q NO!!! _ASSERT(dt.isValid()); // if ((year == 2013) && (month == 9) && (day == 18)) { // // this is for testing.. set a breakpoint on here and // int i=5; @@ -359,7 +359,7 @@ quint32 convertFLWDate(quint32 timestamp) // Bit format: hhhhhmmmmmmssssssYYYYYY if(!dt.isValid()){ dt = QDateTime(QDate(2015,1,1), QTime(0,0,1)); } -// Q_ASSERT(dt.isValid()); +// Q NO!!! _ASSERT(dt.isValid()); // if ((year == 2013) && (month == 9) && (day == 18)) { // int i=5; // } diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 8aec3129..725b5ed8 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -495,7 +495,10 @@ int PRS1Loader::Open(QString path) int PRS1Loader::OpenMachine(QString path) { - Q_ASSERT(p_profile != nullptr); + if (p_profile == nullptr) { + qWarning() << "PRS1Loader::OpenMachine() called without a valid p_profile object present"; + return 0; + } qDebug() << "Opening PRS1 " << path; QDir dir(path); @@ -3139,8 +3142,10 @@ QList PRS1Loader::ParseFile2(QString path) if ((chunk->ext == 5) || (chunk->ext == 6)) { // if Flow/MaskPressure Waveform or OXI Waveform file if (lastchunk != nullptr) { - - Q_ASSERT(lastchunk->sessionid == chunk->sessionid); + if (lastchunk->sessionid != chunk->sessionid) { + qWarning() << "lastchunk->sessionid != chunk->sessionid in PRS1Loader::ParseFile2()"; + break; + } if (diff == 0) { // In sync, so append waveform data to previous chunk @@ -3423,7 +3428,10 @@ QList PRS1Loader::ParseFile(QString path) if ((chunk->ext == 5) || (chunk->ext == 6)) { // if Flow/MaskPressure Waveform or OXI Waveform file if (lastchunk != nullptr) { - Q_ASSERT(lastchunk->sessionid == chunk->sessionid); + if (lastchunk->sessionid != chunk->sessionid) { + qWarning() << "lastchunk->sessionid != chunk->sessionid in PRS1Loader::ParseFile()"; + break; + } if (diff == 0) { // In sync, so append waveform data to previous chunk diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index 40b644b2..9d06bff9 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -208,7 +208,7 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles) << QDateTime::fromTime_t(si.value().maskoff).toString() << "!=" << QDateTime::fromTime_t(offtime).toString(); } - //Q_ASSERT(si.value().maskoff == offtime); + //NO ASSERTS!!!! Q _ASSERT(si.value().maskoff == offtime); } } continue; @@ -724,7 +724,10 @@ bool EDFParser::Parse() } bool EDFParser::Open(QString name) { - Q_ASSERT(buffer == nullptr); + if (buffer != nullptr) { + qWarning() << "EDFParser::Open() called with buffer already initialized"; + return false; + } if (name.endsWith(STR_ext_gz)) { // Open and decempress file to buffer @@ -1188,7 +1191,10 @@ void ResmedImportStage2::run() QMap >::iterator dtit = loader->strdate.find(R.date); // should not be possible, but my brain hurts... - Q_ASSERT(dtit != loader->strdate.end()); + if (dtit == loader->strdate.end()) { + qWarning() << "ResmedImportStage2::run() ASSERT(dtit != loader->strdate.end()) failed"; + return; + } if (dtit != loader->strdate.end()) { QList & dayrecs = dtit.value(); @@ -2351,7 +2357,7 @@ int ResmedLoader::Open(QString path) continue; } - //Q_ASSERT(R.sessionid == 0); + //noooo ASSERTS!!!! Q _ASSERT(R.sessionid == 0); // the following should not happen if (R.sessionid > 0) { diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp index fc10c38b..9aa9e99e 100644 --- a/sleepyhead/SleepLib/machine.cpp +++ b/sleepyhead/SleepLib/machine.cpp @@ -225,9 +225,14 @@ QDate Machine::pickDate(qint64 first) bool Machine::AddSession(Session *s) { - Q_ASSERT(s != nullptr); - Q_ASSERT(p_profile); - Q_ASSERT(p_profile->isOpen()); + if (s == nullptr) { + qCritical() << "AddSession() called with a null object"; + return false; + } + if (p_profile == nullptr) { + qCritical() << "AddSession() called without a valid p_profile"; + return false; + } updateChannels(s); @@ -853,10 +858,9 @@ void Machine::queTask(ImportTask * task) void Machine::runTasks() { - if (0) { //!AppSetting->multithreading()) { - Q_ASSERT(m_tasklist.isEmpty()); + if (m_tasklist.isEmpty()) return; - } + QThreadPool * threadpool = QThreadPool::globalInstance(); // int m_totaltasks=m_tasklist.size(); int m_currenttask=0; diff --git a/sleepyhead/SleepLib/machine_loader.h b/sleepyhead/SleepLib/machine_loader.h index 72779afd..94a60952 100644 --- a/sleepyhead/SleepLib/machine_loader.h +++ b/sleepyhead/SleepLib/machine_loader.h @@ -1,4 +1,4 @@ -/* SleepLib MachineLoader Base Class Header +/* SleepLib MachineLoader Base Class Header * * Copyright (c) 2018 Mark Watkins * @@ -57,7 +57,11 @@ class MachineLoader: public QObject inline MachineType type() { return m_type; } void unsupported(Machine * m) { - Q_ASSERT(m != nullptr); + if (m == nullptr) { + qCritical("MachineLoader::unsupported(Machine *) called with null machine object"); + return; + } + m->setUnsupported(true); emit machineUnsupported(m); } diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index b29b0781..c63b6c68 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -545,7 +545,11 @@ void Profile::DataFormatError(Machine *m) } void Profile::UnloadMachineData() { - Q_ASSERT(m_machopened); + if (!m_machopened) { + qCritical() << "Profile::UnloadMachineData() called with m_machopened==false"; + return; + } + QMap::iterator it; for (it = daylist.begin(); it != daylist.end(); ++it) { delete it.value(); diff --git a/sleepyhead/SleepLib/schema.cpp b/sleepyhead/SleepLib/schema.cpp index b3443680..44afa38c 100644 --- a/sleepyhead/SleepLib/schema.cpp +++ b/sleepyhead/SleepLib/schema.cpp @@ -717,6 +717,7 @@ void init() schema::channel[CPAP_CSR].setShowInOverview(true); schema::channel[CPAP_PB].setShowInOverview(true); schema::channel[CPAP_LargeLeak].setShowInOverview(true); + schema::channel[CPAP_FLG].setShowInOverview(true); } @@ -985,17 +986,18 @@ bool ChannelList::Load(QString filename) void ChannelList::add(QString group, Channel *chan) { - Q_ASSERT(chan != nullptr); + if (chan == nullptr) { + qCritical() << "ChannelList::add called with null chan object"; + return; + } if (channels.contains(chan->id())) { - qWarning() << "Channels already contains id" << chan->id() << chan->code(); - Q_ASSERT(false); + qCritical() << "Channels already contains id" << chan->id() << chan->code(); return; } if (names.contains(chan->code())) { - qWarning() << "Channels already contains name" << chan->id() << chan->code(); - Q_ASSERT(false); + qCritical() << "Channels already contains name" << chan->id() << chan->code(); return; } diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 231bbe90..42eaf480 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -491,12 +491,18 @@ void MainWindow::OpenProfile(QString profileName) ui->statEndDate->setDate(p_profile->LastDay()); // Reload everything profile related - Q_ASSERT(!daily); + if (daily) { + qCritical() << "OpenProfile called with active Daily object!"; + return; + } daily = new Daily(ui->tabWidget, nullptr); ui->tabWidget->insertTab(2, daily, STR_TR_Daily); daily->ReloadGraphs(); - Q_ASSERT(!overview); + if (overview) { + qCritical() << "OpenProfile called with active Overview object!"; + return; + } overview = new Overview(ui->tabWidget, daily->graphView()); ui->tabWidget->insertTab(3, overview, STR_TR_Overview); overview->ReloadGraphs(); @@ -2246,7 +2252,10 @@ void MainWindow::FreeSessions() void MainWindow::MachineUnsupported(Machine * m) { - Q_ASSERT(m != nullptr); + if (m == nullptr) { + qCritical() << "MainWindow::MachineUnsupported called with null machine object"; + return; + } QMessageBox::information(this, STR_MessageBox_Error, QObject::tr("Sorry, your %1 %2 machine is not currently supported.").arg(m->brand()).arg(m->model()), QMessageBox::Ok); } diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp index 53c1d7d8..51721d98 100644 --- a/sleepyhead/oximeterimport.cpp +++ b/sleepyhead/oximeterimport.cpp @@ -1,4 +1,4 @@ -/* Oximeter Import Wizard Implementation +/* Oximeter Import Wizard Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -782,7 +782,10 @@ void OximeterImport::on_informationButton_clicked() void OximeterImport::on_syncButton_clicked() { qDebug() << "Sync button clicked"; - Q_ASSERT(oximodule != nullptr); + if (oximodule == nullptr) { + qCritical() << "OximeterImport::on_syncButton_clicked called when oximodule is null"; + return; + } qDebug() << "Oximodule Start Time is " << oximodule->startTime().toString("yyyy.MM.dd HH.mm.ss") << "Duration: " << oximodule->getDuration(/* dummy */ 0 ); ui->stackedWidget->setCurrentWidget(ui->syncPage); diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index ce2ba59d..e4e0a89a 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -16,6 +16,8 @@ #include #include #include +#include + #include #include "preferencesdialog.h" @@ -84,7 +86,10 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : // QTextCharFormat format = ui->startedUsingMask->calendarWidget()->weekdayTextFormat(Qt::Saturday); // format.setForeground(QBrush(Qt::black, Qt::SolidPattern)); - Q_ASSERT(profile != nullptr); + if (profile == nullptr) { + qCritical() << "Preferences dialog created without legit profile object"; + return; + } ui->tabWidget->setCurrentIndex(0); //i=ui->timeZoneCombo->findText((*profile)["TimeZone"].toString()); diff --git a/sleepyhead/profileselector.cpp b/sleepyhead/profileselector.cpp index a0d44940..6e3d445a 100644 --- a/sleepyhead/profileselector.cpp +++ b/sleepyhead/profileselector.cpp @@ -238,12 +238,16 @@ void ProfileSelector::on_buttonNewProfile_clicked() newprof->setWindowModality(Qt::ApplicationModal); newprof->setModal(true); if (newprof->exec() == NewProfile::Accepted) { - updateProfileList(); p_profile = Profiles::Get(AppSetting->profileName()); - Q_ASSERT(p_profile != nullptr); - QString name = p_profile->user->userName(); - p_profile = nullptr; - SelectProfile(name); + if (p_profile != nullptr) { + QString name = p_profile->user->userName(); + p_profile = nullptr; + SelectProfile(name); + } else { + qWarning() << AppSetting->profileName() << "yielded a null profile"; + p_profile=nullptr; + } + updateProfileList(); } delete newprof; } diff --git a/sleepyhead/sessionbar.cpp b/sleepyhead/sessionbar.cpp index b0e1eb0b..b5bf23a0 100644 --- a/sleepyhead/sessionbar.cpp +++ b/sleepyhead/sessionbar.cpp @@ -1,4 +1,4 @@ -/* SessionBar Graph Implementation +/* SessionBar Graph Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -71,6 +71,14 @@ void SessionBar::updateTimer() update(); } +Session * SessionBar::session(int idx) +{ + if (idx >= segments.size()) { + qCritical() << "SessionBar::session called with out of range index"; + return nullptr; + } + return segments[idx].session; +} SegType SessionBar::min() { diff --git a/sleepyhead/sessionbar.h b/sleepyhead/sessionbar.h index 8092bb69..354603ea 100644 --- a/sleepyhead/sessionbar.h +++ b/sleepyhead/sessionbar.h @@ -1,4 +1,4 @@ -/* SessionBar Graph Header +/* SessionBar Graph Header * * Copyright (c) 2011-2018 Mark Watkins * @@ -46,7 +46,7 @@ class SessionBar : public QWidget void setSelectColor(QColor col) { m_selectColor = col; } int count() { return segments.size(); } int selected() { return m_selectIDX; } - Session * session(int idx) { Q_ASSERT(idx < segments.size()); return segments[idx].session; } + Session * session(int idx); void setSelected(int idx) { m_selectIDX = idx; } protected slots: diff --git a/sleepyhead/updateparser.cpp b/sleepyhead/updateparser.cpp index 3885d1e4..4e7f588e 100644 --- a/sleepyhead/updateparser.cpp +++ b/sleepyhead/updateparser.cpp @@ -1,4 +1,4 @@ -/* UpdateParser Implementation (Autoupdater component) +/* UpdateParser Implementation (Autoupdater component) * * Copyright (c) 2011-2018 Mark Watkins * @@ -247,7 +247,10 @@ bool UpdatesParser::read(QIODevice *device) void UpdatesParser::readUpdates() { - Q_ASSERT(xml.isStartElement() && xml.name() == "Updates"); + if (!xml.isStartElement() || (xml.name() != "Updates")) { + qWarning() << "UpdatesParser::readUpdates() condition check failed"; + } +// Q_ ASSERT(xml.isStartElement() && xml.name() == "Updates"); while (xml.readNextStartElement()) { if (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)==0) { @@ -262,7 +265,10 @@ void UpdatesParser::readUpdates() void UpdatesParser::readPackageUpdate() { - Q_ASSERT(xml.isStartElement() && (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)==0)); + if (!xml.isStartElement() || (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)!=0)) { + qWarning() << "UpdatesParser::readPackageUpdate() condition check failed"; + return; + } package = PackageUpdate(); while (xml.readNextStartElement()) {