Browse Source

working on plots for loading rc data

QGC4.4
Bryan Godbolt 15 years ago
parent
commit
da1a7153dd
  1. 12
      src/ui/RadioCalibration/CurveCalibrator.cc
  2. 2
      src/ui/RadioCalibration/CurveCalibrator.h
  3. 2
      src/ui/RadioCalibration/RadioCalibrationWindow.cc

12
src/ui/RadioCalibration/CurveCalibrator.cc

@ -92,12 +92,16 @@ void CurveCalibrator::set(const QVector<float> &data) @@ -92,12 +92,16 @@ void CurveCalibrator::set(const QVector<float> &data)
{
if (data.size() == 5)
{
delete setpoints;
QVector<double> dataDouble;
// delete setpoints;
// QVector<double> dataDouble;
for (int i=0; i<data.size(); ++i)
dataDouble << static_cast<double>(data[i]);
setpoints = new QVector<double>(dataDouble);
setpoints->replace(i, static_cast<double>(data[i]));
// setpoints = new QVector<double>(dataDouble);
curve->setPen(QPen(QColor(QString("lime"))));
curve->setData(*positions, *setpoints);
curve->attach(plot);
plot->replot();
}
else

2
src/ui/RadioCalibration/CurveCalibrator.h

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
#include <QVector>
#include <qwt_plot.h>
#include <qwt_plot_curve.h>
//#include <qwt_array.h>
#include <QGridLayout>
#include <QHBoxLayout>
#include <QLabel>
@ -34,6 +35,7 @@ protected slots: @@ -34,6 +35,7 @@ protected slots:
protected:
QVector<double> *setpoints;
QVector<double> *positions;
// QwtArrayData
QwtPlot *plot;
QwtPlotCurve *curve;

2
src/ui/RadioCalibration/RadioCalibrationWindow.cc

@ -149,7 +149,7 @@ void RadioCalibrationWindow::parseSetpoint(const QDomElement &setpoint, const QP @@ -149,7 +149,7 @@ void RadioCalibrationWindow::parseSetpoint(const QDomElement &setpoint, const QP
foreach (QString setpoint, setpointList)
setpoints << setpoint.trimmed().toFloat();
qDebug() << __FILE__ << __LINE__ << ": " << setpoint.tagName() << ": " << setpoint.attribute("name") ;
// qDebug() << __FILE__ << __LINE__ << ": " << setpoint.tagName() << ": " << setpoint.attribute("name") ;
if (setpoint.tagName() == "threeSetpoint")
{
if (setpoints.isEmpty())

Loading…
Cancel
Save