From abb01d9403f36968453cac5630a189a6d5de14b9 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 31 May 2011 21:48:57 +1000 Subject: [PATCH] AddSession day cleanup. After Midnight threshold changed to midday (from 6am) --- SleepyHead.depend | 10 ++++---- SleepyHeadMain.cpp | 2 +- graphs/graph.cpp | 10 ++++++-- libs/sleeplib/machine.cpp | 50 +++++++++++++++++++++++---------------- libs/sleeplib/machine.h | 3 +++ version.h | 12 +++++----- 6 files changed, 53 insertions(+), 34 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index 8abb5e9b..c194acf7 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7837,7 +7837,7 @@ "sleeplib/machine.h" "graphs/graph.h" -1306759276 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h +1306839039 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h @@ -7875,7 +7875,7 @@ -1306830916 /home/mark/projects/git/sleepyhead/version.h +1306842369 /home/mark/projects/git/sleepyhead/version.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7892,7 +7892,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306817290 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306838801 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7910,7 +7910,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1306830825 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1306832286 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp @@ -7925,7 +7925,7 @@ -1306806694 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp +1306842369 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index f14fb2bb..1d6688ee 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -589,10 +589,10 @@ Daily::Daily(wxWindow *win,Profile *p) SF->AddLayer(new gFooBar()); fgSizer->Add(SF,1,wxEXPAND); - fgSizer->Add(G_AHI,1,wxEXPAND); fgSizer->Add(FRW,1,wxEXPAND); fgSizer->Add(PRD,1,wxEXPAND); fgSizer->Add(LEAK,1,wxEXPAND); + fgSizer->Add(G_AHI,1,wxEXPAND); fgSizer->Add(TAP,1,wxEXPAND); fgSizer->Add(TAP_IAP,1,wxEXPAND); fgSizer->Add(TAP_EAP,1,wxEXPAND); diff --git a/graphs/graph.cpp b/graphs/graph.cpp index d7a53d69..c4708838 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -719,6 +719,8 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w) // dc.SetPen(*wxBLACK_PEN); + + dc.SetClippingRegion(start_px-10,start_py+height,width+20,w.GetBottomMargin()); double st3=st; while (st3>w.min_x) { st3-=min_tick/10.0; @@ -734,16 +736,17 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w) dc.DrawLine(px,py,px,py+4); } + //st=st3; while (stfirst(); + wxTimeSpan span; + + wxDateTime date=s->first()-wxTimeSpan::Day(); date.ResetTime(); - date-=wxTimeSpan::Day(); - bool ok=false; + const int hours_since_last_session=4; + const int hours_since_midnight=12; + + bool previous=false; + + // Find what day session belongs to. if (day.find(date)!=day.end()) { - wxTimeSpan span=s->first()-day[date]->last(); - if (spanfirst(); - t.ResetTime(); - wxTimeSpan j=s->first()-t; - if (jfirst(); - t.ResetTime(); - wxTimeSpan j=s->first()-t; - if (jfirst()-day[date]->last(); + + // less than n hours since last session yesterday? + if (span < wxTimeSpan::Hours(hours_since_last_session)) { + previous=true; } } - if (!ok) { + if (!previous) { + // Calculate Hours since midnight. + wxDateTime t=s->first(); + t.ResetTime(); + span=s->first()-t; + + // Bedtime was late last night. + if (span < wxTimeSpan::Hours(hours_since_midnight)) { + previous=true; + } + } + + if (!previous) { + // Revert to sessions original day. date+=wxTimeSpan::Day(); } diff --git a/libs/sleeplib/machine.h b/libs/sleeplib/machine.h index d851c335..1f4255dd 100644 --- a/libs/sleeplib/machine.h +++ b/libs/sleeplib/machine.h @@ -326,6 +326,8 @@ public: map > events; map > waveforms; + bool IsLoneSession() { return s_lonesession; }; + void SetLoneSession(bool b) { s_lonesession=b; }; protected: SessionID s_session; @@ -334,6 +336,7 @@ protected: wxDateTime s_last; float s_hours; bool s_changed; + bool s_lonesession; }; class CPAP:public Machine diff --git a/version.h b/version.h index 9236303d..e4c07b16 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 = 2495; - static const long REVISION = 8284; + static const long BUILD = 2512; + static const long REVISION = 8376; //Miscellaneous Version Types - static const long BUILDS_COUNT = 7575; - #define RC_FILEVERSION 0,7,2495,8284 - #define RC_FILEVERSION_STRING "0, 7, 2495, 8284\0" - static const char FULLVERSION_STRING[] = "0.7.2495.8284"; + static const long BUILDS_COUNT = 7621; + #define RC_FILEVERSION 0,7,2512,8376 + #define RC_FILEVERSION_STRING "0, 7, 2512, 8376\0" + static const char FULLVERSION_STRING[] = "0.7.2512.8376"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;