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

Last day in summary tab wasn't always showing

Browse Source
This commit is contained in:
Mark Watkins 2011-06-03 02:31:36 +10:00
parent de39de05dc
commit 7ffebb1cb8
7 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SleepyHead.depend
View File

@ -7872,11 +7872,11 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306988764 /home/mark/projects/git/sleepyhead/graphs/graph.h 1307020079 /home/mark/projects/git/sleepyhead/graphs/graph.h
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7893,7 +7893,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.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" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -7912,7 +7912,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.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
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/log.h> <wx/log.h>
@ -7961,7 +7961,7 @@
"machine_loader.h" "machine_loader.h"
"tinyxml/tinyxml.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
<wx/dir.h> <wx/dir.h>
<wx/filename.h> <wx/filename.h>
<wx/ffile.h> <wx/ffile.h>

20
SleepyHead.layout
View File

@ -10,17 +10,17 @@
<File name="SleepyHeadApp.cpp" open="1" top="0" tabpos="10"> <File name="SleepyHeadApp.cpp" open="1" top="0" tabpos="10">
<Cursor position="1061" topLine="14" /> <Cursor position="1061" topLine="14" />
</File> </File>
<File name="SleepyHeadMain.cpp" open="1" top="0" tabpos="3"> <File name="SleepyHeadMain.cpp" open="1" top="1" tabpos="3">
<Cursor position="36337" topLine="796" /> <Cursor position="21805" topLine="553" />
</File> </File>
<File name="SleepyHeadMain.h" open="1" top="0" tabpos="4"> <File name="SleepyHeadMain.h" open="1" top="0" tabpos="4">
<Cursor position="550" topLine="0" /> <Cursor position="550" topLine="15" />
</File> </File>
<File name="graphs/graph.cpp" open="1" top="0" tabpos="6"> <File name="graphs/graph.cpp" open="1" top="0" tabpos="6">
<Cursor position="48082" topLine="1834" /> <Cursor position="36899" topLine="1392" />
</File> </File>
<File name="graphs/graph.h" open="1" top="0" tabpos="5"> <File name="graphs/graph.h" open="1" top="0" tabpos="5">
<Cursor position="12238" topLine="318" /> <Cursor position="2182" topLine="42" />
</File> </File>
<File name="libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11"> <File name="libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
@ -29,10 +29,10 @@
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="libs/sleeplib/machine.cpp" open="1" top="0" tabpos="1"> <File name="libs/sleeplib/machine.cpp" open="1" top="0" tabpos="1">
<Cursor position="35662" topLine="1241" /> <Cursor position="1304" topLine="19" />
</File> </File>
<File name="libs/sleeplib/machine.h" open="1" top="1" tabpos="2"> <File name="libs/sleeplib/machine.h" open="1" top="0" tabpos="2">
<Cursor position="481" topLine="0" /> <Cursor position="786" topLine="14" />
</File> </File>
<File name="libs/sleeplib/machine_loader.cpp" open="0" top="0" tabpos="8"> <File name="libs/sleeplib/machine_loader.cpp" open="0" top="0" tabpos="8">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
@ -50,10 +50,10 @@
<Cursor position="6582" topLine="216" /> <Cursor position="6582" topLine="216" />
</File> </File>
<File name="libs/sleeplib/profiles.h" open="1" top="0" tabpos="8"> <File name="libs/sleeplib/profiles.h" open="1" top="0" tabpos="8">
<Cursor position="628" topLine="5" /> <Cursor position="628" topLine="0" />
</File> </File>
<File name="libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="9"> <File name="libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="9">
<Cursor position="17629" topLine="473" /> <Cursor position="458" topLine="0" />
</File> </File>
<File name="libs/sleeplib/prs1_loader.h" open="0" top="0" tabpos="8"> <File name="libs/sleeplib/prs1_loader.h" open="0" top="0" tabpos="8">
<Cursor position="1115" topLine="0" /> <Cursor position="1115" topLine="0" />

5
SleepyHeadMain.cpp
View File

