Changeset 4693fa6 for src/mvc

Timestamp:

01/20/10 22:02:30 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

8fe9bd2

Parents:

926f106

Message:

changed 'Activity' -> 'Track'

Location:

src/mvc

Files:

• activity.cpp (deleted)
• delegate.cpp (modified) (3 diffs)
• event.cpp (modified) (2 diffs)
• event.h (modified) (3 diffs)
• eventmodel.cpp (modified) (5 diffs)
• eventmodel.h (modified) (2 diffs)
• mvc.pro (modified) (1 diff)
• track.cpp (added)
• track.h (moved) (moved from src/mvc/activity.h) (4 diffs)

src/mvc/delegate.cpp

@@ -1 +1 @@
 #include "delegate.h"
 #include "eventmodel.h"
-#include <activity.h>
+#include <track.h>
 
 #include <QDebug>
@@ -63 +63 @@
         QFontMetrics fmBigB(fontBigB);
 
-        int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
+        //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
 
         if(isLast(index))
@@ -165 +165 @@
         // track
         titlePointF.setY(titlePointF.y()+fmSmall.height()-fmSmall.descent());
-        painter->drawText(titlePointF,"Activity(s): " + Activity::getActivityName(event->activityId()));
+        painter->drawText(titlePointF,"Track: " + Track::getTrackName(event->trackId()));
     }
     else // doesn't have parent - time-groups' elements (top items)

src/mvc/event.cpp

@@ -8 +8 @@
 int const Event::sTable1ColCount = 9; // see 'toRecord()' for more details
 int const Event::sTable2ColCount = 5; // see 'toRecord()' for more details
-const QString Event::XID_ACTIVITY = "xid_activity";
-const QString Event::START = "start";
-
-
 
 QSqlRecord const Event::sColumns = Event::toRecord(QList<QSqlField>()
@@ -19 +15 @@
     << QSqlField("start", QVariant::DateTime)
     << QSqlField("duration", QVariant::Int)
-    << QSqlField("xid_activity", QVariant::Int)
+    << QSqlField("xid_track", QVariant::Int)
     << QSqlField("type", QVariant::String)
     << QSqlField("language", QVariant::String)

src/mvc/event.h

@@ -24 +24 @@
     static const int sTable1ColCount;
     static const int sTable2ColCount;
-    static const QString XID_ACTIVITY;
-    static const QString START;
 public:
     static Event getById(int id, int conferenceId);
@@ -34 +32 @@
     int id() const { return value("id").toInt(); }
     int conferenceId() const { return value("xid_conference").toInt(); }
-    QDateTime start() const { return value(START).toDateTime(); }
+    QDateTime start() const { return value("start").toDateTime(); }
     int duration() const { return value("duration").toInt(); }
-    int activityId() const { return value(XID_ACTIVITY).toInt(); }
+    int trackId() const { return value("xid_track").toInt(); }
     QString type() const { return value("type").toString(); }
     QString language() const { return value("language").toString(); }
@@ -55 +53 @@
     void setId(int id) { setValue("id", id); }
     void setConferenceId(int conferenceId) { setValue("xid_conference", conferenceId); }
-    void setStart(const QDateTime & start) { setValue(START, start); }
+    void setStart(const QDateTime & start) { setValue("start", start); }
     void setDuration(int duration) { setValue("duration", duration); }
-    void setActivityId(int activityId) { setValue(XID_ACTIVITY, activityId); }
+    void setTrackId(int trackId) { setValue("xid_track", trackId); }
     void setType(const QString & type) { setValue("type", type); }
     void setLanguage(const QString & language) { setValue("language", language); }

src/mvc/eventmodel.cpp

@@ -1 +1 @@
 #include "eventmodel.h"
 #include <conference.h>
-#include <activity.h>
-
-const QString EventModel::COMMA_SEPARATOR = ", ";
+#include <track.h>
 
 EventModel::EventModel()
@@ -46 +44 @@
 }
 
