@@ -44,9 +44,9 public: | |||||
44 | * @remarks this method is only available for a unidimensional ArrayData |
|
44 | * @remarks this method is only available for a unidimensional ArrayData | |
45 | */ |
|
45 | */ | |
46 | template <int D = Dim, typename = std::enable_if_t<D == 1> > |
|
46 | template <int D = Dim, typename = std::enable_if_t<D == 1> > | |
47 | QVector<double> data() const noexcept |
|
47 | const QVector<double> &data() const noexcept | |
48 | { |
|
48 | { | |
49 |
return m_Data |
|
49 | return m_Data[0]; | |
50 | } |
|
50 | } | |
51 |
|
51 | |||
52 | /** |
|
52 | /** | |
@@ -61,10 +61,10 public: | |||||
61 |
|
61 | |||
62 | // TODO Comment |
|
62 | // TODO Comment | |
63 | template <int D = Dim, typename = std::enable_if_t<D == 1> > |
|
63 | template <int D = Dim, typename = std::enable_if_t<D == 1> > | |
64 |
void merge(ArrayData<1> |
|
64 | void merge(const ArrayData<1> &arrayData) | |
65 | { |
|
65 | { | |
66 | if (!m_Data.empty()) { |
|
66 | if (!m_Data.empty()) { | |
67 |
m_Data[0] += arrayData |
|
67 | m_Data[0] += arrayData.data(); | |
68 | } |
|
68 | } | |
69 | } |
|
69 | } | |
70 |
|
70 |
General Comments 0
You need to be logged in to leave comments.
Login now