From d45dbe3711fe0eaceea780489f8f81762ff012d1 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 27 May 2011 16:08:39 +1000 Subject: [PATCH] BIPAP Pressure graph layers --- SleepyHead.depend | 6 +++--- SleepyHeadMain.cpp | 8 ++++++-- SleepyHeadMain.h | 2 +- version.h | 12 ++++++------ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index e40e4335..5af52170 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7826,7 +7826,7 @@ 1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h -1306468775 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h +1306476329 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h "SleepyHeadApp.h" "GUIFrame.h" "sleeplib/machine.h" @@ -7870,7 +7870,7 @@ -1306469818 /home/mark/projects/git/sleepyhead/version.h +1306476387 /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" -1306469818 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306476387 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 65fdb1ee..959f0b1c 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -67,9 +67,9 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event ) wxRect r=GetRect(); #if defined(__UNIX__) - /*int cx, cy; + int cx, cy; ClientToScreen(&cx,&cy); - int border_width = cx - r.x; + /*int border_width = cx - r.x; int title_bar_height = cy - r.y; r.width += (border_width * 2); r.height += title_bar_height + border_width; */ @@ -308,9 +308,13 @@ Daily::Daily(wxWindow *win) LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leaks"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false)); + AddData(pressure_iap=new PressureData(CPAP_IAP)); + AddData(pressure_eap=new PressureData(CPAP_EAP)); AddData(prd=new PressureData(CPAP_Pressure)); PRD=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false)); + PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false)); + PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false)); AddData(frw=new FlowData()); FRW=new gGraphWindow(ScrolledWindow,-1,wxT("Flow Rate"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); diff --git a/SleepyHeadMain.h b/SleepyHeadMain.h index dc28f29e..239c50d8 100644 --- a/SleepyHeadMain.h +++ b/SleepyHeadMain.h @@ -48,7 +48,7 @@ protected: void UpdateGraphs(wxDateTime date); bool foobar_datehack; - gPointData *tap,*g_ahi,*frw,*prd,*leakdata; + gPointData *tap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap; gPointData *flags[8]; gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF; diff --git a/version.h b/version.h index 41562746..e55dd10c 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 = 1247; - static const long REVISION = 1277; + static const long BUILD = 1252; + static const long REVISION = 1304; //Miscellaneous Version Types - static const long BUILDS_COUNT = 4795; - #define RC_FILEVERSION 0,7,1247,1277 - #define RC_FILEVERSION_STRING "0, 7, 1247, 1277\0" - static const char FULLVERSION_STRING[] = "0.7.1247.1277"; + static const long BUILDS_COUNT = 4810; + #define RC_FILEVERSION 0,7,1252,1304 + #define RC_FILEVERSION_STRING "0, 7, 1252, 1304\0" + static const char FULLVERSION_STRING[] = "0.7.1252.1304"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;