tempo-plotter Changeset - 01c2ff14aade · protofusion repositories

Changeset - 01c2ff14aade

Parent rev.

Child rev.

[Not reviewed]

value-tracker

0 2 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-09-27 16:21:08
hy@ozderya.net

calculate and display values between samples

2 files changed with 25 insertions and 30 deletions:

src/streamchannel.cpp

src/streamchannel.h

0 comments (0 inline, 0 general)

src/streamchannel.cpp

➞

Show inline comments

@@ @@ -41,41 +41,34 @@ bool StreamChannel::visible() const {ret @@
 const XFrameBuffer* StreamChannel::xData() const {return _x;}
 const FrameBuffer* StreamChannel::yData() const {return _y;}
 FrameBuffer* StreamChannel::yData() {return _y;}
 const ChannelInfoModel* StreamChannel::info() const {return _info;}
 void StreamChannel::setX(const XFrameBuffer* x) {_x = x;};
 #include <QtDebug>
 double StreamChannel::findValue(double x) const
+{
     // int index = findIndex(x);
     int index = _x->findIndex(x);
     qDebug() << x << ":" << index;
     Q_ASSERT(index < (int) _x->size());
     if (index >= 0)
+    {
         // can't do estimation for last sample
         if (index == (int) _x->size() - 1)
+        {
         return _y->sample(index);
+        }
     else
+        {
             // calculate middle of the line
             double prev_x = _x->sample(index);
             double next_x = _x->sample(index+1);
             double ratio = (x - prev_x) / (next_x - prev_x);
             double prev_y = _y->sample(index);
             double next_y = _y->sample(index+1);
             return ratio * (next_y - prev_y) + prev_y;
+        }
+    }
     else
+    {
         return std::numeric_limits<double>::quiet_NaN();
+}
 int StreamChannel::findIndex(double x) const
+{
     // TODO: optimize, implement in `framebuffer`
     bool first = true;
     for (int i = _x->size()-1; i > 0; i--)
+    {
         double val = _x->sample(i);
         if (x >= val)
+        {
             // TODO: optional linear approx. method
             // check if previous sample (bigger one) is actually closer
             if (!first && (x - val) > (_x->sample(i + 1) - x))
+            {
                 ++i;
+            }
             return i;
+        }
         first = false;
+    }
     return -1;
+}

src/streamchannel.h

➞

Show inline comments

@@ @@ -47,20 +47,22 @@ public: @@
     const XFrameBuffer* xData() const;
     FrameBuffer* yData();
     const FrameBuffer* yData() const;
     const ChannelInfoModel* info() const;
     void setX(const XFrameBuffer* x);
     /// Returns sample value for closest X
     /**
      * Returns sample value for `x`.
+     *
      * If `x` is out of range `NaN` is returned. A calculated (linear)
      * value is returned when `x` is in between two data points.
      */
     double findValue(double x) const;
 private:
     unsigned _index;
     const XFrameBuffer* _x;
     FrameBuffer* _y;
     ChannelInfoModel* _info;
     /// Finds index of closest X in `xData`
     int findIndex(double x) const;
 };
 #endif // STREAMCHANNEL_H

0 comments (0 inline, 0 general)