From 6ba03a4e45a79fbf710c5327a20db0dd852433ff Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 23 Sep 2011 15:22:52 +1000 Subject: [PATCH] Initial Preferences Color support: No Summary Charts, and No Saving Yet. --- Graphs/gFlagsLine.cpp | 1 + Graphs/gLineChart.cpp | 1 + Graphs/gLineOverlay.cpp | 1 + Graphs/gSegmentChart.cpp | 2 +- SleepLib/schema.h | 2 ++ preferencesdialog.cpp | 20 ++++++++++++++++++-- preferencesdialog.h | 1 + preferencesdialog.ui | 9 +++++++-- 8 files changed, 32 insertions(+), 5 deletions(-) diff --git a/Graphs/gFlagsLine.cpp b/Graphs/gFlagsLine.cpp index 30625349..82d1a321 100644 --- a/Graphs/gFlagsLine.cpp +++ b/Graphs/gFlagsLine.cpp @@ -137,6 +137,7 @@ void gFlagsLine::paint(gGraph & w,int left, int top, int width, int height) float bottom=top+height-2; bool verts_exceeded=false; qint64 X,Y; + m_flag_color=schema::channel[m_code].defaultColor(); for (QVector::iterator s=m_day->begin();s!=m_day->end(); s++) { if ((*s)->eventlist.find(m_code)==(*s)->eventlist.end()) continue; diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 5c5317b2..4c98f1b3 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -124,6 +124,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height) QHash >::iterator ci; + m_line_color=schema::channel[m_code].defaultColor(); for (int svi=0;svisize();svi++) { if (!(*m_day)[svi]) { qWarning() << "gLineChart::Plot() NULL Session Record.. This should not happen"; diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp index 4412fae9..5ab6aa87 100644 --- a/Graphs/gLineOverlay.cpp +++ b/Graphs/gLineOverlay.cpp @@ -50,6 +50,7 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh bool verts_exceeded=false; QHash >::iterator cei; + m_flag_color=schema::channel[m_code].defaultColor(); for (QVector::iterator s=m_day->begin();s!=m_day->end(); s++) { cei=(*s)->eventlist.find(m_code); if (cei==(*s)->eventlist.end()) continue; diff --git a/Graphs/gSegmentChart.cpp b/Graphs/gSegmentChart.cpp index 985893d6..4a51cd5e 100644 --- a/Graphs/gSegmentChart.cpp +++ b/Graphs/gSegmentChart.cpp @@ -103,7 +103,7 @@ void gSegmentChart::paint(gGraph & w,int left, int top, int width, int height) GLBuffer *lines2=w.lines(); for (unsigned m=0;m m_options; QHash m_colors; QList m_links; // better versions of this data type diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 9c0148f6..ad34d7eb 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -69,12 +69,15 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : ui->eventTable->setColumnWidth(0,40); ui->eventTable->setColumnWidth(1,55); + ui->eventTable->setColumnHidden(3,true); int row=0; QTableWidgetItem *item; QHash::iterator ci; for (ci=schema::channel.names.begin();ci!=schema::channel.names.end();ci++) { if (ci.value()->type()==schema::DATA) { ui->eventTable->insertRow(row); + int id=ci.value()->id(); + ui->eventTable->setItem(row,3,new QTableWidgetItem(QString::number(id))); item=new QTableWidgetItem(ci.value()->description()); ui->eventTable->setItem(row,2,item); QCheckBox *c=new QCheckBox(ui->eventTable); @@ -83,7 +86,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : pb->setText("foo"); ui->eventTable->setCellWidget(row,0,c); ui->eventTable->setCellWidget(row,1,pb); - QColor a(rand() % 255, rand() % 255, rand() % 255, 255); + + + QColor a=ci.value()->defaultColor();//(rand() % 255, rand() % 255, rand() % 255, 255); QPalette p(a,a,a,a,a,a,a); pb->setPalette(p); @@ -121,6 +126,8 @@ void PreferencesDialog::on_eventTable_doubleClicked(const QModelIndex &index) { int row=index.row(); int col=index.column(); + bool ok; + int id=ui->eventTable->item(row,3)->text().toInt(&ok); if (col==1) { QWidget *w=ui->eventTable->cellWidget(row,col); QColorDialog a; @@ -130,7 +137,8 @@ void PreferencesDialog::on_eventTable_doubleClicked(const QModelIndex &index) QColor c=a.currentColor(); QPalette p(c,c,c,c,c,c,c); w->setPalette(p); - qDebug() << "Color accepted" << col; + m_new_colors[id]=c; + //qDebug() << "Color accepted" << col << id; } } } @@ -163,6 +171,14 @@ void PreferencesDialog::Save() pref["IntentionalLeak"]=ui->intentionalLeakEdit->value(); pref["EnableMultithreading"]=ui->useMultithreading->isChecked(); + for (QHash::iterator i=m_new_colors.begin();i!=m_new_colors.end();i++) { + schema::Channel &chan=schema::channel[i.key()]; + if (!chan.isNull()) { + qDebug() << "TODO: Change" << chan.name() << "color to" << i.value(); + chan.setDefaultColor(i.value()); + } + } + qDebug() << "TODO: Save channels.xml to update channel data"; profile->Save(); pref.Save(); diff --git a/preferencesdialog.h b/preferencesdialog.h index a98966c1..11e0f4ff 100644 --- a/preferencesdialog.h +++ b/preferencesdialog.h @@ -32,6 +32,7 @@ private slots: private: Ui::PreferencesDialog *ui; Profile * profile; + QHash m_new_colors; }; #endif // PREFERENCESDIALOG_H diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 38c0c807..7f959c72 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -29,7 +29,7 @@ - 2 + 3 @@ -663,7 +663,7 @@ It has no effect on single cpu machines. 0 - 3 + 4 true @@ -689,6 +689,11 @@ It has no effect on single cpu machines. Event + + + ID + +