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

Fix to the last thing

Browse Source
This commit is contained in:
Mark Watkins 2011-07-03 19:13:54 +10:00
parent c9d3c5fbe7
commit f7db127257
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -240,8 +240,8 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile)
for (int i=0;i<flist.size();i++) { for (int i=0;i<flist.size();i++) {
QFileInfo fi=flist.at(i); QFileInfo fi=flist.at(i);
QString ext_s=fi.fileName().section(".",-1); //AfterLast(wxChar('.')); QString ext_s=fi.fileName().section(".",-1);
QString session_s=fi.fileName().section(".",0,-2); //BeforeLast(wxChar('.')); QString session_s=fi.fileName().section(".",0,-2);
ext=ext_s.toLong(&ok); ext=ext_s.toLong(&ok);
if (!ok) continue; if (!ok) continue;
@ -277,6 +277,8 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile)
if (s->second[0].isEmpty()) continue; if (s->second[0].isEmpty()) continue;
Session *sess=new Session(m,session); Session *sess=new Session(m,session);
if (session==0x112)
int q=0;
if (!OpenSummary(sess,s->second[0])) { if (!OpenSummary(sess,s->second[0])) {
qWarning() << "PRS1Loader: Could'nt open summary file " << s->second[0]; qWarning() << "PRS1Loader: Could'nt open summary file " << s->second[0];

11
SleepLib/machine.cpp
View File

@ -236,13 +236,20 @@ Day *Machine::AddSession(Session *s,Profile *p)
QDateTime d1,d2=QDateTime::fromMSecsSinceEpoch(s->first()); QDateTime d1,d2=QDateTime::fromMSecsSinceEpoch(s->first());
QDate date=d2.date(); QDate date=d2.date();
QTime time=d2.time();
// pref["NoonDateSplit"]=true; // pref["NoonDateSplit"]=true;
if (pref["NoonDateSplit"].toBool()) { if (pref["NoonDateSplit"].toBool()) {
if (d2.time().hour()<12) date.addDays(-1); int hour=d2.time().hour();
if (s->session()==0x114) {
int q=0;
}
if (hour<12)
date=date.addDays(-1);
//date=date.addDays(1);
} else { } else {
date.addDays(-1); date=date.addDays(-1);
const int hours_since_last_session=4; const int hours_since_last_session=4;
const int hours_since_midnight=12; const int hours_since_midnight=12;