chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes ScrolledWindow issues for BIPAP TAP Graphs

Browse Source
This commit is contained in:
Mark Watkins 2011-05-29 20:09:24 +10:00
parent a75a2072ef
commit 9deb94e462
6 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SleepyHead.depend
View File

@ -7829,7 +7829,7 @@
1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h 1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h
<wx/app.h> <wx/app.h>
1306655333 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h 1306662900 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
"SleepyHeadApp.h" "SleepyHeadApp.h"
"GUIFrame.h" "GUIFrame.h"
"sleeplib/machine.h" "sleeplib/machine.h"
@ -7869,11 +7869,11 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306654979 /home/mark/projects/git/sleepyhead/graphs/graph.h 1306659032 /home/mark/projects/git/sleepyhead/graphs/graph.h
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7890,7 +7890,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.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" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -7905,7 +7905,7 @@
"SleepyHeadMain.h" "SleepyHeadMain.h"
"sleeplib/profiles.h" "sleeplib/profiles.h"
1306655056 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp 1306658943 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>

35
SleepyHeadMain.cpp
View File

@ -323,6 +323,8 @@ Summary::Summary(wxWindow *win)
AddData(ahidata=new HistoryData(machine,days_shown)); AddData(ahidata=new HistoryData(machine,days_shown));
AddData(pressure=new HistoryCodeData(machine,CPAP_PressureAverage,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(leak=new HistoryCodeData(machine,CPAP_LeakMedian,days_shown));
AddData(usage=new UsageHistoryData(machine,days_shown,UHD_Hours)); AddData(usage=new UsageHistoryData(machine,days_shown,UHD_Hours));
AddData(waketime=new UsageHistoryData(machine,days_shown,UHD_Waketime)); AddData(waketime=new UsageHistoryData(machine,days_shown,UHD_Waketime));
@ -338,6 +340,8 @@ Summary::Summary(wxWindow *win)
PRESSURE->SetMargins(10,15,60,80); PRESSURE->SetMargins(10,15,60,80);
//PRESSURE->AddLayer(new gBarChart(pressure,wxBLUE)); //PRESSURE->AddLayer(new gBarChart(pressure,wxBLUE));
PRESSURE->AddLayer(new gLineChart(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); fgSizer->Add(PRESSURE,1,wxEXPAND);
LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leak"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER); 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,1,wxEXPAND);
fgSizer->Add(TAP_IAP,1,wxEXPAND); fgSizer->Add(TAP_IAP,1,wxEXPAND);
fgSizer->Add(TAP_EAP,1,wxEXPAND); fgSizer->Add(TAP_EAP,1,wxEXPAND);
//fgSizer->Layout();
foobar_datehack=false; // this exists due to a wxGTK bug. foobar_datehack=false; // this exists due to a wxGTK bug.
// RefreshData(); // RefreshData();
@ -555,12 +560,31 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
Day *d; 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))) { 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("")); //HTMLInfo->SetPage(wxT(""));
CPAPMode mode=(CPAPMode)d->summary_max(CPAP_Mode);
UpdateGraphs(day); 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]; // Session *s=(*machine->day[day])[0];
PRTypes pr=(PRTypes)d->summary_max(CPAP_PressureReliefType); PRTypes pr=(PRTypes)d->summary_max(CPAP_PressureReliefType);
wxString epr=PressureReliefNames[pr]+wxString::Format(wxT(" x%i"),(int)d->summary_max(CPAP_PressureReliefSetting)); 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]; wxString modestr=CPAPModeNames[mode];
float ahi=(d->count(CPAP_Obstructive)+d->count(CPAP_Hypopnea)+d->count(CPAP_ClearAirway))/d->hours(); 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("<tr><td><b>")+_("Pressure&nbsp;Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
} else if (mode==MODE_BIPAP) { } else if (mode==MODE_BIPAP) {
TAP->Hide();
TAP_EAP->Show();
TAP_IAP->Show();
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
} }
if (mode!=MODE_BIPAP) {
TAP->Show();
TAP_EAP->Hide();
TAP_IAP->Hide();
}
html=html+wxT("<tr><td><b>")+_("Ramp-Time")+wxT("</b></td><td>")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Ramp-Time")+wxT("</b></td><td>")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Ramp-Prs.")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Ramp-Prs.")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("</td></tr>\n");

3
SleepyHeadMain.h
View File

@ -26,7 +26,7 @@ class Summary:public SummaryPanel
public: public:
Summary(wxWindow *win); Summary(wxWindow *win);
virtual ~Summary(); 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; gGraphWindow *AHI,*PRESSURE,*LEAK,*USAGE;
void RefreshData(Machine *m); void RefreshData(Machine *m);
void AddData(HistoryData *d) { Data.push_back(d); }; void AddData(HistoryData *d) { Data.push_back(d); };
@ -54,7 +54,6 @@ protected:
gPointData *flags[10]; gPointData *flags[10];
gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP; gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP;
Machine *machine; Machine *machine;
list<gPointData *> Data; list<gPointData *> Data;
}; };

4
graphs/graph.cpp
View File

@ -1936,7 +1936,7 @@ void HistoryData::Reload(Day *day)
auto d=machine->day.rbegin(); auto d=machine->day.rbegin();
int i=0; int i=0;
while (d!=machine->day.rend() && (i<days)) { while (d!=machine->day.rend() && (i<=days)) {
d++; d++;
i++; i++;
} }
@ -1948,7 +1948,7 @@ void HistoryData::Reload(Day *day)
do { do {
d--; d--;
y=Calc(d->second); y=Calc(d->second);
x=d->first.GetMJD()+1; x=d->first.GetMJD();
if (first) { if (first) {
max_x=x; max_x=x;
min_x=x; min_x=x;

4
graphs/graph.h
View File

@ -283,6 +283,8 @@ class gLayer
return data->MinY()+(yy*hh); return data->MinY()+(yy*hh);
}; };
void NotifyGraphWindow(gGraphWindow *g) { m_graph.push_back(g); }; void NotifyGraphWindow(gGraphWindow *g) { m_graph.push_back(g); };
void SetVisible(bool v) { m_visible=v; };
bool IsVisible() { return m_visible; };
protected: protected:
bool m_visible; bool m_visible;
@ -376,7 +378,7 @@ class gBarChart:public gLayer
// d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors // 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; 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 & 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; }; virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };

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 = 1810; static const long BUILD = 1853;
static const long REVISION = 4453; static const long REVISION = 4678;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 6099; static const long BUILDS_COUNT = 6233;
#define RC_FILEVERSION 0,7,1810,4453 #define RC_FILEVERSION 0,7,1853,4678
#define RC_FILEVERSION_STRING "0, 7, 1810, 4453\0" #define RC_FILEVERSION_STRING "0, 7, 1853, 4678\0"
static const char FULLVERSION_STRING[] = "0.7.1810.4453"; static const char FULLVERSION_STRING[] = "0.7.1853.4678";
//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;