tempo-plotter Changeset - 337bb486333f · protofusion repositories

Changeset - 337bb486333f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 11 years ago 2015-05-18 16:14:58
hy@ozderya.net

skip byte button isn't used in ASCII mode, so disable it

1 file changed with 2 insertions and 1 deletions:

mainwindow.cpp

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -609,103 +609,104 @@ void MainWindow::onYScaleChanged() @@
+}
 void MainWindow::onNumberFormatButtonToggled(int numberFormatId, bool checked)
+{
     if (checked) selectNumberFormat((NumberFormat) numberFormatId);
+}
 void MainWindow::selectNumberFormat(NumberFormat numberFormatId)
+{
     numberFormat = numberFormatId;
     switch(numberFormat)
+    {
         case NumberFormat_uint8:
             sampleSize = 1;
             readSample = &MainWindow::readSampleAs<quint8>;
             break;
         case NumberFormat_int8:
             sampleSize = 1;
             readSample = &MainWindow::readSampleAs<qint8>;
             break;
         case NumberFormat_uint16:
             sampleSize = 2;
             readSample = &MainWindow::readSampleAs<quint16>;
             break;
         case NumberFormat_int16:
             sampleSize = 2;
             readSample = &MainWindow::readSampleAs<qint16>;
             break;
         case NumberFormat_uint32:
             sampleSize = 4;
             readSample = &MainWindow::readSampleAs<quint32>;
             break;
         case NumberFormat_int32:
             sampleSize = 4;
             readSample = &MainWindow::readSampleAs<qint32>;
             break;
         case NumberFormat_ASCII:
             sampleSize = 0;    // these two members should not be used
             readSample = NULL; // in this mode
             break;
+    }
     if (numberFormat == NumberFormat_ASCII)
+    {
         QObject::disconnect(&(this->serialPort), &QSerialPort::readyRead, 0, 0);
         QObject::connect(&(this->serialPort), &QSerialPort::readyRead,
                          this, &MainWindow::onDataReadyASCII);
+        ui->pbSkipByte->setDisabled(true);
+    }
     else
+    {
         QObject::disconnect(&(this->serialPort), &QSerialPort::readyRead, 0, 0);
         QObject::connect(&(this->serialPort), &QSerialPort::readyRead,
                          this, &MainWindow::onDataReady);
         ui->pbSkipByte->setEnabled(true);
+    }
+}
 template<typename T> double MainWindow::readSampleAs()
+{
     T data;
     this->serialPort.read((char*) &data, sizeof(data));
     return double(data);
+}
 bool MainWindow::isDemoRunning()
+{
     return ui->actionDemoMode->isChecked();
+}
 void MainWindow::demoTimerTimeout()
+{
     demoCount++;
     if (demoCount > 100) demoCount = 0;
     for (int ci = 0; ci < numOfChannels; ci++)
+    {
         DataArray data(1);
         data.replace(0, (ci + 1)*demoCount);
         addChannelData(ci, data);
+    }
+}
 void MainWindow::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         if (!serialPort.isOpen())
+        {
             demoTimer.start();
             ui->actionDemoMode->setChecked(true);
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         demoTimer.stop();
         ui->actionDemoMode->setChecked(false);
+    }
+}

0 comments (0 inline, 0 general)