From 02d0ba7ca25122897f3c8f8c87edeabe1d9fd4e2 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 1 Jun 2011 23:08:44 +1000 Subject: [PATCH] Added Line Chart square plot mode --- GUIFrame.cpp | 28 ++--- GUIFrame.h | 10 +- SleepyHead.cbp | 4 +- SleepyHead.depend | 31 +++-- SleepyHead.layout | 26 ++--- SleepyHeadMain.cpp | 142 ++++++++++++++++++----- SleepyHeadMain.h | 17 ++- WxWizFrame.fbp | 210 +++++++++++++++++----------------- graphs/graph.cpp | 45 +++++--- graphs/graph.h | 6 +- libs/sleeplib/prs1_loader.cpp | 4 +- version.h | 18 +-- 12 files changed, 339 insertions(+), 202 deletions(-) diff --git a/GUIFrame.cpp b/GUIFrame.cpp index ac2baa40..9a922610 100644 --- a/GUIFrame.cpp +++ b/GUIFrame.cpp @@ -129,8 +129,11 @@ DailyPanel::DailyPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, con { m_mgr.SetManagedWindow(this); + Calendar = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_MONDAY_FIRST|wxCAL_SEQUENTIAL_MONTH_SELECTION|wxCAL_SHOW_SURROUNDING_WEEKS ); + m_mgr.AddPane( Calendar, wxAuiPaneInfo() .Left() .Caption( wxT("Selected Day") ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( true ).PaneBorder( false ).Dock().Fixed().BottomDockable( false ).TopDockable( false ) ); + HTMLInfo = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); - m_mgr.AddPane( HTMLInfo, wxAuiPaneInfo() .Left() .Caption( wxT("Day Summary") ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( 200,424 ) ).DockFixed( false ).Row( 0 ).Position( 1 ).MinSize( wxSize( 200,200 ) ).Layer( 0 ) ); + m_mgr.AddPane( HTMLInfo, wxAuiPaneInfo() .Left() .Caption( wxT("Day Summary") ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( 208,424 ) ).DockFixed( false ).Row( 0 ).Position( 1 ).MinSize( wxSize( 200,400 ) ).Layer( 0 ) ); ScrolledWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL ); ScrolledWindow->SetScrollRate( 5, 5 ); @@ -144,9 +147,6 @@ DailyPanel::DailyPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, con ScrolledWindow->SetSizer( fgSizer ); ScrolledWindow->Layout(); fgSizer->Fit( ScrolledWindow ); - Calendar = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_MONDAY_FIRST|wxCAL_SEQUENTIAL_MONTH_SELECTION|wxCAL_SHOW_SURROUNDING_WEEKS ); - m_mgr.AddPane( Calendar, wxAuiPaneInfo() .Left() .Caption( wxT("Selected Day") ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( true ).PaneBorder( false ).Dock().Fixed().BottomDockable( false ).TopDockable( false ) ); - m_mgr.Update(); @@ -191,14 +191,14 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, wxBoxSizer* bSizer1; bSizer1 = new wxBoxSizer( wxHORIZONTAL ); - rbAll = new wxRadioButton( m_panel1, wxID_ANY, _("Everything"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - bSizer1->Add( rbAll, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + rbLastMonth = new wxRadioButton( m_panel1, wxID_ANY, _("Last Month"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + bSizer1->Add( rbLastMonth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); rbLastWeek = new wxRadioButton( m_panel1, wxID_ANY, _("Last Week"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer1->Add( rbLastWeek, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - rbLastMonth = new wxRadioButton( m_panel1, wxID_ANY, _("Last Month"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer1->Add( rbLastMonth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + rbAll = new wxRadioButton( m_panel1, wxID_ANY, _("Everything"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer1->Add( rbAll, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); rbCustomDate = new wxRadioButton( m_panel1, wxID_ANY, _("Custom"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer1->Add( rbCustomDate, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); @@ -209,7 +209,7 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, bSizer1->Add( sdLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - StartDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_SPIN ); + StartDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT ); StartDatePicker->Enable( false ); bSizer1->Add( StartDatePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 ); @@ -220,7 +220,7 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, bSizer1->Add( edLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - EndDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_SPIN ); + EndDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT ); EndDatePicker->Enable( false ); bSizer1->Add( EndDatePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 ); @@ -232,9 +232,9 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, m_mgr.Update(); // Connect Events - rbAll->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); - rbLastWeek->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); rbLastMonth->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); + rbLastWeek->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); + rbAll->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); rbCustomDate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); StartDatePicker->Connect( wxEVT_DATE_CHANGED, wxDateEventHandler( SummaryPanel::OnStartDateChanged ), NULL, this ); EndDatePicker->Connect( wxEVT_DATE_CHANGED, wxDateEventHandler( SummaryPanel::OnEndDateChanged ), NULL, this ); @@ -243,9 +243,9 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, SummaryPanel::~SummaryPanel() { // Disconnect Events - rbAll->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); - rbLastWeek->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); rbLastMonth->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); + rbLastWeek->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); + rbAll->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); rbCustomDate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SummaryPanel::OnRBSelect ), NULL, this ); StartDatePicker->Disconnect( wxEVT_DATE_CHANGED, wxDateEventHandler( SummaryPanel::OnStartDateChanged ), NULL, this ); EndDatePicker->Disconnect( wxEVT_DATE_CHANGED, wxDateEventHandler( SummaryPanel::OnEndDateChanged ), NULL, this ); diff --git a/GUIFrame.h b/GUIFrame.h index a6d5364f..fc2fd8c0 100644 --- a/GUIFrame.h +++ b/GUIFrame.h @@ -23,10 +23,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -85,10 +85,10 @@ class DailyPanel : public wxPanel private: protected: + wxCalendarCtrl* Calendar; wxHtmlWindow* HTMLInfo; wxScrolledWindow* ScrolledWindow; wxFlexGridSizer* fgSizer; - wxCalendarCtrl* Calendar; // Virtual event handlers, overide them in your derived class virtual void OnCalendarMonth( wxCalendarEvent& event ) { event.Skip(); } @@ -97,7 +97,7 @@ class DailyPanel : public wxPanel public: - DailyPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 935,573 ), long style = wxTAB_TRAVERSAL ); wxAuiManager m_mgr; + DailyPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 935,660 ), long style = wxTAB_TRAVERSAL ); wxAuiManager m_mgr; ~DailyPanel(); @@ -115,9 +115,9 @@ class SummaryPanel : public wxPanel wxScrolledWindow* ScrolledWindow; wxFlexGridSizer* fgSizer; wxPanel* m_panel1; - wxRadioButton* rbAll; - wxRadioButton* rbLastWeek; wxRadioButton* rbLastMonth; + wxRadioButton* rbLastWeek; + wxRadioButton* rbAll; wxRadioButton* rbCustomDate; wxStaticText* sdLabel; wxDatePickerCtrl* StartDatePicker; diff --git a/SleepyHead.cbp b/SleepyHead.cbp index 8bffa187..aabd16fe 100644 --- a/SleepyHead.cbp +++ b/SleepyHead.cbp @@ -41,12 +41,12 @@ - + - + diff --git a/SleepyHead.depend b/SleepyHead.depend index c194acf7..4de735c4 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7785,12 +7785,12 @@ "wx/progdlg.h" "wx/dialog.h" -1306802240 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp +1306858490 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp "wx/wxprec.h" "GUIFrame.h" -1306797017 /home/mark/projects/git/sleepyhead/GUIFrame.h +1306857828 /home/mark/projects/git/sleepyhead/GUIFrame.h @@ -7805,10 +7805,10 @@ + - @@ -7831,8 +7831,9 @@ 1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h -1306806202 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h +1306925254 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h "SleepyHeadApp.h" + "GUIFrame.h" "sleeplib/machine.h" "graphs/graph.h" @@ -7871,11 +7872,11 @@ "tinyxml/tinyxml.h" -1306817262 /home/mark/projects/git/sleepyhead/graphs/graph.h +1306927363 /home/mark/projects/git/sleepyhead/graphs/graph.h -1306842369 /home/mark/projects/git/sleepyhead/version.h +1306933584 /home/mark/projects/git/sleepyhead/version.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7892,7 +7893,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306838801 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306933486 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7906,11 +7907,12 @@ + "SleepyHeadMain.h" "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1306832286 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1306931755 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp @@ -7958,7 +7960,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1306760452 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp +1306926301 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp @@ -8114,3 +8116,14 @@ "wx/hashmap.h" "wx/bitmap.h" +1302101440 /usr/include/wx-2.8/wx/collpane.h + "wx/defs.h" + "wx/control.h" + "wx/gtk/collpane.h" + "wx/generic/collpaneg.h" + +1302101441 /usr/include/wx-2.8/wx/gtk/collpane.h + "wx/generic/collpaneg.h" + +1302101440 /usr/include/wx-2.8/wx/generic/collpaneg.h + diff --git a/SleepyHead.layout b/SleepyHead.layout index 50742373..a7b0ad1a 100644 --- a/SleepyHead.layout +++ b/SleepyHead.layout @@ -1,26 +1,26 @@ - - - + + + - - + + - + - + - + - + @@ -29,10 +29,10 @@ - + - + @@ -52,8 +52,8 @@ - - + + diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 1d6688ee..e8334856 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -27,7 +27,7 @@ #include #include #include - +#include #include "SleepyHeadMain.h" #include "sleeplib/profiles.h" @@ -211,12 +211,12 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event ) wxRect r=GetRect(); #if defined(__UNIX__) // Borrowed.. this need fixing. - int cx=r.x, cy=r.y; + /*int cx=r.x, cy=r.y; ClientToScreen(&cx,&cy); int border_width = cx - r.x; int title_bar_height = cy - r.y; r.width += (border_width * 2); - r.height += title_bar_height + border_width; + r.height += title_bar_height + border_width; */ #endif wxScreenDC sdc; @@ -250,7 +250,7 @@ void SleepyHeadFrame::OnShowSerial(wxCommandEvent& event) void SleepyHeadFrame::OnAbout(wxCommandEvent &event) { wxString msg = wxbuildinfo(long_f); - msg=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8)+wxT("\nAuthors: Mark Watkins / Troy Schultz\nThis is alpha software is guaranteed to break regularly!\nUse at your own risk."); //,AutoVersion::DATE,AutoVersion::MONTH,AutoVersion::YEAR + msg=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8)+wxT("\nAuthors: Mark Watkins / Troy Schultz\nThis is alpha software is guaranteed to break regularly!\nUse at your own risk.\n\nLicense: GPL"); //,AutoVersion::DATE,AutoVersion::MONTH,AutoVersion::YEAR wxMessageBox(msg, _("Welcome to..."),0,this); } @@ -322,8 +322,11 @@ Summary::Summary(wxWindow *win,Profile *_profile) { AddData(ahidata=new HistoryData(profile)); AddData(pressure=new HistoryCodeData(profile,CPAP_PressureAverage)); - AddData(pressure_eap=new HistoryCodeData(profile,BIPAP_EAPAverage)); - AddData(pressure_iap=new HistoryCodeData(profile,BIPAP_IAPAverage)); + AddData(pressure_min=new HistoryCodeData(profile,CPAP_PressureMinAchieved)); + AddData(pressure_max=new HistoryCodeData(profile,CPAP_PressureMaxAchieved)); + + AddData(pressure_eap=new HistoryCodeData(profile,BIPAP_EAPMax)); + AddData(pressure_iap=new HistoryCodeData(profile,BIPAP_IAPMin)); AddData(leak=new HistoryCodeData(profile,CPAP_LeakMedian)); AddData(usage=new UsageHistoryData(profile,UHD_Hours)); @@ -341,18 +344,23 @@ Summary::Summary(wxWindow *win,Profile *_profile) PRESSURE=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(400,160), wxNO_BORDER); PRESSURE->SetMargins(10,15,65,80); //PRESSURE->AddLayer(new gBarChart(pressure,wxBLUE)); - PRESSURE->AddLayer(new gLineChart(pressure,wxDARK_GREEN,6192)); - PRESSURE->AddLayer(new gLineChart(pressure_eap,wxRED,6192,false,true)); - PRESSURE->AddLayer(new gLineChart(pressure_iap,wxBLUE,6192,false,true)); + //PRESSURE->AddLayer(new gLineChart(pressure_eap,wxRED,6192,false,true)); + //PRESSURE->AddLayer(new gLineChart(pressure_iap,wxBLUE,6192,false,true)); + PRESSURE->AddLayer(new gYAxis(wxBLACK)); PRESSURE->AddLayer(new gXAxis(wxBLACK)); + PRESSURE->AddLayer(new gLineChart(pressure_max,wxBLUE,6192,false,true,true)); + PRESSURE->AddLayer(new gLineChart(pressure_min,wxRED,6192,false,true,true)); +// PRESSURE->AddLayer(new gLineChart(pressure_eap,wxPURPLE,6192,false,true,true)); + //PRESSURE->AddLayer(new gLineChart(pressure_iap,wxYELLOW,6192,false,true,true)); + PRESSURE->AddLayer(new gLineChart(pressure,wxDARK_GREEN,6192,false,true,true)); fgSizer->Add(PRESSURE,1,wxEXPAND); LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leak"),wxPoint(0,0), wxSize(400,160), wxNO_BORDER); LEAK->SetMargins(10,15,65,80); //LEAK->AddLayer(new gBarChart(leak,wxYELLOW)); - LEAK->AddLayer(new gLineChart(leak,wxPURPLE,6192)); LEAK->AddLayer(new gXAxis(wxBLACK)); + LEAK->AddLayer(new gLineChart(leak,wxPURPLE,6192,false,false,true)); fgSizer->Add(LEAK,1,wxEXPAND); @@ -397,8 +405,10 @@ void Summary::RefreshData() wxString submodel=_("Unknown Model"); double ahi=ahidata->GetAverage(); double avp=pressure->GetAverage(); - // double aeap=pressure_eap->GetAverage(); - //double aiap=pressure_iap->GetAverage(); + double apmin=pressure_min->GetAverage(); + double apmax=pressure_max->GetAverage(); + double aeap=pressure_eap->GetAverage(); + double aiap=pressure_iap->GetAverage(); double bt=fmod(bedtime->GetAverage(),12.0); double ua=usage->GetAverage(); double wt=waketime->GetAverage(); //fmod(bt+ua,12.0); @@ -416,10 +426,20 @@ void Summary::RefreshData() html=html+wxT("  \n"); html=html+wxT("")+_("Indice Averages")+wxT("\n"); html=html+wxT("")+_("AHI")+wxT("")+wxString::Format(wxT("%0.2f"),ahi)+wxT("\n"); - html=html+wxT("")+_("Pressure")+wxT("")+wxString::Format(wxT("%0.2fcmH2O"),avp)+wxT("\n"); - html=html+wxT("")+_("Mask Leaks")+wxT("")+wxString::Format(wxT("%0.2f"),leak->GetAverage())+wxT("\n"); + html=html+wxT("")+_("Pressure Avg")+wxT("")+wxString::Format(wxT("%0.2fcmH2O"),avp)+wxT("\n"); + if (aiap>0) { + html=html+wxT("")+_("IPAP Avg")+wxT("")+wxString::Format(wxT("%0.2fcmH2O"),aiap)+wxT("\n"); + html=html+wxT("")+_("EPAP Avg")+wxT("")+wxString::Format(wxT("%0.2fcmH2O"),aeap)+wxT("\n"); + } else { + if (apmin!=apmax) { + html=html+wxT("")+_("Pressure Min")+wxT("")+wxString::Format(wxT("%0.2fcmH2O"),apmin)+wxT("\n"); + html=html+wxT("")+_("Pressure Max")+wxT("")+wxString::Format(wxT("%0.2fcmH2O"),apmax)+wxT("\n"); + } + } html=html+wxT("  \n"); + html=html+wxT("")+_("Mask Leaks")+wxT("")+wxString::Format(wxT("%0.2f"),leak->GetAverage())+wxT("\n"); + html=html+wxT("  \n"); html=html+wxT("")+_("Bedtime")+wxT("")+wxString::Format(wxT("%02.0f:%02i"),bt,int(bt*60) % 60)+wxT("\n"); html=html+wxT("")+_("Waketime")+wxT("")+wxString::Format(wxT("%02.0f:%02i"),wt,int(wt*60) % 60)+wxT("\n"); html=html+wxT("")+_("Hours/Night")+wxT("")+wxString::Format(wxT("%02.0f:%02i"),ua,int(ua*60)%60)+wxT("\n"); @@ -485,9 +505,33 @@ void Summary::OnClose(wxCloseEvent &event) } +/* + +MyListBox::MyListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, int n, const wxString choices[], long style, const wxValidator& validator, const wxString& name) +:wxListBox(parent,id,pos,size,n,choices,style,validator,name) +{ + InvalidateBestSize(); + Clear(); + +} + +wxSize MyListBox::DoGetBestSize() const +{ + wxSize best(200, 50); +// CacheBestSize(best); + return best; + +} +*/ + Daily::Daily(wxWindow *win,Profile *p) :DailyPanel(win),profile(p) { + //SessionList=new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + //SessionList->SetMinSize(wxSize(200,50)); + //SessionList->SetMaxSize(wxSize(200,50)); + + //m_mgr.AddPane(SessionList,wxLEFT,wxT("Sessions")); AddData(tap_eap=new TAPData(CPAP_EAP)); AddData(tap_iap=new TAPData(CPAP_IAP)); @@ -526,16 +570,16 @@ Daily::Daily(wxWindow *win,Profile *p) AddData(leakdata=new PressureData(CPAP_Leak,0)); LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leaks"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); - LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false)); + LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false,false,true)); LEAK->AddLayer(new gXAxis(wxBLACK)); AddData(pressure_iap=new PressureData(CPAP_IAP)); AddData(pressure_eap=new PressureData(CPAP_EAP)); AddData(prd=new PressureData(CPAP_Pressure)); PRD=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER); - PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false)); - PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true)); - PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false,true)); + PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false,false,true)); + PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true,true)); + PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false,true,true)); PRD->AddLayer(new gXAxis(wxBLACK)); AddData(frw=new FlowData()); @@ -597,10 +641,12 @@ Daily::Daily(wxWindow *win,Profile *p) fgSizer->Add(TAP_IAP,1,wxEXPAND); fgSizer->Add(TAP_EAP,1,wxEXPAND); + ResetDate(); } Daily::~Daily() { +// delete SessionList; } void Daily::OnClose(wxCloseEvent &event) { @@ -766,26 +812,70 @@ void Daily::RefreshData() } html=html+wxT("  \n"); html=html+wxT("")+_("Session Files")+wxT("\n"); + + + //SessionList->Clear(); + for (auto i=d->begin();i!=d->end();i++) { + //wxString a=wxString::Format(wxT("Session %i"),(*i)->session()); + //SessionList->Append(a); + html=html+wxT("")+(*i)->first().Format(wxT("%d-%m-%Y %H:%M:%S"))+wxT(" ")+wxString::Format(wxT("%05i"),(*i)->session())+wxT("\n"); + html=html+wxT("")+(*i)->last().Format(wxT("%d-%m-%Y %H:%M:%S"))+wxT(" ")+wxString::Format(wxT("%05i"),(*i)->session())+wxT("\n"); } - //PRS1_SystemLockStatus + //SessionList->SetSelection(0); html=html+wxT(""); - /* for (auto i=s->summary.begin();i!=s->summary.end();i++) { - MachineCode c=(*i).first; - wxString name; - if (DefaultMCShortNames.find(c)!=DefaultMCShortNames.end()) name=DefaultMCShortNames[c]; - else name=wxString::Format(wxT("%04i"),(int)c); - html+=name+wxT(" = ")+(*i).second.GetString()+wxT("
\n"); - } */ html+=wxT(""); HTMLInfo->SetPage(html); +/* + if (d->size()>1) { + if (!SessionList->IsShown()) { + SessionList->Show(true); + SessionList->SetMinSize(wxSize(200,45)); + SessionList->SetMaxSize(wxSize(200,45)); + m_mgr.AddPane(SessionList,wxLEFT,wxEmptyString); + m_mgr.GetPane(SessionList).MinSize(200,45); + m_mgr.GetPane(SessionList).MaxSize(200,45); + m_mgr.GetPane(SessionList).CaptionVisible(false); + m_mgr.GetPane(Calendar).Position(0); + m_mgr.GetPane(SessionList).Position(1); + m_mgr.GetPane(HTMLInfo).Position(2); + m_mgr.Update(); + //Refresh(); + } + + } else { + if (SessionList->IsShown()) { + m_mgr.DetachPane(SessionList); + SessionList->Hide(); + m_mgr.Update(); + //Refresh(); + } + //m_mgr.Update(); + } +*/ } else { HTMLInfo->SetPage(_("No CPAP Machine Data Available")); + + /*if (SessionList->IsShown()) { + m_mgr.DetachPane(SessionList); + SessionList->Hide(); + m_mgr.Update(); + //Refresh(); + }*/ } } +void Daily::OnSelectSession( wxCommandEvent& event ) +{ + if (event.IsSelection()) { + int sessid=event.GetSelection(); + + wxLogMessage(wxT("Selected:")+wxString::Format(wxT("%i"),sessid)); + } +} + ///usr/local/bin/upx ./bin/Windows/SleepyHead void Daily::OnCalendarDay( wxCalendarEvent& event ) diff --git a/SleepyHeadMain.h b/SleepyHeadMain.h index 6c734df1..d8d005bd 100644 --- a/SleepyHeadMain.h +++ b/SleepyHeadMain.h @@ -13,7 +13,7 @@ #include "SleepyHeadApp.h" - +#include #include "GUIFrame.h" #include "sleeplib/machine.h" #include "graphs/graph.h" @@ -33,6 +33,8 @@ public: // void SetProfile(Profile *p); HistoryData *ahidata,*pressure,*leak,*usage,*bedtime,*waketime,*pressure_iap,*pressure_eap; + HistoryData *pressure_min,*pressure_max; + gGraphWindow *AHI,*PRESSURE,*LEAK,*USAGE; wxBitmap Logo; @@ -50,6 +52,14 @@ protected: }; +/*class MyListBox:public wxListBox +{ + public: + // DECLARE_DYNAMIC_CLASS(MyListBox) + MyListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxT("listBox")); + virtual wxSize DoGetBestSize() const; +}; */ + class Daily:public DailyPanel { public: @@ -61,7 +71,9 @@ public: protected: virtual void OnCalendarDay( wxCalendarEvent& event ); virtual void OnCalendarMonth( wxCalendarEvent& event ); - virtual void OnClose(wxCloseEvent &event); + virtual void OnClose(wxCloseEvent &event); + virtual void OnSelectSession( wxCommandEvent& event ); + void AddData(gPointData *d) { Data.push_back(d); }; void UpdateGraphs(Day *day); @@ -72,6 +84,7 @@ protected: Profile *profile; list Data; + //wxListBox *SessionList; }; const wxEventType wxEVT_DO_SCREENSHOT = wxNewEventType(); diff --git a/WxWizFrame.fbp b/WxWizFrame.fbp index b3e0555a..431ffc4b 100644 --- a/WxWizFrame.fbp +++ b/WxWizFrame.fbp @@ -543,10 +543,10 @@ - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 1 @@ -583,11 +583,11 @@ 1 - + 0 Resizable 1 - 935,573 + 935,660 0 @@ -628,6 +628,92 @@ + + 0 + 1 + 1 + 0 + + + + Selected Day + 1 + 0 + 0 + + 1 + 0 + Dock + 1 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + Calendar + 0 + 465,709 + 201,163 + protected + 1 + + + Fixed + + 1 + + wxCAL_MONDAY_FIRST|wxCAL_SEQUENTIAL_MONTH_SELECTION|wxCAL_SHOW_SURROUNDING_WEEKS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + OnCalendarMonth + OnCalendarDay + + + + + + + + + + + + + + + + + + + + + + + + + + 1 1 @@ -657,14 +743,14 @@ 0 - 200,200 + 200,400 0 1 HTMLInfo 1 - 483,386 - 200,424 + 467,397 + 208,424 protected 1 @@ -805,98 +891,12 @@ 0 - - 0 - 1 - 1 - 0 - - - - Selected Day - 1 - 0 - 0 - - 1 - 0 - Dock - 1 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - Calendar - 0 - - - protected - 1 - - - Fixed - - 1 - - wxCAL_MONDAY_FIRST|wxCAL_SEQUENTIAL_MONTH_SELECTION|wxCAL_SHOW_SURROUNDING_WEEKS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - OnCalendarMonth - OnCalendarDay - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 1 @@ -1267,7 +1267,7 @@ 0 0 wxID_ANY - Everything + Last Month 0 @@ -1276,7 +1276,7 @@ 0 1 - rbAll + rbLastMonth 1 @@ -1443,7 +1443,7 @@ 0 0 wxID_ANY - Last Month + Everything 0 @@ -1452,7 +1452,7 @@ 0 1 - rbLastMonth + rbAll 1 @@ -1726,7 +1726,7 @@ 1 - wxDP_SPIN + wxDP_DEFAULT 0 @@ -1899,7 +1899,7 @@ 1 - wxDP_SPIN + wxDP_DEFAULT 0 diff --git a/graphs/graph.cpp b/graphs/graph.cpp index c4708838..83563e06 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -1115,8 +1115,8 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) dc.DrawLine(start_px,start_py+height,start_px+width,start_py+height); } -gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool a,bool _hide_axes) -:gLayer(d),m_accelerate(a),m_drawlist_size(dlsize),m_hide_axes(_hide_axes) +gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool _accelerate,bool _hide_axes,bool _square_plot) +:gLayer(d),m_accelerate(_accelerate),m_drawlist_size(dlsize),m_hide_axes(_hide_axes),m_square_plot(_square_plot) { m_drawlist=new wxPoint [dlsize]; color.clear(); @@ -1240,6 +1240,7 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) if (i>=sam) i-=sam; } if (point[i].x < minx) done=true; + } px=(point[i].x - minx) * xmult; @@ -1260,6 +1261,14 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) if (pym_drawlist[z].y) m_drawlist[z].y=py; } else { + if (m_square_plot && (dp>0)) { // twice as many points needed + m_drawlist[dp].x=start_px+px; + m_drawlist[dp].y=m_drawlist[dp-1].y; + if (++dp>=m_drawlist_size) { + wxLogWarning(wxT("gLineChart: m_drawlist is too small")); + break; + } + } m_drawlist[dp].x=start_px+px; m_drawlist[dp].y=start_py+py; if (++dp>=m_drawlist_size) { @@ -1555,10 +1564,17 @@ void FlowData::Reload(Day *day) //double t1=MAX(fabs(min_y),fabs(max_y)); - //max_y=t1; - //min_y=-t1; - min_y=-90; - max_y=90; + if (max_y>128) { + } else if (max_y>90) { + max_y=120; + min_y=-120; + } else if (max_y>60) { + min_y=-90; + max_y=90; + } else { + min_y=-60; + max_y=60; + } real_min_x=min_x; real_min_y=min_y; @@ -1597,14 +1613,14 @@ void PressureData::Reload(Day *day) } int t=0; - EventDataType p,lastp=-1; + EventDataType p; //,lastp=-1; for (auto ev=(*s)->events[code].begin(); ev!=(*s)->events[code].end(); ev++) { p=(*(*ev))[field]; - if (lastp>=0) { + /*if (lastp>=0) { wxRealPoint r2((*ev)->time().GetMJD(),lastp); point[vc][t++]=r2; assert(ttime().GetMJD(),p); point[vc][t++]=r; assert(tmax_y) max_y=r.y; } - lastp=p; + //lastp=p; } np[vc]=t; tt+=t; @@ -1838,7 +1854,7 @@ void HistoryData::Reload(Day *day) int i=0; bool first=true; bool done=false; - double y; + double y,lasty=0; for (int x=real_min_x;x<=real_max_x;x++) { date.Set(x+2400000.5); date.ResetTime(); @@ -1853,13 +1869,13 @@ void HistoryData::Reload(Day *day) z++; } if (z>1) y /= z; - point[vc][i].x=x; - point[vc][i].y=y; if (first) { // max_x=min_x=x; - max_y=min_y=y; + lasty=max_y=min_y=y; first=false; } + point[vc][i].x=x; + point[vc][i].y=y; if (y>max_y) max_y=y; if (ysummary[CPAP_Mode]==(long)MODE_CPAP) { + sess->summary[CPAP_PressureMax]=sess->summary[CPAP_PressureMin]; + } sess->summary[CPAP_LeakMinimum]=sess->min_event_field(CPAP_Leak,0); sess->summary[CPAP_LeakMaximum]=sess->max_event_field(CPAP_Leak,0); // should be merged.. diff --git a/version.h b/version.h index e4c07b16..61c6a78e 100644 --- a/version.h +++ b/version.h @@ -4,10 +4,10 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "31"; - static const char MONTH[] = "05"; + static const char DATE[] = "01"; + static const char MONTH[] = "06"; static const char YEAR[] = "2011"; - static const char UBUNTU_VERSION_STYLE[] = "11.05"; + static const char UBUNTU_VERSION_STYLE[] = "11.06"; //Software Status static const char STATUS[] = "Alpha"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 2512; - static const long REVISION = 8376; + static const long BUILD = 2713; + static const long REVISION = 9489; //Miscellaneous Version Types - static const long BUILDS_COUNT = 7621; - #define RC_FILEVERSION 0,7,2512,8376 - #define RC_FILEVERSION_STRING "0, 7, 2512, 8376\0" - static const char FULLVERSION_STRING[] = "0.7.2512.8376"; + static const long BUILDS_COUNT = 8127; + #define RC_FILEVERSION 0,7,2713,9489 + #define RC_FILEVERSION_STRING "0, 7, 2713, 9489\0" + static const char FULLVERSION_STRING[] = "0.7.2713.9489"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;