Rewrote code to group events together with gregoa.

Closes bug #22.

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 074c51ab9486a7052cb7b1fffb273e308285a58c..280868f9374bfa75a3b2d3c0f6ac360186386197 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -27,40 +27,68 @@ const QString EventModel::COMMA_SEPARATOR = ", ";
 EventModel::EventModel()
 { }
 
 EventModel::EventModel()
 { }
 

-void EventModel::createTimeGroups()
-{
-    mGroups.clear();
-    mParents.clear();

 
 

-    if (mEvents.empty())
-    {
-        return;
+void EventModel::Group::setTitle(const QList<Event>& 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"));
+}

 
 

-    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<mEvents.count(); i++)
-    {
-        QTime eventTime = mEvents.at(i).start().time();
+// 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 (nextGroupTime <= eventTime)
-        {
-            mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
-            mGroups << EventModel::Group(QString("%1 - %2").arg(nextGroupTime.toString("HH:mm"),
-                nextGroupTime.addSecs(timeSpan).toString("HH:mm")), i);
-            nextGroupTime = nextGroupTime.addSecs(timeSpan);
+            // a new group is necessary
+            mGroups.last().setTitle(mEvents);
+            groupStartTime = groupStartTime.addSecs(timeSpan);
+            groupEndTime = groupStartTime.addSecs(mEvents.at(i).duration());
+            mGroups << EventModel::Group("", i);
+            timeSpan = minTimeSpan;

         }
 
         }
 

-        // add parent-child relation
+        // insert event into current group

         mParents[mEvents.at(i).id()] = mGroups.count() - 1;
         mParents[mEvents.at(i).id()] = mGroups.count() - 1;

+        mGroups.last().mChildCount += 1;
+        groupEndTime = qMax(eventEndTime, groupEndTime);

     }
 
     }
 

-    mGroups.last().mChildCount = mEvents.count() - mGroups.last().mFirstEventIndex;
+    // the last group needs a title as well
+    mGroups.last().setTitle(mEvents);

 
     reset();
 }
 
     reset();
 }

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index adf633cfdf6a3a3bb2819d3bba8bc70d9e0df79f..49d5dc7de01506b1bd97b08c8f6380ab3deae9c7 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -58,6 +58,8 @@ private:
         QString mTitle;
         int mFirstEventIndex;
         int mChildCount;
         QString mTitle;
         int mFirstEventIndex;
         int mChildCount;

+
+        void setTitle(const QList<Event>& mEvents);

     };
 
 private:
     };
 
 private:


@@ -72,7 +74,7 @@ public slots:
 private:
     QList<Event> mEvents;
     QList<Group> mGroups;
 private:
     QList<Event> mEvents;
     QList<Group> mGroups;

-    QHash<int, int> mParents;
+    QHash<int, int> mParents; ///< eventId, groupId

 };
 
 #endif // EVENTMODEL_H
 };
 
 #endif // EVENTMODEL_H