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

Default summary view to 1 month, more graph fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-06-03 18:12:00 +10:00
parent 77f11d5c4b
commit 2d850c9196
4 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SleepyHead.depend
View File

@ -7876,7 +7876,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307084623 /home/mark/projects/git/sleepyhead/version.h 1307088642 /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"
1307084513 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp 1307088511 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"
1307084623 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp 1307088318 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>

29
SleepyHeadMain.cpp
View File

@ -388,21 +388,33 @@ void Summary::ResetProfile(Profile *p)
profile=p; profile=p;
if (profile->FirstDay().IsValid()) { if (profile->FirstDay().IsValid()) {
StartDatePicker->SetRange(profile->FirstDay()+wxTimeSpan::Day(),profile->LastDay()+wxTimeSpan::Day()); wxDateTime last=profile->LastDay()+wxTimeSpan::Day();
EndDatePicker->SetRange(profile->FirstDay()+wxTimeSpan::Day(),profile->LastDay()+wxTimeSpan::Day()); wxDateTime first=profile->FirstDay()+wxTimeSpan::Day();
StartDatePicker->SetValue(profile->FirstDay()+wxTimeSpan::Day()); wxDateTime start=last-wxTimeSpan::Days(30);
EndDatePicker->SetValue(profile->LastDay()+wxTimeSpan::Day());
StartDatePicker->SetRange(first,last);
EndDatePicker->SetRange(first,last);
if (start<first) start=first;
StartDatePicker->SetValue(start);
EndDatePicker->SetValue(last);
for (list<HistoryData *>::iterator h=Data.begin();h!=Data.end();h++) { for (list<HistoryData *>::iterator h=Data.begin();h!=Data.end();h++) {
(*h)->SetProfile(p); (*h)->SetProfile(p);
(*h)->ResetDateRange(); (*h)->ResetDateRange();
(*h)->Reload(NULL);
} }
} }
} }
void Summary::RefreshData() void Summary::RefreshData()
{ {
wxDateTime first=StartDatePicker->GetValue();
wxDateTime last=EndDatePicker->GetValue();
for (list<HistoryData *>::iterator h=Data.begin();h!=Data.end();h++) { for (list<HistoryData *>::iterator h=Data.begin();h!=Data.end();h++) {
(*h)->Update(dummyday); //(*h)->Update(dummyday);
(*h)->SetDateRange(first,last);
} }
wxString submodel=_("Unknown Model"); wxString submodel=_("Unknown Model");
@ -420,6 +432,7 @@ void Summary::RefreshData()
//html=html+wxT("<img src=\"memory:test.png\" width='180'>"); //html=html+wxT("<img src=\"memory:test.png\" width='180'>");
html=html+wxT("<table cellspacing=2 cellpadding=0>\n"); html=html+wxT("<table cellspacing=2 cellpadding=0>\n");
if (avp>0) {
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Machine Information has been removed because this page has become machine agnostic. Not sure what to display here.")+wxT("</i></td></tr>\n"); html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Machine Information has been removed because this page has become machine agnostic. Not sure what to display here.")+wxT("</i></td></tr>\n");
/*if (machine->properties.find(wxT("SubModel"))!=machine->properties.end()) /*if (machine->properties.find(wxT("SubModel"))!=machine->properties.end())
@ -465,6 +478,10 @@ void Summary::RefreshData()
html=html+wxT("<tr><td><b>")+_("Waketime")+wxT("</b></td><td>")+wxString::Format(wxT("%02.0f:%02i"),wt,int(wt*60) % 60)+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Waketime")+wxT("</b></td><td>")+wxString::Format(wxT("%02.0f:%02i"),wt,int(wt*60) % 60)+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Hours/Night")+wxT("</b></td><td>")+wxString::Format(wxT("%02.0f:%02i"),ua,int(ua*60)%60)+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Hours/Night")+wxT("</b></td><td>")+wxString::Format(wxT("%02.0f:%02i"),ua,int(ua*60)%60)+wxT("</td></tr>\n");
html=html+wxT("</table>"); html=html+wxT("</table>");
} else {
html+=wxT("<div align=center><h1>Welcome</h1><br/>&nbsp;<br/><i>Please import some data</i></div>");
}
html+=wxT("</body></html>"); html+=wxT("</body></html>");
HTMLInfo->SetPage(html); HTMLInfo->SetPage(html);
} }
@ -881,7 +898,7 @@ void Daily::RefreshData()
} }
*/ */
} else { } else {
HTMLInfo->SetPage(_("No CPAP Machine Data Available")); HTMLInfo->SetPage(_("<i>Please import some data</i>"));
/*if (SessionList->IsShown()) { /*if (SessionList->IsShown()) {
m_mgr.DetachPane(SessionList); m_mgr.DetachPane(SessionList);

20
graphs/graph.cpp
View File

@ -821,7 +821,9 @@ void gYAxis::Plot(wxDC & dc,gGraphWindow &w)
double miny=w.min_y; double miny=w.min_y;
double maxy=w.max_y; double maxy=w.max_y;
if (((maxy-miny)==0) && (miny==0)) return; if (maxy==miny)
return;
if ((w.max_x-w.min_x)==0) return;
int start_px=w.GetLeftMargin(); int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin(); int start_py=w.GetTopMargin();
@ -1617,9 +1619,7 @@ void PressureData::Reload(Day *day)
} }
min_x=day->first().GetMJD(); min_x=day->first().GetMJD();
max_x=day->last().GetMJD(); max_x=day->last().GetMJD();
if (min_x>max_x) { assert(min_x<max_x);
max_x=max_x;
}
min_y=max_y=0; min_y=max_y=0;
int tt=0; int tt=0;
bool first=true; bool first=true;
@ -1672,10 +1672,8 @@ void PressureData::Reload(Day *day)
min_y=floor(min_y); min_y=floor(min_y);
max_y=ceil(max_y+1); max_y=ceil(max_y+1);
if (min_y>1) min_y-=1; if (min_y>1) min_y-=1;
} else {
min_y=max_y=0;
min_x=max_x=0;
} }
//} //}
if (force_min_y!=force_max_y) { if (force_min_y!=force_max_y) {
min_y=force_min_y; min_y=force_min_y;
@ -1827,6 +1825,7 @@ void FlagData::Reload(Day *day)
min_y=v1; min_y=v1;
first=false; first=false;
} else { } else {
if (v1<min_x) min_x=v1; if (v1<min_x) min_x=v1;
} }
if (v2>max_x) max_x=v2; */ if (v2>max_x) max_x=v2; */
@ -1855,6 +1854,7 @@ HistoryData::HistoryData(Profile * _profile)
real_min_x=profile->FirstDay().GetMJD(); real_min_x=profile->FirstDay().GetMJD();
real_max_x=profile->LastDay().GetMJD()+1; real_max_x=profile->LastDay().GetMJD()+1;
} }
real_min_y=real_max_y=0;
} }
HistoryData::~HistoryData() HistoryData::~HistoryData()
{ {
@ -1865,7 +1865,7 @@ void HistoryData::ResetDateRange()
real_min_x=profile->FirstDay().GetMJD(); real_min_x=profile->FirstDay().GetMJD();
real_max_x=profile->LastDay().GetMJD()+1; real_max_x=profile->LastDay().GetMJD()+1;
} }
Reload(NULL); // Reload(NULL);
} }
double HistoryData::Calc(Day *day) double HistoryData::Calc(Day *day)
{ {
@ -1880,6 +1880,8 @@ void HistoryData::Reload(Day *day)
bool first=true; bool first=true;
bool done=false; bool done=false;
double y,lasty=0; double y,lasty=0;
min_y=max_y=0;
min_x=max_x=0;
for (int x=real_min_x;x<=real_max_x;x++) { for (int x=real_min_x;x<=real_max_x;x++) {
date.Set(x+2400000.5); date.Set(x+2400000.5);
date.ResetTime(); date.ResetTime();
@ -1893,6 +1895,7 @@ void HistoryData::Reload(Day *day)
y=Calc(d); y=Calc(d);
z++; z++;
} }
if (!z) continue;
if (z>1) y /= z; if (z>1) y /= z;
if (first) { if (first) {
// max_x=min_x=x; // max_x=min_x=x;
@ -1941,6 +1944,7 @@ double HistoryData::GetAverage()
for (int i=0;i<np[0];i++) { for (int i=0;i<np[0];i++) {
val+=point[0][i].y; val+=point[0][i].y;
} }
if (!np[0]) return 0;
val/=np[0]; val/=np[0];
return val; return val;
} }

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 = 2939; static const long BUILD = 2985;
static const long REVISION = 10661; static const long REVISION = 10912;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 8700; static const long BUILDS_COUNT = 8822;
#define RC_FILEVERSION 0,7,2939,10661 #define RC_FILEVERSION 0,7,2985,10912
#define RC_FILEVERSION_STRING "0, 7, 2939, 10661\0" #define RC_FILEVERSION_STRING "0, 7, 2985, 10912\0"
static const char FULLVERSION_STRING[] = "0.7.2939.10661"; static const char FULLVERSION_STRING[] = "0.7.2985.10912";
//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;