From ce89e89c9ce028259d1b14a6d0f0b464ac5e918e Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 8 Jun 2011 02:16:15 +1000 Subject: [PATCH] Daily Summary HTML fruitsalad test --- Projects/CodeBlocks/SleepyHead.depend | 8 +- src/GUIFrame.cpp | 2 +- src/SleepyHeadMain.cpp | 188 +++++++++++++++----------- src/WxWizFrame.fbp | 2 +- src/libs/sleeplib/machine.cpp | 2 +- src/version.h | 14 +- 6 files changed, 125 insertions(+), 91 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 161c6bd2..7fd77bfb 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8201,7 +8201,7 @@ "wx/treebase.h" "wx/hashmap.h" -1307418393 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp +1307461025 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp "wx/wxprec.h" "GUIFrame.h" @@ -8295,7 +8295,7 @@ -1307446079 /home/mark/projects/git/sleepyhead/src/version.h +1307463320 /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" -1307446078 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307463279 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -8347,7 +8347,7 @@ -1307418393 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp +1307458866 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp diff --git a/src/GUIFrame.cpp b/src/GUIFrame.cpp index 13108256..a114dd94 100644 --- a/src/GUIFrame.cpp +++ b/src/GUIFrame.cpp @@ -145,7 +145,7 @@ DailyPanel::DailyPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, con ScrolledWindow->Layout(); fgSizer->Fit( ScrolledWindow ); Notebook = new wxAuiNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TAB_MOVE|wxAUI_NB_TAB_SPLIT ); - m_mgr.AddPane( Notebook, wxAuiPaneInfo() .Left() .CaptionVisible( false ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( false ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxDefaultSize ).DockFixed( false ).Position( 1 ).MinSize( wxSize( 220,-1 ) ) ); + m_mgr.AddPane( Notebook, wxAuiPaneInfo() .Left() .CaptionVisible( false ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( false ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxDefaultSize ).DockFixed( false ).Position( 1 ).MinSize( wxSize( 260,-1 ) ) ); diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index 59340c45..e9f7125f 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -760,9 +760,12 @@ void Daily::RefreshData() if (cpap) UpdateCPAPGraphs(cpap); if (oxi) UpdateOXIGraphs(oxi); - wxString html=wxT("\n"); + wxString html=wxT(""); + html=html+wxT("
\n"); CPAPMode mode; + PRTypes pr; + wxString epr,modestr; if (cpap) { mode=(CPAPMode)cpap->summary_max(CPAP_Mode); @@ -823,7 +826,7 @@ void Daily::RefreshData() teap_bmp=NULL; } wxRect r=HTMLInfo->GetRect(); - int w=r.width-25; + int w=r.width-30; ahi_bmp=G_AHI->RenderBitmap(w,25); tap_bmp=TAP->RenderBitmap(w,25); wxMemoryFSHandler::AddFile(_T("ahi.png"), *ahi_bmp, wxBITMAP_TYPE_PNG); @@ -836,11 +839,11 @@ void Daily::RefreshData() wxMemoryFSHandler::AddFile(_T("teap.png"), *teap_bmp, wxBITMAP_TYPE_PNG); } - - - PRTypes pr=(PRTypes)cpap->summary_max(CPAP_PressureReliefType); - wxString epr=PressureReliefNames[pr]+wxString::Format(wxT(" x%i"),(int)cpap->summary_max(CPAP_PressureReliefSetting)); - wxString modestr=CPAPModeNames[mode]; + pr=(PRTypes)cpap->summary_max(CPAP_PressureReliefType); + if (pr==PR_NONE) + epr=_(" No Pressure Relief"); + else epr=PressureReliefNames[pr]+wxString::Format(wxT(" x%i"),(int)cpap->summary_max(CPAP_PressureReliefSetting)); + modestr=CPAPModeNames[mode]; float ahi=(cpap->count(CPAP_Obstructive)+cpap->count(CPAP_Hypopnea)+cpap->count(CPAP_ClearAirway))/cpap->hours(); float csr=(100.0/cpap->hours())*(cpap->sum(CPAP_CSR)/3600.0); @@ -856,74 +859,83 @@ void Daily::RefreshData() wxString submodel=_("Unknown Model"); - html=html+wxT("\n"); + html=html+wxT("\n"); if (cpap->machine->properties.find(wxT("SubModel"))!=cpap->machine->properties.end()) submodel=wxT("
")+cpap->machine->properties[wxT("SubModel")]; - html=html+wxT("\n"); + html=html+wxT("\n"); if (pref.Exists("ShowSerialNumbers") && pref["ShowSerialNumbers"]) { - html=html+wxT("\n"); + html=html+wxT("\n"); } - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); + //html=html+wxT("\n"); + //html=html+wxT("\n"); + //html=html+wxT("\n"); + html=html+wxT(""); + //html=html+wxT("\n"); + html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); +// html=html+wxT("\n"); + //html=html+wxT("\n"); +// html=html+wxT("\n"); + // html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT(""); + + // html=html+wxT("\n"); + //html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + //html=html+wxT("\n"); + + //html=html+wxT("\n"); + + html=html+wxT("
")+_("Machine Information")+wxT("
")+_("Machine Information")+wxT("
")+cpap->machine->properties[wxT("Brand")]+wxT("
")+cpap->machine->properties[wxT("Model")]+wxT(" ")+cpap->machine->properties[wxT("ModelNumber")]+submodel+wxT("
")+cpap->machine->properties[wxT("Brand")]+wxT("
")+cpap->machine->properties[wxT("Model")]+wxT(" ")+cpap->machine->properties[wxT("ModelNumber")]+submodel+wxT("
")+cpap->machine->properties[wxT("Serial")]+wxT("
")+cpap->machine->properties[wxT("Serial")]+wxT("
  
