tempo-plotter Changeset - f9c0c2336d7b · protofusion repositories

Changeset - f9c0c2336d7b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-27 16:19:48
hy@ozderya.net

fix plot view not updated when number of samples is changed (unless there is incoming data)

1 file changed with 11 insertions and 0 deletions:

mainwindow.cpp

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -411,109 +411,120 @@ void MainWindow::addChannelData(unsigned @@
         (*channelDataArray) = data;
+    }
     else
+    {
         // shift old samples
         int shift = data.size();
         for (int i = 0; i < offset; i++)
+        {
             (*channelDataArray)[i] = (*channelDataArray)[i + shift];
+        }
         // place new samples
         for (int i = 0; i < data.size(); i++)
+        {
             (*channelDataArray)[offset + i] = data[i];
+        }
+    }
     // update plot
     curves[channel]->setSamples(dataX, (*channelDataArray));
     ui->plot->replot(); // TODO: replot after all channel data updated
     sampleCount += data.size();
+}
 void MainWindow::clearPlot()
+{
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelsData[ci].fill(0.0);
         curves[ci]->setSamples(dataX, channelsData[ci]);
+    }
     // update plot
     ui->plot->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     unsigned int oldNum = this->numOfSamples;
     numOfSamples = value;
     // resize data arrays
     if (numOfSamples < oldNum)
+    {
         dataX.resize(numOfSamples);
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             channelsData[ci].remove(0, oldNum - numOfSamples);
             curves[ci]->setSamples(dataX, channelsData[ci]);
+        }
         ui->plot->replot();
+    }
     else if(numOfSamples > oldNum)
+    {
         // update data arrays
         dataX.resize(numOfSamples);
         for (unsigned int i = oldNum; i < numOfSamples; i++)
+        {
             dataX[i] = i;
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 // TODO: opportunity of major optimization here
                 //       let's hope nobody sees this
                 channelsData[ci].prepend(0);
+            }
+        }
         // update curves
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             curves[ci]->setSamples(dataX, channelsData[ci]);
+        }
         ui->plot->replot();
+    }
+}
 void MainWindow::onNumOfChannelsChanged(int value)
+{
     unsigned int oldNum = this->numOfChannels;
     this->numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (unsigned int i = 0; i < numOfChannels - oldNum; i++)
+        {
             channelsData.append(DataArray(numOfSamples, 0.0));
             curves.append(new QwtPlotCurve());
             curves.last()->setSamples(dataX, channelsData.last());
             curves.last()->setPen(makeColor(curves.length()-1));
             curves.last()->attach(ui->plot);
+        }
+    }
     else if(numOfChannels < oldNum)
+    {
         // remove channels
         for (unsigned int i = 0; i < oldNum - numOfChannels; i++)
+        {
             channelsData.removeLast();
             auto curve = curves.takeLast();
             curve->detach();
             delete curve;
+        }
+    }
+}
 void MainWindow::onAutoScaleChecked(bool checked)
+{
     if (checked)
+    {
         ui->plot->setAxis(true);
         ui->lYmin->setEnabled(false);
         ui->lYmax->setEnabled(false);
         ui->spYmin->setEnabled(false);
         ui->spYmax->setEnabled(false);
+    }
     else
+    {
         ui->lYmin->setEnabled(true);
         ui->lYmax->setEnabled(true);
         ui->spYmin->setEnabled(true);

0 comments (0 inline, 0 general)