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

@@ @@ -45,430 +45,424 @@ MainWindow::MainWindow(QWidget *parent) @@
     ui(new Ui::MainWindow),
     portControl(&serialPort)
+{
     ui->setupUi(this);
     ui->tabWidget->insertTab(0, &portControl, "Port");
     ui->tabWidget->setCurrentIndex(0);
     setupAboutDialog();
     // init UI signals
     // menu signals
     QObject::connect(ui->actionHelpAbout, &QAction::triggered,
               &aboutDialog, &QWidget::show);
     QObject::connect(ui->actionExportCsv, &QAction::triggered,
                      this, &MainWindow::onExportCsv);
     QObject::connect(ui->actionQuit, &QAction::triggered,
                      this, &MainWindow::close);
     QObject::connect(ui->actionGrid, &QAction::toggled, [this](bool show)
+                     {
                          ui->plot->showGrid(show);
                          ui->actionMinorGrid->setEnabled(show);
                      });
     ui->actionMinorGrid->setEnabled(ui->actionGrid->isChecked());
     QObject::connect(ui->actionMinorGrid, &QAction::toggled,
                      ui->plot, &Plot::showMinorGrid);
     QObject::connect(ui->actionUnzoom, &QAction::triggered,
                      ui->plot, &Plot::unzoom);
     QObject::connect(ui->actionDarkBackground, &QAction::toggled,
                      ui->plot, &Plot::darkBackground);
     ui->plot->darkBackground(ui->actionDarkBackground->isChecked());
     // port control signals
     QObject::connect(&portControl, &PortControl::portToggled,
                      this, &MainWindow::onPortToggled);
     QObject::connect(&portControl, &PortControl::skipByteRequested,
                      this, &MainWindow::skipByte);
     QObject::connect(ui->spNumOfSamples, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
                      this, &MainWindow::onNumOfSamplesChanged);
     QObject::connect(ui->cbAutoScale, &QCheckBox::toggled,
                      this, &MainWindow::onAutoScaleChecked);
     QObject::connect(ui->spYmin, SIGNAL(valueChanged(double)),
                      this, SLOT(onYScaleChanged()));
     QObject::connect(ui->spYmax, SIGNAL(valueChanged(double)),
                      this, SLOT(onYScaleChanged()));
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     // setup number of channels spinbox
     QObject::connect(ui->spNumOfChannels,
                      SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
                      this, &MainWindow::onNumOfChannelsChanged);
     // setup number format buttons
     numberFormatButtons.addButton(ui->rbUint8,  NumberFormat_uint8);
     numberFormatButtons.addButton(ui->rbUint16, NumberFormat_uint16);
     numberFormatButtons.addButton(ui->rbUint32, NumberFormat_uint32);
     numberFormatButtons.addButton(ui->rbInt8,   NumberFormat_int8);
     numberFormatButtons.addButton(ui->rbInt16,  NumberFormat_int16);
     numberFormatButtons.addButton(ui->rbInt32,  NumberFormat_int32);
     numberFormatButtons.addButton(ui->rbFloat,  NumberFormat_float);
     numberFormatButtons.addButton(ui->rbASCII,  NumberFormat_ASCII);
     QObject::connect(&numberFormatButtons, SIGNAL(buttonToggled(int, bool)),
                      this, SLOT(onNumberFormatButtonToggled(int, bool)));
     // init port signals
     QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
                      this, SLOT(onPortError(QSerialPort::SerialPortError)));
     // set limits for axis limit boxes
     ui->spYmin->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     ui->spYmax->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     // init data arrays and plot
     numOfSamples = ui->spNumOfSamples->value();
     numOfChannels = ui->spNumOfChannels->value();
     // init channel data and curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
+    {
         channelBuffers.append(new FrameBuffer(numOfSamples));
         curves.append(new QwtPlotCurve());
         curves[i]->setSamples(channelBuffers[i]);
         curves[i]->setPen(makeColor(i));
         curves[i]->attach(ui->plot);
+    }
     // init auto scale
     ui->plot->setAxis(ui->cbAutoScale->isChecked(),
                       ui->spYmin->value(), ui->spYmax->value());
     // init grid
     ui->plot->showGrid(ui->actionGrid->isChecked());
     ui->plot->showMinorGrid(ui->actionMinorGrid->isChecked());
     // init number format
     if (numberFormatButtons.checkedId() >= 0)
+    {
         selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
+    }
     else
+    {
         selectNumberFormat(NumberFormat_uint8);
+    }
     // Init sps (sample per second) counter
     sampleCount = 0;
     spsLabel.setText("0sps");
     spsLabel.setToolTip("samples per second (total of all channels)");
     ui->statusBar->addPermanentWidget(&spsLabel);
     spsTimer.start(SPS_UPDATE_TIMEOUT * 1000);
     QObject::connect(&spsTimer, &QTimer::timeout,
                      this, &MainWindow::spsTimerTimeout);
     // Init demo mode
     demoCount = 0;
     demoTimer.setInterval(100);
     QObject::connect(&demoTimer, &QTimer::timeout,
                      this, &MainWindow::demoTimerTimeout);
     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)
