Changeset - a6f1f85f1eba
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Hasan Yavuz ÖZDERYA - 11 years ago 2015-05-18 17:34:15
hy@ozderya.net
added 32-bit floating point number format support
3 files changed with 14 insertions and 1 deletions:
mainwindow.cpp
5
mainwindow.h
1
mainwindow.ui
8
1
0 comments (0 inline, 0 general)
mainwindow.cpp
➞
Show inline comments
 
@@ -66,48 +66,49 @@ MainWindow::MainWindow(QWidget *parent)
 
    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)));

			




	
	
	
		
 

			




	
	
	
		
 
    // setup parity selection buttons

			




	
	
	
		
 
    parityButtons.addButton(ui->rbNoParity, (int) QSerialPort::NoParity);

			




	
	
	
		
 
    parityButtons.addButton(ui->rbEvenParity, (int) QSerialPort::EvenParity);

			




	
	
	
		
 
    parityButtons.addButton(ui->rbOddParity, (int) QSerialPort::OddParity);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(&parityButtons,

			




	
	
	
		
 
                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),

			




	
	
	
		
 
                     this, &MainWindow::selectParity);

			




	
	
	
		
 

			




	
	
	
		
 
    // setup data bits selection buttons

			




	
	
	
		
 
    dataBitsButtons.addButton(ui->rb8Bits, (int) QSerialPort::Data8);

			




	
	
	
		
 
    dataBitsButtons.addButton(ui->rb7Bits, (int) QSerialPort::Data7);

			




	
	
	
		
 
    dataBitsButtons.addButton(ui->rb6Bits, (int) QSerialPort::Data6);

			




	
	
	
		
 
    dataBitsButtons.addButton(ui->rb5Bits, (int) QSerialPort::Data5);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(&dataBitsButtons,

			




	
	
	
		
 
                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),

			




	
	
	
		
 
                     this, &MainWindow::selectDataBits);

			




	
	
	
		
 

			




	
	
		
 
