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

Reworked Profile to holds new day list (Mega changeset)

Browse Source
This commit is contained in:
Mark Watkins 2011-05-30 21:59:20 +10:00
parent 37cdc5a25b
commit 19c229c7b1
16 changed files with 986 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
GUIFrame.cpp
View File

@ -52,6 +52,12 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
ViewMenuDaily = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("&Daily") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
ViewMenu->Append( ViewMenuDaily );
wxMenuItem* m_separator3;
m_separator3 = ViewMenu->AppendSeparator();
ViewMenuSerial = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("Show Serial Numbers") ) , wxEmptyString, wxITEM_CHECK );
ViewMenu->Append( ViewMenuSerial );
wxMenuItem* m_separator2;
m_separator2 = ViewMenu->AppendSeparator();
@ -61,8 +67,8 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
menubar->Append( ViewMenu, _("&View") );
MachineMenu = new wxMenu();
menubar->Append( MachineMenu, _("&Machine") );
ProfileMenu = new wxMenu();
menubar->Append( ProfileMenu, _("&Profiles") );
ToolsMenu = new wxMenu();
wxMenuItem* ToolsMenuScreenshot;
@ -95,6 +101,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
this->Connect( FileMenuExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnQuit ) );
this->Connect( ViewMenuSummary->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuSummary ) );
this->Connect( ViewMenuDaily->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuDaily ) );
this->Connect( ViewMenuSerial->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnShowSerial ) );
this->Connect( ViewMenuFullscreen->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFullscreen ) );
this->Connect( ToolsMenuScreenshot->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnScreenshot ) );
this->Connect( HelpMenuAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnAbout ) );
@ -109,6 +116,7 @@ GUIFrame::~GUIFrame()
this->Disconnect( wxID_QUIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnQuit ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuSummary ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuDaily ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnShowSerial ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFullscreen ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnScreenshot ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnAbout ) );
@ -177,24 +185,44 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos,
fgSizer->Fit( ScrolledWindow );
m_panel1 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_panel1->SetMaxSize( wxSize( -1,40 ) );
m_mgr.AddPane( m_panel1, wxAuiPaneInfo() .Bottom() .Caption( wxT("Date Range") ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).DockFixed( false ).Row( 0 ).Position( 1 ).BestSize( wxSize( 300,40 ) ).MinSize( wxSize( 300,40 ) ).MaxSize( wxSize( 300,40 ) ) );
m_mgr.AddPane( m_panel1, wxAuiPaneInfo() .Bottom() .Caption( wxT("Date Range") ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).DockFixed( false ).Row( 0 ).Position( 1 ).BestSize( wxSize( 570,42 ) ).MinSize( wxSize( 570,42 ) ).MaxSize( wxSize( -1,42 ) ) );
wxBoxSizer* bSizer1;
bSizer1 = new wxBoxSizer( wxHORIZONTAL );
m_staticText1 = new wxStaticText( m_panel1, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText1->Wrap( -1 );
bSizer1->Add( m_staticText1, 0, wxALIGN_TOP|wxLEFT|wxTOP, 12 );
rbAll = new wxRadioButton( m_panel1, wxID_RB, _("Everything"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
bSizer1->Add( rbAll, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
StartDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT );
bSizer1->Add( StartDatePicker, 0, wxALL, 5 );
rbLastWeek = new wxRadioButton( m_panel1, wxID_ANY, _("Last Week"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer1->Add( rbLastWeek, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_staticText2 = new wxStaticText( m_panel1, wxID_ANY, _("End"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText2->Wrap( -1 );
bSizer1->Add( m_staticText2, 0, wxALIGN_TOP|wxLEFT|wxTOP, 12 );
rbLastMonth = new wxRadioButton( m_panel1, wxID_ANY, _("Last Month"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer1->Add( rbLastMonth, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
EndDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT );
bSizer1->Add( EndDatePicker, 0, wxALL, 5 );
rbCustomDate = new wxRadioButton( m_panel1, wxID_ANY, _("Custom"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer1->Add( rbCustomDate, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
sdLabel = new wxStaticText( m_panel1, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0 );
sdLabel->Wrap( -1 );
sdLabel->Enable( false );
bSizer1->Add( sdLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
StartDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_SHOWCENTURY|wxDP_SPIN );
StartDatePicker->Enable( false );
bSizer1->Add( StartDatePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
edLabel = new wxStaticText( m_panel1, wxID_ANY, _("End"), wxDefaultPosition, wxDefaultSize, 0 );
edLabel->Wrap( -1 );
edLabel->Enable( false );
bSizer1->Add( edLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
EndDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_SPIN );
EndDatePicker->Enable( false );
bSizer1->Add( EndDatePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
m_panel1->SetSizer( bSizer1 );
m_panel1->Layout();
@ -203,6 +231,10 @@ 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 );
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 );
}
@ -210,6 +242,10 @@ 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 );
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 );

17
GUIFrame.h
View File

@ -28,6 +28,7 @@
#include <wx/scrolwin.h>
#include <wx/calctrl.h>
#include <wx/panel.h>
#include <wx/radiobut.h>
#include <wx/stattext.h>
#include <wx/datectrl.h>
#include <wx/dateevt.h>
@ -35,6 +36,7 @@
///////////////////////////////////////////////////////////////////////////
#define wxID_QUIT 1000
#define wxID_RB 1001
///////////////////////////////////////////////////////////////////////////////
/// Class GUIFrame
@ -47,7 +49,8 @@ class GUIFrame : public wxFrame
wxMenuBar* menubar;
wxMenu* FileMenu;
wxMenu* ViewMenu;
wxMenu* MachineMenu;
wxMenuItem* ViewMenuSerial;
wxMenu* ProfileMenu;
wxMenu* ToolsMenu;
wxMenu* HelpMenu;
wxStatusBar* statusBar;
@ -59,6 +62,7 @@ class GUIFrame : public wxFrame
virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
virtual void OnViewMenuSummary( wxCommandEvent& event ) { event.Skip(); }
virtual void OnViewMenuDaily( wxCommandEvent& event ) { event.Skip(); }
virtual void OnShowSerial( wxCommandEvent& event ) { event.Skip(); }
virtual void OnFullscreen( wxCommandEvent& event ) { event.Skip(); }
virtual void OnScreenshot( wxCommandEvent& event ) { event.Skip(); }
virtual void OnAbout( wxCommandEvent& event ) { event.Skip(); }
@ -112,19 +116,24 @@ class SummaryPanel : public wxPanel
wxScrolledWindow* ScrolledWindow;
wxFlexGridSizer* fgSizer;
wxPanel* m_panel1;
wxStaticText* m_staticText1;
wxRadioButton* rbAll;
wxRadioButton* rbLastWeek;
wxRadioButton* rbLastMonth;
wxRadioButton* rbCustomDate;
wxStaticText* sdLabel;
wxDatePickerCtrl* StartDatePicker;
wxStaticText* m_staticText2;
wxStaticText* edLabel;
wxDatePickerCtrl* EndDatePicker;
// Virtual event handlers, overide them in your derived class
virtual void OnRBSelect( wxCommandEvent& event ) { event.Skip(); }
virtual void OnStartDateChanged( wxDateEvent& event ) { event.Skip(); }
virtual void OnEndDateChanged( wxDateEvent& event ) { event.Skip(); }
public:
SummaryPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 775,447 ), long style = wxTAB_TRAVERSAL ); wxAuiManager m_mgr;
SummaryPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 868,599 ), long style = wxTAB_TRAVERSAL ); wxAuiManager m_mgr;
~SummaryPanel();

100
SleepyHead.depend
View File

@ -7785,12 +7785,12 @@
"wx/progdlg.h"
"wx/dialog.h"
1306577554 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp
1306753008 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp
"wx/wxprec.h"
<wx/wx.h>
"GUIFrame.h"
1306577554 /home/mark/projects/git/sleepyhead/GUIFrame.h
1306753008 /home/mark/projects/git/sleepyhead/GUIFrame.h
<wx/intl.h>
<wx/string.h>
<wx/bitmap.h>
@ -7810,16 +7810,18 @@
<wx/scrolwin.h>
<wx/calctrl.h>
<wx/panel.h>
<wx/radiobut.h>
<wx/stattext.h>
<wx/datectrl.h>
<wx/dateevt.h>
1306414983 source:/home/mark/projects/git/sleepyhead/SleepyHeadApp.cpp
1306741958 source:/home/mark/projects/git/sleepyhead/SleepyHeadApp.cpp
"wx_pch.h"
<iostream>
<wx/log.h>
<wx/progdlg.h>
<wx/datetime.h>
<wx/fs_mem.h>
"SleepyHeadApp.h"
"SleepyHeadMain.h"
"version.h"
@ -7829,13 +7831,13 @@
1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h
<wx/app.h>
1306662900 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
1306753017 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
"SleepyHeadApp.h"
"GUIFrame.h"
"sleeplib/machine.h"
"graphs/graph.h"
1306682653 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
1306726896 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
<wx/string.h>
<wx/variant.h>
<wx/dir.h>
@ -7869,13 +7871,13 @@
<map>
"tinyxml/tinyxml.h"
1306659032 /home/mark/projects/git/sleepyhead/graphs/graph.h
1306750273 /home/mark/projects/git/sleepyhead/graphs/graph.h
<sleeplib/machine.h>
<list>
1306683584 /home/mark/projects/git/sleepyhead/version.h
1306756665 /home/mark/projects/git/sleepyhead/version.h
1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h"
"machine_loader.h"
"profiles.h"
@ -7883,14 +7885,14 @@
1306415040 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.h
"profiles.h"
1306415066 /home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.h
1306754109 /home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.h
<wx/string.h>
<map>
"machine.h"
"preferences.h"
"tinyxml/tinyxml.h"
1306683142 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
1306756567 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>
@ -7902,14 +7904,16 @@
<wx/dcscreen.h>
<wx/dcmemory.h>
<wx/filedlg.h>
<wx/fs_mem.h>
"SleepyHeadMain.h"
"sleeplib/profiles.h"
1306658943 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
1306756303 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/log.h>
"graph.h"
"sleeplib/profiles.h"
1306485891 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/binary_file.cpp
<wx/filename.h>
@ -7919,7 +7923,7 @@
<wx/ffile.h>
<wx/utils.h>
1306683485 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
1306753649 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
<tr1/random>
<wx/colour.h>
<wx/log.h>
@ -7940,7 +7944,7 @@
<wx/stdpaths.h>
"preferences.h"
1306673434 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp
1306755802 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp
<wx/filefn.h>
<wx/filename.h>
<wx/utils.h>
@ -7952,7 +7956,7 @@
"machine_loader.h"
"tinyxml/tinyxml.h"
1306681892 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
1306724998 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
<wx/dir.h>
<wx/filename.h>
<wx/ffile.h>
@ -8004,3 +8008,71 @@
1305166122 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.8/wx/generic/datectrl.h
1302101440 /usr/include/wx-2.8/wx/fs_mem.h
"wx/defs.h"
"wx/filesys.h"
1305166121 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.8/wx/fs_mem.h
"wx/defs.h"
"wx/filesys.h"
1302101441 /usr/include/wx-2.8/wx/statline.h
"wx/defs.h"
"wx/control.h"
"wx/univ/statline.h"
"wx/msw/statline.h"
"wx/gtk/statline.h"
"wx/gtk1/statline.h"
"wx/os2/statline.h"
"wx/mac/statline.h"
"wx/cocoa/statline.h"
"wx/generic/statline.h"
1302101441 /usr/include/wx-2.8/wx/gtk/statline.h
"wx/defs.h"
1305215600 /usr/include/wx-2.9/wx/datectrl.h
"wx/defs.h"
"wx/control.h"
"wx/datetime.h"
"wx/palmos/datectrl.h"
"wx/msw/datectrl.h"
"wx/generic/datectrl.h"
1305215600 /usr/include/wx-2.9/wx/generic/datectrl.h
"wx/calctrl.h"
"wx/combo.h"
1305215599 /usr/include/wx-2.9/wx/combo.h
"wx/defs.h"
"wx/control.h"
"wx/renderer.h"
"wx/bitmap.h"
"wx/msw/combo.h"
"wx/generic/combo.h"
1305215599 /usr/include/wx-2.9/wx/renderer.h
"wx/gdicmn.h"
"wx/colour.h"
"wx/font.h"
"wx/bitmap.h"
"wx/string.h"
1305215599 /usr/include/wx-2.9/wx/generic/combo.h
1305215600 /usr/include/wx-2.9/wx/progdlg.h
"wx/defs.h"
"wx/palmos/progdlg.h"
"wx/generic/progdlgg.h"
1305215599 /usr/include/wx-2.9/wx/generic/progdlgg.h
"wx/defs.h"
"wx/progdlg.h"
"wx/dialog.h"
1305215598 /usr/include/wx-2.9/wx/fs_mem.h
"wx/defs.h"
"wx/filesys.h"
"wx/hashmap.h"
"wx/bitmap.h"

5
SleepyHeadApp.cpp
View File

@ -20,6 +20,8 @@
#include <wx/log.h>
#include <wx/progdlg.h>
#include <wx/datetime.h>
#include <wx/fs_mem.h>
#include "SleepyHeadApp.h"
#include "SleepyHeadMain.h"
#include "version.h"
@ -36,6 +38,9 @@ bool SleepyHeadApp::OnInit()
wxLog *logger=new wxLogStream(&std::cout);
wxLog::SetActiveTarget(logger);
wxFileSystem::AddHandler(new wxMemoryFSHandler);
wxInitAllImageHandlers();
//wxDateTime::SetCountry(wxDateTime::USA);
SetAppName(_("SleepyHead"));
PRS1Loader::Register();

350
SleepyHeadMain.cpp
View File

@ -25,6 +25,10 @@
#include <wx/dcscreen.h>
#include <wx/dcmemory.h>
#include <wx/filedlg.h>
#include <wx/fs_mem.h>
#include "SleepyHeadMain.h"
#include "sleeplib/profiles.h"
//#include "graphs/sleepflagsgraph.h"
@ -66,7 +70,6 @@ wxString wxbuildinfo(wxbuildinfoformat format)
SleepyHeadFrame::SleepyHeadFrame(wxFrame *frame)
: GUIFrame(frame)
{
wxInitAllImageHandlers();
loader_progress=new wxProgressDialog(wxT("SleepyHead"),wxT("Please Wait..."),100,this, wxPD_APP_MODAL|wxPD_AUTO_HIDE|wxPD_SMOOTH);
loader_progress->Hide();
wxString title=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8);
@ -77,20 +80,16 @@ SleepyHeadFrame::SleepyHeadFrame(wxFrame *frame)
wxLogError(wxT("Couldn't get active profile"));
abort();
}
UpdateProfiles();
if (pref.Exists("ShowSerialNumbers")) ViewMenuSerial->Check(pref["ShowSerialNumbers"]);
UpdateMachineMenu();
int id=0;
if (pref.Exists("DefaultMachine")) {
id=pref[wxT("DefaultMachine")].GetInteger();
} else {
pref[wxT("DefaultMachine")]=(long)0;
}
// wxDisableAsserts();
// Create AUINotebook Tabs
wxCommandEvent dummy;
OnViewMenuDaily(dummy); // Daily Page
OnViewMenuSummary(dummy); // Summary Page
OnViewMenuDaily(dummy); // Daily Page
this->Connect(wxID_ANY, wxEVT_DO_SCREENSHOT, wxCommandEventHandler(SleepyHeadFrame::DoScreenshot));
//this->Connect(wxID_ANY, wxEVT_MACHINE_SELECTED, wxCommandEventHandler(SleepyHeadFrame::OnMachineSelected));
@ -110,34 +109,33 @@ SleepyHeadFrame::~SleepyHeadFrame()
delete loader_progress;
}
}
void SleepyHeadFrame::UpdateMachineMenu()
void SleepyHeadFrame::UpdateProfiles()
{
cpap_machines=profile->GetMachines(MT_CPAP);
// cpap_machines=profile->GetMachines(MT_CPAP);
wxMenuItemList z=MachineMenu->GetMenuItems();
int i=MachineMenuID;
for (int j=0;j<z.size();j++) {
wxMenuItemList z=ProfileMenu->GetMenuItems();
int i=ProfileMenuID;
for (unsigned int j=0;j<z.size();j++) {
wxMenuItem *mi=z[j];
this->Disconnect(i,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(SleepyHeadFrame::OnMachineSelected));
MachineMenu->Remove(mi);
this->Disconnect(i,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(SleepyHeadFrame::OnProfileSelected));
ProfileMenu->Remove(mi);
i++;
}
i=MachineMenuID;
i=ProfileMenuID;
for (auto m=cpap_machines.begin();m!=cpap_machines.end();m++) {
wxMenuItem *item=MachineMenu->AppendRadioItem(i,(*m)->properties[wxT("Serial")],wxEmptyString);
this->Connect(i,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(SleepyHeadFrame::OnMachineSelected));
i++;
for (auto p=Profiles::profiles.begin();p!=Profiles::profiles.end();p++) {
Profile &pro=*(Profiles::profiles[p->first]);
wxMenuItem *item=ProfileMenu->AppendRadioItem(i,pro["Realname"],wxEmptyString);
if (p->first==pref["Profile"].GetString()) {
item->Check(true);
}
long l=pref[wxT("DefaultMachine")];
MachineMenu->Check(l+MachineMenuID,true);
/*if (vm.size()>=1) {
machine=vm[0];
} else machine=NULL; */
this->Connect(i,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(SleepyHeadFrame::OnProfileSelected));
i++;
}
}
void SleepyHeadFrame::OnClose(wxCloseEvent &event)
@ -157,12 +155,12 @@ void SleepyHeadFrame::OnFullscreen(wxCommandEvent& event)
ShowFullScreen(false);
}
}
void SleepyHeadFrame::OnMachineSelected(wxCommandEvent& event)
void SleepyHeadFrame::OnProfileSelected(wxCommandEvent& event)
{
int id=event.GetId()-MachineMenuID;
int id=event.GetId()-ProfileMenuID;
wxLogMessage(wxT("Machine Selected:")+wxString::Format(wxT("%i"),id));
Machine *m=cpap_machines[id];
wxLogMessage(wxT("Profile Selected:")+wxString::Format(wxT("%i"),id));
/*Machine *m=cpap_machines[id];
if (m) {
pref[wxT("DefaultMachine")]=(long)id;
@ -174,10 +172,10 @@ void SleepyHeadFrame::OnMachineSelected(wxCommandEvent& event)
}
idx=main_auinotebook->GetPageIndex(summary);
if (idx!=wxNOT_FOUND) {
summary->RefreshData(m);
summary->ResetProfile(profile)
summary->Refresh();
}
event.Skip();
} */
//event.Skip();
//Refresh();
}
void SleepyHeadFrame::OnScreenshot(wxCommandEvent& event)
@ -196,7 +194,7 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event )
{
wxRect r=GetRect();
#if defined(__UNIX__)
#if defined(__UNIX__) // Borrowed.. this need fixing.
int cx=r.x, cy=r.y;
ClientToScreen(&cx,&cy);
int border_width = cx - r.x;
@ -204,10 +202,6 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event )
r.width += (border_width * 2);
r.height += title_bar_height + border_width;
#endif
int x=r.x;
int y=r.y;
int w=r.width;
int h=r.height;
wxScreenDC sdc;
wxMemoryDC mdc;
@ -232,6 +226,10 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event )
}
}
}
void SleepyHeadFrame::OnShowSerial(wxCommandEvent& event)
{
pref["ShowSerialNumbers"]=event.IsChecked();
}
void SleepyHeadFrame::OnAbout(wxCommandEvent &event)
{
@ -253,7 +251,7 @@ void SleepyHeadFrame::OnImportSD(wxCommandEvent &event)
loader_progress->Update(100);
loader_progress->Show(false);
UpdateMachineMenu(); // Also updates cpap_machines list.
/*//UpdateMachineMenu(); // Also updates cpap_machines list.
auto q=MachineMenu->GetMenuItems().rbegin();
int i=0;
@ -263,15 +261,18 @@ void SleepyHeadFrame::OnImportSD(wxCommandEvent &event)
i=(*q)->GetId()-MachineMenuID;
}
m=cpap_machines[i];
*/
int idx=main_auinotebook->GetPageIndex(daily);
if (idx!=wxNOT_FOUND) {
daily->RefreshData(m);
daily->ResetDate();
daily->RefreshData();
daily->Refresh();
}
idx=main_auinotebook->GetPageIndex(summary);
if (idx!=wxNOT_FOUND) {
summary->RefreshData(m);
summary->ResetProfile(profile); // resets the date ranges..
summary->RefreshData();
summary->Refresh();
}
@ -279,17 +280,11 @@ void SleepyHeadFrame::OnImportSD(wxCommandEvent &event)
void SleepyHeadFrame::OnViewMenuDaily( wxCommandEvent& event )
{
int idx=main_auinotebook->GetPageIndex(daily);
int id;
unsigned int id;
if (idx==wxNOT_FOUND) {
daily=new Daily(this);
daily=new Daily(this,profile);
main_auinotebook->AddPage(daily,_("Daily"),true);
if (pref.Exists(wxT("DefaultMachine")))
id=pref["DefaultMachine"].GetInteger();
else id=0;
if (id<cpap_machines.size()) {
Machine *m=cpap_machines[id];
if (m) daily->RefreshData(m);
}
daily->RefreshData();
daily->Refresh();
} else {
@ -303,36 +298,28 @@ void SleepyHeadFrame::OnViewMenuSummary( wxCommandEvent& event )
int id,idx=main_auinotebook->GetPageIndex(summary);
if (idx==wxNOT_FOUND) {
summary=new Summary(this);
summary=new Summary(this,profile);
main_auinotebook->AddPage(summary,_("Summary"),true);
if (pref.Exists(wxT("DefaultMachine")))
id=pref["DefaultMachine"].GetInteger();
else id=0;
if (id<cpap_machines.size()) {
Machine *m=cpap_machines[id];
if (m) summary->RefreshData(m);
}
summary->ResetProfile(profile);
summary->RefreshData();
summary->Refresh();
} else {
main_auinotebook->SetSelection(idx);
}
}
Summary::Summary(wxWindow *win)
:SummaryPanel(win)
Summary::Summary(wxWindow *win,Profile *_profile)
:SummaryPanel(win),profile(_profile)
{
machine=NULL;
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));
const int days_shown=60;
AddData(ahidata=new HistoryData(machine,days_shown));
AddData(pressure=new HistoryCodeData(machine,CPAP_PressureAverage,days_shown));
AddData(pressure_eap=new HistoryCodeData(machine,BIPAP_EAPAverage,days_shown));
AddData(pressure_iap=new HistoryCodeData(machine,BIPAP_IAPAverage,days_shown));
AddData(leak=new HistoryCodeData(machine,CPAP_LeakMedian,days_shown));
AddData(usage=new UsageHistoryData(machine,days_shown,UHD_Hours));
AddData(waketime=new UsageHistoryData(machine,days_shown,UHD_Waketime));
AddData(bedtime=new UsageHistoryData(machine,days_shown,UHD_Bedtime));
AddData(leak=new HistoryCodeData(profile,CPAP_LeakMedian));
AddData(usage=new UsageHistoryData(profile,UHD_Hours));
AddData(waketime=new UsageHistoryData(profile,UHD_Waketime));
AddData(bedtime=new UsageHistoryData(profile,UHD_Bedtime));
AHI=new gGraphWindow(ScrolledWindow,-1,wxT("AHI"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
AHI->SetMargins(10,15,60,80);
@ -361,39 +348,54 @@ Summary::Summary(wxWindow *win)
//USAGE->AddLayer(new gLineChart(usage,wxGREEN));
fgSizer->Add(USAGE,1,wxEXPAND);
// Logo.LoadFile(wxT("./pic.png"));
//wxMemoryFSHandler::AddFile(_T("test.png"), Logo, wxBITMAP_TYPE_PNG);
// RefreshData();
}
Summary::~Summary()
{
wxMemoryFSHandler::RemoveFile(_T("test.png"));
}
void Summary::RefreshData(Machine *m)
void Summary::ResetProfile(Profile *p)
{
profile=p;
for (auto h=Data.begin();h!=Data.end();h++) {
(*h)->SetProfile(p);
(*h)->ResetDateRange();
}
if (profile->FirstDay().IsValid()) {
StartDatePicker->SetRange(profile->FirstDay()+wxTimeSpan::Day(),profile->LastDay()+wxTimeSpan::Day());
EndDatePicker->SetRange(profile->FirstDay()+wxTimeSpan::Day(),profile->LastDay()+wxTimeSpan::Day());
StartDatePicker->SetValue(profile->FirstDay()+wxTimeSpan::Day());
EndDatePicker->SetValue(profile->LastDay()+wxTimeSpan::Day());
}
}
void Summary::RefreshData()
{
if (!m) return;
machine=m;
for (auto h=Data.begin();h!=Data.end();h++) {
(*h)->SetMachine(m);
(*h)->Update();
}
wxString submodel=_("Unknown Model");
double ahi=ahidata->GetAverage();
double avp=pressure->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);
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>");
if (machine) {
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Machine Information")+wxT("</i></td></tr>\n");
if (machine->properties.find(wxT("SubModel"))!=machine->properties.end())
//html=html+wxT("<img src=\"memory:test.png\" width='180'>");
html=html+wxT("<table cellspacing=2 cellpadding=0>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Machine Information has been removed because this page has become machine agnostic. Not sure what to display here.")+wxT("</i></td></tr>\n");
/*if (machine->properties.find(wxT("SubModel"))!=machine->properties.end())
submodel=wxT(" <br>\n ")+machine->properties[wxT("SubModel")];
html=html+wxT("<tr><td colspan=2 align=center><b>")+machine->properties[wxT("Brand")]+wxT("</b> <br/>")+machine->properties[wxT("Model")]+wxT("&nbsp;")+machine->properties[wxT("ModelNumber")]+submodel+wxT("</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center>")+_("Firmware")+wxT(" ")+machine->properties[wxT("SoftwareVersion")]+wxT("</td></tr>");
html=html+wxT("<tr><td colspan=2 align=center>")+_("Firmware")+wxT(" ")+machine->properties[wxT("SoftwareVersion")]+wxT("</td></tr>"); */
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=left><i>")+_("Indice Averages")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("AHI")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),ahi)+wxT("</td></tr>\n");
@ -405,19 +407,66 @@ void Summary::RefreshData(Machine *m)
html=html+wxT("<tr><td><b>")+_("Waketime")+wxT("</b></td><td>")+wxString::Format(wxT("%02.0f:%02i"),wt,int(wt*60) % 60)+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Hours/Night")+wxT("</b></td><td>")+wxString::Format(wxT("%02.0f:%02i"),ua,int(ua*60)%60)+wxT("</td></tr>\n");
html=html+wxT("</table>");
} else {
html=html+_("Please import some data.");
}
html+=wxT("</body></html>");
HTMLInfo->SetPage(html);
}
void Summary::EnableDatePickers(bool b)
{
StartDatePicker->Enable(b);
sdLabel->Enable(b);
EndDatePicker->Enable(b);
edLabel->Enable(b);
}
void Summary::OnRBSelect( wxCommandEvent& event )
{
wxDateTime start=StartDatePicker->GetValue();
wxDateTime end=EndDatePicker->GetValue();
if (rbCustomDate->GetValue()) {
EnableDatePickers(true);
} else if (rbAll->GetValue()) {
start=profile->FirstDay()-wxTimeSpan::Day();
end=profile->LastDay();
} else if (rbLastMonth->GetValue()) {
end=profile->LastDay();
start=end-wxTimeSpan::Days(30);
} else if (rbLastWeek->GetValue()) {
end=profile->LastDay();
start=end-wxTimeSpan::Days(7);
}
Daily::Daily(wxWindow *win)
:DailyPanel(win)
if ((start==StartDatePicker->GetValue()) && (end==EndDatePicker->GetValue()))
return;
StartDatePicker->SetValue(start);
EndDatePicker->SetValue(end);
for (auto h=Data.begin();h!=Data.end();h++) {
(*h)->SetDateRange(start,end);
}
}
void Summary::OnStartDateChanged( wxDateEvent& event )
{
wxDateTime start=StartDatePicker->GetValue()-wxTimeSpan::Days(2);
wxDateTime end=EndDatePicker->GetValue()-wxTimeSpan::Day();
for (auto h=Data.begin();h!=Data.end();h++) {
(*h)->SetDateRange(start,end);
}
}
void Summary::OnEndDateChanged( wxDateEvent& event )
{
wxDateTime start=StartDatePicker->GetValue()-wxTimeSpan::Days(2);
wxDateTime end=EndDatePicker->GetValue()-wxTimeSpan::Day();
for (auto h=Data.begin();h!=Data.end();h++) {
(*h)->SetDateRange(start,end);
}
}
Daily::Daily(wxWindow *win,Profile *p)
:DailyPanel(win),profile(p)
{
machine=NULL;
AddData(tap_eap=new TAPData(CPAP_EAP));
AddData(tap_iap=new TAPData(CPAP_IAP));
@ -520,54 +569,53 @@ Daily::Daily(wxWindow *win)
fgSizer->Add(TAP,1,wxEXPAND);
fgSizer->Add(TAP_IAP,1,wxEXPAND);
fgSizer->Add(TAP_EAP,1,wxEXPAND);
//fgSizer->Layout();
foobar_datehack=false; // this exists due to a wxGTK bug.
// RefreshData();
ResetDate();
}
Daily::~Daily()
{
}
void Daily::RefreshData(Machine *m)
void Daily::ResetDate()
{
if (!m) return;
machine=m;
foobar_datehack=false; // this exists due to a wxGTK bug.
// RefreshData();
wxDateTime date;
if (profile->LastDay().IsValid()) {
date=profile->LastDay();
Calendar->SetDate(date);
} else {
Calendar->SetDate(wxDateTime::Today());
}
wxDateTime day=m->LastDay()+wxTimeSpan::Days(1);
Calendar->SetDate(day);
day.ResetTime();
day.SetHour(0);
//et-=wxTimeSpan::Days(1);
UpdateGraphs(day);
wxCalendarEvent ev;
ev.SetDate(day);
ev.SetDate(date);
OnCalendarMonth(ev);
OnCalendarDay(ev);
}
///usr/local/bin/upx ./bin/Windows/SleepyHead
void Daily::OnCalendarDay( wxCalendarEvent& event )
void Daily::RefreshData()
{
if (foobar_datehack) {
OnCalendarMonth(event);
foobar_datehack=false;
wxDateTime date=Calendar->GetDate();
date.ResetTime();
date.SetHour(0);
date-=wxTimeSpan::Days(1);
Day *d=NULL;
if (profile->daylist.find(date)!=profile->daylist.end()) {
vector<Day *>::iterator di;
for (di=profile->daylist[date].begin();di!=profile->daylist[date].end();di++) {
if ((*di)->machine_type()==MT_CPAP) {
d=(*di);
break;
}
if (!machine) return;
wxDateTime day=event.GetDate();
day.ResetTime();
day.SetHour(0);
day-=wxTimeSpan::Days(1);
Day *d;
if (machine && (machine->day.find(day)!=machine->day.end()) && (d=machine->day[day]) && (d->size()>0)) { // && ((d->last()-d->first())>wxTimeSpan::Minutes(15))) {
//HTMLInfo->SetPage(wxT(""));
}
}
UpdateGraphs(d);
if (d) {
CPAPMode mode=(CPAPMode)d->summary_max(CPAP_Mode);
UpdateGraphs(day);
if (mode!=MODE_BIPAP) {
TAP_EAP->Show(false);
TAP_IAP->Show(false);
TAP->Show(true);
@ -577,16 +625,9 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
TAP_EAP->Show(true);
}
//TAP_EAP->Refresh();
//TAP_IAP->Refresh();
//TAP->Refresh();
fgSizer->Layout();
// Update();
ScrolledWindow->FitInside();
//ScrolledWindow->Refresh();
// wxWindow::UpdateWindowUI();
// Session *s=(*machine->day[day])[0];
PRTypes pr=(PRTypes)d->summary_max(CPAP_PressureReliefType);
wxString epr=PressureReliefNames[pr]+wxString::Format(wxT(" x%i"),(int)d->summary_max(CPAP_PressureReliefSetting));
wxString modestr=CPAPModeNames[mode];
@ -607,15 +648,18 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
wxString html=wxT("<html><body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0><table cellspacing=2 cellpadding=0>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Machine Information")+wxT("</i></td></tr>\n");
if (machine->properties.find(wxT("SubModel"))!=machine->properties.end())
submodel=wxT(" <br>")+machine->properties[wxT("SubModel")];
html=html+wxT("<tr><td colspan=2 align=center><b>")+machine->properties[wxT("Brand")]+wxT("</b> <br>")+machine->properties[wxT("Model")]+wxT(" ")+machine->properties[wxT("ModelNumber")]+submodel+wxT("</td></tr>\n");
if (d->machine->properties.find(wxT("SubModel"))!=d->machine->properties.end())
submodel=wxT(" <br>")+d->machine->properties[wxT("SubModel")];
html=html+wxT("<tr><td colspan=2 align=center><b>")+d->machine->properties[wxT("Brand")]+wxT("</b> <br>")+d->machine->properties[wxT("Model")]+wxT(" ")+d->machine->properties[wxT("ModelNumber")]+submodel+wxT("</td></tr>\n");
if (pref.Exists("ShowSerialNumbers") && pref["ShowSerialNumbers"]) {
html=html+wxT("<tr><td colspan=2 align=center>")+d->machine->properties[wxT("Serial")]+wxT("</td></tr>\n");
}
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Sleep Times")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Date")+wxT("</b></td><td>")+machine->day[day]->first().Format(wxT("%x"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Sleep")+wxT("</b></td><td>")+machine->day[day]->first().Format(wxT("%H:%M"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Wake")+wxT("</b></td><td>")+machine->day[day]->last().Format(wxT("%H:%M"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Total Time")+wxT("</b></td><td><i>")+machine->day[day]->total_time().Format(wxT("%H:%M&nbsp;hours"))+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Date")+wxT("</b></td><td>")+d->first().Format(wxT("%x"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Sleep")+wxT("</b></td><td>")+d->first().Format(wxT("%H:%M"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Wake")+wxT("</b></td><td>")+d->last().Format(wxT("%H:%M"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Total Time")+wxT("</b></td><td><i>")+d->total_time().Format(wxT("%H:%M&nbsp;hours"))+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Indices")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("AHI")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),ahi)+wxT("</td></tr>\n");
@ -655,6 +699,10 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
html=html+wxT("<tr><td><b>")+_("Avg Leak")+wxT("</b></td><td>")+wxString::Format(wxT("%.2f"),d->summary_avg(CPAP_LeakAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
if (d->summary_avg(CPAP_BrokenSummary)==1) {
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("No System Settings Recorded")+wxT("</i></td></tr>\n");
} else {
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("System Settings")+wxT("</i></td></tr>\n");
if (mode==MODE_CPAP) {
@ -684,7 +732,7 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
str=wxString::Format(wxT("x%i"),(int)d->summary_max(PRS1_SystemResistanceSetting));
} else str=wxT("No");
html=html+wxT("<tr><td><b>")+_("Sys-Resist.")+wxT("</b></td><td>")+str+wxT("</td></tr>\n");
}
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Session Files")+wxT("</i></td></tr>\n");
for (auto i=d->begin();i!=d->end();i++) {
@ -704,21 +752,24 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
HTMLInfo->SetPage(html);
} else {
HTMLInfo->SetPage(_("No CPAP Machine Data Available"));
UpdateGraphs(wxInvalidDateTime);
}
}
void Daily::UpdateGraphs(wxDateTime d)
///usr/local/bin/upx ./bin/Windows/SleepyHead
void Daily::OnCalendarDay( wxCalendarEvent& event )
{
Day *day=NULL;
if (!machine) return;
if (d!=wxInvalidDateTime) {
if (machine->day.find(d)!=machine->day.end()) {
day=machine->day[d];
if (foobar_datehack) {
OnCalendarMonth(event);
foobar_datehack=false;
}
RefreshData();
}
for (auto g=Data.begin();g!=Data.end();g++) {
void Daily::UpdateGraphs(Day *day)
{
//if (!day) return;
for (auto g=Data.begin();g!=Data.end();g++) {
(*g)->Update(day);
}
};
@ -737,13 +788,14 @@ void Daily::OnCalendarMonth( wxCalendarEvent& event )
static wxFont f=*wxNORMAL_FONT; //wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
f.SetWeight(wxBOLD);
if (!machine) return;
//if (!machine) return;
for (int i=1;i<31;i++) {
int j=wxDateTime::GetNumberOfDays(m,y);
if (i>j) break;
wxDateTime d(i,m,y,0,0,0,0);
d-=wxTimeSpan::Days(1);
if ((machine->day.find(d)!=machine->day.end())) {
if ((profile->daylist.find(d)!=profile->daylist.end())) {
#if wxCHECK_VERSION(2,9,0)
Calendar->Mark(i,true);
#else

39
SleepyHeadMain.h
View File

@ -24,14 +24,27 @@
class Summary:public SummaryPanel
{
public:
Summary(wxWindow *win);
Summary(wxWindow *win,Profile *_profile);
virtual ~Summary();
void RefreshData();
void ResetProfile(Profile *p);
void AddData(HistoryData *d) { Data.push_back(d); };
// void SetProfile(Profile *p);
HistoryData *ahidata,*pressure,*leak,*usage,*bedtime,*waketime,*pressure_iap,*pressure_eap;
gGraphWindow *AHI,*PRESSURE,*LEAK,*USAGE;
void RefreshData(Machine *m);
void AddData(HistoryData *d) { Data.push_back(d); };
wxBitmap Logo;
protected:
Machine *machine;
virtual void OnRBSelect( wxCommandEvent& event );
virtual void OnStartDateChanged( wxDateEvent& event );
virtual void OnEndDateChanged( wxDateEvent& event );
void EnableDatePickers(bool b);
Profile *profile;
list<HistoryData *> Data;
};
@ -39,29 +52,30 @@ protected:
class Daily:public DailyPanel
{
public:
Daily(wxWindow *win);
Daily(wxWindow *win,Profile *p);
virtual ~Daily();
void RefreshData(Machine *m);
void ResetDate();
void RefreshData();
// void SetProfile(Profile *p);
protected:
virtual void OnCalendarDay( wxCalendarEvent& event );
virtual void OnCalendarMonth( wxCalendarEvent& event );
void AddData(gPointData *d) { Data.push_back(d); };
void UpdateGraphs(wxDateTime date);
void UpdateGraphs(Day *day);
bool foobar_datehack;
gPointData *tap,*tap_eap,*tap_iap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap;
gPointData *flags[10];
gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP;
Machine *machine;
Profile *profile;
list<gPointData *> Data;
};
const wxEventType wxEVT_DO_SCREENSHOT = wxNewEventType();
const wxEventType wxEVT_MACHINE_SELECTED = wxNewEventType();
const int MachineMenuID=wxID_HIGHEST;
const int ProfileMenuID=wxID_HIGHEST;
class SleepyHeadFrame: public GUIFrame
{
@ -78,9 +92,10 @@ class SleepyHeadFrame: public GUIFrame
virtual void OnImportSD(wxCommandEvent& event);
virtual void OnViewMenuDaily(wxCommandEvent& event);
virtual void OnViewMenuSummary(wxCommandEvent& event);
virtual void OnMachineSelected(wxCommandEvent& event);
virtual void OnShowSerial(wxCommandEvent& event);
virtual void OnProfileSelected(wxCommandEvent& event);
virtual void UpdateMachineMenu();
virtual void UpdateProfiles();
Summary *summary;
Daily *daily;

427
WxWizFrame.fbp
View File

@ -285,6 +285,25 @@
<event name="OnMenuSelection">OnViewMenuDaily</event>
<event name="OnUpdateUI"></event>
</object>
<object class="separator" expanded="1">
<property name="name">m_separator3</property>
<property name="permission">none</property>
</object>
<object class="wxMenuItem" expanded="1">
<property name="bitmap"></property>
<property name="checked">0</property>
<property name="enabled">1</property>
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_CHECK</property>
<property name="label">Show Serial Numbers</property>
<property name="name">ViewMenuSerial</property>
<property name="permission">protected</property>
<property name="shortcut"></property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnShowSerial</event>
<event name="OnUpdateUI"></event>
</object>
<object class="separator" expanded="1">
<property name="name">m_separator2</property>
<property name="permission">none</property>
@ -306,8 +325,8 @@
</object>
</object>
<object class="wxMenu" expanded="1">
<property name="label">&amp;Machine</property>
<property name="name">MachineMenu</property>
<property name="label">&amp;Profiles</property>
<property name="name">ProfileMenu</property>
<property name="permission">protected</property>
</object>
<object class="wxMenu" expanded="1">
@ -918,7 +937,7 @@
<property name="resize">Resizable</property>
<property name="row"></property>
<property name="show">1</property>
<property name="size">775,447</property>
<property name="size">868,599</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
@ -1142,7 +1161,7 @@
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_name"></property>
<property name="best_size">300,40</property>
<property name="best_size">570,42</property>
<property name="bg"></property>
<property name="caption">Date Range</property>
<property name="caption_visible">1</property>
@ -1162,10 +1181,10 @@
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="layer"></property>
<property name="max_size">300,40</property>
<property name="max_size">-1,42</property>
<property name="maximize_button">0</property>
<property name="maximum_size">-1,40</property>
<property name="min_size">300,40</property>
<property name="min_size">570,42</property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
@ -1220,10 +1239,98 @@
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">12</property>
<property name="flag">wxALIGN_TOP|wxLEFT|wxTOP</property>
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<object class="wxRadioButton" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_RB</property>
<property name="label">Everything</property>
<property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">rbAll</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="resize">Resizable</property>
<property name="row"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxRB_GROUP</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioButton">OnRBSelect</event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -1248,6 +1355,270 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Last Week</property>
<property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">rbLastWeek</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="resize">Resizable</property>
<property name="row"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioButton">OnRBSelect</event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Last Month</property>
<property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">rbLastMonth</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="resize">Resizable</property>
<property name="row"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioButton">OnRBSelect</event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Custom</property>
<property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">rbCustomDate</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="resize">Resizable</property>
<property name="row"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioButton">OnRBSelect</event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Start</property>
<property name="layer"></property>
<property name="max_size"></property>
@ -1257,7 +1628,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText1</property>
<property name="name">sdLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -1306,11 +1677,11 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<object class="sizeritem" expanded="0">
<property name="border">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">0</property>
<object class="wxDatePickerCtrl" expanded="1">
<object class="wxDatePickerCtrl" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -1328,7 +1699,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
@ -1355,7 +1726,7 @@
<property name="row"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxDP_DEFAULT</property>
<property name="style">wxDP_SHOWCENTURY|wxDP_SPIN</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
@ -1392,11 +1763,11 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">12</property>
<property name="flag">wxALIGN_TOP|wxLEFT|wxTOP</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -1414,7 +1785,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
@ -1430,7 +1801,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText2</property>
<property name="name">edLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -1479,11 +1850,11 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<object class="sizeritem" expanded="0">
<property name="border">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">0</property>
<object class="wxDatePickerCtrl" expanded="1">
<object class="wxDatePickerCtrl" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -1501,7 +1872,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
@ -1528,7 +1899,7 @@
<property name="row"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxDP_DEFAULT</property>
<property name="style">wxDP_SPIN</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>

115
graphs/graph.cpp
View File

@ -9,6 +9,7 @@ License: LGPL
#include <wx/dcbuffer.h>
#include <wx/log.h>
#include "graph.h"
#include "sleeplib/profiles.h"
#if !wxCHECK_VERSION(2,9,0)
wxColor zwxYELLOW=wxColor(0xb0,0xb0,0x40,0xff);
@ -819,12 +820,12 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
double xx=w.max_x - w.min_x;
double days=int(xx);
days=data->np[0];
//days=data->np[0];
/*days=0;
days=0;
for (int i=0;i<data->np[0];i++) {
if ((data->point[0][i].x > w.min_x) && (data->point[0][i].x<w.max_x)) days++;
}*/
if ((data->point[0][i].x >= w.min_x) && (data->point[0][i].x<w.max_x)) days+=1;
}
float barwidth,pxr;
float px,py;
@ -848,8 +849,8 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
int cnt=0;
for (int i=0;i<data->np[0];i++) {
//if (data->point[0][i].x < w.min_x) continue;
//if (data->point[0][i].x > w.max_x) break;
if (data->point[0][i].x < w.min_x) continue;
if (data->point[0][i].x >= w.max_x) break;
dc.SetBrush(*wxTRANSPARENT_BRUSH);
t1=px;
px+=barwidth+1;
@ -1150,11 +1151,11 @@ void gLineChart::DrawXTicks(wxDC & dc,gGraphWindow &w)
if (min_tick<=0.25/86400.0)
min_tick=0.25/86400;
} else {
} else { // Day ticks..
show_time=false;
st=st2;
min_tick=1;
double mtiks=(y+20.0)/width;
double mtiks=(x+20.0)/width;
double mt=mtiks*xx;
min_tick=mt;
if (min_tick<1) min_tick=1;
@ -1186,7 +1187,7 @@ void gLineChart::DrawXTicks(wxDC & dc,gGraphWindow &w)
int hour,minute,second,millisecond;
wxDateTime d;
for (double i=st; i<=w.max_x; i+=min_tick) { //600.0/86400.0) {
d.Set(i+2400000.5+.000001+1); // JDN vs MJD vs Rounding errors
d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors
if (show_time) {
minute=d.GetMinute();
@ -1211,11 +1212,11 @@ void gLineChart::DrawXTicks(wxDC & dc,gGraphWindow &w)
dc.DrawLine(px,py,px,py+6);
dc.GetTextExtent(fd,&x,&y);
if (!show_time) {
dc.DrawRotatedText(fd, px-(y/2)+2, py+x+14, 90);
} else {
//if (!show_time) {
// dc.DrawRotatedText(fd, px-(y/2)+2, py+x+14, 90);
//} else {
dc.DrawText(fd, px-(x/2), py+y);
}
//}
}
@ -1917,14 +1918,26 @@ void FlagData::Reload(Day *day)
m_ready=true;
}
HistoryData::HistoryData(Machine *_machine,int _days)
:gPointData(_days*2),machine(_machine),days(_days)
HistoryData::HistoryData(Profile * _profile)
:gPointData(1024),profile(_profile)
{
AddSegment(max_points);
if (profile->LastDay().IsValid()) {
real_min_x=profile->FirstDay().GetMJD()-1;
real_max_x=profile->LastDay().GetMJD()+1;
}
}
HistoryData::~HistoryData()
{
}
void HistoryData::ResetDateRange()
{
if (profile->LastDay().IsValid()) {
real_min_x=profile->FirstDay().GetMJD()-1;
real_max_x=profile->LastDay().GetMJD()+1;
}
Reload(NULL);
}
double HistoryData::Calc(Day *day)
{
return (day->count(CPAP_Obstructive)+day->count(CPAP_Hypopnea)+day->count(CPAP_ClearAirway))/day->hours();
@ -1932,27 +1945,31 @@ double HistoryData::Calc(Day *day)
void HistoryData::Reload(Day *day)
{
if (!machine) return;
auto d=machine->day.rbegin();
int i=0;
while (d!=machine->day.rend() && (i<=days)) {
d++;
i++;
}
wxDateTime date;
vc=0;
int i=0;
bool first=true;
double x,y;
max_y=0;
i=0;
do {
d--;
y=Calc(d->second);
x=d->first.GetMJD();
bool done=false;
double y;
for (int x=real_min_x;x<=real_max_x;x++) {
date.Set(x+2400000.5);
date.ResetTime();
if (profile->daylist.find(date)==profile->daylist.end()) continue;
y=0;
int z=0;
vector<Day *> & daylist=profile->daylist[date];
for (auto dd=daylist.begin(); dd!=daylist.end(); dd++) { // average any multiple data sets
Day *d=(*dd);
y=Calc(d);
z++;
}
if (z>1) y /= z;
point[vc][i].x=x;
point[vc][i].y=y;
if (first) {
max_x=x;
min_x=x;
min_y=y;
max_x=min_x=x;
max_y=min_y=y;
first=false;
}
if (y>max_y) max_y=y;
@ -1960,14 +1977,16 @@ void HistoryData::Reload(Day *day)
if (x<min_x) min_x=x;
if (x>max_x) max_x=x;
point[vc][i].x=x;
point[vc][i].y=y;
i++;
} while (d!=machine->day.rbegin() && (i<days));
if (i>max_points) {
wxLogError(wxT("max_points is not enough in HistoryData"));
done=true;
}
if (done) break;
}
np[vc]=i;
vc++;
min_y=0;
max_y=ceil(max_y);
max_x+=1;
real_min_x=min_x;
real_max_x=max_x;
real_min_y=min_y;
@ -1983,10 +2002,22 @@ double HistoryData::GetAverage()
val/=np[0];
return val;
}
void HistoryData::SetDateRange(wxDateTime start,wxDateTime end)
{
double x1=start.GetMJD()+1;
double x2=end.GetMJD()+1;
if (x1 < real_min_x) x1=real_min_x;
if (x2 > real_max_x) x2=real_max_x;
min_x=x1;
max_x=x2;
for (auto i=notify_layers.begin();i!=notify_layers.end();i++) {
(*i)->DataChanged(this);
} // Do nothing else.. Callers responsibility to Refresh window.
}
HistoryCodeData::HistoryCodeData(Machine *_machine,MachineCode _code,int _days)
:HistoryData(_machine,_days),code(_code)
HistoryCodeData::HistoryCodeData(Profile *_profile,MachineCode _code)
:HistoryData(_profile),code(_code)
{
}
HistoryCodeData::~HistoryCodeData()
@ -1997,8 +2028,8 @@ double HistoryCodeData::Calc(Day *day)
return day->summary_avg(code);
}
UsageHistoryData::UsageHistoryData(Machine *_machine,int _days,T_UHD _uhd)
:HistoryData(_machine,_days),uhd(_uhd)
UsageHistoryData::UsageHistoryData(Profile *_profile,T_UHD _uhd)
:HistoryData(_profile),uhd(_uhd)
{
}
UsageHistoryData::~UsageHistoryData()

17
graphs/graph.h
View File

@ -444,27 +444,26 @@ public:
class HistoryData:public gPointData
{
public:
HistoryData(Machine *_machine,int _days);
HistoryData(Profile * _profile);
virtual ~HistoryData();
void SetMachine(Machine *_machine) { machine=_machine; Reload(); };
Machine * GetMachine() { return machine; };
void SetDays(int i) { days=i; };
int GetDays() { return days; };
void SetProfile(Profile *_profile) { profile=_profile; Reload(); };
Profile * GetProfile() { return profile; };
double GetAverage();
virtual double Calc(Day *day);
virtual void Reload(Day *day=NULL);
virtual void ResetDateRange();
virtual void SetDateRange(wxDateTime start,wxDateTime end);
// virtual void Reload(Machine *machine=NULL);
protected:
Machine *machine;
int days;
Profile * profile;
};
class HistoryCodeData:public HistoryData
{
public:
HistoryCodeData(Machine *_machine,MachineCode _code,int _days);
HistoryCodeData(Profile *_profile,MachineCode _code);
virtual ~HistoryCodeData();
virtual double Calc(Day *day);
protected:
@ -476,7 +475,7 @@ enum T_UHD { UHD_Bedtime, UHD_Waketime, UHD_Hours };
class UsageHistoryData:public HistoryData
{
public:
UsageHistoryData(Machine *_machine,int _days,T_UHD _uhd);
UsageHistoryData(Profile *_profile,T_UHD _uhd);
virtual ~UsageHistoryData();
virtual double Calc(Day *day);
protected:

41
libs/sleeplib/machine.cpp
View File

@ -53,12 +53,14 @@ const map<MachineCode,wxColour> DefaultFlagColours= {
{PRS1_PressurePulse,wxColour(0xff,0x40,0xff,flagalpha)}
};
map<CPAPMode,wxString> CPAPModeNames={
{MODE_UNKNOWN,wxT("Undetermined")},
{MODE_CPAP,wxT("CPAP")},
{MODE_APAP,wxT("APAP")},
{MODE_BIPAP,wxT("BIPAP")},
{MODE_ASV,wxT("ASV")}
};
map<PRTypes,wxString> PressureReliefNames={
{PR_UNKNOWN,_("Undetermined")},
{PR_NONE,_("None")},
{PR_CFLEX,wxT("C-Flex")},
{PR_CFLEXPLUS,wxT("C-Flex+")},
@ -137,7 +139,7 @@ Session *Machine::SessionExists(SessionID session)
return NULL;
}
}
void Machine::AddSession(Session *s)
Day *Machine::AddSession(Session *s,Profile *p)
{
wxDateTime date=s->first();
date.ResetTime();
@ -156,11 +158,11 @@ void Machine::AddSession(Session *s)
ok=true;
}
}
} else {
} else { // No day record yesterday
wxDateTime t=s->first();
t.ResetTime();
wxTimeSpan j=s->first()-t;
if (j<wxTimeSpan::Hours(6)) {
if (j<wxTimeSpan::Hours(12)) {
ok=true;
}
}
@ -169,22 +171,8 @@ void Machine::AddSession(Session *s)
date+=wxTimeSpan::Day();
}
sessionlist[s->session()]=s;
/* wxDateTime s1=s->first();
wxDateTime s2=s->last();
if (s1==s2) return; // leave this session out of daylist.. it's dodgy. DELETE?
wxDateTime date,d1=s1;
date=d1;
d1.SetHour(15);
if (s1<d1) {
date-=wxTimeSpan::Hours(24);
} */
if (!firstsession) {
if (firstday>date) firstday=date;
if (lastday<date) lastday=date;
@ -193,12 +181,13 @@ void Machine::AddSession(Session *s)
firstsession=false;
}
if (day.find(date)==day.end()) {
day[date]=new Day();
//wxLogMessage(wxT("Creating Day ")+date.Format()+wxT(" to store ")+s1.Format());
day[date]=new Day(this);
p->AddDay(date,day[date]);
}
//wxLogMessage(wxT("Using Day ")+date.Format()+wxT(" to store ")+s1.Format()+wxT(" ")+s2.Format());
day[date]->AddSession(s);
return day[date];
}
bool Machine::Load()
@ -239,7 +228,7 @@ bool Machine::Load()
// wxPrintf(s+wxT(" O=%i H=%i CA=%i \n"),sess->summary[CPAP_Obstructive].GetLong(),sess->summary[CPAP_Hypopnea].GetLong(),sess->summary[CPAP_ClearAirway].GetLong());
sess->LoadEvents(s->second[1]);
sess->LoadWaveforms(s->second[2]);
AddSession(sess);
AddSession(sess,profile);
} else {
delete sess;
}
@ -262,7 +251,8 @@ bool Machine::Save()
//////////////////////////////////////////////////////////////////////////////////////////
// Day Class implmementation
//////////////////////////////////////////////////////////////////////////////////////////
Day::Day()
Day::Day(Machine *m)
:machine(m)
{
d_firstsession=true;
sessions.clear();
@ -271,6 +261,11 @@ Day::~Day()
{
}
MachineType Day::machine_type()
{
return machine->GetType();
};
void Day::AddSession(Session *s)
{
if (!s) {
@ -758,7 +753,7 @@ double Session::weighted_avg_event_field(MachineCode mc,int field)
void Session::AddEvent(Event * e)
{
events[e->code()].push_back(e);
// if (e->time()>s_last) s_last=e->time();
if (e->time()>s_last) s_last=e->time();
// wxLogMessage(e->time().Format(wxT("%Y-%m-%d %H:%M:%S"))+wxString::Format(wxT(" %04i %02i "),e->code(),e->fields()));
}
void Session::AddWaveform(Waveform *w)

13
libs/sleeplib/machine.h
View File

@ -47,7 +47,7 @@ wxInt16 {
CPAP_PressureMaxAchieved, CPAP_PressurePercentValue, CPAP_PressurePercentName, CPAP_PressureAverage, CPAP_PressureMedian,
CPAP_LeakMedian,CPAP_LeakMinimum,CPAP_LeakMaximum,CPAP_LeakAverage,CPAP_Duration,
BIPAP_EAPAverage,BIPAP_IAPAverage,BIPAP_EAPMin,BIPAP_EAPMax,BIPAP_IAPMin,BIPAP_IAPMax,
BIPAP_EAPAverage,BIPAP_IAPAverage,BIPAP_EAPMin,BIPAP_EAPMax,BIPAP_IAPMin,BIPAP_IAPMax,CPAP_BrokenSummary,
// PRS1 Specific Codes
PRS1_PressurePulse=0x1000, PRS1_VSnore2,
@ -61,11 +61,11 @@ short { FT_BAR, FT_DOT, FT_SPAN };
enum CPAPMode:
short {
MODE_CPAP=0,MODE_APAP,MODE_BIPAP,MODE_ASV
MODE_UNKNOWN=0,MODE_CPAP,MODE_APAP,MODE_BIPAP,MODE_ASV
};
enum PRTypes:
short {
PR_NONE=0,PR_CFLEX,PR_CFLEXPLUS,PR_AFLEX,PR_BIFLEX,PR_EPR,PR_SMARTFLEX
PR_UNKNOWN=0,PR_NONE,PR_CFLEX,PR_CFLEXPLUS,PR_AFLEX,PR_BIFLEX,PR_EPR,PR_SMARTFLEX
};
extern map<MachineCode,wxString> DefaultMCShortNames;
@ -81,14 +81,16 @@ typedef float EventDataType;
class Session;
class Profile;
class Machine;
class Day
{
public:
Day();
Day(Machine *m);
~Day();
void AddSession(Session *s);
MachineType machine_type();
EventDataType min(MachineCode code,int field=0);
EventDataType max(MachineCode code,int field=0);
@ -117,6 +119,7 @@ public:
vector<Session *>::iterator end() { return sessions.end(); };
size_t size() { return sessions.size(); };
Machine *machine;
protected:
vector<Session *> sessions;
@ -141,7 +144,7 @@ public:
map<wxString,wxString> properties;
Session * SessionExists(SessionID session);
void AddSession(Session *s);
Day *AddSession(Session *s,Profile *p);
void SetClass(wxString t) {
m_class=t;

16
libs/sleeplib/profiles.cpp
View File

@ -22,12 +22,15 @@ Preferences *p_pref;
Preferences *p_layout;
Profile::Profile()
:Preferences(),is_first_day(true)
{
p_name=wxT("Profile");
p_path=pref.Get("{home}{sep}Profiles");
machlist.clear();
m_first=m_last=wxInvalidDateTime;
}
Profile::Profile(wxString path)
:Preferences(),is_first_day(true)
{
const wxString xmlext=wxT(".xml");
p_name=wxT("Profile");
@ -38,6 +41,7 @@ Profile::Profile(wxString path)
if (!p_path.EndsWith(sep)) p_path+=sep;
p_filename=p_path+p_name+xmlext;
machlist.clear();
m_first=m_last=wxInvalidDateTime;
}
Profile::~Profile()
@ -119,6 +123,18 @@ TiXmlElement * Profile::ExtraSave()
}
void Profile::AddDay(wxDateTime date,Day *day) {
//date+=wxTimeSpan::Day();
if (is_first_day) {
m_first=m_last=date;
is_first_day=false;
}
if (m_first>date) m_first=date;
if (m_last<date) m_last=date;
daylist[date].push_back(day);
}
/**
* @brief Import Machine Data
* @param path

11
libs/sleeplib/profiles.h
View File

@ -31,15 +31,26 @@ public:
Profile();
virtual ~Profile();
bool is_first_day;
map<MachineID,Machine *> machlist;
void AddMachine(Machine *m);
void LoadMachineData();
void Import(wxString path);
void AddDay(wxDateTime date,Day *day);
vector<Machine *> GetMachines(MachineType t);
Machine * GetMachine(MachineType t,wxDateTime date);
virtual void ExtraLoad(TiXmlHandle *root);
virtual TiXmlElement * ExtraSave();
map<wxDateTime,vector<Day *> > daylist;
const wxDateTime & FirstDay() { return m_first; };
const wxDateTime & LastDay() { return m_last; };
protected:
wxDateTime m_first,m_last;
};
extern Preferences *p_pref;

40
libs/sleeplib/prs1_loader.cpp
View File

@ -127,7 +127,7 @@ bool PRS1Loader::Open(wxString & path,Profile *profile)
wxString s=*sn;
m=CreateMachine(s,profile);
if (m) OpenMachine(m,newpath+wxFileName::GetPathSeparator()+(*sn));
if (m) OpenMachine(m,newpath+wxFileName::GetPathSeparator()+(*sn),profile);
}
return PRS1List.size();
@ -174,7 +174,7 @@ bool PRS1Loader::ParseProperties(Machine *m,wxString filename)
return true;
}
int PRS1Loader::OpenMachine(Machine *m,wxString path)
int PRS1Loader::OpenMachine(Machine *m,wxString path,Profile *profile)
{
wxLogDebug(wxT("Opening PRS1 ")+path);
@ -267,18 +267,17 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path)
wxLogWarning(wxT("PRS1Loader: Couldn't open event file ")+s->second[1]);
}
}
const double ignore_thresh=300.0/3600.0;// Ignore useless sessions under 5 minute
if (sess->hours()<=ignore_thresh) {
delete sess;
continue;
}
m->AddSession(sess);
if (!s->second[2].IsEmpty()) {
if (!OpenWaveforms(sess,s->second[2])) {
wxLogWarning(wxT("PRS1Loader: Couldn't open event file ")+s->second[2]);
}
}
const double ignore_thresh=300.0/3600.0;// Ignore useless sessions under 5 minute
if (sess->hours()<=ignore_thresh) {
delete sess;
continue;
}
m->AddSession(sess,profile);
if (sess->summary.find(CPAP_Obstructive)!=sess->summary.end()) {
sess->summary[CPAP_Obstructive]=(long)sess->count_events(CPAP_Obstructive);
@ -309,13 +308,24 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path)
sess->summary[BIPAP_EAPAverage]=sess->weighted_avg_event_field(CPAP_EAP,0);
sess->summary[BIPAP_EAPMin]=sess->min_event_field(CPAP_EAP,0);
sess->summary[BIPAP_EAPMax]=sess->max_event_field(CPAP_EAP,0);
} else {
sess->summary[CPAP_PressureMedian]=sess->avg_event_field(CPAP_Pressure,0);
sess->summary[CPAP_PressureAverage]=sess->weighted_avg_event_field(CPAP_Pressure,0);
sess->summary[CPAP_PressureMinAchieved]=sess->min_event_field(CPAP_Pressure,0);
sess->summary[CPAP_PressureMaxAchieved]=sess->max_event_field(CPAP_Pressure,0);
if (sess->summary.find(CPAP_PressureMin)==sess->summary.end()) {
sess->summary[CPAP_BrokenSummary]=true;
sess->set_last(sess->first());
if (sess->summary[CPAP_PressureMinAchieved]==sess->summary[CPAP_PressureMaxAchieved]) {
sess->summary[CPAP_Mode]=(long)MODE_CPAP;
} else {
sess->summary[CPAP_Mode]=(long)MODE_UNKNOWN;
}
sess->summary[CPAP_PressureReliefType]=(long)PR_UNKNOWN;
}
}
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..
@ -358,8 +368,7 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
if (ext!=1)
return false;
if (size<0x30)
return false;
//size|=(header[3]<<16) | (header[4]<<24); // the jury is still out on the 32bitness of one. doesn't matter here anyway.
size-=(hl+2);
@ -368,6 +377,11 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
if (sum!=header[hl-1])
return false;
if (size<=19) {
wxLogWarning(wxT("Ignoring short session file ")+filename);
return false;
}
wxDateTime date(timestamp);
//wxDateTime tmpdate=date;
//wxLogMessage(date.Format()+wxT(" UTC=")+tmpdate.Format());
@ -381,6 +395,8 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
if (br<size) {
return false;
}
if (size<0x30)
return true;
session->set_first(date);
session->set_last(date);

2
libs/sleeplib/prs1_loader.h
View File

@ -37,7 +37,7 @@ public:
protected:
wxString last;
map<wxString,Machine *> PRS1List;
int OpenMachine(Machine *m,wxString path);
int OpenMachine(Machine *m,wxString path,Profile *profile);
bool ParseProperties(Machine *m,wxString filename);
bool OpenSummary(Session *session,wxString filename);
bool OpenEvents(Session *session,wxString filename);

12
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 = 1951;
static const long REVISION = 5273;
static const long BUILD = 2233;
static const long REVISION = 6877;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 6389;
#define RC_FILEVERSION 0,7,1951,5273
#define RC_FILEVERSION_STRING "0, 7, 1951, 5273\0"
static const char FULLVERSION_STRING[] = "0.7.1951.5273";
static const long BUILDS_COUNT = 7025;
#define RC_FILEVERSION 0,7,2233,6877
#define RC_FILEVERSION_STRING "0, 7, 2233, 6877\0"
static const char FULLVERSION_STRING[] = "0.7.2233.6877";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;