Changeset - 8932fd91959c
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Hasan Yavuz ÖZDERYA - 10 years ago 2015-04-18 17:48:21
hy@ozderya.net
implemented primitive multi channel support
2 files changed with 70 insertions and 26 deletions:
mainwindow.cpp
60
22
mainwindow.h
10
4
0 comments (0 inline, 0 general)
mainwindow.cpp
➞
Show inline comments
 
@@ -145,16 +145,25 @@ MainWindow::MainWindow(QWidget *parent)
 
    ui->spYmax->setRange((-1) * std::numeric_limits<double>::max(),
 
                         std::numeric_limits<double>::max());
 

			




	
	
	
		
 
    // init plot

			




	
	
	
		
 
    // init data arrays and plot

			




	
	
	
		
 

			




	
	
	
		
 
    numOfSamples = ui->spNumOfSamples->value();

			




	
	
	
		
 
    dataArray.resize(numOfSamples);

			




	
	
	
		
 
    numOfChannels = 1;

			




	
	
	
		
 

			




	
	
	
		
 
    dataX.resize(numOfSamples);

			




	
	
	
		
 
    for (int i = 0; i < dataX.size(); i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        dataX[i] = i;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    curve.setSamples(dataX, dataArray);

			




	
	
	
		
 
    curve.attach(ui->plot);

			




	
	
	
		
 

			




	
	
	
		
 
    // init channel data and curve list

			




	
	
	
		
 
    for (int i = 0; i < numOfChannels; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        channelsData.append(DataArray(numOfSamples, 0.0));

			




	
	
	
		
 
        curves.append(new QwtPlotCurve());

			




	
	
	
		
 
        curves[i]->setSamples(dataX, channelsData[i]);

			




	
	
	
		
 
        curves[i]->attach(ui->plot);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // init number format

			




	
	
	
		
 
    if (numberFormatButtons.checkedId() >= 0)

			




	
	
		
 
@@ -169,6 +178,11 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::~MainWindow()

			




	
	
	
		
 
{

			




	
	
	
		
 
    for (auto curve : curves)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete curve;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    if (serialPort.isOpen())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        serialPort.close();

			




	
	
		
 
@@ -335,6 +349,8 @@ 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)

			




	
	
		
 
@@ -344,22 +360,34 @@ void MainWindow::onDataReady()

			




	
	
	
		
 
            bytesAvailable--;

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        if (bytesAvailable < sampleSize)

			




	
	
	
		
 
        if (bytesAvailable < packageSize)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            return;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else

			




	
	
	
		
 
        {

			




	
	
	
		
 
            int numOfSamplesToRead =

			




	
	
	
		
 
                (bytesAvailable - (bytesAvailable % sampleSize)) / sampleSize;

			




	
	
	
		
 
            QVector<double> samples(numOfSamplesToRead);

			




	
	
	
		
 
            int numOfPackagesToRead =

			




	
	
	
		
 
                (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;

			




	
	
	
		
 
            QVector<DataArray> channelSamples(numOfChannels);

			




	
	
	
		
 
            for (int ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                channelSamples[ci].resize(numOfPackagesToRead);

			




	
	
	
		
 
            }

			




	
	
	
		
 

			




	
	
	
		
 
            int i = 0;

			




	
	
	
		
 
            while(i < numOfSamplesToRead)

			




	
	
	
		
 
            while(i < numOfPackagesToRead)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                samples.replace(i, (this->*readSample)());

			




	
	
	
		
 
                for (int ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    channelSamples[ci].replace(i, (this->*readSample)());

			




	
	
	
		
 
                }

			




	
	
	
		
 
                i++;

			




	
	
	
		
 
            }

			




	
	
	
		
 
            addData(samples);

			




	
	
	
		
 

			




	
	
	
		
 
            for (int ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                addChannelData(ci, channelSamples[ci]);

			




	
	
	
		
 
            }

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
		
 
@@ -395,20 +423,21 @@ void MainWindow::skipByte()

			




	
	
	
		
 
    skipByteRequested = true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::addData(QVector<double> data)

			




	
	
	
		
 
void MainWindow::addChannelData(unsigned int channel, DataArray data)

			




	
	
	
		
 
{

			




	
	
	
		
 
    DataArray* channelDataArray = &(channelsData[channel]);

			




	
	
	
		
 
    int offset = numOfSamples - data.size();

			




	
	
	
		
 

			




	
	
	
		
 
    if (offset < 0)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        for (int i = 0; i < numOfSamples; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            dataArray[i] = data[i - offset];

			




	
	
	
		
 
            (*channelDataArray)[i] = data[i - offset];

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if (offset == 0)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        dataArray = data;

			




	
	
	
		
 
        (*channelDataArray) = data;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
		
 
@@ -416,26 +445,29 @@ void MainWindow::addData(QVector<double>

			




	
	
	
		
 
        int shift = data.size();

			




	
	
	
		
 
        for (int i = 0; i < offset; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            dataArray[i] = dataArray[i + shift];

			




	
	
	
		
 
            (*channelDataArray)[i] = (*channelDataArray)[i + shift];

			




	
	
	
		
 
        }

			




	
	
	
		
 
        // place new samples

			




	
	
	
		
 
        for (int i = 0; i < data.size(); i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            dataArray[offset + i] = data[i];

			




	
	
	
		
 
            (*channelDataArray)[offset + i] = data[i];

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // update plot

			




	
	
	
		
 
    curve.setSamples(dataX, dataArray);

			




	
	
	
		
 
    ui->plot->replot();

			




	
	
	
		
 
    curves[channel]->setSamples(dataX, (*channelDataArray));

			




	
	
	
		
 
    ui->plot->replot(); // TODO: replot after all channel data updated

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::clearPlot()

			




	
	
	
		
 
{

			




	
	
	
		
 
    dataArray.fill(0.0);

			




	
	
	
		
 
    for (int ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        channelsData[ci].fill(0.0);

			




	
	
	
		
 
        curves[ci]->setSamples(dataX, channelsData[ci]);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // update plot

			




	
	
	
		
 
    curve.setSamples(dataX, dataArray);

			




	
	
	
		
 
    ui->plot->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -448,7 +480,10 @@ void MainWindow::onNumOfSamplesChanged(i

			




	
	
	
		
 
    if (numOfSamples < oldNum)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        dataX.resize(numOfSamples);

			




	
	
	
		
 
        dataArray.remove(0, oldNum - numOfSamples);

			




	
	
	
		
 
        for (int ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            channelsData[ci].remove(0, oldNum - numOfSamples);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if(numOfSamples > oldNum)

			




	
	
	
		
 
    {

			




	
	
		
 
@@ -456,7 +491,10 @@ void MainWindow::onNumOfSamplesChanged(i

			




	
	
	
		
 
        for (unsigned int i = oldNum; i < numOfSamples; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            dataX[i] = i;

			




	
	
	
		
 
            dataArray.prepend(0);

			




	
	
	
		
 
            for (int ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                channelsData[ci].prepend(0);

			




	
	
	
		
 
            }

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,6 +24,7 @@

			




	
	
	
		
 
#include <QButtonGroup>

			




	
	
	
		
 
#include <QString>

			




	
	
	
		
 
#include <QVector>

			




	
	
	
		
 
#include <QList>

			




	
	
	
		
 
#include <QSerialPort>

			




	
	
	
		
 
#include <QSignalMapper>

			




	
	
	
		
 
#include <qwt_plot_curve.h>

			




	
	
		
 
@@ -66,10 +67,15 @@ private:

			




	
	
	
		
 
    QSerialPort serialPort;

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned int numOfSamples;

			




	
	
	
		
 
    QwtPlotCurve curve;

			




	
	
	
		
 
    QVector<double> dataArray;

			




	
	
	
		
 
    QVector<double> dataX;

			




	
	
	
		
 
    void addData(QVector<double> data);

			




	
	
	
		
 
    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

			




	
	
	
		
 
    void addChannelData(unsigned int channel, DataArray data);

			




	
	
	
		
 

			




	
	
	
		
 
    NumberFormat numberFormat;

			




	
	
	
		
 
    unsigned int sampleSize; // number of bytes in the selected number format

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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