GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r663:4397af00f7d0

Merge branch 'feature/NbPointsColumn' into develop

Alexandre Leroux -

r663:4397af00f7d0

parent child

Context file:

r663:4397af00f7d0

Collapse all files

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

                     return m_Data.size() / m_NbComponents;
                 }
+                /// @return the total size (i.e. number of values) of the array data
+                int totalSize() const
+                {
+                    QReadLocker locker{&m_Lock};
+                    return m_Data.size();
+                }
                 std::shared_ptr<ArrayData<Dim> > sort(const std::vector<int> &sortPermutation)
                 {
                     QReadLocker locker{&m_Lock};

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

                 /// @sa IDataSeries::valuesUnit()
                 Unit valuesUnit() const override { return m_ValuesUnit; }
+                int nbPoints() const override { return m_XAxisData->totalSize() + m_ValuesData->totalSize(); }
                 SqpRange range() const override
                 {

core/include/Data/IDataSeries.h +4 0

                 virtual std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) = 0;
                 virtual std::unique_ptr<IDataSeries> clone() const = 0;
+                /// @return the total number of points contained in the data series
+                virtual int nbPoints() const = 0;
                 virtual SqpRange range() const = 0;
                 // ///////// //

core/include/Variable/Variable.h +4 0

                 SqpRange cacheRange() const noexcept;
                 void setCacheRange(const SqpRange &cacheRange) noexcept;
+                /// @return the number of points hold by the variable. The number of points is updated each time
+                /// the data series changes
+                int nbPoints() const noexcept;
                 /// Returns the real range of the variable, i.e. the min and max x-axis values of the data
                 /// series between the range of the variable. The real range is updated each time the variable
                 /// range or the data series changed

core/src/Variable/Variable.cpp +13 -2

                           m_Range{dateTime},
                           m_Metadata{metadata},
                           m_DataSeries{nullptr},
-                          m_RealRange{INVALID_RANGE}
+                          m_RealRange{INVALID_RANGE},
+                          m_NbPoints{0}
                 {
                 }
                           m_Range{other.m_Range},
                           m_Metadata{other.m_Metadata},
                           m_DataSeries{other.m_DataSeries != nullptr ? other.m_DataSeries->clone() : nullptr},
-                          m_RealRange{other.m_RealRange}
+                          m_RealRange{other.m_RealRange},
+                          m_NbPoints{other.m_NbPoints}
                 {
                 }
                         m_DataSeries->purge(m_CacheRange.m_TStart, m_CacheRange.m_TEnd);
                     }
                     updateRealRange();
+                    updateNbPoints();
                 }
+                void updateNbPoints() { m_NbPoints = m_DataSeries ? m_DataSeries->nbPoints() : 0; }
                 /// Updates real range according to current variable range and data series
                 void updateRealRange()
                 {
                 QVariantHash m_Metadata;
                 std::shared_ptr<IDataSeries> m_DataSeries;
                 SqpRange m_RealRange;
+                int m_NbPoints;
                 QReadWriteLock m_Lock;
             };
                 impl->unlock();
             }
+            int Variable::nbPoints() const noexcept
+            {
+                return impl->m_NbPoints;
+            }
             SqpRange Variable::realRange() const noexcept
             {
                 return impl->m_RealRange;

core/src/Variable/VariableModel.cpp +11 -7

             const auto NAME_COLUMN = 0;
             const auto TSTART_COLUMN = 1;
             const auto TEND_COLUMN = 2;
-            const auto UNIT_COLUMN = 3;
+            const auto NBPOINTS_COLUMN = 3;
-            const auto MISSION_COLUMN = 4;
+            const auto UNIT_COLUMN = 4;
-            const auto PLUGIN_COLUMN = 5;
+            const auto MISSION_COLUMN = 5;
-            const auto NB_COLUMNS = 6;
+            const auto PLUGIN_COLUMN = 6;
+            const auto NB_COLUMNS = 7;
             // Column properties
             const auto DEFAULT_HEIGHT = 25;
             };
             const auto COLUMN_PROPERTIES = QHash<int, ColumnProperties>{
-                {NAME_COLUMN, {QObject::tr("Name")}},       {TSTART_COLUMN, {QObject::tr("tStart"), 180}},
+                {NAME_COLUMN, {QObject::tr("Name")}},      {TSTART_COLUMN, {QObject::tr("tStart"), 180}},
-                {TEND_COLUMN, {QObject::tr("tEnd"), 180}},  {UNIT_COLUMN, {QObject::tr("Unit")}},
+                {TEND_COLUMN, {QObject::tr("tEnd"), 180}}, {NBPOINTS_COLUMN, {QObject::tr("Nb points")}},
-                {MISSION_COLUMN, {QObject::tr("Mission")}}, {PLUGIN_COLUMN, {QObject::tr("Plugin")}}};
+                {UNIT_COLUMN, {QObject::tr("Unit")}},      {MISSION_COLUMN, {QObject::tr("Mission")}},
+                {PLUGIN_COLUMN, {QObject::tr("Plugin")}}};
             /// Format for datetimes
             const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz");
                                            ? DateUtils::dateTime(range.m_TEnd).toString(DATETIME_FORMAT)
                                            : QVariant{};
                             }
+                            case NBPOINTS_COLUMN:
+                                return variable->nbPoints();
                             case UNIT_COLUMN:
                                 return variable->metadata().value(QStringLiteral("units"));
                             case MISSION_COLUMN:

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