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

Profile::GetDay and related fixes

Browse Source
This commit is contained in:
Mark Watkins 2012-01-08 13:29:22 +10:00
parent 7ecbced115
commit c7fa1c408c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SleepLib/profiles.cpp
View File

@ -231,6 +231,10 @@ QDomElement Profile::ExtraSave(QDomDocument & doc)
#include <QMessageBox> #include <QMessageBox>
void Profile::AddDay(QDate date,Day *day,MachineType mt) { void Profile::AddDay(QDate date,Day *day,MachineType mt) {
//date+=wxTimeSpan::Day(); //date+=wxTimeSpan::Day();
if (!day) {
qDebug() << "Profile::AddDay called with null day object";
return;
}
if (is_first_day) { if (is_first_day) {
m_first=m_last=date; m_first=m_last=date;
is_first_day=false; is_first_day=false;
@ -282,17 +286,21 @@ Day * Profile::GetGoodDay(QDate date,MachineType type)
Day * Profile::GetDay(QDate date,MachineType type) Day * Profile::GetDay(QDate date,MachineType type)
{ {
Day *day=NULL; Day *tmp,*day=NULL;
// profile-> why did I d that??
if (daylist.find(date)!=daylist.end()) { if (daylist.find(date)!=daylist.end()) {
for (QList<Day *>::iterator di=daylist[date].begin();di!=daylist[date].end();di++) { for (QList<Day *>::iterator di=daylist[date].begin();di!=daylist[date].end();di++) {
tmp=*di;
if (!tmp) {
qDebug() << "This should never happen in Profile::GetDay()";
break;
}
if (type==MT_UNKNOWN) { // Who cares.. We just want to know there is data available. if (type==MT_UNKNOWN) { // Who cares.. We just want to know there is data available.
day=(*di); day=tmp;
break; break;
} }
if ((*di)->machine_type()==type) { if ((*di)->machine_type()==type) {
day=(*di); day=tmp;
break; break;
} }
} }

3
mainwindow.cpp
View File

@ -2311,7 +2311,8 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
if ((*it)==day) break; if ((*it)==day) break;
} }
if (it!=dl.end()) { if (it!=dl.end()) {
PROFILE.daylist[date].erase(it); dl.erase(it);
//PROFILE.daylist[date]. // ??
delete day; delete day;
} }
} }