tempo-plotter Changeset - c83e2c5aa6fe · protofusion repositories

Changeset - c83e2c5aa6fe

Parent rev.

Child rev.

[Not reviewed]

channelmanager

0 3 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-01-02 05:36:00
hy@ozderya.net

update color selector on selection change, fix index checks

3 files changed with 42 insertions and 26 deletions:

src/channelinfomodel.cpp

src/channelmanager.cpp

src/plotcontrolpanel.cpp

0 comments (0 inline, 0 general)

src/channelinfomodel.cpp

➞

Show inline comments

 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "channelinfomodel.h"
 #include "setting_defines.h"
 const QColor colors[8] =
+{
     QColor(237,97,68),
     QColor(92,200,96),
     QColor(225,98,207),
     QColor(163,195,58),
     QColor(148,123,239),
     QColor(212,182,52),
     QColor(238,82,133),
     QColor(219,136,44)
 };
 ChannelInfoModel::ChannelInfoModel(unsigned numberOfChannels, QObject* parent) :
     QAbstractTableModel(parent)
+{
     _numOfChannels = 0;
     setNumOfChannels(numberOfChannels);
+}
 int ChannelInfoModel::rowCount(const QModelIndex &parent) const
+{
     return _numOfChannels;
+}
 int ChannelInfoModel::columnCount(const QModelIndex & parent) const
+{
     return COLUMN_COUNT;
+}
 Qt::ItemFlags ChannelInfoModel::flags(const QModelIndex &index) const
+{
     if (index.column() == COLUMN_NAME)
+    {
         return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren | Qt::ItemIsSelectable;
+    }
     else if (index.column() == COLUMN_VISIBILITY)
+    {
         return Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren | Qt::ItemIsSelectable;
+    }
     return Qt::NoItemFlags;
+}
 QVariant ChannelInfoModel::data(const QModelIndex &index, int role) const
+{
     // check index
     if (index.row() >= (int) _numOfChannels)
+    if (index.row() >= (int) _numOfChannels || index.row() < 0)
+    {
         return QVariant();
+    }
     // get color
     if (role == Qt::ForegroundRole)
+    {
         return infos[index.row()].color;
+    }
     // get name
     if (index.column() == COLUMN_NAME)
+    {
         if (role == Qt::DisplayRole || role == Qt::EditRole)
+        {
             return QVariant(infos[index.row()].name);
+        }
     } // get visibility
     else if (index.column() == COLUMN_VISIBILITY)
+    {
         if (role == Qt::CheckStateRole)
+        {
             bool visible = infos[index.row()].visibility;
             return visible ? Qt::Checked : Qt::Unchecked;
+        }
+    }
     return QVariant();
+}
 QVariant ChannelInfoModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
     if (orientation == Qt::Horizontal)
+    {
         if (role == Qt::DisplayRole)
+        {
             if (section == COLUMN_NAME)
+            {
                 return tr("Channel");
+            }
             else if (section == COLUMN_VISIBILITY)
+            {
                 return tr("Visible");
+            }
+        }
+    }
     else                        // vertical
+    {
         if (section < (int) _numOfChannels && role == Qt::DisplayRole)
+        {
             return QString::number(section + 1);
+        }
+    }
     return QVariant();
+}
 bool ChannelInfoModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
     // check index
     if (index.row() >= (int) _numOfChannels)
+    if (index.row() >= (int) _numOfChannels || index.row() < 0)
+    {
         return false;
+    }
     // set color
     if (role == Qt::ForegroundRole)
+    {
         infos[index.row()].color = value.value<QColor>();
         emit dataChanged(index, index, QVector<int>({Qt::ForegroundRole}));
         return true;
+    }
     // set name
     if (index.column() == COLUMN_NAME)
+    {
         if (role == Qt::DisplayRole || role == Qt::EditRole)
+        {
             infos[index.row()].name = value.toString();
             emit dataChanged(index, index, QVector<int>({role}));
             return true;
+        }
     } // set visibility
     else if (index.column() == COLUMN_VISIBILITY)
+    {
         if (role == Qt::CheckStateRole)
+        {
             bool checked = value.toInt() == Qt::Checked;
             infos[index.row()].visibility = checked;
             emit dataChanged(index, index, QVector<int>({role}));
             return true;
+        }
+    }
     // invalid index/role
     return false;
