mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Catch some exceptions
This commit is contained in:
Mark Watkins
parent
f7db127257
commit
687eb0aaa2
@ -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;
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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();
|
||||
|
||||
|
||||
@ -505,7 +505,7 @@ void Daily::Load(QDate date)
|
||||
html+="<table cellspacing=0 cellpadding=2 border=0 width='100%'>\n";
|
||||
QString tmp;
|
||||
|
||||
const int gwwidth=270;
|
||||
const int gwwidth=240;
|
||||
const int gwheight=25;
|
||||
UpdateCPAPGraphs(cpap);
|
||||
UpdateOXIGraphs(oxi);
|
||||
|
||||
10
daily.ui
10
daily.ui
@ -38,6 +38,12 @@
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<widget class="QSplitter" name="splitter">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>280</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
@ -56,7 +62,7 @@
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>300</width>
|
||||
<width>280</width>
|
||||
<height>180</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -459,7 +465,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>728</width>
|
||||
<width>748</width>
|
||||
<height>620</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
<html>
|
||||
<head>
|
||||
<style type='text/css'>
|
||||
h1,p,a,td,body { font-family: 'FreeSans', 'Sans Serif' }
|
||||
<!--h1,p,a,td,body { font-family: 'FreeSans', 'Sans Serif' } --/>
|
||||
p,a,td,body { font-size: 14px }
|
||||
</style>
|
||||
</head>
|
||||
<body leftmargin=0 topmargin=0 rightmargin=0>
|
||||
<table width="100%" cellspacing=0 cellpadding=0 border=0 >
|
||||
<tr><td bgcolor="#d0d0d0" colspan=2 cellpadding=12 valign=center align=center><font color="black"><h1>Welcome to SleepyHead</h1></font></td></tr>
|
||||
<table width="100%" cellspacing=0 cellpadding=4 border=0 >
|
||||
<tr><td bgcolor="#d0d0d0" colspan=2 cellpadding=0 valign=center align=center><font color="black" size=+1><b>Welcome to SleepyHead</b></font></td></tr>
|
||||
<tr>
|
||||
<td valign="top" cellpadding=6>
|
||||
<br>
|
||||
<td valign="top" leftmargin=0 cellpadding=6>
|
||||
<p>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.</p>
|
||||
<p>Currenly supports the following machines:</p>
|
||||
<li>Philips Respironics System One (BIPAP and lower)</li>
|
||||
@ -22,11 +21,11 @@ p,a,td,body { font-size: 14px }
|
||||
</td>
|
||||
<td><image src='qrc:/docs/sheep.png' width=220 height=220><br/>
|
||||
<div align=center>This is a temporary logo</div>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<hr/>
|
||||
<tr>
|
||||
<td colspan=2>
|
||||
<hr>
|
||||
<p><b>Copyright:</b> ©2011 Mark Watkins (jedimark)</p>
|
||||
<p><b>License:</b> This software is released freely under the GNU Public License.</p>
|
||||
<p><i>This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose.
|
||||
|
||||
9
main.cpp
9
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();
|
||||
|
||||
|
||||
@ -98,6 +98,12 @@
|
||||
<string>&Welcome</string>
|
||||
</attribute>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QSplitter" name="splitter">
|
||||
<property name="sizePolicy">
|
||||
@ -111,6 +117,9 @@
|
||||
</property>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QFrame" name="frame">
|
||||
<property name="sizePolicy">
|
||||
@ -132,14 +141,14 @@
|
||||
</size>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Raised</enum>
|
||||
<enum>QFrame::Plain</enum>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>6</number>
|
||||
@ -576,17 +585,6 @@
|
||||
<addaction name="menu_Help"/>
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusbar"/>
|
||||
<widget class="QToolBar" name="toolBar">
|
||||
<property name="windowTitle">
|
||||
<string>toolBar</string>
|
||||
</property>
|
||||
<attribute name="toolBarArea">
|
||||
<enum>TopToolBarArea</enum>
|
||||
</attribute>
|
||||
<attribute name="toolBarBreak">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
</widget>
|
||||
<action name="action_Import_Data">
|
||||
<property name="text">
|
||||
<string>&Import Data</string>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user