tempo-plotter Changeset - 027be1575c36 · protofusion repositories

Changeset - 027be1575c36

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-08-15 12:53:38
hy@ozderya.net

cleanup removed two else clauses reducing the scope depth

1 file changed with 38 insertions and 44 deletions:

mainwindow.cpp

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -225,70 +225,64 @@ void MainWindow::setupAboutDialog() @@
     uiAboutDialog.lbAbout->setText(aboutText);
+}
 void MainWindow::onPortToggled(bool open)
+{
     // make sure demo mode is disabled
     if (open && isDemoRunning()) enableDemo(false);
     ui->actionDemoMode->setEnabled(!open);
+}
 void MainWindow::onDataReady()
+{
     if (!ui->actionPause->isChecked())
+    {
         // a package is a set of channel data like {CHAN0_SAMPLE, CHAN1_SAMPLE...}
         int packageSize = sampleSize * numOfChannels;
         int bytesAvailable = serialPort.bytesAvailable();
         if (bytesAvailable > 0 && skipByteRequested)
+        {
             serialPort.read(1);
             skipByteRequested = false;
             bytesAvailable--;
+        }
         if (bytesAvailable < packageSize)
+        {
             return;
+        }
         else
+        {
             int numOfPackagesToRead =
                 (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
             QVector<DataArray> channelSamples(numOfChannels);
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 channelSamples[ci].resize(numOfPackagesToRead);
+            }
             int i = 0;
             while(i < numOfPackagesToRead)
+            {
                 for (unsigned int ci = 0; ci < numOfChannels; ci++)
+                {
                     channelSamples[ci].replace(i, (this->*readSample)());
+                }
                 i++;
+            }
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 addChannelData(ci, channelSamples[ci]);
+            }
+        }
+    }
     else
     if (ui->actionPause->isChecked())
+    {
         serialPort.clear(QSerialPort::Input);
         return;
+    }
     // a package is a set of channel data like {CHAN0_SAMPLE, CHAN1_SAMPLE...}
     int packageSize = sampleSize * numOfChannels;
     int bytesAvailable = serialPort.bytesAvailable();
     if (bytesAvailable > 0 && skipByteRequested)
+    {
         serialPort.read(1);
         skipByteRequested = false;
         bytesAvailable--;
+    }
     if (bytesAvailable < packageSize) return;
     int numOfPackagesToRead =
         (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
     QVector<DataArray> channelSamples(numOfChannels);
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelSamples[ci].resize(numOfPackagesToRead);
+    }
     int i = 0;
     while(i < numOfPackagesToRead)
+    {
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             channelSamples[ci].replace(i, (this->*readSample)());
+        }
         i++;
+    }
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         addChannelData(ci, channelSamples[ci]);
+    }
+}
 void MainWindow::onDataReadyASCII()
+{
     while(serialPort.canReadLine())
+    {
         QByteArray line = serialPort.readLine();
         // discard data if paused
         if (ui->actionPause->isChecked())
+        {

0 comments (0 inline, 0 general)