HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r669:ae1634210b26

Updates merge() method (2)...

Alexandre Leroux -

r669:ae1634210b26

parent child

Context file:

r669:ae1634210b26

Collapse all files

core/include/Data/ArrayData.h +11 0

                              m_Data, m_NbComponents, false)}};
                  }
+                 /// Inserts at the end of the array data the values passed as a parameter. This
+                 /// method is intended to be used in the context of generating a back insert iterator, or only
+                 /// if it's ensured that the total size of the vector is consistent with the number of
+                 /// components of the array data
+                 /// @param values the values to insert
+                 /// @sa http://en.cppreference.com/w/cpp/iterator/back_inserter
+                 void push_back(const QVector<double> &values)
+                 {
+                     Q_ASSERT(values.size() % m_NbComponents == 0);
+                     m_Data.append(values);
+                 }
                  /**
                   * @return the data at a specified index

core/include/Data/DataSeries.h +20 0

                  friend class DataSeriesMergeHelper;
              public:
+                 /// Tag needed to define the push_back() method
+                 /// @sa push_back()
+                 using value_type = DataSeriesIteratorValue;
                  /// @sa IDataSeries::xAxisData()
                  std::shared_ptr<ArrayData<1> > xAxisData() override { return m_XAxisData; }
                  const std::shared_ptr<ArrayData<1> > xAxisData() const { return m_XAxisData; }
                  virtual void lockWrite() { m_Lock.lockForWrite(); }
                  virtual void unlock() { m_Lock.unlock(); }
+                 // ///// //
+                 // Other //
+                 // ///// //
+                 /// Inserts at the end of the data series the value of the iterator passed as a parameter. This
+                 /// method is intended to be used in the context of generating a back insert iterator
+                 /// @param iteratorValue the iterator value containing the values to insert
+                 /// @sa http://en.cppreference.com/w/cpp/iterator/back_inserter
+                 /// @sa merge()
+                 /// @sa value_type
+                 void push_back(const value_type &iteratorValue)
+                 {
+                     m_XAxisData->push_back(QVector<double>{iteratorValue.x()});
+                     m_ValuesData->push_back(iteratorValue.values());
+                 }
              protected:
                  /// Protected ctor (DataSeries is abstract). The vectors must have the same size, otherwise a
                  /// DataSeries with no values will be created.

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages