Changeset - 641f94e963c4
[Not reviewed]
default
0 1 0
Hasan Yavuz Ă–ZDERYA - 11 years ago 2015-03-07 16:55:55
hy@ozderya.net
fixed unfortunate tab indentations
1 file changed with 24 insertions and 24 deletions:
0 comments (0 inline, 0 general)
mainwindow.cpp
Show inline comments
 
@@ -32,24 +32,24 @@ MainWindow::MainWindow(QWidget *parent) 
 
    QObject::connect(&(this->serialPort), &QSerialPort::readyRead,
 
                     this, &MainWindow::onDataReady);
 

	
 
	// init port signals
 
	QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
 
    // init port signals
 
    QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
 
                     this, SLOT(onPortError(QSerialPort::SerialPortError)));
 

	
 
    loadPortList();
 
    loadBaudRateList();
 
    ui->cbBaudRate->setCurrentIndex(ui->cbBaudRate->findText("9600"));
 

	
 
	// init plot
 
	numOfSamples = 100;
 
	dataArray.resize(numOfSamples);
 
	dataX.resize(numOfSamples);
 
	for (int i = 0; i < dataX.size(); i++)
 
	{
 
		dataX[i] = i;
 
	}
 
	curve.setSamples(dataX, dataArray);
 
	curve.attach(ui->plot);
 
    // init plot
 
    numOfSamples = 100;
 
    dataArray.resize(numOfSamples);
 
    dataX.resize(numOfSamples);
 
    for (int i = 0; i < dataX.size(); i++)
 
    {
 
        dataX[i] = i;
 
    }
 
    curve.setSamples(dataX, dataArray);
 
    curve.attach(ui->plot);
 
}
 

	
 
MainWindow::~MainWindow()
 
@@ -161,25 +161,25 @@ void MainWindow::onPortToggled(bool open
 

	
 
void MainWindow::onDataReady()
 
{
 
	QByteArray data = serialPort.readAll();
 
	addData((unsigned char)(data[0]));
 
    QByteArray data = serialPort.readAll();
 
    addData((unsigned char)(data[0]));
 
}
 

	
 
void MainWindow::onPortError(QSerialPort::SerialPortError error)
 
{
 
	qDebug() << "Port error happened: " << serialPort.error();
 
    qDebug() << "Port error happened: " << serialPort.error();
 
}
 

	
 
void MainWindow::addData(double data)
 
{
 
	// shift data array and place new data at the end
 
	for (int i = 0; i < dataArray.size()-1; i++)
 
	{
 
		dataArray[i] = dataArray[i+1];
 
	}
 
	dataArray.last() = data;
 
    // shift data array and place new data at the end
 
    for (int i = 0; i < dataArray.size()-1; i++)
 
    {
 
        dataArray[i] = dataArray[i+1];
 
    }
 
    dataArray.last() = data;
 

	
 
	// update plot
 
	curve.setSamples(dataX, dataArray);
 
	ui->plot->replot();
 
    // update plot
 
    curve.setSamples(dataX, dataArray);
 
    ui->plot->replot();
 
}
0 comments (0 inline, 0 general)