diff --git a/SleepyHead.depend b/SleepyHead.depend index c5f87f3b..342605fc 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7832,7 +7832,7 @@ "sleeplib/machine.h" "graphs/graph.h" -1306483536 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h +1306485972 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h @@ -7870,7 +7870,7 @@ -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 "machine.h" @@ -7887,7 +7887,7 @@ "preferences.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" "version.h" @@ -7907,15 +7907,15 @@ "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 "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 -1306405052 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp +1306486059 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp @@ -7947,7 +7947,7 @@ "machine_loader.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 diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 4c251641..5eddc6e2 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -486,17 +486,20 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) html=html+wxT("")+_("Ramp-Time")+wxT("")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("\n"); html=html+wxT("")+_("Ramp-Prs.")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("\n"); // check HumidiferStatus.. - wxString humid; + wxString str; if (bool(d->summary_max(CPAP_HumidifierStatus))) { - humid=wxString::Format(wxT("x%i"),(int)d->summary_max(CPAP_HumidifierSetting)); - } else humid=wxT("No"); - html=html+wxT("")+_("Humidifier")+wxT("")+humid+wxT("\n"); + str=wxString::Format(wxT("x%i"),(int)d->summary_max(CPAP_HumidifierSetting)); + } else str=wxT("No"); + html=html+wxT("")+_("Humidifier")+wxT("")+str+wxT("\n"); html=html+wxT("")+_("System-Lock")+wxT("")+(bool(d->summary_max(PRS1_SystemLockStatus)) ? _("On") : _("Off"))+wxT("\n"); html=html+wxT("")+_("Auto-Off")+wxT("")+(bool(d->summary_max(PRS1_AutoOff)) ? _("On") : _("Off"))+wxT("\n"); html=html+wxT("")+_("Mask-Alert")+wxT("")+(bool(d->summary_max(PRS1_MaskAlert)) ? _("On") : _("Off"))+wxT("\n"); html=html+wxT("")+_("Show-AHI")+wxT("")+(bool(d->summary_max(PRS1_ShowAHI)) ? _("On") : _("Off"))+wxT("\n"); html=html+wxT("")+_("Hose-Size")+wxT("")+(bool(d->summary_max(PRS1_HoseDiameter)) ? _("22mm") : _("15mm"))+wxT("\n"); - html=html+wxT("")+_("Sys-Resist.")+wxT("")+wxString::Format(wxT("%i"),int(d->summary_max(PRS1_SystemResistanceStatus)))+wxT("\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("")+_("Sys-Resist.")+wxT("")+str+wxT("\n"); html=html+wxT("  \n"); html=html+wxT("")+_("Session Files")+wxT("\n"); diff --git a/libs/sleeplib/binary_file.cpp b/libs/sleeplib/binary_file.cpp index b418a1aa..6af1ddf8 100644 --- a/libs/sleeplib/binary_file.cpp +++ b/libs/sleeplib/binary_file.cpp @@ -28,6 +28,11 @@ BinaryFile::~BinaryFile() { Close(); } +size_t BinaryFile::Write(const void* buffer, size_t count) +{ + return f.Write(buffer,count); +} + bool BinaryFile::Open(wxString filename,BFOpenMode mode) { pos=size=0; diff --git a/libs/sleeplib/binary_file.h b/libs/sleeplib/binary_file.h index 7aad3bb6..ce56db9c 100644 --- a/libs/sleeplib/binary_file.h +++ b/libs/sleeplib/binary_file.h @@ -67,6 +67,8 @@ public: bool Pack(const wxString & data); bool Pack(const wxDateTime & data); + size_t Write(const void* buffer, size_t count); + protected: BFOpenMode bf_mode; wxFFile f; diff --git a/libs/sleeplib/machine.cpp b/libs/sleeplib/machine.cpp index 17fde5db..70b941ea 100644 --- a/libs/sleeplib/machine.cpp +++ b/libs/sleeplib/machine.cpp @@ -1100,7 +1100,11 @@ bool Session::StoreWaveforms(wxString filename) //t8=0; // 0=signed, 1=unsigned, 2=float // 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; diff --git a/libs/sleeplib/machine.h b/libs/sleeplib/machine.h index acf345e3..4f1e1e4b 100644 --- a/libs/sleeplib/machine.h +++ b/libs/sleeplib/machine.h @@ -49,7 +49,7 @@ wxInt16 { // PRS1 Specific Codes PRS1_PressurePulse=0x1000, PRS1_VSnore2, 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() { return Max; }; + SampleFormat *GetBuffer() { return w_data; }; protected: wxDateTime w_time; diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp index ffe6a93a..4b9c96fb 100644 --- a/libs/sleeplib/prs1_loader.cpp +++ b/libs/sleeplib/prs1_loader.cpp @@ -367,6 +367,7 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename) session->summary[CPAP_HumidifierStatus]=(buffer[0x09]&0x80)==0x80; session->summary[PRS1_SystemLockStatus]=(buffer[0x0a]&0x80)==0x80; 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_AutoOff]=(buffer[0x0c]&0x10)==0x10; session->summary[PRS1_MaskAlert]=(buffer[0x0c]&0x08)==0x08; diff --git a/version.h b/version.h index 8d874ebf..026c810a 100644 --- a/version.h +++ b/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 1284; - static const long REVISION = 1487; + static const long BUILD = 1292; + static const long REVISION = 1534; //Miscellaneous Version Types - static const long BUILDS_COUNT = 4879; - #define RC_FILEVERSION 0,7,1284,1487 - #define RC_FILEVERSION_STRING "0, 7, 1284, 1487\0" - static const char FULLVERSION_STRING[] = "0.7.1284.1487"; + static const long BUILDS_COUNT = 4892; + #define RC_FILEVERSION 0,7,1292,1534 + #define RC_FILEVERSION_STRING "0, 7, 1292, 1534\0" + static const char FULLVERSION_STRING[] = "0.7.1292.1534"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;