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

Improved importing time in temporary loader

Browse Source
This commit is contained in:
Mark Watkins 2011-05-27 18:50:17 +10:00
parent e9f2346b8f
commit 10268288f5
8 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SleepyHead.depend
View File

@ -7832,7 +7832,7 @@
"sleeplib/machine.h" "sleeplib/machine.h"
"graphs/graph.h" "graphs/graph.h"
1306483536 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h 1306485972 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
<wx/string.h> <wx/string.h>
<wx/variant.h> <wx/variant.h>
<wx/dir.h> <wx/dir.h>
@ -7870,7 +7870,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1306484375 /home/mark/projects/git/sleepyhead/version.h 1306486059 /home/mark/projects/git/sleepyhead/version.h
1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h 1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7887,7 +7887,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306483872 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp 1306485080 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
"wx_pch.h" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -7907,15 +7907,15 @@
<wx/log.h> <wx/log.h>
"graph.h" "graph.h"
1306414966 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/binary_file.cpp 1306485891 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/binary_file.cpp
<wx/filename.h> <wx/filename.h>
"binary_file.h" "binary_file.h"
1306415015 /home/mark/projects/git/sleepyhead/libs/sleeplib/binary_file.h 1306485862 /home/mark/projects/git/sleepyhead/libs/sleeplib/binary_file.h
<wx/ffile.h> <wx/ffile.h>
<wx/utils.h> <wx/utils.h>
1306405052 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp 1306486059 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
<tr1/random> <tr1/random>
<wx/colour.h> <wx/colour.h>
<wx/log.h> <wx/log.h>
@ -7947,7 +7947,7 @@
"machine_loader.h" "machine_loader.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306484375 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp 1306485176 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
<wx/dir.h> <wx/dir.h>
<wx/filename.h> <wx/filename.h>
<wx/ffile.h> <wx/ffile.h>

13
SleepyHeadMain.cpp
View File

@ -486,17 +486,20 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
html=html+wxT("<tr><td><b>")+_("Ramp-Time")+wxT("</b></td><td>")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Ramp-Time")+wxT("</b></td><td>")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Ramp-Prs.")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Ramp-Prs.")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("</td></tr>\n");
// check HumidiferStatus.. // check HumidiferStatus..
wxString humid; wxString str;
if (bool(d->summary_max(CPAP_HumidifierStatus))) { if (bool(d->summary_max(CPAP_HumidifierStatus))) {
humid=wxString::Format(wxT("x%i"),(int)d->summary_max(CPAP_HumidifierSetting)); str=wxString::Format(wxT("x%i"),(int)d->summary_max(CPAP_HumidifierSetting));
} else humid=wxT("No"); } else str=wxT("No");
html=html+wxT("<tr><td><b>")+_("Humidifier")+wxT("</b></td><td>")+humid+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Humidifier")+wxT("</b></td><td>")+str+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("System-Lock")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_SystemLockStatus)) ? _("On") : _("Off"))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("System-Lock")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_SystemLockStatus)) ? _("On") : _("Off"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Auto-Off")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_AutoOff)) ? _("On") : _("Off"))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Auto-Off")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_AutoOff)) ? _("On") : _("Off"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Mask-Alert")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_MaskAlert)) ? _("On") : _("Off"))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Mask-Alert")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_MaskAlert)) ? _("On") : _("Off"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Show-AHI")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_ShowAHI)) ? _("On") : _("Off"))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Show-AHI")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_ShowAHI)) ? _("On") : _("Off"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Hose-Size")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_HoseDiameter)) ? _("22mm") : _("15mm"))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Hose-Size")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_HoseDiameter)) ? _("22mm") : _("15mm"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Sys-Resist.")+wxT("</b></td><td>")+wxString::Format(wxT("%i"),int(d->summary_max(PRS1_SystemResistanceStatus)))+wxT("</td></tr>\n"); if (bool(d->summary_max(PRS1_SystemResistanceStatus))) {
str=wxString::Format(wxT("x%i"),(int)d->summary_max(PRS1_SystemResistanceSetting));
} else str=wxT("No");
html=html+wxT("<tr><td><b>")+_("Sys-Resist.")+wxT("</b></td><td>")+str+wxT("</td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n"); html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Session Files")+wxT("</i></td></tr>\n"); html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Session Files")+wxT("</i></td></tr>\n");

5
libs/sleeplib/binary_file.cpp
View File

