From 624f7b55560e675871d39f7c1da9e7e73be6ed84 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 16 Apr 2018 11:02:32 +0200 Subject: Rename viewLength and viewStart properties to start & length --- framework/src/domain/perioddayeventmodel.cpp | 36 ++++++++++++++-------------- framework/src/domain/perioddayeventmodel.h | 34 +++++++++++++------------- views/calendar/qml/WeekEvents.qml | 3 ++- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/framework/src/domain/perioddayeventmodel.cpp b/framework/src/domain/perioddayeventmodel.cpp index 0b374d5c..c88bdbc8 100644 --- a/framework/src/domain/perioddayeventmodel.cpp +++ b/framework/src/domain/perioddayeventmodel.cpp @@ -56,7 +56,7 @@ void PeriodDayEventModel::partitionData() beginResetModel(); - partitionedEvents = QVector>>(mViewLength); + partitionedEvents = QVector>>(mPeriodLength); for (int i = 0; i < eventModel->rowCount(); ++i) { auto event = eventModel->index(i, 0).data(Sink::Store::DomainObjectRole).value(); @@ -80,8 +80,8 @@ void PeriodDayEventModel::partitionData() int PeriodDayEventModel::bucketOf(QDate const &candidate) const { - int bucket = mViewStart.daysTo(candidate); - if(bucket >= mViewLength || bucket < 0) { + int bucket = mPeriodStart.daysTo(candidate); + if(bucket >= mPeriodLength || bucket < 0) { return -1; } @@ -97,7 +97,7 @@ QModelIndex PeriodDayEventModel::index(int row, int column, const QModelIndex &p if (!parent.isValid()) { // Asking for a day - if (!(0 <= row && row < mViewLength)) { + if (!(0 <= row && row < mPeriodLength)) { return {}; } @@ -107,7 +107,7 @@ QModelIndex PeriodDayEventModel::index(int row, int column, const QModelIndex &p // Asking for an Event auto day = static_cast(parent.row()); - Q_ASSERT(0 <= day && day <= mViewLength); + Q_ASSERT(0 <= day && day <= mPeriodLength); if (row >= partitionedEvents[day].size()) { return {}; } @@ -133,7 +133,7 @@ QModelIndex PeriodDayEventModel::parent(const QModelIndex &index) const int PeriodDayEventModel::rowCount(const QModelIndex &parent) const { if (!parent.isValid()) { - return mViewLength; + return mPeriodLength; } auto day = parent.row(); @@ -160,7 +160,7 @@ QVariant PeriodDayEventModel::data(const QModelIndex &id, int role) const switch (role) { case Qt::DisplayRole: - return mViewStart.addDays(day).toString(); + return mPeriodStart.addDays(day).toString(); case Events: { auto result = QVariantList{}; @@ -224,34 +224,34 @@ QHash PeriodDayEventModel::roleNames() const return roles; } -QDate PeriodDayEventModel::viewStart() const +QDate PeriodDayEventModel::periodStart() const { - return mViewStart; + return mPeriodStart; } -void PeriodDayEventModel::setViewStart(QDate start) +void PeriodDayEventModel::setPeriodStart(QDate start) { if (!start.isValid()) { - SinkWarning() << "Passed an invalid starting date in setViewStart, ignoring..."; + SinkWarning() << "Passed an invalid starting date in setPeriodStart, ignoring..."; return; } - mViewStart = std::move(start); + mPeriodStart = std::move(start); partitionData(); } -void PeriodDayEventModel::setViewStart(QVariant start) +void PeriodDayEventModel::setPeriodStart(QVariant start) { - setViewStart(start.toDate()); + setPeriodStart(start.toDate()); } -int PeriodDayEventModel::viewLength() const +int PeriodDayEventModel::periodLength() const { - return mViewLength; + return mPeriodLength; } -void PeriodDayEventModel::setViewLength(int length) +void PeriodDayEventModel::setPeriodLength(int length) { - mViewLength = std::move(length); + mPeriodLength = std::move(length); partitionData(); } diff --git a/framework/src/domain/perioddayeventmodel.h b/framework/src/domain/perioddayeventmodel.h index cd26fe46..5f493bbe 100644 --- a/framework/src/domain/perioddayeventmodel.h +++ b/framework/src/domain/perioddayeventmodel.h @@ -30,22 +30,22 @@ #include -// Facility used to get a restricted view into a Sink model comprised of +// Facility used to get a restricted period into a Sink model comprised of // events, partitioned according to the day the events take place. // // Model Format // ============ // // Day 0 -// |--- Event 0 starting at `viewStart + 0d` -// |--- Event 1 starting at `viewStart + 0d` -// '--- Event 2 starting at `viewStart + 0d` +// |--- Event 0 starting at `periodStart + 0d` +// |--- Event 1 starting at `periodStart + 0d` +// '--- Event 2 starting at `periodStart + 0d` // Day 1 -// '--- Event 0 starting at `viewStart + 1d` +// '--- Event 0 starting at `periodStart + 1d` // Day 2 // Day 3 -// |--- Event 0 starting at `viewStart + 3d` -// '--- Event 1 starting at `viewStart + 3d` +// |--- Event 0 starting at `periodStart + 3d` +// '--- Event 1 starting at `periodStart + 3d` // Day 4 // ⋮ // @@ -58,7 +58,7 @@ // Columns are never used. // // Top-level items just contains the ".events" attribute, and their rows -// correspond to their offset compared to the start of the view (in number of +// correspond to their offset compared to the start of the period (in number of // days). In that case the internalId contains DAY_ID. // // Direct children are events, and their rows corresponds to their index in @@ -80,8 +80,8 @@ class PeriodDayEventModel : public QAbstractItemModel { Q_OBJECT - Q_PROPERTY(QVariant viewStart READ viewStart WRITE setViewStart) - Q_PROPERTY(int viewLength READ viewLength WRITE setViewLength) + Q_PROPERTY(QVariant start READ periodStart WRITE setPeriodStart) + Q_PROPERTY(int length READ periodLength WRITE setPeriodLength) public: using Event = Sink::ApplicationDomain::Event; @@ -108,19 +108,19 @@ public: QHash roleNames() const override; - QDate viewStart() const; - void setViewStart(QDate); - void setViewStart(QVariant); - int viewLength() const; - void setViewLength(int); + QDate periodStart() const; + void setPeriodStart(QDate); + void setPeriodStart(QVariant); + int periodLength() const; + void setPeriodLength(int); private: void partitionData(); int bucketOf(QDate const &candidate) const; - QDate mViewStart; - int mViewLength = 7; + QDate mPeriodStart; + int mPeriodLength = 7; QSharedPointer eventModel; QVector>> partitionedEvents; diff --git a/views/calendar/qml/WeekEvents.qml b/views/calendar/qml/WeekEvents.qml index 2956f3ac..774f254e 100644 --- a/views/calendar/qml/WeekEvents.qml +++ b/views/calendar/qml/WeekEvents.qml @@ -3,5 +3,6 @@ import QtQuick 2.7 import org.kube.framework 1.0 as Kube Kube.PeriodDayEventModel { - viewStart: "2018-04-09" + start: "2018-04-09" + length: 7 } -- cgit v1.2.3