+}
 void ChannelInfoModel::setNumOfChannels(unsigned number)
+{
     if (number == _numOfChannels) return;
     bool isInserting = number > _numOfChannels;
     if (isInserting)
+    {
         beginInsertRows(QModelIndex(), _numOfChannels, number-1);
+    }
     else
+    {
         beginRemoveRows(QModelIndex(), number, _numOfChannels-1);
+    }
     // we create channel info but never remove channel info to
     // remember user entered info
     if ((int) number > infos.length())
+    {
         for (unsigned ci = _numOfChannels; ci < number; ci++)
+        {
             infos.append({QString("Channel %1").arg(ci+1), true, colors[ci % 8]});
+        }
+    }
     // make sure newly available channels are visible, we don't
     // remember visibility option intentionally so that user doesn't
     // get confused
     if (number > _numOfChannels)
+    {
         for (unsigned ci = _numOfChannels; ci < number; ci++)
+        {
             infos[ci].visibility = true;
+        }
+    }
     _numOfChannels = number;
     if (isInserting)
+    {
         endInsertRows();
+    }
     else
+    {
         endRemoveRows();
+    }
+}
 void ChannelInfoModel::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Channels);
     settings->beginWriteArray(SG_Channels_Channel);
     // save all channel information regardless of current number of channels
     for (unsigned ci = 0; (int) ci < infos.length(); ci++)
+    {
         settings->setArrayIndex(ci);
         settings->setValue(SG_Channels_Name, infos[ci].name);
         settings->setValue(SG_Channels_Color, infos[ci].color);
         settings->setValue(SG_Channels_Visible, infos[ci].visibility);
+    }
     settings->endArray();
     settings->endGroup();
+}
 void ChannelInfoModel::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Channels);
     unsigned size = settings->beginReadArray(SG_Channels_Channel);
     for (unsigned ci = 0; ci < size; ci++)
+    {
         settings->setArrayIndex(ci);
         ChannelInfo chanInfo;
         chanInfo.name       = settings->value(SG_Channels_Name,
                                               QString(tr("Channel %1")).arg(ci+1)).toString();
         chanInfo.color      = settings->value(SG_Channels_Color, colors[ci % 8]).value<QColor>();
         chanInfo.visibility = settings->value(SG_Channels_Visible, true).toBool();
-        if ((int) ci >= infos.size())
+        if ((int) ci < infos.size())
+        {
             infos.append(chanInfo);
             infos[ci] = chanInfo;
             if (ci < _numOfChannels)
+            {
                 auto roles = QVector<int>({
                     Qt::DisplayRole, Qt::EditRole, Qt::ForegroundRole, Qt::CheckStateRole});
                 emit dataChanged(index(ci, 0), index(ci, COLUMN_COUNT-1), roles);
+            }
+        }
         else
+        {
             infos[ci] = chanInfo;
             auto roles = QVector<int>({
                     Qt::DisplayRole, Qt::EditRole, Qt::ForegroundRole, Qt::CheckStateRole});
             emit dataChanged(index(ci, 0), index(ci, COLUMN_COUNT-1), roles);
             infos.append(chanInfo);
+        }
+    }
     settings->endArray();
     settings->endGroup();
+}

src/channelmanager.cpp

➞

Show inline comments

@@ @@ -47,132 +47,131 @@ ChannelManager::~ChannelManager() @@
         delete buffer;
+    }
+}
 unsigned ChannelManager::numOfChannels()
+{
     return channelBuffers.size();
+}
 unsigned ChannelManager::numOfSamples()
+{
     return _numOfSamples;
+}
 void ChannelManager::setNumOfChannels(unsigned number)
+{
     unsigned int oldNum = channelBuffers.size();
     if (number > oldNum)
+    {
         // add new channels
         for (unsigned int i = 0; i < number - oldNum; i++)
+        {
             channelBuffers.append(new FrameBuffer(_numOfSamples));
+        }
+    }
     else if(number < oldNum)
+    {
         // remove channels
         for (unsigned int i = oldNum-1; i > number-1; i--)
+        {
             delete channelBuffers.takeLast();
+        }
+    }
     _infoModel.setNumOfChannels(number);
     emit numOfChannelsChanged(number);
+}
 void ChannelManager::setNumOfSamples(unsigned number)