@ -28,6 +28,11 @@ BinaryFile::~BinaryFile()
{ {
Close(); Close();
} }
size_t BinaryFile::Write(const void* buffer, size_t count)
{
return f.Write(buffer,count);
}
bool BinaryFile::Open(wxString filename,BFOpenMode mode) bool BinaryFile::Open(wxString filename,BFOpenMode mode)
{ {
pos=size=0; pos=size=0;

2
libs/sleeplib/binary_file.h
View File

@ -67,6 +67,8 @@ public:
bool Pack(const wxString & data); bool Pack(const wxString & data);
bool Pack(const wxDateTime & data); bool Pack(const wxDateTime & data);
size_t Write(const void* buffer, size_t count);
protected: protected:
BFOpenMode bf_mode; BFOpenMode bf_mode;
wxFFile f; wxFFile f;

6
libs/sleeplib/machine.cpp
View File

@ -1100,7 +1100,11 @@ bool Session::StoreWaveforms(wxString filename)
//t8=0; // 0=signed, 1=unsigned, 2=float //t8=0; // 0=signed, 1=unsigned, 2=float
// followed by sample data. // followed by sample data.
for (int k=0; k<(*j)->samples(); k++) f.Pack((wxInt16)w[k]); if (wxIsPlatformLittleEndian()) {
f.Write(w.GetBuffer(),w.samples()*sizeof(SampleFormat));
} else {
for (int k=0; k<(*j)->samples(); k++) f.Pack((wxInt16)w[k]);
}
} }
} }
return true; return true;

3
libs/sleeplib/machine.h
View File

@ -49,7 +49,7 @@ wxInt16 {
// PRS1 Specific Codes // PRS1 Specific Codes
PRS1_PressurePulse=0x1000, PRS1_VSnore2, PRS1_PressurePulse=0x1000, PRS1_VSnore2,
PRS1_Unknown00, PRS1_Unknown01, PRS1_Unknown08, PRS1_Unknown09, PRS1_Unknown0B, PRS1_Unknown0E, PRS1_Unknown10, PRS1_Unknown12, PRS1_Unknown00, PRS1_Unknown01, PRS1_Unknown08, PRS1_Unknown09, PRS1_Unknown0B, PRS1_Unknown0E, PRS1_Unknown10, PRS1_Unknown12,
PRS1_SystemLockStatus, PRS1_SystemResistanceStatus, PRS1_HoseDiameter, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI, PRS1_SystemLockStatus, PRS1_SystemResistanceStatus, PRS1_SystemResistanceSetting, PRS1_HoseDiameter, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI,
}; };
@ -234,6 +234,7 @@ public:
const SampleFormat & max() { const SampleFormat & max() {
return Max; return Max;
}; };
SampleFormat *GetBuffer() { return w_data; };
protected: protected:
wxDateTime w_time; wxDateTime w_time;

1
libs/sleeplib/prs1_loader.cpp
View File

@ -367,6 +367,7 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
session->summary[CPAP_HumidifierStatus]=(buffer[0x09]&0x80)==0x80; session->summary[CPAP_HumidifierStatus]=(buffer[0x09]&0x80)==0x80;
session->summary[PRS1_SystemLockStatus]=(buffer[0x0a]&0x80)==0x80; session->summary[PRS1_SystemLockStatus]=(buffer[0x0a]&0x80)==0x80;
session->summary[PRS1_SystemResistanceStatus]=(buffer[0x0a]&0x40)==0x40; session->summary[PRS1_SystemResistanceStatus]=(buffer[0x0a]&0x40)==0x40;
session->summary[PRS1_SystemResistanceSetting]=(long)buffer[0x0a]&7;
session->summary[PRS1_HoseDiameter]=(long)((buffer[0x0a]&0x08)?15:22); session->summary[PRS1_HoseDiameter]=(long)((buffer[0x0a]&0x08)?15:22);
session->summary[PRS1_AutoOff]=(buffer[0x0c]&0x10)==0x10; session->summary[PRS1_AutoOff]=(buffer[0x0c]&0x10)==0x10;
session->summary[PRS1_MaskAlert]=(buffer[0x0c]&0x08)==0x08; session->summary[PRS1_MaskAlert]=(buffer[0x0c]&0x08)==0x08;

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 1284; static const long BUILD = 1292;
static const long REVISION = 1487; static const long REVISION = 1534;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 4879; static const long BUILDS_COUNT = 4892;
#define RC_FILEVERSION 0,7,1284,1487 #define RC_FILEVERSION 0,7,1292,1534
#define RC_FILEVERSION_STRING "0, 7, 1284, 1487\0" #define RC_FILEVERSION_STRING "0, 7, 1292, 1534\0"
static const char FULLVERSION_STRING[] = "0.7.1284.1487"; static const char FULLVERSION_STRING[] = "0.7.1292.1534";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62; static const long BUILD_HISTORY = 62;