Changeset - a377c9d3792c
[Not reviewed]
default
0 1 0
Hasan Yavuz Ă–ZDERYA - 10 years ago 2015-11-07 14:49:30
hy@ozderya.net
use `for` instead of `while`
1 file changed with 1 insertions and 4 deletions:
0 comments (0 inline, 0 general)
dataformatpanel.cpp
Show inline comments
 
@@ -214,58 +214,55 @@ void DataFormatPanel::onDataReady()
 
    // TODO: discard data in the size of packageSize
 
    if (paused)
 
    {
 
        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;
 
    double* channelSamples = new double[numOfPackagesToRead*_numOfChannels];
 

	
 
    // TODO: use `for`, it is for this
 
    int i = 0;
 
    while(i < numOfPackagesToRead)
 
    for (int i = 0; i < numOfPackagesToRead; i++)
 
    {
 
        for (unsigned int ci = 0; ci < _numOfChannels; ci++)
 
        {
 
            // channelSamples[ci].replace(i, (this->*readSample)());
 
            channelSamples[ci*numOfPackagesToRead+i] = (this->*readSample)();
 
        }
 
        i++;
 
    }
 

	
 
    for (unsigned int ci = 0; ci < _numOfChannels; ci++)
 
    {
 
        addChannelData(ci,
 
                       channelSamples + ci*numOfPackagesToRead,
 
                       numOfPackagesToRead);
 
    }
 
    emit dataAdded();
 

	
 
    delete channelSamples;
 
}
 

	
 
void DataFormatPanel::onDataReadyASCII()
 
{
 
    while(serialPort->canReadLine())
 
    {
 
        QByteArray line = serialPort->readLine();
 

	
 
        // discard data if paused
 
        if (paused)
 
        {
 
            return;
 
        }
0 comments (0 inline, 0 general)