Initial Preferences Color support: No Summary Charts, and No Saving Yet.

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<Session *>::iterator s=m_day->begin();s!=m_day->end(); s++) {
         if ((*s)->eventlist.find(m_code)==(*s)->eventlist.end()) continue;
 

Graphs/gLineChart.cpp

@@ -124,6 +124,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
 
     QHash<ChannelID,QVector<EventList *> >::iterator ci;
 
+    m_line_color=schema::channel[m_code].defaultColor();
     for (int svi=0;svi<m_day->size();svi++) {
         if (!(*m_day)[svi]) {
             qWarning() << "gLineChart::Plot() NULL Session Record.. This should not happen";

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<ChannelID,QVector<EventList *> >::iterator cei;
 
+    m_flag_color=schema::channel[m_code].defaultColor();
     for (QVector<Session *>::iterator s=m_day->begin();s!=m_day->end(); s++) {
         cei=(*s)->eventlist.find(m_code);
         if (cei==(*s)->eventlist.end()) continue;

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<size;m++) {
         data=m_values[m];
-        QColor & col=m_colors[m % m_colors.size()];
+        QColor & col=schema::channel[m_codes[m % m_colors.size()]].defaultColor();
 
         if (data==0) continue;
 /////////////////////////////////////////////////////////////////////////////////////

SleepLib/schema.h

@@ -39,6 +39,8 @@ public:
     const QString & name() { return m_name; }
     const QString & description() { return m_description; }
     const QString & label() { return m_label; }
+    QColor & defaultColor() { return m_defaultcolor; }
+    void setDefaultColor(QColor color) { m_defaultcolor=color; }
     QHash<int,QString> m_options;
     QHash<Function,QColor> m_colors;
     QList<Channel *> m_links;              // better versions of this data type

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<QString, schema::Channel *>::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<int,QColor>::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();

preferencesdialog.h

@@ -32,6 +32,7 @@ private slots:
 private:
     Ui::PreferencesDialog *ui;
     Profile * profile;
+    QHash<int,QColor> m_new_colors;
 };
 
 #endif // PREFERENCESDIALOG_H

preferencesdialog.ui

@@ -29,7 +29,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>2</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="profileTab">
       <attribute name="title">
@@ -663,7 +663,7 @@ It has no effect on single cpu machines.</string>
           <number>0</number>
          </property>
          <property name="columnCount">
-          <number>3</number>
+          <number>4</number>
          </property>
          <attribute name="horizontalHeaderStretchLastSection">
           <bool>true</bool>
@@ -689,6 +689,11 @@ It has no effect on single cpu machines.</string>
            <string>Event</string>
           </property>
          </column>
+         <column>
+          <property name="text">
+           <string>ID</string>
+          </property>
+         </column>
         </widget>
        </item>
       </layout>