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

Implemented abort on multiple machine day records of the same type.

Browse Source 
Also, Session data was not being freed.
This commit is contained in:
Mark Watkins 2011-05-30 23:11:29 +10:00
parent 19c229c7b1
commit 3fdd240428
10 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GUIFrame.cpp
View File

@ -184,8 +184,8 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos,
ScrolledWindow->Layout(); ScrolledWindow->Layout();
fgSizer->Fit( ScrolledWindow ); fgSizer->Fit( ScrolledWindow );
m_panel1 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panel1 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_panel1->SetMaxSize( wxSize( -1,40 ) ); 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 ).Row( 0 ).Position( 1 ).BestSize( wxSize( 570,42 ) ).MinSize( wxSize( 570,42 ) ).MaxSize( 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; wxBoxSizer* bSizer1;
bSizer1 = new wxBoxSizer( wxHORIZONTAL ); 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 ); bSizer1->Add( rbLastWeek, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
rbLastMonth = new wxRadioButton( m_panel1, wxID_ANY, _("Last Month"), wxDefaultPosition, wxDefaultSize, 0 ); 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 ); 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 = new wxStaticText( m_panel1, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0 );
sdLabel->Wrap( -1 ); 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 ); 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 ); StartDatePicker->Enable( false );
bSizer1->Add( StartDatePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 ); bSizer1->Add( StartDatePicker, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );

17
SleepyHead.depend
View File

@ -7785,7 +7785,7 @@
"wx/progdlg.h" "wx/progdlg.h"
"wx/dialog.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" "wx/wxprec.h"
<wx/wx.h> <wx/wx.h>
"GUIFrame.h" "GUIFrame.h"
@ -7837,7 +7837,7 @@
"sleeplib/machine.h" "sleeplib/machine.h"
"graphs/graph.h" "graphs/graph.h"
1306726896 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h 1306759276 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
<wx/string.h> <wx/string.h>
<wx/variant.h> <wx/variant.h>
<wx/dir.h> <wx/dir.h>
@ -7875,7 +7875,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7885,14 +7885,14 @@
1306415040 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.h 1306415040 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.h
"profiles.h" "profiles.h"
1306754109 /home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.h 1306759480 /home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.h
<wx/string.h> <wx/string.h>
<map> <map>
"machine.h" "machine.h"
"preferences.h" "preferences.h"
"tinyxml/tinyxml.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" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -7923,7 +7923,7 @@
<wx/ffile.h> <wx/ffile.h>
<wx/utils.h> <wx/utils.h>
1306753649 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp 1306760870 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
<tr1/random> <tr1/random>
<wx/colour.h> <wx/colour.h>
<wx/log.h> <wx/log.h>
@ -7944,7 +7944,7 @@
<wx/stdpaths.h> <wx/stdpaths.h>
"preferences.h" "preferences.h"
1306755802 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp 1306759549 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp
<wx/filefn.h> <wx/filefn.h>
<wx/filename.h> <wx/filename.h>
<wx/utils.h> <wx/utils.h>
@ -7956,7 +7956,7 @@
"machine_loader.h" "machine_loader.h"
"tinyxml/tinyxml.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
<wx/dir.h> <wx/dir.h>
<wx/filename.h> <wx/filename.h>
<wx/ffile.h> <wx/ffile.h>
@ -7965,6 +7965,7 @@
<wx/datetime.h> <wx/datetime.h>
<wx/log.h> <wx/log.h>
<wx/progdlg.h> <wx/progdlg.h>
<wx/msgdlg.h>
<initializer_list> <initializer_list>
"prs1_loader.h" "prs1_loader.h"

4
SleepyHeadMain.cpp
View File

@ -355,7 +355,7 @@ Summary::Summary(wxWindow *win,Profile *_profile)
} }
Summary::~Summary() Summary::~Summary()
{ {
wxMemoryFSHandler::RemoveFile(_T("test.png")); // wxMemoryFSHandler::RemoveFile(_T("test.png"));
} }
void Summary::ResetProfile(Profile *p) void Summary::ResetProfile(Profile *p)
{ {
@ -582,7 +582,7 @@ void Daily::ResetDate()
// RefreshData(); // RefreshData();
wxDateTime date; wxDateTime date;
if (profile->LastDay().IsValid()) { if (profile->LastDay().IsValid()) {
date=profile->LastDay(); date=profile->LastDay()+wxTimeSpan::Day();
Calendar->SetDate(date); Calendar->SetDate(date);
} else { } else {
Calendar->SetDate(wxDateTime::Today()); Calendar->SetDate(wxDateTime::Today());

16
WxWizFrame.fbp
View File

@ -1157,8 +1157,8 @@
</object> </object>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">0</property>
<property name="RightDockable">1</property> <property name="RightDockable">0</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size">570,42</property> <property name="best_size">570,42</property>
@ -1183,7 +1183,7 @@
<property name="layer"></property> <property name="layer"></property>
<property name="max_size">-1,42</property> <property name="max_size">-1,42</property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size">-1,40</property> <property name="maximum_size">-1,42</property>
<property name="min_size">570,42</property> <property name="min_size">570,42</property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
@ -1415,8 +1415,8 @@
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">0</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxRadioButton" expanded="1"> <object class="wxRadioButton" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1503,8 +1503,8 @@
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">0</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxRadioButton" expanded="1"> <object class="wxRadioButton" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1726,7 +1726,7 @@
<property name="row"></property> <property name="row"></property>
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxDP_SHOWCENTURY|wxDP_SPIN</property> <property name="style">wxDP_SPIN</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="toolbar_pane">0</property> <property name="toolbar_pane">0</property>
<property name="tooltip"></property> <property name="tooltip"></property>

5
libs/sleeplib/machine.cpp
View File

@ -182,7 +182,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
} }
if (day.find(date)==day.end()) { if (day.find(date)==day.end()) {
day[date]=new Day(this); day[date]=new Day(this);
p->AddDay(date,day[date]); p->AddDay(date,day[date],m_type);
} }
day[date]->AddSession(s); day[date]->AddSession(s);
@ -259,6 +259,9 @@ Day::Day(Machine *m)
} }
Day::~Day() Day::~Day()
{ {
for (auto s=sessions.begin();s!=sessions.end();s++) {
delete (*s);
}
} }
MachineType Day::machine_type() MachineType Day::machine_type()

