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

Mac fix.. the wxDC thing I tried to test didn't work

Browse Source
This commit is contained in:
Mark Watkins 2011-06-08 05:14:04 +10:00
parent dd696784c5
commit 9337885013
4 changed files with 9 additions and 12 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>
<list>
1307470427 /home/mark/projects/git/sleepyhead/src/version.h
1307470976 /home/mark/projects/git/sleepyhead/src/version.h
1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h"
@ -8312,7 +8312,7 @@
"preferences.h"
"tinyxml/tinyxml.h"
1307470291 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
1307470970 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>

3
src/SleepyHeadMain.cpp
View File

@ -1046,8 +1046,7 @@ void Daily::RefreshData()
} else if (mode==MODE_APAP) {
html=html+wxT("<tr><td><b>")+_("Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH20 Min<br>"),cpap->summary_min(CPAP_PressureMin))+wxString::Format(wxT("%.2fcmH2O Max"),cpap->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
} else if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td><b>")+_("IPAP&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1f cmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("EPAP&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O IPAP<br>"),cpap->summary_min(CPAP_PressureMin))+wxString::Format(wxT("%.2fcmH2O EPAP"),cpap->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
}
html=html+wxT("<tr><td><b>")+_("Ramp")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),cpap->summary_min(CPAP_RampStartingPressure))+wxString::Format(wxT(" @ %imin"),(int)cpap->summary_max(CPAP_RampTime))+wxT("</td></tr>\n");

2
src/graphs/graph.cpp
View File

@ -405,8 +405,6 @@ void gGraphWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
{
#if defined(__WXMSW__)
wxAutoBufferedPaintDC dc(this);
#elif defined (__WXMAC__)
wxGCDC(this);
#else
wxPaintDC dc(this);
#endif

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 3665;
static const long REVISION = 3253;
static const long BUILD = 3666;
static const long REVISION = 3258;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 1366;
#define RC_FILEVERSION 0,7,3665,3253
#define RC_FILEVERSION_STRING "0, 7, 3665, 3253\0"
static const char FULLVERSION_STRING[] = "0.7.3665.3253";
static const long BUILDS_COUNT = 1369;
#define RC_FILEVERSION 0,7,3666,3258
#define RC_FILEVERSION_STRING "0, 7, 3666, 3258\0"
static const char FULLVERSION_STRING[] = "0.7.3666.3258";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;