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

Bookmark fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-12-03 00:18:47 +10:00
parent 61669afb06
commit 44d572fd7b
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daily.cpp
View File

@ -448,17 +448,24 @@ void Daily::UpdateCalendarDay(QDate date)
QTextCharFormat cpapcol; QTextCharFormat cpapcol;
QTextCharFormat normal; QTextCharFormat normal;
QTextCharFormat oxiday; QTextCharFormat oxiday;
QTextCharFormat jourday;
bold.setForeground(QBrush(QColor("dark blue"), Qt::SolidPattern));
bold.setFontWeight(QFont::Bold); bold.setFontWeight(QFont::Bold);
cpapcol.setForeground(QBrush(Qt::blue, Qt::SolidPattern)); cpapcol.setForeground(QBrush(Qt::blue, Qt::SolidPattern));
cpapcol.setFontWeight(QFont::Bold); cpapcol.setFontWeight(QFont::Bold);
oxiday.setForeground(QBrush(Qt::red, Qt::SolidPattern)); oxiday.setForeground(QBrush(Qt::red, Qt::SolidPattern));
oxiday.setFontWeight(QFont::Bold); oxiday.setFontWeight(QFont::Bold);
jourday.setForeground(QBrush(QColor("black"), Qt::SolidPattern));
jourday.setFontWeight(QFont::Bold);
bool hascpap=PROFILE.GetDay(date,MT_CPAP)!=NULL; bool hascpap=PROFILE.GetDay(date,MT_CPAP)!=NULL;
bool hasoxi=PROFILE.GetDay(date,MT_OXIMETER)!=NULL; bool hasoxi=PROFILE.GetDay(date,MT_OXIMETER)!=NULL;
bool hasjournal=PROFILE.GetDay(date,MT_JOURNAL)!=NULL;
if (hascpap) { if (hascpap) {
if (hasoxi) { if (hasoxi) {
ui->calendar->setDateTextFormat(date,oxiday); ui->calendar->setDateTextFormat(date,oxiday);
} else if (hasjournal) {
ui->calendar->setDateTextFormat(date,jourday);
} else { } else {
ui->calendar->setDateTextFormat(date,cpapcol); ui->calendar->setDateTextFormat(date,cpapcol);
} }
@ -827,6 +834,7 @@ void Daily::Load(QDate date)
ui->weightSpinBox->setValue(0); ui->weightSpinBox->setValue(0);
ui->ouncesSpinBox->setValue(0); ui->ouncesSpinBox->setValue(0);
ui->ZombieMeter->setValue(50); ui->ZombieMeter->setValue(50);
BookmarksChanged=false;
Session *journal=GetJournalSession(date); Session *journal=GetJournalSession(date);
if (journal) { if (journal) {
bool ok; bool ok;
@ -938,7 +946,7 @@ void Daily::Unload(QDate date)
journal->SetChanged(true); journal->SetChanged(true);
} }
bool ok; bool ok;
if (ui->bookmarkTable->rowCount()>0) { if (BookmarksChanged) {
QVariantList start; QVariantList start;
QVariantList end; QVariantList end;
QStringList notes; QStringList notes;
@ -975,7 +983,7 @@ void Daily::Unload(QDate date)
journal->settings["Weight"]=kg; journal->settings["Weight"]=kg;
journal->SetChanged(true); journal->SetChanged(true);
} }
if (ui->bookmarkTable->rowCount()>0) { if (BookmarksChanged) {
QVariantList start; QVariantList start;
QVariantList end; QVariantList end;
QStringList notes; QStringList notes;
@ -1326,6 +1334,7 @@ void Daily::on_addBookmarkButton_clicked()
tw->setData(Qt::UserRole,st); tw->setData(Qt::UserRole,st);
tw->setData(Qt::UserRole+1,et); tw->setData(Qt::UserRole+1,et);
BookmarksChanged=true;
//ui->bookmarkTable->setItem(row,2,new QTableWidgetItem(QString::number(st))); //ui->bookmarkTable->setItem(row,2,new QTableWidgetItem(QString::number(st)));
//ui->bookmarkTable->setItem(row,3,new QTableWidgetItem(QString::number(et))); //ui->bookmarkTable->setItem(row,3,new QTableWidgetItem(QString::number(et)));
} }
@ -1335,6 +1344,7 @@ void Daily::on_removeBookmarkButton_clicked()
int row=ui->bookmarkTable->currentRow(); int row=ui->bookmarkTable->currentRow();
if (row>=0) { if (row>=0) {
ui->bookmarkTable->removeRow(row); ui->bookmarkTable->removeRow(row);
BookmarksChanged=true;
} }
} }
@ -1354,3 +1364,8 @@ void Daily::on_ZombieMeter_actionTriggered(int action)
//s->summary[JOURNAL_Energy]=position; //s->summary[JOURNAL_Energy]=position;
//s->SetChanged(true); //s->SetChanged(true);
//} //}
void Daily::on_bookmarkTable_itemChanged(QTableWidgetItem *item)
{
Q_UNUSED(item);
BookmarksChanged=true;
}

6
daily.h
View File

@ -86,6 +86,8 @@ private slots:
void on_bookmarkTable_itemClicked(QTableWidgetItem *item); void on_bookmarkTable_itemClicked(QTableWidgetItem *item);
void on_bookmarkTable_itemChanged(QTableWidgetItem *item);
protected: protected:
private: private:
@ -122,9 +124,7 @@ private:
MyScrollBar *scrollbar; MyScrollBar *scrollbar;
QHBoxLayout *layout; QHBoxLayout *layout;
bool ZombieMeterMoved; bool ZombieMeterMoved;
bool BookmarksChanged;
}; };
#endif // DAILY_H #endif // DAILY_H

2
daily.ui
View File

@ -248,7 +248,7 @@
</size> </size>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>3</number>
</property> </property>
<property name="movable"> <property name="movable">
<bool>true</bool> <bool>true</bool>

4
overview.cpp
View File

@ -112,14 +112,14 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
WEIGHT=createGraph("Weight"); WEIGHT=createGraph("Weight");
ZOMBIE=createGraph("Zombie"); ZOMBIE=createGraph("Zombie");
weight=new SummaryChart("Pulse Rate",GT_LINE); weight=new SummaryChart("Weight",GT_LINE);
weight->setMachineType(MT_JOURNAL); weight->setMachineType(MT_JOURNAL);
weight->addSlice("Weight",QColor("black"),ST_SETAVG); weight->addSlice("Weight",QColor("black"),ST_SETAVG);
WEIGHT->AddLayer(weight); WEIGHT->AddLayer(weight);
zombie=new SummaryChart("Zombie Meter",GT_LINE); zombie=new SummaryChart("Zombie Meter",GT_LINE);
zombie->setMachineType(MT_JOURNAL); zombie->setMachineType(MT_JOURNAL);
zombie->addSlice("ZombieMeter",QColor("dark gray"),ST_SETAVG); zombie->addSlice("ZombieMeter",QColor("dark red"),ST_SETAVG);
ZOMBIE->AddLayer(zombie); ZOMBIE->AddLayer(zombie);
pulse=new SummaryChart("Pulse Rate",GT_LINE); pulse=new SummaryChart("Pulse Rate",GT_LINE);