tempo-plotter Changeset - cd99f9b81da2 · protofusion repositories

Changeset - cd99f9b81da2

Parent rev.

Child rev.

[Not reviewed]

gain-offset

0 3 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-07-08 05:50:12
hy@ozderya.net

preliminary implementation of gain and offset

3 files changed with 40 insertions and 2 deletions:

src/channelinfomodel.cpp

src/channelinfomodel.h

src/stream.cpp

0 comments (0 inline, 0 general)

src/channelinfomodel.cpp

➞

Show inline comments

@@ @@ -97,48 +97,68 @@ ChannelInfoModel::ChannelInfo::ChannelIn @@
     name = tr("Channel %1").arg(index + 1);
     visibility = true;
     color = colors[index % NUMOF_COLORS];
     gain = 1.0;
     offset = 0.0;
     gainEn = false;
     offsetEn = false;
+}
 QString ChannelInfoModel::name(unsigned i) const
+{
     return infos[i].name;
+}
 QColor ChannelInfoModel::color(unsigned i) const
+{
     return infos[i].color;
+}
 bool ChannelInfoModel::isVisible(unsigned i) const
+{
     return infos[i].visibility;
+}
 bool ChannelInfoModel::gainEn (unsigned i) const
+{
     return infos[i].gainEn;
+}
 double ChannelInfoModel::gain (unsigned i) const
+{
     return infos[i].gain;
+}
 bool ChannelInfoModel::offsetEn (unsigned i) const
+{
     return infos[i].offsetEn;
+}
 double ChannelInfoModel::offset (unsigned i) const
+{
     return infos[i].offset;
+}
 QStringList ChannelInfoModel::channelNames() const
+{
     QStringList r;
     for (unsigned ci = 0; ci < _numOfChannels; ci++)
+    {
         r << name(ci);
+    }
     return r;
+}
 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)
+    {

src/channelinfomodel.h

➞

Show inline comments

@@ @@ -25,48 +25,52 @@ @@
 #include <QSettings>
 #include <QStringList>
 class ChannelInfoModel : public QAbstractTableModel
+{
     Q_OBJECT
 public:
     enum ChannelInfoColumn
+    {
         COLUMN_NAME = 0,
         COLUMN_VISIBILITY,
         COLUMN_GAIN,
         COLUMN_OFFSET,
         COLUMN_COUNT            // MUST be last
     };
     explicit ChannelInfoModel(unsigned numberOfChannels, QObject *parent = 0);
     ChannelInfoModel(const ChannelInfoModel& other);
     explicit ChannelInfoModel(const QStringList& channelNames);
     QString name     (unsigned i) const;
     QColor  color    (unsigned i) const;
     bool    isVisible(unsigned i) const;
     bool    gainEn   (unsigned i) const;
     double  gain     (unsigned i) const;
     bool    offsetEn (unsigned i) const;
     double  offset   (unsigned i) const;
     /// Returns a list of channel names
     QStringList channelNames() const;
     // implemented from QAbstractItemModel
     int           rowCount(const QModelIndex &parent = QModelIndex()) const;
     int           columnCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant      data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     bool          setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
     Qt::ItemFlags flags(const QModelIndex &index) const;
     QVariant      headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     void setNumOfChannels(unsigned number);
     /// Stores all channel info into a `QSettings`
     void saveSettings(QSettings* settings) const;
     /// Loads all channel info from a `QSettings`.
     void loadSettings(QSettings* settings);
 public slots:
     /// reset all channel info (names, color etc.)
     void resetInfos();
     /// reset all channel names
     void resetNames();
     /// reset all channel colors
     void resetColors();

src/stream.cpp

➞

Show inline comments

@@ @@ -133,53 +133,67 @@ void Stream::setNumChannels(unsigned nc, @@
+    }
     if (nc != oldNum)
+    {
         _infoModel.setNumOfChannels(nc);
         // TODO: how about X change?
         emit numChannelsChanged(nc);
+    }
     Sink::setNumChannels(nc, x);
+}
 void Stream::feedIn(const SamplePack& data)
+{
     Q_ASSERT(data.numChannels() == numChannels() &&
              data.hasX() == hasX());
     if (_paused) return;
     unsigned ns = data.numSamples();
     if (_hasx)
+    {
         static_cast<RingBuffer*>(xData)->addSamples(data.xData(), ns);
+    }
-    for (unsigned i = 0; i < numChannels(); i++)
+    for (unsigned ci = 0; ci < numChannels(); ci++)
+    {
         static_cast<RingBuffer*>(channels[i]->yData())->addSamples(data.data(i), ns);
         // TODO: check for gainEn and offsetEn
         // apply gain and offset
         auto rdata = data.data(ci);
         auto mdata = new double[sizeof(double) * ns];
         // TODO: add gain&offset access methods to `StreamChannel`
         double gain = channels[ci]->info()->gain(ci);
         double offset = channels[ci]->info()->offset(ci);
         for (int i = 0; i < ns; i++)
+        {
             mdata[i] = rdata[i] * gain + offset;
+    }
         static_cast<RingBuffer*>(channels[ci]->yData())->addSamples(mdata, ns);
         delete[] mdata;
+    }
     // TODO: emit modified (gain&offset) data
     Sink::feedIn(data);
     emit dataAdded();
+}
 void Stream::pause(bool paused)
+{
     _paused = paused;
+}
 void Stream::clear()
+{
     for (auto c : channels)
+    {
         static_cast<RingBuffer*>(c->yData())->clear();
+    }
+}
 void Stream::setNumSamples(unsigned value)
+{
     if (value == _numSamples) return;
     _numSamples = value;
     xData->resize(value);

0 comments (0 inline, 0 general)