diff --git a/src/ui/RadioCalibration/CurveCalibrator.cc b/src/ui/RadioCalibration/CurveCalibrator.cc index dfaf279977b7b2853c352b3204cef9eb097d1660..7338c80de35bef5da179c33ba63ac9e9889dd2db 100644 --- a/src/ui/RadioCalibration/CurveCalibrator.cc +++ b/src/ui/RadioCalibration/CurveCalibrator.cc @@ -92,12 +92,16 @@ void CurveCalibrator::set(const QVector &data) { if (data.size() == 5) { - delete setpoints; - QVector dataDouble; +// delete setpoints; +// QVector dataDouble; for (int i=0; i(data[i]); - setpoints = new QVector(dataDouble); + setpoints->replace(i, static_cast(data[i])); +// setpoints = new QVector(dataDouble); + curve->setPen(QPen(QColor(QString("lime")))); curve->setData(*positions, *setpoints); + + + curve->attach(plot); plot->replot(); } else diff --git a/src/ui/RadioCalibration/CurveCalibrator.h b/src/ui/RadioCalibration/CurveCalibrator.h index 6fd3e454d4909ade144721dec99f91ca1b929463..8e0aeb3835571c5390d3d1f4989fec8fcb8d3493 100644 --- a/src/ui/RadioCalibration/CurveCalibrator.h +++ b/src/ui/RadioCalibration/CurveCalibrator.h @@ -5,6 +5,7 @@ #include #include #include +//#include #include #include #include @@ -34,6 +35,7 @@ protected slots: protected: QVector *setpoints; QVector *positions; +// QwtArrayData QwtPlot *plot; QwtPlotCurve *curve; diff --git a/src/ui/RadioCalibration/RadioCalibrationWindow.cc b/src/ui/RadioCalibration/RadioCalibrationWindow.cc index 5114ff4ed2d4dd51dba44407bf4dcb2e18164846..a1bcfc59efb9dff2c6cd0ade32be3b28fd94d18b 100644 --- a/src/ui/RadioCalibration/RadioCalibrationWindow.cc +++ b/src/ui/RadioCalibration/RadioCalibrationWindow.cc @@ -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())