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

AddSession day cleanup. After Midnight threshold changed to midday (from 6am)

Browse Source
This commit is contained in:
Mark Watkins 2011-05-31 21:48:57 +10:00
parent a8ccc90ce2
commit abb01d9403
6 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SleepyHead.depend
View File

@ -7837,7 +7837,7 @@
"sleeplib/machine.h" "sleeplib/machine.h"
"graphs/graph.h" "graphs/graph.h"
1306759276 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h 1306839039 /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>
@ -7875,7 +7875,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7892,7 +7892,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.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" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -7910,7 +7910,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.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
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/log.h> <wx/log.h>
@ -7925,7 +7925,7 @@
<wx/ffile.h> <wx/ffile.h>
<wx/utils.h> <wx/utils.h>
1306806694 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp 1306842369 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>

2
SleepyHeadMain.cpp
View File

@ -589,10 +589,10 @@ Daily::Daily(wxWindow *win,Profile *p)
SF->AddLayer(new gFooBar()); SF->AddLayer(new gFooBar());
fgSizer->Add(SF,1,wxEXPAND); fgSizer->Add(SF,1,wxEXPAND);
fgSizer->Add(G_AHI,1,wxEXPAND);
fgSizer->Add(FRW,1,wxEXPAND); fgSizer->Add(FRW,1,wxEXPAND);
fgSizer->Add(PRD,1,wxEXPAND); fgSizer->Add(PRD,1,wxEXPAND);
fgSizer->Add(LEAK,1,wxEXPAND); fgSizer->Add(LEAK,1,wxEXPAND);
fgSizer->Add(G_AHI,1,wxEXPAND);
fgSizer->Add(TAP,1,wxEXPAND); fgSizer->Add(TAP,1,wxEXPAND);
fgSizer->Add(TAP_IAP,1,wxEXPAND); fgSizer->Add(TAP_IAP,1,wxEXPAND);
fgSizer->Add(TAP_EAP,1,wxEXPAND); fgSizer->Add(TAP_EAP,1,wxEXPAND);

10
graphs/graph.cpp
View File

@ -719,6 +719,8 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
// dc.SetPen(*wxBLACK_PEN); // dc.SetPen(*wxBLACK_PEN);
dc.SetClippingRegion(start_px-10,start_py+height,width+20,w.GetBottomMargin());
double st3=st; double st3=st;
while (st3>w.min_x) { while (st3>w.min_x) {
st3-=min_tick/10.0; st3-=min_tick/10.0;
@ -734,16 +736,17 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
dc.DrawLine(px,py,px,py+4); dc.DrawLine(px,py,px,py+4);
} }
//st=st3;
while (st<w.min_x) { while (st<w.min_x) {
st+=min_tick;///10.0; // mucking with this changes the scrollyness of the ticker. st+=min_tick; //10.0; // mucking with this changes the scrollyness of the ticker.
} }
int hour,minute,second,millisecond; int hour,minute,second,millisecond;
wxDateTime d; wxDateTime d;
for (double i=st; i<=w.max_x; i+=min_tick) { //600.0/86400.0) { for (double i=st; i<=w.max_x; i+=min_tick) { //600.0/86400.0) {
d.Set(i+2400000.5+.000001+1); // JDN vs MJD vs Rounding errors d.Set(i+2400000.5+.00000001+1); // JDN vs MJD vs Rounding errors
if (show_time) { if (show_time) {
minute=d.GetMinute(); minute=d.GetMinute();
@ -764,6 +767,7 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
px=w.x2p(i); px=w.x2p(i);
dc.DrawLine(px,py,px,py+6); dc.DrawLine(px,py,px,py+6);
//dc.DrawLine(px+1,py,px+1,py+6);
y=x=0; y=x=0;
dc.GetTextExtent(fd,&x,&y); // This doesn't work properly on windows. dc.GetTextExtent(fd,&x,&y); // This doesn't work properly on windows.
@ -778,6 +782,8 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
} }
} }
dc.DestroyClippingRegion();
} }

50
libs/sleeplib/machine.cpp
View File

@ -143,33 +143,43 @@ Session *Machine::SessionExists(SessionID session)
} }
Day *Machine::AddSession(Session *s,Profile *p) Day *Machine::AddSession(Session *s,Profile *p)
{ {
wxDateTime date=s->first(); wxTimeSpan span;
wxDateTime date=s->first()-wxTimeSpan::Day();
date.ResetTime(); 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()) { if (day.find(date)!=day.end()) {
wxTimeSpan span=s->first()-day[date]->last(); // Previous day record exists...
if (span<wxTimeSpan::Hours(4)) ok=true;
else {
wxDateTime t=s->first(); // Calculate time since end of previous days last session
t.ResetTime(); span=s->first()-day[date]->last();
wxTimeSpan j=s->first()-t;
if (j<wxTimeSpan::Hours(6)) { // less than n hours since last session yesterday?
ok=true; if (span < wxTimeSpan::Hours(hours_since_last_session)) {
} previous=true;
}
} else { // No day record yesterday
wxDateTime t=s->first();
t.ResetTime();
wxTimeSpan j=s->first()-t;
if (j<wxTimeSpan::Hours(12)) {
ok=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(); date+=wxTimeSpan::Day();
} }

3
libs/sleeplib/machine.h
View File

@ -326,6 +326,8 @@ public:
map<MachineCode,vector<Event *> > events; map<MachineCode,vector<Event *> > events;
map<MachineCode,vector<Waveform *> > waveforms; map<MachineCode,vector<Waveform *> > waveforms;
bool IsLoneSession() { return s_lonesession; };
void SetLoneSession(bool b) { s_lonesession=b; };
protected: protected:
SessionID s_session; SessionID s_session;
@ -334,6 +336,7 @@ protected:
wxDateTime s_last; wxDateTime s_last;
float s_hours; float s_hours;
bool s_changed; bool s_changed;
bool s_lonesession;
}; };
class CPAP:public Machine class CPAP:public Machine

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 = 2495; static const long BUILD = 2512;
static const long REVISION = 8284; static const long REVISION = 8376;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 7575; static const long BUILDS_COUNT = 7621;
#define RC_FILEVERSION 0,7,2495,8284 #define RC_FILEVERSION 0,7,2512,8376
#define RC_FILEVERSION_STRING "0, 7, 2495, 8284\0" #define RC_FILEVERSION_STRING "0, 7, 2512, 8376\0"
static const char FULLVERSION_STRING[] = "0.7.2495.8284"; static const char FULLVERSION_STRING[] = "0.7.2512.8376";
//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;