+    {
         // also deletes respective FrameBuffer
         delete curve;
+    }
     if (serialPort.isOpen())
+    {
         serialPort.close();
+    }
     delete ui;
     ui = NULL; // we check if ui is deleted in messageHandler
+}
 void MainWindow::setupAboutDialog()
+{
     Ui_AboutDialog uiAboutDialog;
     uiAboutDialog.setupUi(&aboutDialog);
     QObject::connect(uiAboutDialog.pbAboutQt, &QPushButton::clicked,
                      [](){ QApplication::aboutQt();});
     QString aboutText = uiAboutDialog.lbAbout->text();
     aboutText.replace("$VERSION_STRING$", VERSION_STRING);
     aboutText.replace("$VERSION_REVISION$", VERSION_REVISION);
     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())
+        {
             return;
+        }
         line = line.trimmed();
         auto separatedValues = line.split(',');
         int numReadChannels; // effective number of channels to read
         if (separatedValues.length() >= int(numOfChannels))
+        {
             numReadChannels = numOfChannels;
+        }
         else // there is missing channel data
+        {
             numReadChannels = separatedValues.length();
             qWarning() << "Incoming data is missing data for some channels!";
+        }
         // parse read line
         for (int ci = 0; ci < numReadChannels; ci++)
+        {
             bool ok;
             double channelSample = separatedValues[ci].toDouble(&ok);
             if (ok)
+            {
                 addChannelData(ci, DataArray({channelSample}));
+            }
             else
+            {
                 qWarning() << "Data parsing error for channel: " << ci;
+            }
+        }
+    }
+}
 void MainWindow::onPortError(QSerialPort::SerialPortError error)
+{
     switch(error)
+    {
         case QSerialPort::NoError :
             break;
         case QSerialPort::ResourceError :
             qWarning() << "Port error: resource unavaliable; most likely device removed.";
             if (serialPort.isOpen())
+            {
                 qWarning() << "Closing port on resource error: " << serialPort.portName();
                 portControl.togglePort();
+            }
             portControl.loadPortList();
             break;
         case QSerialPort::DeviceNotFoundError:
             qCritical() << "Device doesn't exists: " << serialPort.portName();
             break;
         case QSerialPort::PermissionError:
             qCritical() << "Permission denied. Either you don't have \
 required privileges or device is already opened by another process.";
             break;
         case QSerialPort::OpenError:
             qWarning() << "Device is already opened!";
             break;
         case QSerialPort::NotOpenError:
             qCritical() << "Device is not open!";
             break;
         case QSerialPort::ParityError:
             qCritical() << "Parity error detected.";
             break;
         case QSerialPort::FramingError:
             qCritical() << "Framing error detected.";
             break;
         case QSerialPort::BreakConditionError:
             qCritical() << "Break condition is detected.";
             break;
         case QSerialPort::WriteError:
             qCritical() << "An error occurred while writing data.";
             break;
         case QSerialPort::ReadError:
             qCritical() << "An error occurred while reading data.";
             break;
         case QSerialPort::UnsupportedOperationError:
             qCritical() << "Operation is not supported.";
             break;
         case QSerialPort::TimeoutError:
             qCritical() << "A timeout error occurred.";
             break;
         case QSerialPort::UnknownError:
             qCritical() << "Unknown error!";
             break;
         default:
             qCritical() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::skipByte()
+{
     skipByteRequested = true;
+}
 void MainWindow::addChannelData(unsigned int channel, DataArray data)
+{
     channelBuffers[channel]->addSamples(data);
     ui->plot->replot(); // TODO: replot after all channel data updated
     sampleCount += data.size();
+}
 void MainWindow::clearPlot()
+{
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelBuffers[ci]->clear();
+    }
     ui->plot->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     numOfSamples = value;
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelBuffers[ci]->resize(numOfSamples);
+    }
     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++)
+        {
             channelBuffers.append(new FrameBuffer(numOfSamples));
             curves.append(new QwtPlotCurve());
             curves.last()->setSamples(channelBuffers.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++)
+        {
             // also deletes owned FrameBuffer
             delete curves.takeLast();
             channelBuffers.removeLast();
+        }
+    }
+}
 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);
         ui->spYmax->setEnabled(true);
         ui->plot->setAxis(false,  ui->spYmin->value(), ui->spYmax->value());
+    }
+}
 void MainWindow::onYScaleChanged()
+{
     ui->plot->setAxis(false,  ui->spYmin->value(), ui->spYmax->value());
+}

0 comments (0 inline, 0 general)