-void EventModel::createActivityGroups() {
+void EventModel::createTrackGroups() {
     mGroups.clear();
     mParents.clear();
@@ -53 +51 @@
         return;
     }
-    int activityId = mEvents.first().activityId();
-
-    mGroups << EventModel::Group(Activity::getActivityName(activityId), 0);
-    int nextActivityId = activityId;
+    int trackId = mEvents.first().trackId();
+
+    mGroups << EventModel::Group(Track::getTrackName(trackId), 0);
+    int nextTrackId = trackId;
 
     for (int i=0; i<mEvents.count(); i++)
     {
-        activityId = mEvents.at(i).activityId();
-        if (nextActivityId != activityId)
+        trackId = mEvents.at(i).trackId();
+        if (nextTrackId != trackId)
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
-            mGroups << EventModel::Group(Activity::getActivityName(activityId), i);
-            nextActivityId = activityId;
+            mGroups << EventModel::Group(Track::getTrackName(trackId), i);
+            nextTrackId = trackId;
         }
         // add parent-child relation
@@ -168 +166 @@
     {
         qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
-        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::START);
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
     }
     createTimeGroups();
@@ -185 +183 @@
 }
 
-void EventModel::loadEventsByActivities(const QDate &aDate, int aConferenceId)
+void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId)
 {
     clearModel();
     if(Conference::getAll().count())
     {
-        qDebug() << "Loading Conference Data (by Activities): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
-        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::XID_ACTIVITY + COMMA_SEPARATOR + Event::START);
-    }
-    createActivityGroups();
+        qDebug() << "Loading Conference Data (by Track): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "xid_track, start");
+    }
+    createTrackGroups();
 }
 

src/mvc/eventmodel.h

@@ -19 +19 @@
     void loadEvents(const QDate &aDate, int aConferenceId); // loads Events from the DB
     void loadFavEvents(const QDate &aDate, int aConferenceId); // loads Favourite events from the DB
-    void loadEventsByActivities(const QDate &aDate, int aConferenceId); // loads Events grouped by Activities from the DB
+    void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events grouped by Track from the DB
     // a method to force 'EventModel' emit signal 'dataChanged()'
     // a 'view', eg. 'TreeView' listens for this signal and redraws changed items(indexes)
@@ -42 +42 @@
 private:
     void createTimeGroups();
-    void createActivityGroups();
+    void createTrackGroups();
     void clearModel();
 

src/mvc/mvc.pro

@@ -19 +19 @@
 }
 
-HEADERS += activity.h \
-           event.h \
+HEADERS += event.h \
            conference.h \
+           track.h \
            delegate.h \
            eventmodel.h \
            treeview.h
 
-SOURCES += activity.cpp \
-           event.cpp \
+SOURCES += event.cpp \
            conference.cpp \
+           track.cpp \
            delegate.cpp \
            eventmodel.cpp \

src/mvc/track.h

@@ -1 +1 @@
 /*
- * activity.h
+ * track.h
  *
  *  Created on: Dec 27, 2009
@@ -6 +6 @@
  */
 
-#ifndef ACTIVITY_H_
-#define ACTIVITY_H_
+#ifndef TRACK_H
+#define TRACK_H
 
 #include <ormrecord.h>
 
-class Activity : public OrmRecord<Activity>
+class Track : public OrmRecord<Track>
 {
 public:
@@ -18 +18 @@
     static const int sTableColCount;
 public:
-    static QMap<int, Activity> mIdToActivity;
+    static QMap<int, Track> mIdToTrack;
 public:
-    static QList<Activity> getAll();
+    static QList<Track> getAll();
     int id() const { return value("id").toInt(); }
     void setId(int id) { setValue("id", id); }
@@ -26 +26 @@
     void setName(const QString & type) { setValue("name", type); }
 public:
-    static void updateActivityMap();
-    static QString getActivityName(int id);
+    static void updateTrackMap();
+    static QString getTrackName(int id);
 };
 
-#endif /* ACTIVITY_H_ */
+#endif /* TRACK_H */
+