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

Fruitsalad cleanup

Browse Source
This commit is contained in:
Mark Watkins 2011-06-08 02:37:17 +10:00
parent ce89e89c9c
commit f16284b75d
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8295,7 +8295,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307463320 /home/mark/projects/git/sleepyhead/src/version.h 1307464570 /home/mark/projects/git/sleepyhead/src/version.h
1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8312,7 +8312,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307463279 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp 1307464513 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>

31
src/SleepyHeadMain.cpp
View File

@ -766,6 +766,8 @@ void Daily::RefreshData()
CPAPMode mode; CPAPMode mode;
PRTypes pr; PRTypes pr;
wxString epr,modestr; wxString epr,modestr;
float iap90,eap90;
if (cpap) { if (cpap) {
mode=(CPAPMode)cpap->summary_max(CPAP_Mode); mode=(CPAPMode)cpap->summary_max(CPAP_Mode);
@ -854,8 +856,8 @@ void Daily::RefreshData()
float vsi=cpap->count(CPAP_VSnore)/cpap->hours(); float vsi=cpap->count(CPAP_VSnore)/cpap->hours();
float fli=cpap->count(CPAP_FlowLimit)/cpap->hours(); float fli=cpap->count(CPAP_FlowLimit)/cpap->hours();
// float p90=cpap->percentile(CPAP_Pressure,0,0.9); // float p90=cpap->percentile(CPAP_Pressure,0,0.9);
float eap90=cpap->percentile(CPAP_EAP,0,0.9); eap90=cpap->percentile(CPAP_EAP,0,0.9);
float iap90=cpap->percentile(CPAP_IAP,0,0.9); iap90=cpap->percentile(CPAP_IAP,0,0.9);
wxString submodel=_("Unknown Model"); wxString submodel=_("Unknown Model");
@ -906,28 +908,34 @@ void Daily::RefreshData()
html=html+wxT("<tr height='2'><td colspan=4 height='2'><hr></td></tr>\n"); html=html+wxT("<tr height='2'><td colspan=4 height='2'><hr></td></tr>\n");
//html=html+wxT("<tr><td colspan=4 align=center><hr></td></tr>\n"); //html=html+wxT("<tr><td colspan=4 align=center><hr></td></tr>\n");
html=html+wxT("<tr><td><b>What</b></td><td><b>Min</b></td><td><b>Avg</b></td><td><b>Max</b></td></tr>");
if (mode==MODE_CPAP) { if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td><b>")+_("Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n"); html=html+wxT("<tr><td colspan=4 align='center'><i>")+_("90%&nbsp;IPAP ")+wxString::Format(wxT("%.1fcmH2O"),iap90)+wxT("</td></tr>\n");
html=html+wxT("<tr><td colspan=4 align='center'><i>")+_("90%&nbsp;EPAP ")+wxString::Format(wxT("%.1fcmH2O"),eap90)+wxT("</td></tr>\n");
} else if (mode==MODE_APAP) { } else if (mode==MODE_APAP) {
html=html+wxT("<tr><td colspan=4 align='center'><i>")+_("90%&nbsp;Pressure ")+wxString::Format(wxT("%.2fcmH2O"),cpap->summary_weighted_avg(CPAP_PressurePercentValue))+wxT("</i></td></tr>\n");
} else if (mode==MODE_CPAP) {
html=html+wxT("<tr><td colspan=4 align='center'><i>")+_("Pressure ")+wxString::Format(wxT("%.2fcmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("</i></td></tr>\n");
}
html=html+wxT("<tr><td colspan=4 align=center>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td> </td><td><b>Min</b></td><td><b>Avg</b></td><td><b>Max</b></td></tr>");
if (mode==MODE_APAP) {
html=html+wxT("<tr><td>Pressure</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_min(CPAP_PressureMinAchieved)); html=html+wxT("<tr><td>Pressure</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_min(CPAP_PressureMinAchieved));
html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_PressureAverage)); html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_PressureAverage));
html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_max(CPAP_PressureMaxAchieved))+wxT("</td></tr>"); html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_max(CPAP_PressureMaxAchieved))+wxT("</td></tr>");
/*html=html+wxT("<tr><td><b>")+_("90%&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_weighted_avg(CPAP_PressurePercentValue))+wxT("</td></tr>\n");
// html=html+wxT("<tr><td><b>")+_("90%&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),p90)+wxT("</td></tr>\n"); // html=html+wxT("<tr><td><b>")+_("90%&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),p90)+wxT("</td></tr>\n");
} else if (mode==MODE_BIPAP) { } else if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td>IPAP</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_min(BIPAP_IAPMin)); html=html+wxT("<tr><td>IPAP</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_min(BIPAP_IAPMin));
html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(BIPAP_IAPAverage)); html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(BIPAP_IAPAverage));
html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_max(BIPAP_IAPMax))+wxT("</td></tr>"); html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_max(BIPAP_IAPMax))+wxT("</td></tr>");
html=html+wxT("<tr><td>EPAP</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_min(BIPAP_EAPMin)); html=html+wxT("<tr><td>EPAP</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_min(BIPAP_EAPMin));
html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(BIPAP_EAPAverage)); html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(BIPAP_EAPAverage));
html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_max(BIPAP_EAPMax))+wxT("</td></tr>"); html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_max(BIPAP_EAPMax))+wxT("</td></tr>");
html=html+wxT("<tr><td><b>")+_("90%&nbsp;IPAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),iap90)+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("90%&nbsp;EPAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),eap90)+wxT("</td></tr>\n"); */
} }
html=html+wxT("<tr><td>Leak"); //</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_LeakAverage)) html=html+wxT("<tr><td>Leak"); //</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_LeakAverage))
html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_min(CPAP_LeakMinimum)); html=html+wxT("</td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_min(CPAP_LeakMinimum));
@ -988,17 +996,18 @@ void Daily::RefreshData()
if (cpap) { if (cpap) {
if (mode==MODE_BIPAP) { if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Time@IPAP")+wxT("</i></td></tr>\n"); html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Time@IPAP")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:tiap.png\" ></td></tr>\n"); html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:tiap.png\" ></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Time@EPAP")+wxT("</i></td></tr>\n"); html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Time@EPAP")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:teap.png\" ></td></tr>\n"); html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:teap.png\" ></td></tr>\n");
} else { //if (mode==MODE_APAP) { } else if (mode==MODE_APAP) {
html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Time@Pressure")+wxT("</i></td></tr>\n"); html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Time@Pressure")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:tap.png\" ></td></tr>\n"); html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:tap.png\" ></td></tr>\n");
} }
html=html+wxT("</table><hr>"); html=html+wxT("</table><hr>");
html=html+wxT("<div align=left>"); html=html+wxT("<div align=left>");
html=html+wxT("<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n"); html=html+wxT("<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n");

12
src/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 = 3621; static const long BUILD = 3643;
static const long REVISION = 3007; static const long REVISION = 3130;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 1247; static const long BUILDS_COUNT = 1297;
#define RC_FILEVERSION 0,7,3621,3007 #define RC_FILEVERSION 0,7,3643,3130
#define RC_FILEVERSION_STRING "0, 7, 3621, 3007\0" #define RC_FILEVERSION_STRING "0, 7, 3643, 3130\0"
static const char FULLVERSION_STRING[] = "0.7.3621.3007"; static const char FULLVERSION_STRING[] = "0.7.3643.3130";
//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 = 0; static const long BUILD_HISTORY = 0;