diff --git a/SleepyHead.depend b/SleepyHead.depend index d5ef91c9..7e4f562a 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7876,7 +7876,7 @@ -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 "machine.h" @@ -7893,7 +7893,7 @@ "preferences.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" "version.h" @@ -7912,7 +7912,7 @@ "sleeplib/profiles.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 diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index d1e31c6e..2dda5525 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -388,21 +388,33 @@ void Summary::ResetProfile(Profile *p) profile=p; if (profile->FirstDay().IsValid()) { - StartDatePicker->SetRange(profile->FirstDay()+wxTimeSpan::Day(),profile->LastDay()+wxTimeSpan::Day()); - EndDatePicker->SetRange(profile->FirstDay()+wxTimeSpan::Day(),profile->LastDay()+wxTimeSpan::Day()); - StartDatePicker->SetValue(profile->FirstDay()+wxTimeSpan::Day()); - EndDatePicker->SetValue(profile->LastDay()+wxTimeSpan::Day()); + wxDateTime last=profile->LastDay()+wxTimeSpan::Day(); + wxDateTime first=profile->FirstDay()+wxTimeSpan::Day(); + wxDateTime start=last-wxTimeSpan::Days(30); + + StartDatePicker->SetRange(first,last); + EndDatePicker->SetRange(first,last); + if (startSetValue(start); + EndDatePicker->SetValue(last); + for (list::iterator h=Data.begin();h!=Data.end();h++) { (*h)->SetProfile(p); (*h)->ResetDateRange(); + (*h)->Reload(NULL); } } } void Summary::RefreshData() { + wxDateTime first=StartDatePicker->GetValue(); + wxDateTime last=EndDatePicker->GetValue(); + for (list::iterator h=Data.begin();h!=Data.end();h++) { - (*h)->Update(dummyday); + //(*h)->Update(dummyday); + (*h)->SetDateRange(first,last); } wxString submodel=_("Unknown Model"); @@ -420,6 +432,7 @@ void Summary::RefreshData() //html=html+wxT(""); html=html+wxT("\n"); + if (avp>0) { html=html+wxT("\n"); /*if (machine->properties.find(wxT("SubModel"))!=machine->properties.end()) @@ -465,6 +478,10 @@ void Summary::RefreshData() html=html+wxT("\n"); html=html+wxT("\n"); html=html+wxT("
")+_("Machine Information has been removed because this page has become machine agnostic. Not sure what to display here.")+wxT("
")+_("Waketime")+wxT("")+wxString::Format(wxT("%02.0f:%02i"),wt,int(wt*60) % 60)+wxT("
")+_("Hours/Night")+wxT("")+wxString::Format(wxT("%02.0f:%02i"),ua,int(ua*60)%60)+wxT("
"); + } else { + html+=wxT("

Welcome


 
Please import some data
"); + } + html+=wxT(""); HTMLInfo->SetPage(html); } @@ -881,7 +898,7 @@ void Daily::RefreshData() } */ } else { - HTMLInfo->SetPage(_("No CPAP Machine Data Available")); + HTMLInfo->SetPage(_("Please import some data")); /*if (SessionList->IsShown()) { m_mgr.DetachPane(SessionList); diff --git a/graphs/graph.cpp b/graphs/graph.cpp index 56f7a341..5ec5115a 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -821,7 +821,9 @@ void gYAxis::Plot(wxDC & dc,gGraphWindow &w) double miny=w.min_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_py=w.GetTopMargin(); @@ -1617,9 +1619,7 @@ void PressureData::Reload(Day *day) } min_x=day->first().GetMJD(); max_x=day->last().GetMJD(); - if (min_x>max_x) { - max_x=max_x; - } + assert(min_x1) min_y-=1; - } else { - min_y=max_y=0; - min_x=max_x=0; } + //} if (force_min_y!=force_max_y) { min_y=force_min_y; @@ -1827,7 +1825,8 @@ void FlagData::Reload(Day *day) min_y=v1; first=false; } else { - if (v1max_x) max_x=v2; */ } @@ -1855,6 +1854,7 @@ HistoryData::HistoryData(Profile * _profile) real_min_x=profile->FirstDay().GetMJD(); real_max_x=profile->LastDay().GetMJD()+1; } + real_min_y=real_max_y=0; } HistoryData::~HistoryData() { @@ -1865,7 +1865,7 @@ void HistoryData::ResetDateRange() real_min_x=profile->FirstDay().GetMJD(); real_max_x=profile->LastDay().GetMJD()+1; } - Reload(NULL); + // Reload(NULL); } double HistoryData::Calc(Day *day) { @@ -1880,6 +1880,8 @@ void HistoryData::Reload(Day *day) bool first=true; bool done=false; 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++) { date.Set(x+2400000.5); date.ResetTime(); @@ -1893,6 +1895,7 @@ void HistoryData::Reload(Day *day) y=Calc(d); z++; } + if (!z) continue; if (z>1) y /= z; if (first) { // max_x=min_x=x; @@ -1941,6 +1944,7 @@ double HistoryData::GetAverage() for (int i=0;i