+{
     _numOfSamples = number;
     for (int ci = 0; ci < channelBuffers.size(); ci++)
+    {
         channelBuffers[ci]->resize(_numOfSamples);
+    }
     emit numOfSamplesChanged(number);
+}
 FrameBuffer* ChannelManager::channelBuffer(unsigned channel)
+{
     return channelBuffers[channel];
+}
 ChannelInfoModel* ChannelManager::infoModel()
+{
     return &_infoModel;
+}
 QString ChannelManager::channelName(unsigned channel)
+{
     return _infoModel.data(_infoModel.index(channel, ChannelInfoModel::COLUMN_NAME),
                            Qt::DisplayRole).toString();
+}
 QStringList ChannelManager::channelNames()
+{
     QStringList list;
     for (unsigned ci = 0; ci < _numOfChannels; ci++)
+    {
         list << channelName(ci);
+    }
     return list;
+}
 void ChannelManager::onChannelInfoChanged(const QModelIndex & topLeft,
                                           const QModelIndex & bottomRight,
                                           const QVector<int> & roles)
+{
     Q_UNUSED(roles);
     int start = topLeft.row();
     int end = bottomRight.row();
     int col = topLeft.column();
     for (int ci = start; ci <= end; ci++)
+    {
         for (auto role : roles)
+        {
             switch (role)
+            {
                 case Qt::EditRole:
                     if (col == ChannelInfoModel::COLUMN_NAME)
+                    {
                         qDebug() << channelName(ci);
                         emit channelNameChanged(ci, channelName(ci));
+                    }
                     break;
                 case Qt::ForegroundRole:
                     if (col == ChannelInfoModel::COLUMN_NAME)
+                    {
                         // TODO: emit channel color changed
+                    }
                     break;
                 case Qt::CheckStateRole:
                     if (col == ChannelInfoModel::COLUMN_VISIBILITY)
+                    {
                         // TODO: emit visibility
+                    }
                     break;
+            }
+        }
         // emit channelNameChanged(i, channelName(i));
+    }
+}
 void ChannelManager::addChannelData(unsigned channel, double* data, unsigned size)
+{
     channelBuffer(channel)->addSamples(data, size);
+}
 void ChannelManager::saveSettings(QSettings* settings)
+{
     _infoModel.saveSettings(settings);
+}
 void ChannelManager::loadSettings(QSettings* settings)
+{
     _infoModel.loadSettings(settings);
+}

src/plotcontrolpanel.cpp

➞

Show inline comments

@@ @@ -117,135 +117,150 @@ void PlotControlPanel::onNumOfSamples(in @@
                        this, SLOT(onNumOfSamples(int)));
             ui->spNumOfSamples->setValue(_numOfSamples);
             connect(ui->spNumOfSamples, SIGNAL(valueChanged(int)),
                     this, SLOT(onNumOfSamples(int)));
             return;
+        }
+    }
     _numOfSamples = value;
     emit numOfSamplesChanged(value);
+}
 bool PlotControlPanel::askNSConfirmation(int value)
+{
     auto text = tr("Setting number of samples to a too big value "
                    "(>%1) can seriously impact the performance of "
                    "the application and cause freezes. Are you sure you "
                    "want to change the number of samples to %2?")
         .arg(QString::number(NUMSAMPLES_CONFIRM_AT), QString::number(value));
     // TODO: parent the mainwindow
     QMessageBox mb(QMessageBox::Warning,
                    tr("Confirm Number of Samples"),
                    text,
                    QMessageBox::Apply | QMessageBox::Cancel,
                    this);
     auto cb = new QCheckBox("Don't show this again.");
     connect(cb, &QCheckBox::stateChanged, [this](int state)
+            {
                 warnNumOfSamples = (state == Qt::Unchecked);
             });
     mb.setCheckBox(cb);
     return mb.exec() == QMessageBox::Apply;
+}
 void PlotControlPanel::onAutoScaleChecked(bool checked)
+{
     if (checked)
+    {
         ui->lYmin->setEnabled(false);
         ui->lYmax->setEnabled(false);
         ui->spYmin->setEnabled(false);
         ui->spYmax->setEnabled(false);
         emit scaleChanged(true); // autoscale
+    }
     else
+    {
         ui->lYmin->setEnabled(true);
         ui->lYmax->setEnabled(true);
         ui->spYmin->setEnabled(true);
         ui->spYmax->setEnabled(true);
         emit scaleChanged(false, ui->spYmin->value(), ui->spYmax->value());
+    }
+}
 void PlotControlPanel::onYScaleChanged()
