tempo-plotter Changeset - 52af566267d1 · protofusion repositories

Changeset - 52af566267d1

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2016-03-25 16:47:57
hy@ozderya.net

show sample per second value for a single channel, not total input

2 files changed with 2 insertions and 2 deletions:

src/dataformatpanel.cpp

src/mainwindow.cpp

0 comments (0 inline, 0 general)

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -161,49 +161,49 @@ void DataFormatPanel::requestSkipByte() @@
+{
     skipByteRequested = true;
+}
 void DataFormatPanel::pause(bool enabled)
+{
     paused = enabled;
+}
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoTimer.start();
+    }
     else
+    {
         demoTimer.stop();
+    }
+}
 void DataFormatPanel::spsTimerTimeout()
+{
     unsigned currentSps = _samplesPerSecond;
     _samplesPerSecond = sampleCount/SPS_UPDATE_TIMEOUT;
+    _samplesPerSecond = (sampleCount/_numOfChannels)/SPS_UPDATE_TIMEOUT;
     if (currentSps != _samplesPerSecond)
+    {
         emit samplesPerSecondChanged(_samplesPerSecond);
+    }
     sampleCount = 0;
+}
 void DataFormatPanel::demoTimerTimeout()
+{
     const double period = 100;
     demoCount++;
     if (demoCount >= 100) demoCount = 0;
     if (!paused)
+    {
         for (unsigned ci = 0; ci < _numOfChannels; ci++)
+        {
             // we are calculating the fourier components of square wave
             double value = 4*sin(2*M_PI*double((ci+1)*demoCount)/period)/((2*(ci+1))*M_PI);
             addChannelData(ci, &value, 1);
+        }
         emit dataAdded();
+    }

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -178,49 +178,49 @@ MainWindow::MainWindow(QWidget *parent) @@
         int rmax = pow(2, nbits-1)-1;
         int rmin = -rmax-1;
         Range r = {double(rmin),  double(rmax)};
         ui->cbRangePresets->addItem(
             QString().sprintf("Signed %d bits %d to +%d", nbits, rmin, rmax),
             QVariant::fromValue(r));
+    }
     for (int nbits = 8; nbits <= 24; nbits++) // unsigned binary formats
+    {
         int rmax = pow(2, nbits)-1;
         ui->cbRangePresets->addItem(
             QString().sprintf("Unsigned %d bits %d to +%d", nbits, 0, rmax),
             QVariant::fromValue(Range{0, double(rmax)}));
+    }
     ui->cbRangePresets->addItem("-1 to +1", QVariant::fromValue(Range{-1, +1}));
     ui->cbRangePresets->addItem("0 to +1", QVariant::fromValue(Range{0, +1}));
     ui->cbRangePresets->addItem("-100 to +100", QVariant::fromValue(Range{-100, +100}));
     ui->cbRangePresets->addItem("0 to +100", QVariant::fromValue(Range{0, +100}));
     QObject::connect(ui->cbRangePresets, SIGNAL(activated(int)),
                      this, SLOT(onRangeSelected()));
     // Init sps (sample per second) counter
     spsLabel.setText("0sps");
-    spsLabel.setToolTip("samples per second (total of all channels)");
+    spsLabel.setToolTip("samples per second (per channel)");
     ui->statusBar->addPermanentWidget(&spsLabel);
     QObject::connect(&dataFormatPanel,
                      &DataFormatPanel::samplesPerSecondChanged,
                      this, &MainWindow::onSpsChanged);
     // init demo
     QObject::connect(ui->actionDemoMode, &QAction::toggled,
                      this, &MainWindow::enableDemo);
     {   // init demo indicator
         QwtText demoText(" DEMO RUNNING ");  // looks better with spaces
         demoText.setColor(QColor("white"));
         demoText.setBackgroundBrush(Qt::darkRed);
         demoText.setBorderRadius(4);
         demoText.setRenderFlags(Qt::AlignLeft | Qt::AlignTop);
         demoIndicator.setText(demoText);
         demoIndicator.hide();
         demoIndicator.attach(ui->plot);
+    }
+}
 MainWindow::~MainWindow()
+{
     for (auto curve : curves)

0 comments (0 inline, 0 general)