")+_("Sleep Times")+wxT("
")+_("Date")+wxT("")+cpap->first().Format(wxT("%x"))+wxT("
")+_("Sleep")+wxT("")+cpap->first().Format(wxT("%H:%M"))+wxT("
")+_("Wake")+wxT("")+cpap->last().Format(wxT("%H:%M"))+wxT("
")+_("Total Time")+wxT("")+cpap->total_time().Format(wxT("%H:%M hours"))+wxT("
  
")+_("Sleep Times")+wxT("
DateSleepWakeHours
")+_("Date")+wxT("")+cpap->first().Format(wxT("%x"))+wxT("
")+cpap->first().Format(wxT("%x"))+wxT("")+cpap->first().Format(wxT("%H:%M"))+wxT("")+cpap->last().Format(wxT("%H:%M"))+wxT("")+cpap->total_time().Format(wxT("%H:%M"))+wxT("
")+_("Indices")+wxT("
")+_("AHI")+wxT("")+wxString::Format(wxT("%0.2f"),ahi)+wxT("
")+_("Obstructive")+wxT("")+wxString::Format(wxT("%0.2f"),oai)+wxT("
")+_("Hypopnea")+wxT("")+wxString::Format(wxT("%0.2f"),hi)+wxT("
")+_("ClearAirway")+wxT("")+wxString::Format(wxT("%0.2f"),cai)+wxT("
")+_("RERA")+wxT("")+wxString::Format(wxT("%0.2f"),rei)+wxT("
")+_("FlowLimit")+wxT("")+wxString::Format(wxT("%0.2f"),fli)+wxT("
")+_("Vsnore")+wxT("")+wxString::Format(wxT("%0.2f"),vsi)+wxT("
")+_("CSR")+wxT("")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("
  
")+_("Event Breakdown")+wxT("
  
")+_("Sleep")+wxT("")+cpap->first().Format(wxT("%H:%M"))+wxT("
")+_("Wake")+wxT("")+cpap->last().Format(wxT("%H:%M"))+wxT("
")+_("Total Time")+wxT("")+cpap->total_time().Format(wxT("%H:%M hours"))+wxT("
 
")+_("Other Information")+wxT("
"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("
")+_("AHI")+wxT("")+wxString::Format(wxT("%0.2f"),ahi)+wxT("
")+_("Obstructive")+wxT("")+wxString::Format(wxT("%0.2f"),oai)+wxT("
")+_("Hypopnea")+wxT("")+wxString::Format(wxT("%0.2f"),hi)+wxT("
")+_("ClearAirway")+wxT("")+wxString::Format(wxT("%0.2f"),cai)+wxT("
"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("
")+_("RERA")+wxT("")+wxString::Format(wxT("%0.2f"),rei)+wxT("
")+_("FlowLimit")+wxT("")+wxString::Format(wxT("%0.2f"),fli)+wxT("
")+_("Vsnore")+wxT("")+wxString::Format(wxT("%0.2f"),vsi)+wxT("
")+_("CSR")+wxT("")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("
 
 
")+_("Event Breakdown")+wxT("
 