+{
     emit scaleChanged(false, ui->spYmin->value(), ui->spYmax->value());
+}
 bool PlotControlPanel::autoScale()
+{
     return ui->cbAutoScale->isChecked();
+}
 double PlotControlPanel::yMax()
+{
     return ui->spYmax->value();
+}
 double PlotControlPanel::yMin()
+{
     return ui->spYmin->value();
+}
 void PlotControlPanel::onRangeSelected()
+{
     Range r = ui->cbRangePresets->currentData().value<Range>();
     ui->spYmin->setValue(r.rmin);
     ui->spYmax->setValue(r.rmax);
     ui->cbAutoScale->setChecked(false);
+}
 void PlotControlPanel::setChannelInfoModel(ChannelInfoModel* model)
+{
     ui->tvChannelInfo->setModel(model);
     // channel color selector
     QObject::connect(ui->tvChannelInfo->selectionModel(), &QItemSelectionModel::currentRowChanged,
                      [this](const QModelIndex &current, const QModelIndex &previous)
+                     {
                          auto model = ui->tvChannelInfo->model();
                          QColor color = model->data(current, Qt::ForegroundRole).value<QColor>();
                          ui->colorSelector->setColor(color);
                          // cpicker.setColor(cim.data(current, Qt::ForegroundRole).value<QColor>());
                      });
     connect(ui->tvChannelInfo->selectionModel(), &QItemSelectionModel::currentRowChanged,
             [this](const QModelIndex &current, const QModelIndex &previous)
+            {
                 auto model = ui->tvChannelInfo->model();
                 QColor color = model->data(current, Qt::ForegroundRole).value<QColor>();
                 ui->colorSelector->setColor(color);
             });
     connect(ui->colorSelector, &color_widgets::ColorSelector::colorChanged,
             [this](QColor color)
+            {
                 auto index = ui->tvChannelInfo->selectionModel()->currentIndex();
                 ui->tvChannelInfo->model()->setData(index, color, Qt::ForegroundRole);
             });
     QObject::connect(ui->colorSelector, &color_widgets::ColorSelector::colorChanged,
                      [this](QColor color)
+                     {
                          auto index = ui->tvChannelInfo->selectionModel()->currentIndex();
                          // index = index.sibling(index.row(), 0);
                          ui->tvChannelInfo->model()->setData(index, color, Qt::ForegroundRole);
                      });
     connect(model, &QAbstractItemModel::dataChanged,
             [this](const QModelIndex & topLeft, const QModelIndex & bottomRight, const QVector<int> & roles = QVector<int> ())
+            {
                 auto current = ui->tvChannelInfo->selectionModel()->currentIndex();
                 // no current selection
                 if (!current.isValid()) return;
                 auto mod = ui->tvChannelInfo->model();
                 QColor color = mod->data(current, Qt::ForegroundRole).value<QColor>();
                 // temporarily block signals because `setColor` emits `colorChanged`
                 bool wasBlocked = ui->colorSelector->blockSignals(true);
                 ui->colorSelector->setColor(color);
                 ui->colorSelector->blockSignals(wasBlocked);
             });
+}
 void PlotControlPanel::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     settings->setValue(SG_Plot_NumOfSamples, numOfSamples());
     settings->setValue(SG_Plot_AutoScale, autoScale());
     settings->setValue(SG_Plot_YMax, yMax());
     settings->setValue(SG_Plot_YMin, yMin());
     settings->endGroup();
+}
 void PlotControlPanel::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     ui->spNumOfSamples->setValue(
         settings->value(SG_Plot_NumOfSamples, numOfSamples()).toInt());
     ui->cbAutoScale->setChecked(
         settings->value(SG_Plot_AutoScale, autoScale()).toBool());
     ui->spYmax->setValue(settings->value(SG_Plot_YMax, yMax()).toDouble());
     ui->spYmin->setValue(settings->value(SG_Plot_YMin, yMin()).toDouble());
     settings->endGroup();
+}

0 comments (0 inline, 0 general)