From a75a2072eff09917a50fc397b6c23bce03653c9c Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 29 May 2011 17:53:37 +1000 Subject: [PATCH] BIPAP Time@Pressure additions --- SleepyHead.depend | 10 +++++----- SleepyHeadMain.cpp | 24 +++++++++++++++++++++++- SleepyHeadMain.h | 4 ++-- graphs/graph.cpp | 5 ++--- graphs/graph.h | 3 ++- version.h | 12 ++++++------ 6 files changed, 40 insertions(+), 18 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index 295e9c31..cffc7f36 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7829,7 +7829,7 @@ 1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h -1306584929 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h +1306655333 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h "SleepyHeadApp.h" "GUIFrame.h" "sleeplib/machine.h" @@ -7869,11 +7869,11 @@ "tinyxml/tinyxml.h" -1306652249 /home/mark/projects/git/sleepyhead/graphs/graph.h +1306654979 /home/mark/projects/git/sleepyhead/graphs/graph.h -1306652337 /home/mark/projects/git/sleepyhead/version.h +1306655544 /home/mark/projects/git/sleepyhead/version.h 1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7890,7 +7890,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306650852 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306655045 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7905,7 +7905,7 @@ "SleepyHeadMain.h" "sleeplib/profiles.h" -1306652144 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1306655056 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index e124695f..80f04d8b 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -411,11 +411,22 @@ Daily::Daily(wxWindow *win) { machine=NULL; + AddData(tap_eap=new TAPData(CPAP_EAP)); + AddData(tap_iap=new TAPData(CPAP_IAP)); + AddData(tap=new TAPData(CPAP_Pressure)); + TAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@Pressure"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER); TAP->SetMargins(20,15,5,50); - AddData(tap=new TAPData()); TAP->AddLayer(new gCandleStick(tap)); + TAP_IAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@IAP"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER); + TAP_IAP->SetMargins(20,15,5,50); + TAP_IAP->AddLayer(new gCandleStick(tap_iap)); + + TAP_EAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@EAP"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER); + TAP_EAP->SetMargins(20,15,5,50); + TAP_EAP->AddLayer(new gCandleStick(tap_eap)); + G_AHI=new gGraphWindow(ScrolledWindow,-1,wxT("Event Breakdown"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER); G_AHI->SetMargins(20,15,5,50); AddData(g_ahi=new AHIData()); @@ -499,6 +510,8 @@ Daily::Daily(wxWindow *win) fgSizer->Add(PRD,1,wxEXPAND); fgSizer->Add(LEAK,1,wxEXPAND); fgSizer->Add(TAP,1,wxEXPAND); + fgSizer->Add(TAP_IAP,1,wxEXPAND); + fgSizer->Add(TAP_EAP,1,wxEXPAND); foobar_datehack=false; // this exists due to a wxGTK bug. // RefreshData(); @@ -617,9 +630,18 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) html=html+wxT("")+_("Pressure Min")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); html=html+wxT("")+_("Pressure Max")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); } else if (mode==MODE_BIPAP) { + TAP->Hide(); + TAP_EAP->Show(); + TAP_IAP->Show(); html=html+wxT("")+_("Pressure IAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); html=html+wxT("")+_("Pressure EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); } + if (mode!=MODE_BIPAP) { + TAP->Show(); + TAP_EAP->Hide(); + TAP_IAP->Hide(); + + } 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"); diff --git a/SleepyHeadMain.h b/SleepyHeadMain.h index 52d0941a..8493baf1 100644 --- a/SleepyHeadMain.h +++ b/SleepyHeadMain.h @@ -50,9 +50,9 @@ protected: void UpdateGraphs(wxDateTime date); bool foobar_datehack; - gPointData *tap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap; + gPointData *tap,*tap_eap,*tap_iap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap; gPointData *flags[10]; - gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF; + gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP; Machine *machine; diff --git a/graphs/graph.cpp b/graphs/graph.cpp index 094b3cfc..6c995823 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -1768,8 +1768,8 @@ void PressureData::Reload(Day *day) //graph->Refresh(false); } -TAPData::TAPData() -:gPointData(256) +TAPData::TAPData(MachineCode _code) +:gPointData(256),code(_code) { AddSegment(max_points); } @@ -1793,7 +1793,6 @@ void TAPData::Reload(Day *day) int lastval,val; int field=0; - MachineCode code=CPAP_Pressure; for (auto s=day->begin();s!=day->end();s++) { if ((*s)->events.find(code)==(*s)->events.end()) continue; diff --git a/graphs/graph.h b/graphs/graph.h index 99048494..dd6cf80b 100644 --- a/graphs/graph.h +++ b/graphs/graph.h @@ -402,12 +402,13 @@ protected: class TAPData:public gPointData { public: - TAPData(); + TAPData(MachineCode _code); virtual ~TAPData(); virtual void Reload(Day *day=NULL); static const int max_slots=256; wxTimeSpan pTime[max_slots]; + MachineCode code; }; diff --git a/version.h b/version.h index fe0b8187..37c20eb7 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 = 1804; - static const long REVISION = 4413; + static const long BUILD = 1810; + static const long REVISION = 4453; //Miscellaneous Version Types - static const long BUILDS_COUNT = 6086; - #define RC_FILEVERSION 0,7,1804,4413 - #define RC_FILEVERSION_STRING "0, 7, 1804, 4413\0" - static const char FULLVERSION_STRING[] = "0.7.1804.4413"; + static const long BUILDS_COUNT = 6099; + #define RC_FILEVERSION 0,7,1810,4453 + #define RC_FILEVERSION_STRING "0, 7, 1810, 4453\0" + static const char FULLVERSION_STRING[] = "0.7.1810.4453"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;