From 7ffebb1cb84c081582579f6697ca78ab24fe56df Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 3 Jun 2011 02:31:36 +1000 Subject: [PATCH] Last day in summary tab wasn't always showing --- SleepyHead.depend | 10 +++++----- SleepyHead.layout | 20 ++++++++++---------- SleepyHeadMain.cpp | 5 ++++- graphs/graph.cpp | 20 +++++++++++++++++--- graphs/graph.h | 5 +++++ libs/sleeplib/prs1_loader.cpp | 5 ++++- version.h | 14 +++++++------- 7 files changed, 52 insertions(+), 27 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index 8e621b20..15c5a361 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7872,11 +7872,11 @@ "tinyxml/tinyxml.h" -1306988764 /home/mark/projects/git/sleepyhead/graphs/graph.h +1307020079 /home/mark/projects/git/sleepyhead/graphs/graph.h -1307009363 /home/mark/projects/git/sleepyhead/version.h +1307032231 /home/mark/projects/git/sleepyhead/version.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7893,7 +7893,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306988716 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1307020338 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7912,7 +7912,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1306989181 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1307032239 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp @@ -7961,7 +7961,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1307009357 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp +1307014047 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp diff --git a/SleepyHead.layout b/SleepyHead.layout index f00417b6..160142b0 100644 --- a/SleepyHead.layout +++ b/SleepyHead.layout @@ -10,17 +10,17 @@ - - + + - + - + - + @@ -29,10 +29,10 @@ - + - - + + @@ -50,10 +50,10 @@ - + - + diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index af1b6c6b..f08132f4 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -571,6 +571,10 @@ Daily::Daily(wxWindow *win,Profile *p) G_AHI->AddLayer(l); AddData(leakdata=new PressureData(CPAP_Leak,0)); + //leakdata->ForceMinY(0); + //leakdata->ForceMaxY(120); + + LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leaks"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false,false,true)); LEAK->AddLayer(new gXAxis(wxBLACK)); @@ -692,7 +696,6 @@ void Daily::RefreshData() } UpdateGraphs(d); - if (d) { CPAPMode mode=(CPAPMode)d->summary_max(CPAP_Mode); if (mode!=MODE_BIPAP) { diff --git a/graphs/graph.cpp b/graphs/graph.cpp index 38989aa4..c345d548 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -37,7 +37,7 @@ gGraphData::gGraphData(int mp,gDataType t) :vc(0),type(t),max_points(mp) { m_ready=false; - + force_min_y=force_max_y=0; } gGraphData::~gGraphData() { @@ -1576,6 +1576,11 @@ void FlowData::Reload(Day *day) max_y=60; } + if (force_min_y!=force_max_y) { + min_y=force_min_y; + max_y=force_max_y; + } + real_min_x=min_x; real_min_y=min_y; real_max_x=max_x; @@ -1657,6 +1662,11 @@ void PressureData::Reload(Day *day) if (min_y>1) min_y-=1; } //} + if (force_min_y!=force_max_y) { + min_y=force_min_y; + max_y=force_max_y; + } + real_min_x=min_x; real_min_y=min_y; @@ -1828,7 +1838,7 @@ HistoryData::HistoryData(Profile * _profile) AddSegment(max_points); if (profile->LastDay().IsValid()) { real_min_x=profile->FirstDay().GetMJD(); - real_max_x=profile->LastDay().GetMJD()+0.5; + real_max_x=profile->LastDay().GetMJD()+1; } } HistoryData::~HistoryData() @@ -1838,7 +1848,7 @@ void HistoryData::ResetDateRange() { if (profile->LastDay().IsValid()) { real_min_x=profile->FirstDay().GetMJD(); - real_max_x=profile->LastDay().GetMJD()+0.5; + real_max_x=profile->LastDay().GetMJD()+1; } Reload(NULL); } @@ -1896,6 +1906,10 @@ void HistoryData::Reload(Day *day) // max_x+=1; //real_min_x=min_x; //real_max_x=max_x; + if (force_min_y!=force_max_y) { + min_y=force_min_y; + max_y=force_max_y; + } real_min_y=min_y; real_max_y=max_y; m_ready=true; diff --git a/graphs/graph.h b/graphs/graph.h index cd920440..00222320 100644 --- a/graphs/graph.h +++ b/graphs/graph.h @@ -66,6 +66,9 @@ public: virtual inline double RealMaxY() { return real_max_y; }; virtual inline double RealMinY() { return real_min_y; }; + virtual inline void ForceMinY(double v) { force_min_y=v; }; + virtual inline void ForceMaxY(double v) { force_max_y=v; }; + inline void ResetX() { min_x=real_min_x; max_x=real_max_x; }; inline void ResetY() { min_y=real_min_y; max_y=real_max_y; }; @@ -82,6 +85,8 @@ protected: double real_min_x, real_max_x, real_min_y, real_max_y; double min_x, max_x, min_y, max_y; + double force_min_y,force_max_y; + int vc; gDataType type; int max_points; diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp index 54e20a42..7391353d 100644 --- a/libs/sleeplib/prs1_loader.cpp +++ b/libs/sleeplib/prs1_loader.cpp @@ -536,10 +536,13 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t break; case 0x0e: // Unknown case 0x10: // Unknown - data[0]=buffer[pos++]; + data[0]=buffer[pos++]; // << 8) | buffer[pos]; + //pos+=2; data[1]=buffer[pos++]; data[2]=buffer[pos++]; + //tt-=wxTimeSpan::Seconds(data[0]); session->AddEvent(new Event(t,cpapcode, data, 3)); + //wxLogMessage(tt.FormatTime()+wxString::Format(wxT(" %i: %.2f %.2f %.2f"),code,data[0],data[1],data[2])); break; case 0x0f: // Cheyne Stokes Respiration data[0]=buffer[pos+1]<<8 | buffer[pos]; diff --git a/version.h b/version.h index 610c1829..a77c8b90 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "02"; + static const char DATE[] = "03"; static const char MONTH[] = "06"; static const char YEAR[] = "2011"; static const char UBUNTU_VERSION_STYLE[] = "11.06"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 2821; - static const long REVISION = 10042; + static const long BUILD = 2842; + static const long REVISION = 10143; //Miscellaneous Version Types - static const long BUILDS_COUNT = 8328; - #define RC_FILEVERSION 0,7,2821,10042 - #define RC_FILEVERSION_STRING "0, 7, 2821, 10042\0" - static const char FULLVERSION_STRING[] = "0.7.2821.10042"; + static const long BUILDS_COUNT = 8401; + #define RC_FILEVERSION 0,7,2842,10143 + #define RC_FILEVERSION_STRING "0, 7, 2842, 10143\0" + static const char FULLVERSION_STRING[] = "0.7.2842.10143"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;