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

Noon Date Split option in View Menu

Browse Source
This commit is contained in:
Mark Watkins 2011-07-03 18:08:14 +10:00
parent e4be1f16fc
commit c9d3c5fbe7
4 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SleepLib/machine.cpp
View File

@ -236,11 +236,13 @@ Day *Machine::AddSession(Session *s,Profile *p)
QDateTime d1,d2=QDateTime::fromMSecsSinceEpoch(s->first());
QDate date=d2.date();
date.addDays(-1);
//qint64 date=s->first()/86400000;
//date--; //=date.addDays(-1);
//date*=86400000;
// pref["NoonDateSplit"]=true;
if (pref["NoonDateSplit"].toBool()) {
if (d2.time().hour()<12) date.addDays(-1);
} else {
date.addDays(-1);
const int hours_since_last_session=4;
const int hours_since_midnight=12;
@ -277,7 +279,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
// Revert to sessions original day.
date=date.addDays(1);
}
}
sessionlist[s->session()]=s;
if (!firstsession) {
@ -287,6 +289,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
firstday=lastday=date;
firstsession=false;
}
if (day.find(date)==day.end()) {
//QString dstr=date.toString("yyyyMMdd");
//qDebug("Adding Profile Day %s",dstr.toAscii().data());

8
mainwindow.cpp
View File

@ -56,6 +56,9 @@ MainWindow::MainWindow(QWidget *parent) :
if (!pref.Exists("LinkGraphMovement")) pref["LinkGraphMovement"]=true;
else ui->action_Link_Graphs->setChecked(pref["LinkGraphMovement"].toBool());
if (!pref.Exists("NoonDateSplit")) pref["NoonDateSplit"]=false;
else ui->action_Noon_Date_Split->setChecked(pref["NoonDateSplit"].toBool());
if (!pref.Exists("fruitsalad")) pref["fruitsalad"]=true;
if (!pref.Exists("UseAntiAliasing")) pref["UseAntiAliasing"]=false;
@ -231,3 +234,8 @@ void MainWindow::on_actionUse_AntiAliasing_triggered(bool checked)
if (daily) daily->RedrawGraphs();
}
void MainWindow::on_action_Noon_Date_Split_toggled(bool checked)
{
pref["NoonDateSplit"]=checked;
}

2
mainwindow.h
View File

@ -60,6 +60,8 @@ private slots:
void on_actionUse_AntiAliasing_triggered(bool checked);
void on_action_Noon_Date_Split_toggled(bool );
private:
Ui::MainWindow *ui;
Daily * daily;

9
mainwindow.ui
View File

@ -561,6 +561,7 @@
<addaction name="separator"/>
<addaction name="actionUse_AntiAliasing"/>
<addaction name="action_Link_Graphs"/>
<addaction name="action_Noon_Date_Split"/>
<addaction name="separator"/>
<addaction name="action_Fullscreen"/>
</widget>
@ -655,6 +656,14 @@
<string>&amp;Fullscreen Toggle</string>
</property>
</action>
<action name="action_Noon_Date_Split">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Noon Date Split</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>