")+_("Other Information")+wxT("
"); + + html=html+wxT("\n"); + //html=html+wxT("\n"); + html=html+wxT("\n"); + //html=html+wxT("\n"); + + html=html+wxT(""); - html=html+wxT("\n"); - html=html+wxT("\n"); if (mode==MODE_CPAP) { html=html+wxT("\n"); } else if (mode==MODE_APAP) { - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT(""); + + /*html=html+wxT("\n"); // html=html+wxT("\n"); } else if (mode==MODE_BIPAP) { - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT(""); + html=html+wxT(""); + html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); */ } - html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT(""); - if (mode==MODE_BIPAP) { - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - } else { //if (mode==MODE_APAP) { - html=html+wxT("\n"); - html=html+wxT("\n"); - } + // html=html+wxT("\n"); - - - html=html+wxT("\n"); if (mode!=MODE_BIPAP) { TAP_EAP->Show(false); TAP_IAP->Show(false); @@ -953,14 +965,18 @@ void Daily::RefreshData() SF->Show(false); } if (oxi) { - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT(""); + + html=html+wxT(""); + + //html=html+wxT("\n"); + PULSE->Show(true); SPO2->Show(true); } else { @@ -971,32 +987,47 @@ void Daily::RefreshData() ScrolledWindow->FitInside(); if (cpap) { + + if (mode==MODE_BIPAP) { + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + } else { //if (mode==MODE_APAP) { + html=html+wxT("\n"); + html=html+wxT("\n"); + } + + + html=html+wxT("
 
