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

More daily view cleanups

Browse Source
This commit is contained in:
Mark Watkins 2011-06-07 01:35:54 +10:00
parent 6dc96ade43
commit 504bf11914
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8295,7 +8295,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307372542 /home/mark/projects/git/sleepyhead/src/version.h 1307374498 /home/mark/projects/git/sleepyhead/src/version.h
1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307358939 /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"
1307372397 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp 1307373065 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>
@ -8332,7 +8332,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307358939 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307374169 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/log.h> <wx/log.h>

9
src/SleepyHeadMain.cpp
View File

@ -736,7 +736,7 @@ void Daily::RefreshData()
if (cpap) UpdateCPAPGraphs(cpap); if (cpap) UpdateCPAPGraphs(cpap);
if (oxi) UpdateOXIGraphs(oxi); if (oxi) UpdateOXIGraphs(oxi);
wxString html=wxT("<html><body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0><table cellspacing=2 cellpadding=0>\n"); wxString html=wxT("<html><body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0><table cellspacing=2 cellpadding=0 width='100%'>\n");
CPAPMode mode; CPAPMode mode;
if (cpap) { if (cpap) {
@ -863,6 +863,9 @@ void Daily::RefreshData()
TAP->Show(true); TAP->Show(true);
SF->Show(true); SF->Show(true);
} else { } else {
html+=_("<tr><td colspan=2 align=center><i>No CPAP data available</i></td></tr>");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
TAP_EAP->Show(false); TAP_EAP->Show(false);
TAP_IAP->Show(false); TAP_IAP->Show(false);
FRW->Show(false); FRW->Show(false);
@ -937,9 +940,9 @@ void Daily::RefreshData()
} }
} }
if (!cpap && !oxi) { /*if (!cpap && !oxi) {
html+=_("<tr><td colspan=2><i>No data available for this day</i></td></tr>"); html+=_("<tr><td colspan=2><i>No data available for this day</i></td></tr>");
} } */
html+=wxT("</table></body></html>"); html+=wxT("</table></body></html>");
HTMLInfo->SetPage(html); HTMLInfo->SetPage(html);

11
src/graphs/graph.cpp
View File

@ -1201,6 +1201,17 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
double s1,s2,sr; double s1,s2,sr;
double sfit,sam; double sfit,sam;
if (!data->VC()) {
wxString msg=_("No Waveform Available");
wxCoord x,y;
static wxFont bigfont(32,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL);
dc.SetTextForeground(*wxDARK_GREY);
dc.SetFont(bigfont);
dc.GetTextExtent(msg,&x,&y);
dc.DrawText(msg,start_px+(width/2.0)-(x/2.0),start_py+(height/2.0)-(y/2.0));
dc.SetTextForeground(*wxBLACK);
dc.SetFont(*wxNORMAL_FONT);
}
for (int n=0;n<data->VC();n++) { for (int n=0;n<data->VC();n++) {
dp=0; dp=0;
bool done=false; bool done=false;

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 = 3301; static const long BUILD = 3322;
static const long REVISION = 1162; static const long REVISION = 1288;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 418; static const long BUILDS_COUNT = 472;
#define RC_FILEVERSION 0,7,3301,1162 #define RC_FILEVERSION 0,7,3322,1288
#define RC_FILEVERSION_STRING "0, 7, 3301, 1162\0" #define RC_FILEVERSION_STRING "0, 7, 3322, 1288\0"
static const char FULLVERSION_STRING[] = "0.7.3301.1162"; static const char FULLVERSION_STRING[] = "0.7.3322.1288";
//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;