X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/d49254dfd400b8c543966a2979580db43a1fc867..12fe870b1285b501da13e5ba626537e3a78a3339:/src/mvc/eventmodel.cpp?ds=sidebyside
diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 23568a1..280868f 100644
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ *
+ * This file is part of ConfClerk.
+ *
+ * ConfClerk is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ConfClerk is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ConfClerk. If not, see .
+ */
#include "eventmodel.h"
#include
#include
@@ -6,44 +25,72 @@
const QString EventModel::COMMA_SEPARATOR = ", ";
EventModel::EventModel()
-{
- mEvents.clear();
+{ }
+
+
+void EventModel::Group::setTitle(const QList& mEvents) {
+ QTime startTime = mEvents.at(mFirstEventIndex).start().time();
+ QTime endTime(0, 0);
+ for (int i = mFirstEventIndex; i != mFirstEventIndex + mChildCount; ++i) {
+ endTime = qMax(mEvents.at(i).start().time().addSecs(mEvents.at(i).duration()), endTime);
+ }
+ mTitle = QString("%1 - %2").arg(startTime.toString("HH:mm")).arg(endTime.toString("HH:mm"));
}
+
+// We want to group the events into "time slots/time groups" that
+// should start at full hours and have the duration of either
+// one hour or (if less than 3 events are in one time slot)
+// multiple of one hour.
void EventModel::createTimeGroups()
{
mGroups.clear();
mParents.clear();
+ if (mEvents.empty()) return;
+
+ const int minTimeSpan = 3600; // one hour
+ const int minChildCount = 3; // minimum number of events in one group
+
+ // Create the first time group. The events have to be sorted by start time at this point!
+ QTime groupStartTime(mEvents.first().start().time().hour(), 0);
+ QTime groupEndTime = groupStartTime.addSecs(mEvents.first().duration());
+ mGroups << EventModel::Group("", 0);
+ int timeSpan = minTimeSpan;
+
+ for (int i = 0; i != mEvents.count(); ++i) {
+ QTime eventStartTime = mEvents.at(i).start().time();
+ QTime eventEndTime = eventStartTime.addSecs(mEvents.at(i).duration());
+
+ if (eventStartTime >= groupStartTime.addSecs(timeSpan)) {
+ // a new group could be necessary
+ if (mGroups.last().mChildCount < minChildCount) {
+ // too few events in the group => no new group
+ // except a gap in time would occur that is longer than minTimeSpan
+ if (i > 0 && qMax(mEvents.at(i-1).start().time().addSecs(mEvents.at(i-1).duration()), groupEndTime).secsTo(eventStartTime) < minTimeSpan) {
+ timeSpan += minTimeSpan;
+ --i;
+ continue; // repeat with the same event
+ }
+ }
- if (mEvents.empty())
- {
- return;
- }
-
- const int timeSpan = 5400;
-
- QTime startTime = mEvents.first().start().time();
- mGroups << EventModel::Group(QString("%1 - %2").arg(startTime.toString("HH:mm"),
- startTime.addSecs(timeSpan).toString("HH:mm")), 0);
- QTime nextGroupTime = mEvents.first().start().time().addSecs(timeSpan);
-
- for (int i=0; i