diff options
author | Minijackson <minijackson@riseup.net> | 2018-04-16 11:02:32 +0200 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2018-04-16 11:02:32 +0200 |
commit | 624f7b55560e675871d39f7c1da9e7e73be6ed84 (patch) | |
tree | 1495445b4f5455950157206e4d04b13eb8717e71 /framework/src/domain/perioddayeventmodel.cpp | |
parent | 6a9ff4ac53f7c60902b851f4635ee4bf6ff2d024 (diff) | |
download | kube-624f7b55560e675871d39f7c1da9e7e73be6ed84.tar.gz kube-624f7b55560e675871d39f7c1da9e7e73be6ed84.zip |
Rename viewLength and viewStart properties to start & length
Diffstat (limited to 'framework/src/domain/perioddayeventmodel.cpp')
-rw-r--r-- | framework/src/domain/perioddayeventmodel.cpp | 36 |
1 files changed, 18 insertions, 18 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() | |||
56 | 56 | ||
57 | beginResetModel(); | 57 | beginResetModel(); |
58 | 58 | ||
59 | partitionedEvents = QVector<QList<QSharedPointer<Event>>>(mViewLength); | 59 | partitionedEvents = QVector<QList<QSharedPointer<Event>>>(mPeriodLength); |
60 | 60 | ||
61 | for (int i = 0; i < eventModel->rowCount(); ++i) { | 61 | for (int i = 0; i < eventModel->rowCount(); ++i) { |
62 | auto event = eventModel->index(i, 0).data(Sink::Store::DomainObjectRole).value<Event::Ptr>(); | 62 | auto event = eventModel->index(i, 0).data(Sink::Store::DomainObjectRole).value<Event::Ptr>(); |
@@ -80,8 +80,8 @@ void PeriodDayEventModel::partitionData() | |||
80 | 80 | ||
81 | int PeriodDayEventModel::bucketOf(QDate const &candidate) const | 81 | int PeriodDayEventModel::bucketOf(QDate const &candidate) const |
82 | { | 82 | { |
83 | int bucket = mViewStart.daysTo(candidate); | 83 | int bucket = mPeriodStart.daysTo(candidate); |
84 | if(bucket >= mViewLength || bucket < 0) { | 84 | if(bucket >= mPeriodLength || bucket < 0) { |
85 | return -1; | 85 | return -1; |
86 | } | 86 | } |
87 | 87 | ||
@@ -97,7 +97,7 @@ QModelIndex PeriodDayEventModel::index(int row, int column, const QModelIndex &p | |||
97 | if (!parent.isValid()) { | 97 | if (!parent.isValid()) { |
98 | // Asking for a day | 98 | // Asking for a day |
99 | 99 | ||
100 | if (!(0 <= row && row < mViewLength)) { | 100 | if (!(0 <= row && row < mPeriodLength)) { |
101 | return {}; | 101 | return {}; |
102 | } | 102 | } |
103 | 103 | ||
@@ -107,7 +107,7 @@ QModelIndex PeriodDayEventModel::index(int row, int column, const QModelIndex &p | |||
107 | // Asking for an Event | 107 | // Asking for an Event |
108 | auto day = static_cast<int>(parent.row()); | 108 | auto day = static_cast<int>(parent.row()); |
109 | 109 | ||
110 | Q_ASSERT(0 <= day && day <= mViewLength); | 110 | Q_ASSERT(0 <= day && day <= mPeriodLength); |
111 | if (row >= partitionedEvents[day].size()) { | 111 | if (row >= partitionedEvents[day].size()) { |
112 | return {}; | 112 | return {}; |
113 | } | 113 | } |
@@ -133,7 +133,7 @@ QModelIndex PeriodDayEventModel::parent(const QModelIndex &index) const | |||
133 | int PeriodDayEventModel::rowCount(const QModelIndex &parent) const | 133 | int PeriodDayEventModel::rowCount(const QModelIndex &parent) const |
134 | { | 134 | { |
135 | if (!parent.isValid()) { | 135 | if (!parent.isValid()) { |
136 | return mViewLength; | 136 | return mPeriodLength; |
137 | } | 137 | } |
138 | 138 | ||
139 | auto day = parent.row(); | 139 | auto day = parent.row(); |
@@ -160,7 +160,7 @@ QVariant PeriodDayEventModel::data(const QModelIndex &id, int role) const | |||
160 | 160 | ||
161 | switch (role) { | 161 | switch (role) { |
162 | case Qt::DisplayRole: | 162 | case Qt::DisplayRole: |
163 | return mViewStart.addDays(day).toString(); | 163 | return mPeriodStart.addDays(day).toString(); |
164 | case Events: { | 164 | case Events: { |
165 | auto result = QVariantList{}; | 165 | auto result = QVariantList{}; |
166 | 166 | ||
@@ -224,34 +224,34 @@ QHash<int, QByteArray> PeriodDayEventModel::roleNames() const | |||
224 | return roles; | 224 | return roles; |
225 | } | 225 | } |
226 | 226 | ||
227 | QDate PeriodDayEventModel::viewStart() const | 227 | QDate PeriodDayEventModel::periodStart() const |
228 | { | 228 | { |
229 | return mViewStart; | 229 | return mPeriodStart; |
230 | } | 230 | } |
231 | 231 | ||
232 | void PeriodDayEventModel::setViewStart(QDate start) | 232 | void PeriodDayEventModel::setPeriodStart(QDate start) |
233 | { | 233 | { |
234 | if (!start.isValid()) { | 234 | if (!start.isValid()) { |
235 | SinkWarning() << "Passed an invalid starting date in setViewStart, ignoring..."; | 235 | SinkWarning() << "Passed an invalid starting date in setPeriodStart, ignoring..."; |
236 | return; | 236 | return; |
237 | } | 237 | } |
238 | 238 | ||
239 | mViewStart = std::move(start); | 239 | mPeriodStart = std::move(start); |
240 | partitionData(); | 240 | partitionData(); |
241 | } | 241 | } |
242 | 242 | ||
243 | void PeriodDayEventModel::setViewStart(QVariant start) | 243 | void PeriodDayEventModel::setPeriodStart(QVariant start) |
244 | { | 244 | { |
245 | setViewStart(start.toDate()); | 245 | setPeriodStart(start.toDate()); |
246 | } | 246 | } |
247 | 247 | ||
248 | int PeriodDayEventModel::viewLength() const | 248 | int PeriodDayEventModel::periodLength() const |
249 | { | 249 | { |
250 | return mViewLength; | 250 | return mPeriodLength; |
251 | } | 251 | } |
252 | 252 | ||
253 | void PeriodDayEventModel::setViewLength(int length) | 253 | void PeriodDayEventModel::setPeriodLength(int length) |
254 | { | 254 | { |
255 | mViewLength = std::move(length); | 255 | mPeriodLength = std::move(length); |
256 | partitionData(); | 256 | partitionData(); |
257 | } | 257 | } |