From 93cf201f35cac8ead1494eb11e9ffeff067486a9 2017-06-30 08:45:34 From: mperrinel Date: 2017-06-30 08:45:34 Subject: [PATCH] Update DataSeries to make it compatible with the new arraydata --- diff --git a/core/include/Data/DataSeries.h b/core/include/Data/DataSeries.h index 31825bd..46ee991 100644 --- a/core/include/Data/DataSeries.h +++ b/core/include/Data/DataSeries.h @@ -40,8 +40,8 @@ public: void merge(IDataSeries *dataSeries) override { if (auto dimDataSeries = dynamic_cast *>(dataSeries)) { - m_XAxisData->merge(dimDataSeries->xAxisData().get()); - m_ValuesData->merge(dimDataSeries->valuesData().get()); + m_XAxisData->merge(*dimDataSeries->xAxisData()); + m_ValuesData->merge(*dimDataSeries->valuesData()); } else { qCWarning(LOG_DataSeries())