From 504bf1191422e1a3755c260c4bea5204915e6970 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 7 Jun 2011 01:35:54 +1000 Subject: [PATCH] More daily view cleanups --- Projects/CodeBlocks/SleepyHead.depend | 6 +++--- src/SleepyHeadMain.cpp | 9 ++++++--- src/graphs/graph.cpp | 11 +++++++++++ src/version.h | 12 ++++++------ 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index d101ccd0..ec52642a 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8295,7 +8295,7 @@ -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 "machine.h" @@ -8312,7 +8312,7 @@ "preferences.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" "version.h" @@ -8332,7 +8332,7 @@ "sleeplib/profiles.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 diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index e836d494..dd249a05 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -736,7 +736,7 @@ void Daily::RefreshData() if (cpap) UpdateCPAPGraphs(cpap); if (oxi) UpdateOXIGraphs(oxi); - wxString html=wxT("\n"); + wxString html=wxT("
\n"); CPAPMode mode; if (cpap) { @@ -863,6 +863,9 @@ void Daily::RefreshData() TAP->Show(true); SF->Show(true); } else { + html+=_(""); + html=html+wxT("\n"); + TAP_EAP->Show(false); TAP_IAP->Show(false); FRW->Show(false); @@ -937,9 +940,9 @@ void Daily::RefreshData() } } - if (!cpap && !oxi) { + /*if (!cpap && !oxi) { html+=_(""); - } + } */ html+=wxT("
No CPAP data available
  
No data available for this day
"); HTMLInfo->SetPage(html); diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 8efd1e7f..6a807e06 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -1201,6 +1201,17 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) double s1,s2,sr; 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;nVC();n++) { dp=0; bool done=false; diff --git a/src/version.h b/src/version.h index e1348473..af84271f 100644 --- a/src/version.h +++ b/src/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 = 3301; - static const long REVISION = 1162; + static const long BUILD = 3322; + static const long REVISION = 1288; //Miscellaneous Version Types - static const long BUILDS_COUNT = 418; - #define RC_FILEVERSION 0,7,3301,1162 - #define RC_FILEVERSION_STRING "0, 7, 3301, 1162\0" - static const char FULLVERSION_STRING[] = "0.7.3301.1162"; + static const long BUILDS_COUNT = 472; + #define RC_FILEVERSION 0,7,3322,1288 + #define RC_FILEVERSION_STRING "0, 7, 3322, 1288\0" + static const char FULLVERSION_STRING[] = "0.7.3322.1288"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;