tempo-plotter Changeset - be167cc7f2fb · protofusion repositories

Changeset - be167cc7f2fb

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

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

fixed many warnings of "-Wsign-compare"

1 file changed with 13 insertions and 13 deletions:

mainwindow.cpp

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -104,13 +104,13 @@ MainWindow::MainWindow(QWidget *parent) @@
     for (int i = 0; i < dataX.size(); i++)
+    {
         dataX[i] = i;
+    }
     // init channel data and curve list
     for (int i = 0; i < numOfChannels; i++)
+    for (unsigned int i = 0; i < numOfChannels; i++)
+    {
         channelsData.append(DataArray(numOfSamples, 0.0));
         curves.append(new QwtPlotCurve());
         curves[i]->setSamples(dataX, channelsData[i]);
         curves[i]->setPen(makeColor(i));
         curves[i]->attach(ui->plot);
@@ @@ -191,28 +191,28 @@ void MainWindow::onDataReady() @@
+        }
         else
+        {
             int numOfPackagesToRead =
                 (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
             QVector<DataArray> channelSamples(numOfChannels);
             for (int ci = 0; ci < numOfChannels; ci++)
+            for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 channelSamples[ci].resize(numOfPackagesToRead);
+            }
             int i = 0;
             while(i < numOfPackagesToRead)
+            {
                 for (int ci = 0; ci < numOfChannels; ci++)
+                for (unsigned int ci = 0; ci < numOfChannels; ci++)
+                {
                     channelSamples[ci].replace(i, (this->*readSample)());
+                }
                 i++;
+            }
             for (int ci = 0; ci < numOfChannels; ci++)
+            for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 addChannelData(ci, channelSamples[ci]);
+            }
+        }
+    }
     else
@@ @@ -226,15 +226,15 @@ void MainWindow::onDataReadyASCII() @@
     while(serialPort.canReadLine())
+    {
         QByteArray line = serialPort.readLine();
         line = line.trimmed();
         auto separatedValues = line.split(',');
         if (separatedValues.length() >= numOfChannels)
+        if (separatedValues.length() >= int(numOfChannels))
+        {
             for (int ci = 0; ci < numOfChannels; ci++)
+            for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 double channelSample = separatedValues[ci].toDouble();
                 addChannelData(ci, DataArray({channelSample}));
+            }
+        }
         else // there is missing channel data
@@ @@ -280,13 +280,13 @@ void MainWindow::addChannelData(unsigned @@
+{
     DataArray* channelDataArray = &(channelsData[channel]);
     int offset = numOfSamples - data.size();
     if (offset < 0)
+    {
         for (int i = 0; i < numOfSamples; i++)
+        for (unsigned int i = 0; i < numOfSamples; i++)
+        {
             (*channelDataArray)[i] = data[i - offset];
+        }
+    }
     else if (offset == 0)
+    {
@@ @@ -311,13 +311,13 @@ void MainWindow::addChannelData(unsigned @@
     curves[channel]->setSamples(dataX, (*channelDataArray));
     ui->plot->replot(); // TODO: replot after all channel data updated
+}
 void MainWindow::clearPlot()
+{
     for (int ci = 0; ci < numOfChannels; ci++)
+    for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelsData[ci].fill(0.0);
         curves[ci]->setSamples(dataX, channelsData[ci]);
+    }
     // update plot
@@ @@ -330,24 +330,24 @@ void MainWindow::onNumOfSamplesChanged(i @@
     numOfSamples = value;
     // resize data arrays
     if (numOfSamples < oldNum)
+    {
         dataX.resize(numOfSamples);
         for (int ci = 0; ci < numOfChannels; ci++)
+        for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             channelsData[ci].remove(0, oldNum - numOfSamples);
+        }
+    }
     else if(numOfSamples > oldNum)
+    {
         dataX.resize(numOfSamples);
         for (unsigned int i = oldNum; i < numOfSamples; i++)
+        {
             dataX[i] = i;
             for (int ci = 0; ci < numOfChannels; ci++)
+            for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 channelsData[ci].prepend(0);
+            }
+        }
+    }
+}
@@ @@ -357,25 +357,25 @@ void MainWindow::onNumOfChannelsChanged( @@
     unsigned int oldNum = this->numOfChannels;
     this->numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (int i = 0; i < numOfChannels - oldNum; i++)
+        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 (int i = 0; i < oldNum - numOfChannels; i++)
+        for (unsigned int i = 0; i < oldNum - numOfChannels; i++)
+        {
             channelsData.removeLast();
             auto curve = curves.takeLast();
             curve->detach();
             delete curve;
+        }
@@ @@ -485,13 +485,13 @@ bool MainWindow::isDemoRunning() @@
 void MainWindow::demoTimerTimeout()
+{
     demoCount++;
     if (demoCount > 100) demoCount = 0;
     for (int ci = 0; ci < numOfChannels; ci++)
+    for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         DataArray data(1);
         data.replace(0, (ci + 1)*demoCount);
         addChannelData(ci, data);
+    }
+}

0 comments (0 inline, 0 general)