WhatMinAvgMax
")+_("Mode")+wxT("")+modestr+wxT("
")+_("Relief")+wxT("")+epr+wxT("
")+_("Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("
")+_("90% Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_weighted_avg(CPAP_PressurePercentValue))+wxT("
")+_("Avg Pressure")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),cpap->summary_weighted_avg(CPAP_PressureAverage))+wxT("
")+_("Min Reached")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_min(CPAP_PressureMinAchieved))+wxT("
")+_("Max Reached")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_max(CPAP_PressureMaxAchieved))+wxT("
Pressure")+wxString::Format(wxT("%.2f"),cpap->summary_min(CPAP_PressureMinAchieved)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_PressureAverage)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_max(CPAP_PressureMaxAchieved))+wxT("
")+_("90% Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_weighted_avg(CPAP_PressurePercentValue))+wxT("
")+_("90% Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),p90)+wxT("
")+_("Avg IPAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),cpap->summary_avg(BIPAP_IAPAverage))+wxT("
")+_("Avg EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_avg(BIPAP_EAPAverage))+wxT("
")+_("Min IPAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),cpap->summary_min(BIPAP_IAPMin))+wxT("
")+_("Max IPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_max(BIPAP_IAPMax))+wxT("
")+_("Min EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_min(BIPAP_EAPMin))+wxT("
")+_("Max EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_max(BIPAP_EAPMax))+wxT("
IPAP")+wxString::Format(wxT("%.2f"),cpap->summary_min(BIPAP_IAPMin)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(BIPAP_IAPAverage)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_max(BIPAP_IAPMax))+wxT("
EPAP")+wxString::Format(wxT("%.2f"),cpap->summary_min(BIPAP_EAPMin)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(BIPAP_EAPAverage)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_max(BIPAP_EAPMax))+wxT("
")+_("90% IPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),iap90)+wxT("
")+_("90% EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),eap90)+wxT("
")+_("90% EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),eap90)+wxT("
")+_("Avg Leak")+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_LeakAverage))+wxT("
  
Leak"); //")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_LeakAverage)) + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_min(CPAP_LeakMinimum)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_LeakAverage)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_max(CPAP_LeakMaximum))+wxT("
")+_("Time@IPAP")+wxT("
")+_("Time@EPAP")+wxT("
")+_("Time@Pressure")+wxT("
 
  
")+_("Oximeter Information")+wxT("
")+_("Pulse Avg")+wxT("")+wxString::Format(wxT("%.1fbpm"),oxi->summary_avg(OXI_PulseAverage))+wxT("
")+_("Pulse Min")+wxT("")+wxString::Format(wxT("%.1fbpm"),oxi->summary_min(OXI_PulseMin))+wxT("
")+_("Pulse Max")+wxT("")+wxString::Format(wxT("%.1fbpm"),oxi->summary_max(OXI_PulseMax))+wxT("
")+_("SpO2 Avg")+wxT("")+wxString::Format(wxT("%.1f%%"),oxi->summary_avg(OXI_SPO2Average))+wxT("
")+_("SpO2 Min")+wxT("")+wxString::Format(wxT("%.1f%%"),oxi->summary_min(OXI_SPO2Min))+wxT("
")+_("SpO2 Max")+wxT("")+wxString::Format(wxT("%.1f%%"),oxi->summary_max(OXI_SPO2Max))+wxT("
  
Pulse"); + html=html+wxT("")+wxString::Format(wxT("%.2fbpm"),oxi->summary_min(OXI_PulseMin)); + html=html+wxT("")+wxString::Format(wxT("%.2fbpm"),oxi->summary_avg(OXI_PulseAverage)); + html=html+wxT("")+wxString::Format(wxT("%.2fbpm"),oxi->summary_max(OXI_PulseMax))+wxT("
SpO2"); + html=html+wxT("")+wxString::Format(wxT("%.2f%%"),oxi->summary_min(OXI_SPO2Min)); + html=html+wxT("")+wxString::Format(wxT("%.2f%%"),oxi->summary_avg(OXI_SPO2Average)); + html=html+wxT("")+wxString::Format(wxT("%.2f%%"),oxi->summary_max(OXI_SPO2Max))+wxT("
 
")+_("Time@IPAP")+wxT("
")+_("Time@EPAP")+wxT("
")+_("Time@Pressure")+wxT("
"); + html=html+wxT("
"); + html=html+wxT("\n"); // fgSizer->Layout(); if (cpap->summary_avg(CPAP_BrokenSummary)==1) { html=html+wxT("\n"); } else { - html=html+wxT("\n"); + //html=html+wxT("\n"); + html=html+wxT("\n"); if (mode==MODE_CPAP) { html=html+wxT("\n"); } else if (mode==MODE_APAP) { - html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); } else if (mode==MODE_BIPAP) { - html=html+wxT("\n"); + html=html+wxT("\n"); html=html+wxT("\n"); } - html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); // check HumidiferStatus.. wxString str; if (bool(cpap->summary_max(CPAP_HumidifierStatus))) { str=wxString::Format(wxT("x%i"),(int)cpap->summary_max(CPAP_HumidifierSetting)); } else str=wxT("No"); html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); html=html+wxT("\n"); html=html+wxT("\n"); html=html+wxT("\n"); @@ -1006,20 +1037,23 @@ void Daily::RefreshData() } else str=wxT("No"); html=html+wxT("\n"); } - html=html+wxT("\n"); + html=html+wxT("
")+_("No System Settings Recorded")+wxT("
")+_("System Settings")+wxT("
")+_("System Settings")+wxT("
Mode")+modestr+wxT(" with ")+epr+wxT("
")+_("Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("
")+_("Min Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("
")+_("Max Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_max(CPAP_PressureMax))+wxT("
")+_("Pressure")+wxT("")+wxString::Format(wxT("%.2fcmH20 Min
"),cpap->summary_min(CPAP_PressureMin))+wxString::Format(wxT("%.2fcmH2O Max"),cpap->summary_max(CPAP_PressureMax))+wxT("
")+_("IPAP Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("
")+_("IPAP Pressure")+wxT("")+wxString::Format(wxT("%.1f cmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("
")+_("EPAP Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_max(CPAP_PressureMax))+wxT("
")+_("Ramp-Time")+wxT("")+wxString::Format(wxT("%imin"),(int)cpap->summary_max(CPAP_RampTime))+wxT("
")+_("Ramp-Prs.")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_min(CPAP_RampStartingPressure))+wxT("
")+_("Ramp")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),cpap->summary_min(CPAP_RampStartingPressure))+wxString::Format(wxT(" @ %imin"),(int)cpap->summary_max(CPAP_RampTime))+wxT("
 
")+_("Humidifier")+wxT("")+str+wxT("
")+_("System-Lock")+wxT("")+(bool(cpap->summary_max(PRS1_SystemLockStatus)) ? _("On") : _("Off"))+wxT("
")+_("SystemLock")+wxT("")+(bool(cpap->summary_max(PRS1_SystemLockStatus)) ? _("On") : _("Off"))+wxT("
")+_("Auto-Off")+wxT("")+(bool(cpap->summary_max(PRS1_AutoOff)) ? _("On") : _("Off"))+wxT("
")+_("Mask-Alert")+wxT("")+(bool(cpap->summary_max(PRS1_MaskAlert)) ? _("On") : _("Off"))+wxT("
")+_("Show-AHI")+wxT("")+(bool(cpap->summary_max(PRS1_ShowAHI)) ? _("On") : _("Off"))+wxT("
")+_("Sys-Resist.")+wxT("")+str+wxT("
  
"); + html=html+wxT("\n"); + //html=html+wxT("\n"); + //html=html+wxT("\n"); + html=html+wxT("\n"); for (vector::iterator i=cpap->begin();i!=cpap->end();i++) { - html=html+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); } } /*if (!cpap && !oxi) { html+=_(""); } */ - html+=wxT("
  
")+_("Session Files")+wxT("
")+(*i)->first().Format(wxT("%d-%m-%Y %H:%M:%S"))+wxT(" ")+wxString::Format(wxT("%05i"),(*i)->session())+wxT("
")+(*i)->last().Format(wxT("%d-%m-%Y %H:%M:%S"))+wxT(" ")+wxString::Format(wxT("%05i"),(*i)->session())+wxT("
")+(*i)->first().Format(wxT("%d-%m-%Y %H:%M"))+wxT(" ")+(*i)->last().Format(wxT("%H:%M"))+wxT(" ")+wxString::Format(wxT("#%06i"),(*i)->session())+wxT("
No data available for this day
"); + html+=wxT("
"); HTMLInfo->SetPage(html); } diff --git a/src/WxWizFrame.fbp b/src/WxWizFrame.fbp index dad02eae..7515a315 100644 --- a/src/WxWizFrame.fbp +++ b/src/WxWizFrame.fbp @@ -838,7 +838,7 @@ 0 - 220,-1 + 260,-1 0 1 diff --git a/src/libs/sleeplib/machine.cpp b/src/libs/sleeplib/machine.cpp index 7fbb9ca1..10c0531d 100644 --- a/src/libs/sleeplib/machine.cpp +++ b/src/libs/sleeplib/machine.cpp @@ -97,7 +97,7 @@ void InitMapsWithoutAwesomeInitializerLists() { CPAPModeNames[MODE_UNKNOWN]=wxT("Undetermined"); CPAPModeNames[MODE_CPAP]=wxT("CPAP"); - CPAPModeNames[MODE_APAP]=wxT("APAP"); + CPAPModeNames[MODE_APAP]=wxT("Auto"); CPAPModeNames[MODE_BIPAP]=wxT("BIPAP"); CPAPModeNames[MODE_ASV]=wxT("ASV"); diff --git a/src/version.h b/src/version.h index 5dab82d2..55954cb1 100644 --- a/src/version.h +++ b/src/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "07"; + static const char DATE[] = "08"; static const char MONTH[] = "06"; static const char YEAR[] = "2011"; static const char UBUNTU_VERSION_STYLE[] = "11.06"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 3456; - static const long REVISION = 2033; + static const long BUILD = 3621; + static const long REVISION = 3007; //Miscellaneous Version Types - static const long BUILDS_COUNT = 834; - #define RC_FILEVERSION 0,7,3456,2033 - #define RC_FILEVERSION_STRING "0, 7, 3456, 2033\0" - static const char FULLVERSION_STRING[] = "0.7.3456.2033"; + static const long BUILDS_COUNT = 1247; + #define RC_FILEVERSION 0,7,3621,3007 + #define RC_FILEVERSION_STRING "0, 7, 3621, 3007\0" + static const char FULLVERSION_STRING[] = "0.7.3621.3007"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;