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

Overview Popup Calendar Improvements

Browse Source
This commit is contained in:
Mark Watkins 2011-09-12 13:07:57 +10:00
parent 05efde10ea
commit 8f103ab525
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
overview.cpp
View File

@ -8,6 +8,8 @@
#include <QTextCharFormat> #include <QTextCharFormat>
#include <QSystemLocale> #include <QSystemLocale>
#include <QDebug> #include <QDebug>
#include <QDateTimeEdit>
#include <QCalendarWidget>
#include "overview.h" #include "overview.h"
#include "ui_overview.h" #include "ui_overview.h"
#include "Graphs/gXAxis.h" #include "Graphs/gXAxis.h"
@ -123,10 +125,20 @@ Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) :
ui->dateStart->setDisplayFormat(shortformat); ui->dateStart->setDisplayFormat(shortformat);
ui->dateEnd->setDisplayFormat(shortformat); ui->dateEnd->setDisplayFormat(shortformat);
QTextCharFormat format = ui->dateStart->calendarWidget()->weekdayTextFormat(Qt::Saturday);
format.setForeground(QBrush(Qt::black, Qt::SolidPattern));
ui->dateStart->calendarWidget()->setWeekdayTextFormat(Qt::Saturday, format);
ui->dateStart->calendarWidget()->setWeekdayTextFormat(Qt::Sunday, format);
ui->dateEnd->calendarWidget()->setWeekdayTextFormat(Qt::Saturday, format);
ui->dateEnd->calendarWidget()->setWeekdayTextFormat(Qt::Sunday, format);
connect(ui->dateStart->calendarWidget(),SIGNAL(currentPageChanged(int,int)),this,SLOT(on_dateStart_currentPageChanged(int,int)));
connect(ui->dateEnd->calendarWidget(),SIGNAL(currentPageChanged(int,int)),this,SLOT(on_dateEnd_currentPageChanged(int,int)));
report=NULL; report=NULL;
} }
Overview::~Overview() Overview::~Overview()
{ {
disconnect(this,SLOT(on_dateStart_currentPageChanged(int,int)));
disconnect(this,SLOT(on_dateEnd_currentPageChanged(int,int)));
if (report) { if (report) {
report->close(); report->close();
delete report; delete report;
@ -141,6 +153,55 @@ void Overview::ReloadGraphs()
GraphView->setDay(NULL); GraphView->setDay(NULL);
} }
void Overview::UpdateCalendarDay(QDateEdit * dateedit,QDate date)
{
QCalendarWidget *calendar=dateedit->calendarWidget();
QTextCharFormat bold;
QTextCharFormat cpapcol;
QTextCharFormat normal;
QTextCharFormat oxiday;
bold.setFontWeight(QFont::Bold);
cpapcol.setForeground(QBrush(Qt::blue, Qt::SolidPattern));
cpapcol.setFontWeight(QFont::Bold);
oxiday.setForeground(QBrush(Qt::red, Qt::SolidPattern));
oxiday.setFontWeight(QFont::Bold);
bool hascpap=profile->GetDay(date,MT_CPAP)!=NULL;
bool hasoxi=profile->GetDay(date,MT_OXIMETER)!=NULL;
if (hascpap) {
if (hasoxi) {
calendar->setDateTextFormat(date,oxiday);
} else {
calendar->setDateTextFormat(date,cpapcol);
}
} else if (profile->GetDay(date)) {
calendar->setDateTextFormat(date,bold);
} else {
calendar->setDateTextFormat(date,normal);
}
calendar->setHorizontalHeaderFormat(QCalendarWidget::ShortDayNames);
}
void Overview::on_dateStart_currentPageChanged(int year, int month)
{
QDate d(year,month,1);
int dom=d.daysInMonth();
for (int i=1;i<=dom;i++) {
d=QDate(year,month,i);
UpdateCalendarDay(ui->dateStart,d);
}
}
void Overview::on_dateEnd_currentPageChanged(int year, int month)
{
QDate d(year,month,1);
int dom=d.daysInMonth();
for (int i=1;i<=dom;i++) {
d=QDate(year,month,i);
UpdateCalendarDay(ui->dateEnd,d);
}
}
void Overview::on_dateEnd_dateChanged(const QDate &date) void Overview::on_dateEnd_dateChanged(const QDate &date)
{ {

6
overview.h
View File

@ -10,6 +10,7 @@
#include <QWidget> #include <QWidget>
#include <QGLContext> #include <QGLContext>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QDateEdit>
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
#include "Graphs/gGraphView.h" #include "Graphs/gGraphView.h"
#include "Graphs/gBarChart.h" #include "Graphs/gBarChart.h"
@ -45,9 +46,11 @@ private slots:
void on_rbEverything_clicked(); void on_rbEverything_clicked();
void on_rbDateRange_clicked(); */ void on_rbDateRange_clicked(); */
void on_dateStart_dateChanged(const QDate &date);
void on_dateEnd_dateChanged(const QDate &date); void on_dateEnd_dateChanged(const QDate &date);
void on_dateStart_dateChanged(const QDate &date); void on_dateStart_currentPageChanged(int year, int month);
void on_dateEnd_currentPageChanged(int year, int month);
void on_toolButton_clicked(); void on_toolButton_clicked();
@ -62,6 +65,7 @@ private:
Report * report; Report * report;
void UpdateHTML(); void UpdateHTML();
void UpdateCalendarDay(QDateEdit * calendar,QDate date);
//SessionTimes *session_times; //SessionTimes *session_times;
//,*PRESSURE,*LEAK,*SESSTIMES; //,*PRESSURE,*LEAK,*SESSTIMES;