##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Update DataSeries to make it compatible with the new arraydata
perrinel -
r295:93cf201f35ca
parent child
Show More
Show file before | Show file after | Hide comments
@@ -40,8 +40,8 public:
40 void merge(IDataSeries *dataSeries) override
40 void merge(IDataSeries *dataSeries) override
41 {
41 {
42 if (auto dimDataSeries = dynamic_cast<DataSeries<Dim> *>(dataSeries)) {
42 if (auto dimDataSeries = dynamic_cast<DataSeries<Dim> *>(dataSeries)) {
43 m_XAxisData->merge(dimDataSeries->xAxisData().get());
43 m_XAxisData->merge(*dimDataSeries->xAxisData());
44 m_ValuesData->merge(dimDataSeries->valuesData().get());
44 m_ValuesData->merge(*dimDataSeries->valuesData());
45 }
45 }
46 else {
46 else {
47 qCWarning(LOG_DataSeries())
47 qCWarning(LOG_DataSeries())
General Comments 0
You need to be logged in to leave comments. Login now