From 687eb0aaa2cb3575f95b4214794744874684ad12 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 3 Jul 2011 21:49:47 +1000 Subject: [PATCH] Catch some exceptions --- SleepLib/loader_plugins/prs1_loader.cpp | 4 ++-- SleepLib/machine.cpp | 16 ++++++++----- SleepLib/session.cpp | 30 +++++++++++++++++++++++++ SleepLib/session.h | 17 ++------------ daily.cpp | 2 +- daily.ui | 10 +++++++-- docs/index.html | 15 ++++++------- main.cpp | 9 -------- mainwindow.ui | 26 ++++++++++----------- 9 files changed, 73 insertions(+), 56 deletions(-) diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index e0bf4ee1..9f6a5a5d 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -593,8 +593,8 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64 break; default: // ERROR!!! - throw exception(); // UnknownCode(); - break; + qWarning() << "Some new fandangled PRS1 code detected:" << code; + return false; } } return true; diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index 47ad96ae..3ba9bd2c 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -401,12 +401,18 @@ bool Machine::Load() if (qprogress) qprogress->setValue((float(cnt)/float(size)*100.0)); Session *sess=new Session(this,s->first); - if (sess->LoadSummary(s->second[0])) { - sess->SetEventFile(s->second[1]); - sess->SetWaveFile(s->second[2]); - AddSession(sess,profile); - } else { + try { + if (sess->LoadSummary(s->second[0])) { + sess->SetEventFile(s->second[1]); + sess->SetWaveFile(s->second[2]); + + AddSession(sess,profile); + } else { + delete sess; + } + } catch(UnpackError e) { + qWarning() << "Error unpacking summary data"; delete sess; } } diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 86c03a98..ef284f22 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -244,6 +244,36 @@ void Session::TrashWaveforms() //const int max_pack_size=128; +bool Session::OpenEvents() { + if(s_events_loaded) + return true; + bool b; + try { + b=LoadEvents(s_eventfile); + } catch (UnpackError e) { + qWarning() << "Error Unkpacking Events" << s_eventfile; + b=false; + } + + s_events_loaded=b; + return b; +}; +bool Session::OpenWaveforms() { + if (s_waves_loaded) + return true; + bool b; + try { + b=LoadWaveforms(s_wavefile); + } catch (UnpackError e) { + qWarning() << "Error Unkpacking Wavefile" << s_wavefile; + b=false; + } + s_waves_loaded=b; + return b; +}; + + + bool Session::Store(QString path) // Storing Session Data in our format diff --git a/SleepLib/session.h b/SleepLib/session.h index ab0a5c45..c418af92 100644 --- a/SleepLib/session.h +++ b/SleepLib/session.h @@ -29,21 +29,8 @@ public: bool LoadEvents(QString filename); bool LoadWaveforms(QString filename); - bool OpenEvents() { - if(s_events_loaded) - return true; - bool b=LoadEvents(s_eventfile); - s_events_loaded=b; - return b; - }; - bool OpenWaveforms() { - if (s_waves_loaded) - return true; - bool b=LoadWaveforms(s_wavefile); - s_waves_loaded=b; - return b; - }; - + bool OpenEvents(); + bool OpenWaveforms(); void TrashEvents(); void TrashWaveforms(); diff --git a/daily.cpp b/daily.cpp index 097d85a2..96879cdf 100644 --- a/daily.cpp +++ b/daily.cpp @@ -505,7 +505,7 @@ void Daily::Load(QDate date) html+="\n"; QString tmp; - const int gwwidth=270; + const int gwwidth=240; const int gwheight=25; UpdateCPAPGraphs(cpap); UpdateOXIGraphs(oxi); diff --git a/daily.ui b/daily.ui index 9d60de03..b096de1e 100644 --- a/daily.ui +++ b/daily.ui @@ -38,6 +38,12 @@ Qt::Horizontal + + + 280 + 16777215 + + Qt::Vertical @@ -56,7 +62,7 @@ - 300 + 280 180 @@ -459,7 +465,7 @@ 0 0 - 728 + 748 620 diff --git a/docs/index.html b/docs/index.html index 760baffe..170bce6c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,16 +1,15 @@ -
- +

Welcome to SleepyHead

+ - -
Welcome to SleepyHead
- 
+

This software is designed to assist you in reviewing data for your CPAP Machine, Oximeter, and Sleep Stage monitors, as well as help you track general issues related to sleep health.

Currenly supports the following machines:

  • Philips Respironics System One (BIPAP and lower)
    • @@ -22,11 +21,11 @@ p,a,td,body { font-size: 14px }
    This is a temporary logo
    -
    -
    + + +

    Copyright: ©2011 Mark Watkins (jedimark)

    License: This software is released freely under the GNU Public License.

    This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. diff --git a/main.cpp b/main.cpp index e3a4236b..1ba332bb 100644 --- a/main.cpp +++ b/main.cpp @@ -36,15 +36,6 @@ int main(int argc, char *argv[]) ZEOLoader::Register(); ResmedLoader::Register(); - - - - /*Machine *m=new Machine(profile,0); - m->SetClass("Journal"); - m->SetType(MT_JOURNAL); - m->properties["Brand"]="Virtual"; - profile->AddMachine(m); */ - MainWindow w; w.show(); diff --git a/mainwindow.ui b/mainwindow.ui index 2bdf72c4..4c9afe98 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -98,6 +98,12 @@ &Welcome + + 0 + + + 0 + @@ -111,6 +117,9 @@ + + 0 + @@ -132,14 +141,14 @@ - QFrame::StyledPanel + QFrame::NoFrame - QFrame::Raised + QFrame::Plain - 6 + 0 6 @@ -576,17 +585,6 @@ - - - toolBar - - - TopToolBarArea - - - false - - &Import Data