4
libs/sleeplib/machine.h
View File

@ -83,6 +83,10 @@ class Session;
class Profile; class Profile;
class Machine; class Machine;
class OneTypePerDay
{
};
class Day class Day
{ {
public: public:

15
libs/sleeplib/profiles.cpp
View File

@ -98,6 +98,10 @@ void Profile::AddMachine(Machine *m) {
assert(m!=NULL); assert(m!=NULL);
machlist[m->id()]=m; machlist[m->id()]=m;
}; };
void Profile::DelMachine(Machine *m) {
assert(m!=NULL);
machlist.erase(m->id());
};
TiXmlElement * Profile::ExtraSave() 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(); //date+=wxTimeSpan::Day();
if (is_first_day) { if (is_first_day) {
m_first=m_last=date; 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_first>date) m_first=date;
if (m_last<date) m_last=date; if (m_last<date) m_last=date;
// Check for any other machines of same type.. Throw an exception if one already exists.
vector<Day *> & dl=daylist[date];
for (auto a=dl.begin();a!=dl.end();a++) {
if ((*a)->machine->GetType()==mt) {
throw OneTypePerDay();
}
}
daylist[date].push_back(day); daylist[date].push_back(day);
} }

3
libs/sleeplib/profiles.h
View File

@ -34,10 +34,11 @@ public:
bool is_first_day; bool is_first_day;
map<MachineID,Machine *> machlist; map<MachineID,Machine *> machlist;
void AddMachine(Machine *m); void AddMachine(Machine *m);
void DelMachine(Machine *m);
void LoadMachineData(); void LoadMachineData();
void Import(wxString path); void Import(wxString path);
void AddDay(wxDateTime date,Day *day); void AddDay(wxDateTime date,Day *day,MachineType mt);
vector<Machine *> GetMachines(MachineType t); vector<Machine *> GetMachines(MachineType t);
Machine * GetMachine(MachineType t,wxDateTime date); Machine * GetMachine(MachineType t,wxDateTime date);

12
libs/sleeplib/prs1_loader.cpp
View File

@ -14,7 +14,7 @@ License: GPL
#include <wx/datetime.h> #include <wx/datetime.h>
#include <wx/log.h> #include <wx/log.h>
#include <wx/progdlg.h> #include <wx/progdlg.h>
#include <wx/msgdlg.h>
#include <initializer_list> #include <initializer_list>
#include "prs1_loader.h" #include "prs1_loader.h"
@ -126,13 +126,19 @@ bool PRS1Loader::Open(wxString & path,Profile *profile)
for (sn=SerialNumbers.begin(); sn!=SerialNumbers.end(); sn++) { for (sn=SerialNumbers.begin(); sn!=SerialNumbers.end(); sn++) {
wxString s=*sn; wxString s=*sn;
m=CreateMachine(s,profile); m=CreateMachine(s,profile);
try {
if (m) OpenMachine(m,newpath+wxFileName::GetPathSeparator()+(*sn),profile); 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 PRS1List.size();
return c; // return c;
} }
bool PRS1Loader::ParseProperties(Machine *m,wxString filename) bool PRS1Loader::ParseProperties(Machine *m,wxString filename)
{ {

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 2233; static const long BUILD = 2249;
static const long REVISION = 6877; static const long REVISION = 6961;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 7025; static const long BUILDS_COUNT = 7077;
#define RC_FILEVERSION 0,7,2233,6877 #define RC_FILEVERSION 0,7,2249,6961
#define RC_FILEVERSION_STRING "0, 7, 2233, 6877\0" #define RC_FILEVERSION_STRING "0, 7, 2249, 6961\0"
static const char FULLVERSION_STRING[] = "0.7.2233.6877"; static const char FULLVERSION_STRING[] = "0.7.2249.6961";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62; static const long BUILD_HISTORY = 62;