From 9deb94e4621924ba445387bb532c8e901975c0f1 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 29 May 2011 20:09:24 +1000 Subject: [PATCH] Fixes ScrolledWindow issues for BIPAP TAP Graphs --- SleepyHead.depend | 10 +++++----- SleepyHeadMain.cpp | 35 +++++++++++++++++++++++++---------- SleepyHeadMain.h | 3 +-- graphs/graph.cpp | 4 ++-- graphs/graph.h | 4 +++- version.h | 12 ++++++------ 6 files changed, 42 insertions(+), 26 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index cffc7f36..3e5c43cb 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7829,7 +7829,7 @@ 1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h -1306655333 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h +1306662900 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h "SleepyHeadApp.h" "GUIFrame.h" "sleeplib/machine.h" @@ -7869,11 +7869,11 @@ "tinyxml/tinyxml.h" -1306654979 /home/mark/projects/git/sleepyhead/graphs/graph.h +1306659032 /home/mark/projects/git/sleepyhead/graphs/graph.h -1306655544 /home/mark/projects/git/sleepyhead/version.h +1306663637 /home/mark/projects/git/sleepyhead/version.h 1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7890,7 +7890,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306655045 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306663694 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7905,7 +7905,7 @@ "SleepyHeadMain.h" "sleeplib/profiles.h" -1306655056 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1306658943 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 80f04d8b..16a1db55 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -323,6 +323,8 @@ Summary::Summary(wxWindow *win) AddData(ahidata=new HistoryData(machine,days_shown)); AddData(pressure=new HistoryCodeData(machine,CPAP_PressureAverage,days_shown)); + AddData(pressure_eap=new HistoryCodeData(machine,BIPAP_EAPAverage,days_shown)); + AddData(pressure_iap=new HistoryCodeData(machine,BIPAP_IAPAverage,days_shown)); AddData(leak=new HistoryCodeData(machine,CPAP_LeakMedian,days_shown)); AddData(usage=new UsageHistoryData(machine,days_shown,UHD_Hours)); AddData(waketime=new UsageHistoryData(machine,days_shown,UHD_Waketime)); @@ -338,6 +340,8 @@ Summary::Summary(wxWindow *win) PRESSURE->SetMargins(10,15,60,80); //PRESSURE->AddLayer(new gBarChart(pressure,wxBLUE)); PRESSURE->AddLayer(new gLineChart(pressure,wxBLUE)); + PRESSURE->AddLayer(new gLineChart(pressure_eap,wxRED)); + PRESSURE->AddLayer(new gLineChart(pressure_iap,wxGREEN)); fgSizer->Add(PRESSURE,1,wxEXPAND); LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leak"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER); @@ -512,6 +516,7 @@ Daily::Daily(wxWindow *win) fgSizer->Add(TAP,1,wxEXPAND); fgSizer->Add(TAP_IAP,1,wxEXPAND); fgSizer->Add(TAP_EAP,1,wxEXPAND); + //fgSizer->Layout(); foobar_datehack=false; // this exists due to a wxGTK bug. // RefreshData(); @@ -555,12 +560,31 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) Day *d; if (machine && (machine->day.find(day)!=machine->day.end()) && (d=machine->day[day]) && (d->size()>0)) { // && ((d->last()-d->first())>wxTimeSpan::Minutes(15))) { //HTMLInfo->SetPage(wxT("")); + CPAPMode mode=(CPAPMode)d->summary_max(CPAP_Mode); UpdateGraphs(day); + if (mode!=MODE_BIPAP) { + + TAP_EAP->Show(false); + TAP_IAP->Show(false); + TAP->Show(true); + } else { + TAP->Show(false); + TAP_IAP->Show(true); + TAP_EAP->Show(true); + } + + TAP_EAP->Refresh(); + TAP_IAP->Refresh(); + TAP->Refresh(); + fgSizer->Layout(); +// Update(); + ScrolledWindow->FitInside(); + //ScrolledWindow->Refresh(); +// wxWindow::UpdateWindowUI(); // Session *s=(*machine->day[day])[0]; PRTypes pr=(PRTypes)d->summary_max(CPAP_PressureReliefType); wxString epr=PressureReliefNames[pr]+wxString::Format(wxT(" x%i"),(int)d->summary_max(CPAP_PressureReliefSetting)); - CPAPMode mode=(CPAPMode)d->summary_max(CPAP_Mode); wxString modestr=CPAPModeNames[mode]; float ahi=(d->count(CPAP_Obstructive)+d->count(CPAP_Hypopnea)+d->count(CPAP_ClearAirway))/d->hours(); @@ -630,18 +654,9 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) html=html+wxT("")+_("Pressure Min")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); html=html+wxT("")+_("Pressure Max")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); } else if (mode==MODE_BIPAP) { - TAP->Hide(); - TAP_EAP->Show(); - TAP_IAP->Show(); html=html+wxT("")+_("Pressure IAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); html=html+wxT("")+_("Pressure EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); } - if (mode!=MODE_BIPAP) { - TAP->Show(); - TAP_EAP->Hide(); - TAP_IAP->Hide(); - - } html=html+wxT("")+_("Ramp-Time")+wxT("")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("\n"); html=html+wxT("")+_("Ramp-Prs.")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("\n"); diff --git a/SleepyHeadMain.h b/SleepyHeadMain.h index 8493baf1..ca793b65 100644 --- a/SleepyHeadMain.h +++ b/SleepyHeadMain.h @@ -26,7 +26,7 @@ class Summary:public SummaryPanel public: Summary(wxWindow *win); virtual ~Summary(); - HistoryData *ahidata,*pressure,*leak,*usage,*bedtime,*waketime; + HistoryData *ahidata,*pressure,*leak,*usage,*bedtime,*waketime,*pressure_iap,*pressure_eap; gGraphWindow *AHI,*PRESSURE,*LEAK,*USAGE; void RefreshData(Machine *m); void AddData(HistoryData *d) { Data.push_back(d); }; @@ -54,7 +54,6 @@ protected: gPointData *flags[10]; gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP; - Machine *machine; list Data; }; diff --git a/graphs/graph.cpp b/graphs/graph.cpp index 6c995823..4f052cd3 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -1936,7 +1936,7 @@ void HistoryData::Reload(Day *day) auto d=machine->day.rbegin(); int i=0; - while (d!=machine->day.rend() && (iday.rend() && (i<=days)) { d++; i++; } @@ -1948,7 +1948,7 @@ void HistoryData::Reload(Day *day) do { d--; y=Calc(d->second); - x=d->first.GetMJD()+1; + x=d->first.GetMJD(); if (first) { max_x=x; min_x=x; diff --git a/graphs/graph.h b/graphs/graph.h index dd6cf80b..77df90c2 100644 --- a/graphs/graph.h +++ b/graphs/graph.h @@ -283,6 +283,8 @@ class gLayer return data->MinY()+(yy*hh); }; void NotifyGraphWindow(gGraphWindow *g) { m_graph.push_back(g); }; + void SetVisible(bool v) { m_visible=v; }; + bool IsVisible() { return m_visible; }; protected: bool m_visible; @@ -376,7 +378,7 @@ class gBarChart:public gLayer // d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors - virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(v+2400000.5); t=d.Format(wxT("%e %b")); return t; }; + virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(v+2400000.5+1); t=d.Format(wxT("%e %b")); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi+2400000.5); t=d.Format(wxT("%H:%M")); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; diff --git a/version.h b/version.h index 37c20eb7..c493b3a6 100644 --- a/version.h +++ b/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 1810; - static const long REVISION = 4453; + static const long BUILD = 1853; + static const long REVISION = 4678; //Miscellaneous Version Types - static const long BUILDS_COUNT = 6099; - #define RC_FILEVERSION 0,7,1810,4453 - #define RC_FILEVERSION_STRING "0, 7, 1810, 4453\0" - static const char FULLVERSION_STRING[] = "0.7.1810.4453"; + static const long BUILDS_COUNT = 6233; + #define RC_FILEVERSION 0,7,1853,4678 + #define RC_FILEVERSION_STRING "0, 7, 1853, 4678\0" + static const char FULLVERSION_STRING[] = "0.7.1853.4678"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;