From 3fdd240428efa7ce5594592a85d6aed295ec4e58 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 30 May 2011 23:11:29 +1000 Subject: [PATCH] Implemented abort on multiple machine day records of the same type. Also, Session data was not being freed. --- GUIFrame.cpp | 10 +++++----- SleepyHead.depend | 17 +++++++++-------- SleepyHeadMain.cpp | 4 ++-- WxWizFrame.fbp | 16 ++++++++-------- libs/sleeplib/machine.cpp | 5 ++++- libs/sleeplib/machine.h | 4 ++++ libs/sleeplib/profiles.cpp | 15 ++++++++++++++- libs/sleeplib/profiles.h | 3 ++- libs/sleeplib/prs1_loader.cpp | 14 ++++++++++---- version.h | 12 ++++++------ 10 files changed, 64 insertions(+), 36 deletions(-) diff --git a/GUIFrame.cpp b/GUIFrame.cpp index 76936a25..a4132bb7 100644 --- a/GUIFrame.cpp +++ b/GUIFrame.cpp @@ -184,8 +184,8 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, ScrolledWindow->Layout(); 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( 570,42 ) ).MinSize( wxSize( 570,42 ) ).MaxSize( wxSize( -1,42 ) ) ); + m_panel1->SetMaxSize( wxSize( -1,42 ) ); + 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 ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Position( 1 ).BestSize( wxSize( 570,42 ) ).MinSize( wxSize( 570,42 ) ).MaxSize( wxSize( -1,42 ) ) ); wxBoxSizer* bSizer1; bSizer1 = new wxBoxSizer( wxHORIZONTAL ); @@ -197,10 +197,10 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, 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|wxALL, 0 ); + bSizer1->Add( rbLastMonth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); rbCustomDate = new wxRadioButton( m_panel1, wxID_ANY, _("Custom"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer1->Add( rbCustomDate, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 ); + bSizer1->Add( rbCustomDate, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); sdLabel = new wxStaticText( m_panel1, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0 ); sdLabel->Wrap( -1 ); @@ -208,7 +208,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_SHOWCENTURY|wxDP_SPIN ); + StartDatePicker = new wxDatePickerCtrl( m_panel1, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_SPIN ); StartDatePicker->Enable( false ); bSizer1->Add( StartDatePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 ); diff --git a/SleepyHead.depend b/SleepyHead.depend index efb56c97..8af1204c 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7785,7 +7785,7 @@ "wx/progdlg.h" "wx/dialog.h" -1306753008 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp +1306758595 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp "wx/wxprec.h" "GUIFrame.h" @@ -7837,7 +7837,7 @@ "sleeplib/machine.h" "graphs/graph.h" -1306726896 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h +1306759276 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h @@ -7875,7 +7875,7 @@ -1306756665 /home/mark/projects/git/sleepyhead/version.h +1306761075 /home/mark/projects/git/sleepyhead/version.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7885,14 +7885,14 @@ 1306415040 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.h "profiles.h" -1306754109 /home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.h +1306759480 /home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.h "machine.h" "preferences.h" "tinyxml/tinyxml.h" -1306756567 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306758522 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7923,7 +7923,7 @@ -1306753649 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp +1306760870 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp @@ -7944,7 +7944,7 @@ "preferences.h" -1306755802 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp +1306759549 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp @@ -7956,7 +7956,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1306724998 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp +1306760452 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp @@ -7965,6 +7965,7 @@ + "prs1_loader.h" diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 0a57fe06..ddc23ac4 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -355,7 +355,7 @@ Summary::Summary(wxWindow *win,Profile *_profile) } Summary::~Summary() { - wxMemoryFSHandler::RemoveFile(_T("test.png")); +// wxMemoryFSHandler::RemoveFile(_T("test.png")); } void Summary::ResetProfile(Profile *p) { @@ -582,7 +582,7 @@ void Daily::ResetDate() // RefreshData(); wxDateTime date; if (profile->LastDay().IsValid()) { - date=profile->LastDay(); + date=profile->LastDay()+wxTimeSpan::Day(); Calendar->SetDate(date); } else { Calendar->SetDate(wxDateTime::Today()); diff --git a/WxWizFrame.fbp b/WxWizFrame.fbp index 438a32dc..1f02ab81 100644 --- a/WxWizFrame.fbp +++ b/WxWizFrame.fbp @@ -1157,8 +1157,8 @@ 1 - 1 - 1 + 0 + 0 1 570,42 @@ -1183,7 +1183,7 @@ -1,42 0 - -1,40 + -1,42 570,42 0 @@ -1415,8 +1415,8 @@ - 0 - wxALIGN_CENTER_VERTICAL|wxALL + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1503,8 +1503,8 @@ - 0 - wxALIGN_CENTER_VERTICAL|wxALL + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -1726,7 +1726,7 @@ 1 - wxDP_SHOWCENTURY|wxDP_SPIN + wxDP_SPIN 0 diff --git a/libs/sleeplib/machine.cpp b/libs/sleeplib/machine.cpp index 7762c3ca..8a46c541 100644 --- a/libs/sleeplib/machine.cpp +++ b/libs/sleeplib/machine.cpp @@ -182,7 +182,7 @@ Day *Machine::AddSession(Session *s,Profile *p) } if (day.find(date)==day.end()) { day[date]=new Day(this); - p->AddDay(date,day[date]); + p->AddDay(date,day[date],m_type); } day[date]->AddSession(s); @@ -259,6 +259,9 @@ Day::Day(Machine *m) } Day::~Day() { + for (auto s=sessions.begin();s!=sessions.end();s++) { + delete (*s); + } } MachineType Day::machine_type() diff --git a/libs/sleeplib/machine.h b/libs/sleeplib/machine.h index a4f1be73..d851c335 100644 --- a/libs/sleeplib/machine.h +++ b/libs/sleeplib/machine.h @@ -83,6 +83,10 @@ class Session; class Profile; class Machine; +class OneTypePerDay +{ +}; + class Day { public: diff --git a/libs/sleeplib/profiles.cpp b/libs/sleeplib/profiles.cpp index acd04ba6..72d247e6 100644 --- a/libs/sleeplib/profiles.cpp +++ b/libs/sleeplib/profiles.cpp @@ -98,6 +98,10 @@ void Profile::AddMachine(Machine *m) { assert(m!=NULL); machlist[m->id()]=m; }; +void Profile::DelMachine(Machine *m) { + assert(m!=NULL); + machlist.erase(m->id()); +}; TiXmlElement * Profile::ExtraSave() { @@ -123,7 +127,7 @@ TiXmlElement * Profile::ExtraSave() } -void Profile::AddDay(wxDateTime date,Day *day) { +void Profile::AddDay(wxDateTime date,Day *day,MachineType mt) { //date+=wxTimeSpan::Day(); if (is_first_day) { m_first=m_last=date; @@ -131,6 +135,15 @@ void Profile::AddDay(wxDateTime date,Day *day) { } if (m_first>date) m_first=date; if (m_last & dl=daylist[date]; + for (auto a=dl.begin();a!=dl.end();a++) { + if ((*a)->machine->GetType()==mt) { + throw OneTypePerDay(); + } + } + daylist[date].push_back(day); } diff --git a/libs/sleeplib/profiles.h b/libs/sleeplib/profiles.h index 233c6e9b..23c2e1a4 100644 --- a/libs/sleeplib/profiles.h +++ b/libs/sleeplib/profiles.h @@ -34,10 +34,11 @@ public: bool is_first_day; map machlist; void AddMachine(Machine *m); + void DelMachine(Machine *m); void LoadMachineData(); void Import(wxString path); - void AddDay(wxDateTime date,Day *day); + void AddDay(wxDateTime date,Day *day,MachineType mt); vector GetMachines(MachineType t); Machine * GetMachine(MachineType t,wxDateTime date); diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp index a0659a00..fe440762 100644 --- a/libs/sleeplib/prs1_loader.cpp +++ b/libs/sleeplib/prs1_loader.cpp @@ -14,7 +14,7 @@ License: GPL #include #include #include - +#include #include #include "prs1_loader.h" @@ -126,13 +126,19 @@ bool PRS1Loader::Open(wxString & path,Profile *profile) for (sn=SerialNumbers.begin(); sn!=SerialNumbers.end(); sn++) { wxString s=*sn; m=CreateMachine(s,profile); - - if (m) OpenMachine(m,newpath+wxFileName::GetPathSeparator()+(*sn),profile); + try { + if (m) OpenMachine(m,newpath+wxFileName::GetPathSeparator()+(*sn),profile); + } catch(OneTypePerDay e) { + profile->DelMachine(m); + PRS1List.erase(s); + wxMessageBox(_("This Machine Record cannot be imported in this profile.\nThe Day records overlap with already existing content."),_("Import Error"),wxOK|wxCENTER); + delete m; + } } return PRS1List.size(); - return c; + // return c; } bool PRS1Loader::ParseProperties(Machine *m,wxString filename) { diff --git a/version.h b/version.h index eb674661..99ab846b 100644 --- a/version.h +++ b/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 2233; - static const long REVISION = 6877; + static const long BUILD = 2249; + static const long REVISION = 6961; //Miscellaneous Version Types - 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"; + static const long BUILDS_COUNT = 7077; + #define RC_FILEVERSION 0,7,2249,6961 + #define RC_FILEVERSION_STRING "0, 7, 2249, 6961\0" + static const char FULLVERSION_STRING[] = "0.7.2249.6961"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;