@@ -622,48 +623,52 @@ void MainWindow::selectNumberFormat(Numb

			




	
	
	
		
 
        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_float:

			




	
	
	
		
 
            sampleSize = 4;

			




	
	
	
		
 
            readSample = &MainWindow::readSampleAs<float>;

			




	
	
	
		
 
            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()

			




	
	
	
		
 
{

			




        

    


    
    

    

        

                

                    mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,48 +33,49 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include "ui_about_dialog.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class MainWindow;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class MainWindow : public QMainWindow

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit MainWindow(QWidget *parent = 0);

			




	
	
	
		
 
    ~MainWindow();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    enum NumberFormat

			




	
	
	
		
 
    {

			




	
	
	
		
 
        NumberFormat_uint8,

			




	
	
	
		
 
        NumberFormat_uint16,

			




	
	
	
		
 
        NumberFormat_uint32,

			




	
	
	
		
 
        NumberFormat_int8,

			




	
	
	
		
 
        NumberFormat_int16,

			




	
	
	
		
 
        NumberFormat_int32,

			




	
	
	
		
 
        NumberFormat_float,

			




	
	
	
		
 
        NumberFormat_ASCII

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    Ui::MainWindow *ui;

			




	
	
	
		
 
    QButtonGroup numberFormatButtons;

			




	
	
	
		
 
    QButtonGroup parityButtons;

			




	
	
	
		
 
    QButtonGroup dataBitsButtons;

			




	
	
	
		
 
    QButtonGroup stopBitsButtons;

			




	
	
	
		
 
    QButtonGroup flowControlButtons;

			




	
	
	
		
 

			




	
	
	
		
 
    QDialog aboutDialog;

			




	
	
	
		
 
    void setupAboutDialog();

			




	
	
	
		
 

			




	
	
	
		
 
    QSerialPort serialPort;

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned int numOfSamples;

			




	
	
	
		
 
    unsigned int numOfChannels;

			




	
	
	
		
 

			




	
	
	
		
 
    QList<QwtPlotCurve*> curves;

			




	
	
	
		
 
    typedef QVector<double> DataArray;

			




	
	
	
		
 
    DataArray dataX;   // array that simply contains numbers 0..numberOfSamples

			




	
	
	
		
 
    QList<DataArray> channelsData;

			




	
	
	
		
 

			




	
	
	
		
 
    // `data` contains channel specific data

			




        

    


    
    

    

        

                

                    mainwindow.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -426,58 +426,65 @@

			




	
	
	
		
 
              <string>int32</string>

			




	
	
	
		
 
             </property>

			




	
	
	
		
 
            </widget>

			




	
	
	
		
 
           </item>

			




	
	
	
		
 
           <item row="0" column="1">

			




	
	
	
		
 
            <widget class="QRadioButton" name="rbInt8">

			




	
	
	
		
 
             <property name="text">

			




	
	
	
		
 
              <string>int8</string>

			




	
	
	
		
 
             </property>

			




	
	
	
		
 
            </widget>

			




	
	
	
		
 
           </item>

			




	
	
	
		
 
           <item row="4" column="0">

			




	
	
	
		
 
            <spacer name="verticalSpacer_6">

			




	
	
	
		
 
             <property name="orientation">

			




	
	
	
		
 
              <enum>Qt::Vertical</enum>

			




	
	
	
		
 
             </property>

			




	
	
	
		
 
             <property name="sizeHint" stdset="0">

			




	
	
	
		
 
              <size>

			




	
	
	
		
 
               <width>20</width>

			




	
	
	
		
 
               <height>40</height>

			




	
	
	
		
 
              </size>

			




	
	
	
		
 
             </property>

			




	
	
	
		
 
            </spacer>

			




	
	
	
		
 
           </item>

			




	
	
	
		
 
           <item row="3" column="0">

			




	
	
	
		
 
           <item row="3" column="1">

			




	
	
	
		
 
            <widget class="QRadioButton" name="rbASCII">

			




	
	
	
		
 
             <property name="toolTip">

			




	
	
	
		
 
              <string>Comma Separated Values</string>

			




	
	
	
		
 
             </property>

			




	
	
	
		
 
             <property name="text">

			




	
	
	
		
 
              <string>ASCII(CSV)</string>

			




	
	
	
		
 
             </property>

			




	
	
	
		
 
            </widget>

			




	
	
	
		
 
           </item>

			




	
	
	
		
 
           <item row="3" column="0">

			




	
	
	
		
 
            <widget class="QRadioButton" name="rbFloat">

			




	
	
	
		
 
             <property name="text">

			




	
	
	
		
 
              <string>float</string>

			




	
	
	
		
 
             </property>

			




	
	
	
		
 
            </widget>

			




	
	
	
		
 
           </item>

			




	
	
	
		
 
          </layout>

			




	
	
	
		
 
         </widget>

			




	
	
	
		
 
        </item>

			




	
	
	
		
 
        <item>

			




	
	
	
		
 
         <spacer name="horizontalSpacer_3">

			




	
	
	
		
 
          <property name="orientation">

			




	
	
	
		
 
           <enum>Qt::Horizontal</enum>

			




	
	
	
		
 
          </property>

			




	
	
	
		
 
          <property name="sizeType">

			




	
	
	
		
 
           <enum>QSizePolicy::MinimumExpanding</enum>

			




	
	
	
		
 
          </property>

			




	
	
	
		
 
          <property name="sizeHint" stdset="0">

			




	
	
	
		
 
           <size>

			




	
	
	
		
 
            <width>20</width>

			




	
	
	
		
 
            <height>20</height>

			




	
	
	
		
 
           </size>

			




	
	
	
		
 
          </property>

			




	
	
	
		
 
         </spacer>

			




	
	
	
		
 
        </item>

			




	
	
	
		
 
       </layout>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
      <widget class="QWidget" name="tabPlot">

			




	
	
	
		
 
       <attribute name="title">

			




	
	
	
		
 
        <string>Plot</string>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-13856
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support