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

Yet more assert failures fixed thanks to wx2.9 testing

Browse Source
This commit is contained in:
Mark Watkins 2011-06-08 20:36:52 +10:00
parent d247a7bf40
commit 5d857e16b3
5 changed files with 367 additions and 305 deletions
Projects/CodeBlocks
SleepyHead.depend
src
SleepyHeadMain.cpp
libs/sleeplib
loader_plugins
cms50_loader.cpp
machine.cpp
version.h

646
Projects/CodeBlocks/SleepyHead.depend
View File

File diff suppressed because it is too large Load Diff

2
src/SleepyHeadMain.cpp
View File

@ -265,7 +265,7 @@ void SleepyHeadFrame::OnAbout(wxCommandEvent &event)
msg+=_("Relying on this softwares' accuracy for making personal medical decisions is probably grounds to get you committed. Please don't do it!\n\n");
msg+=_("Combinations of letters which form those of trademarks belong to those who own them.");
wxMessageBox(msg, _("Welcome to..."),0,this);
wxMessageBox(msg, _("Welcome to..."),wxOK,this);
}
void SleepyHeadFrame::OnImportSD(wxCommandEvent &event)
{

6
src/libs/sleeplib/loader_plugins/cms50_loader.cpp
View File

@ -144,7 +144,9 @@ bool CMS50Loader::OpenSPORFile(wxString path,Machine *mach,Profile *profile)
wxDateTime date;
date.ParseFormat(datestr,wxT("%m/%d/%y %H:%M:%S"));
//wxLogMessage(datestr);
if (!date.IsValid()) {
wxLogMessage(datestr);
}
f.Seek(data_starts,wxFromStart);
@ -210,7 +212,7 @@ bool CMS50Loader::OpenSPORFile(wxString path,Machine *mach,Profile *profile)
last_spo2=cs;
if (PMax<cp) PMax=cp;
if (SMax<cs) SMax=cs;
tt+=wxTimeSpan::Seconds(1);
tt+=wxTimeSpan::Seconds(1); // An educated guess. Verified by gcz@cpaptalk
}
if (cp) sess->AddEvent(new Event(tt,OXI_Pulse,&cp,1));
if (cs) sess->AddEvent(new Event(tt,OXI_SPO2,&cs,1));

6
src/libs/sleeplib/machine.cpp
View File

@ -906,7 +906,11 @@ double Session::weighted_avg_event_field(MachineCode mc,int field)
void Session::AddEvent(Event * e)
{
events[e->code()].push_back(e);
if (e->time()>s_last) s_last=e->time();
if (s_last.IsValid())
if (e->time()>s_last) s_last=e->time();
else {
s_last=e->time();
}
// wxLogMessage(e->time().Format(wxT("%Y-%m-%d %H:%M:%S"))+wxString::Format(wxT(" %04i %02i "),e->code(),e->fields()));
}
void Session::AddWaveform(Waveform *w)

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 3745;
static const long REVISION = 3681;
static const long BUILD = 3749;
static const long REVISION = 3692;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 1616;
#define RC_FILEVERSION 0,7,3745,3681
#define RC_FILEVERSION_STRING "0, 7, 3745, 3681\0"
static const char FULLVERSION_STRING[] = "0.7.3745.3681";
static const long BUILDS_COUNT = 1636;
#define RC_FILEVERSION 0,7,3749,3692
#define RC_FILEVERSION_STRING "0, 7, 3749, 3692\0"
static const char FULLVERSION_STRING[] = "0.7.3749.3692";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;