@ -571,6 +571,10 @@ Daily::Daily(wxWindow *win,Profile *p)
G_AHI->AddLayer(l); G_AHI->AddLayer(l);
AddData(leakdata=new PressureData(CPAP_Leak,0)); 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=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 gLineChart(leakdata,wxPURPLE,4096,false,false,true));
LEAK->AddLayer(new gXAxis(wxBLACK)); LEAK->AddLayer(new gXAxis(wxBLACK));
@ -692,7 +696,6 @@ void Daily::RefreshData()
} }
UpdateGraphs(d); UpdateGraphs(d);
if (d) { if (d) {
CPAPMode mode=(CPAPMode)d->summary_max(CPAP_Mode); CPAPMode mode=(CPAPMode)d->summary_max(CPAP_Mode);
if (mode!=MODE_BIPAP) { if (mode!=MODE_BIPAP) {

20
graphs/graph.cpp
View File

@ -37,7 +37,7 @@ gGraphData::gGraphData(int mp,gDataType t)
:vc(0),type(t),max_points(mp) :vc(0),type(t),max_points(mp)
{ {
m_ready=false; m_ready=false;
force_min_y=force_max_y=0;
} }
gGraphData::~gGraphData() gGraphData::~gGraphData()
{ {
@ -1576,6 +1576,11 @@ void FlowData::Reload(Day *day)
max_y=60; 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_x=min_x;
real_min_y=min_y; real_min_y=min_y;
real_max_x=max_x; real_max_x=max_x;
@ -1657,6 +1662,11 @@ void PressureData::Reload(Day *day)
if (min_y>1) min_y-=1; 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_x=min_x;
real_min_y=min_y; real_min_y=min_y;
@ -1828,7 +1838,7 @@ HistoryData::HistoryData(Profile * _profile)
AddSegment(max_points); AddSegment(max_points);
if (profile->LastDay().IsValid()) { if (profile->LastDay().IsValid()) {
real_min_x=profile->FirstDay().GetMJD(); real_min_x=profile->FirstDay().GetMJD();
real_max_x=profile->LastDay().GetMJD()+0.5; real_max_x=profile->LastDay().GetMJD()+1;
} }
} }
HistoryData::~HistoryData() HistoryData::~HistoryData()
@ -1838,7 +1848,7 @@ void HistoryData::ResetDateRange()
{ {
if (profile->LastDay().IsValid()) { if (profile->LastDay().IsValid()) {
real_min_x=profile->FirstDay().GetMJD(); real_min_x=profile->FirstDay().GetMJD();
real_max_x=profile->LastDay().GetMJD()+0.5; real_max_x=profile->LastDay().GetMJD()+1;
} }
Reload(NULL); Reload(NULL);
} }
@ -1896,6 +1906,10 @@ void HistoryData::Reload(Day *day)
// max_x+=1; // max_x+=1;
//real_min_x=min_x; //real_min_x=min_x;
//real_max_x=max_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_min_y=min_y;
real_max_y=max_y; real_max_y=max_y;
m_ready=true; m_ready=true;

5
graphs/graph.h
View File

@ -66,6 +66,9 @@ public:
virtual inline double RealMaxY() { return real_max_y; }; virtual inline double RealMaxY() { return real_max_y; };
virtual inline double RealMinY() { return real_min_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 ResetX() { min_x=real_min_x; max_x=real_max_x; };
inline void ResetY() { min_y=real_min_y; max_y=real_max_y; }; 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 real_min_x, real_max_x, real_min_y, real_max_y;
double min_x, max_x, min_y, max_y; double min_x, max_x, min_y, max_y;
double force_min_y,force_max_y;
int vc; int vc;
gDataType type; gDataType type;
int max_points; int max_points;

5
libs/sleeplib/prs1_loader.cpp
View File

@ -536,10 +536,13 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t
break; break;
case 0x0e: // Unknown case 0x0e: // Unknown
case 0x10: // Unknown case 0x10: // Unknown
data[0]=buffer[pos++]; data[0]=buffer[pos++]; // << 8) | buffer[pos];
//pos+=2;
data[1]=buffer[pos++]; data[1]=buffer[pos++];
data[2]=buffer[pos++]; data[2]=buffer[pos++];
//tt-=wxTimeSpan::Seconds(data[0]);
session->AddEvent(new Event(t,cpapcode, data, 3)); 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; break;
case 0x0f: // Cheyne Stokes Respiration case 0x0f: // Cheyne Stokes Respiration
data[0]=buffer[pos+1]<<8 | buffer[pos]; data[0]=buffer[pos+1]<<8 | buffer[pos];

14
version.h
View File

@ -4,7 +4,7 @@
namespace AutoVersion{ namespace AutoVersion{
//Date Version Types //Date Version Types
static const char DATE[] = "02"; static const char DATE[] = "03";
static const char MONTH[] = "06"; static const char MONTH[] = "06";
static const char YEAR[] = "2011"; static const char YEAR[] = "2011";
static const char UBUNTU_VERSION_STYLE[] = "11.06"; static const char UBUNTU_VERSION_STYLE[] = "11.06";
@ -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 = 2821; static const long BUILD = 2842;
static const long REVISION = 10042; static const long REVISION = 10143;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 8328; static const long BUILDS_COUNT = 8401;
#define RC_FILEVERSION 0,7,2821,10042 #define RC_FILEVERSION 0,7,2842,10143
#define RC_FILEVERSION_STRING "0, 7, 2821, 10042\0" #define RC_FILEVERSION_STRING "0, 7, 2842, 10143\0"
static const char FULLVERSION_STRING[] = "0.7.2821.10042"; static const char FULLVERSION_STRING[] = "0.7.2842.10143";
//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;