- Timestamp:
- 01/20/10 22:02:30 (13 years ago)
- Branches:
- master, qt5
- Children:
- 8fe9bd2
- Parents:
- 926f106
- Location:
- src/mvc
- Files:
-
- 1 added
- 1 deleted
- 6 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
src/mvc/delegate.cpp
r926f106 r4693fa6 1 1 #include "delegate.h" 2 2 #include "eventmodel.h" 3 #include < activity.h>3 #include <track.h> 4 4 5 5 #include <QDebug> … … 63 63 QFontMetrics fmBigB(fontBigB); 64 64 65 int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();65 //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width(); 66 66 67 67 if(isLast(index)) … … 165 165 // track 166 166 titlePointF.setY(titlePointF.y()+fmSmall.height()-fmSmall.descent()); 167 painter->drawText(titlePointF," Activity(s): " + Activity::getActivityName(event->activityId()));167 painter->drawText(titlePointF,"Track: " + Track::getTrackName(event->trackId())); 168 168 } 169 169 else // doesn't have parent - time-groups' elements (top items) -
src/mvc/event.cpp
r926f106 r4693fa6 8 8 int const Event::sTable1ColCount = 9; // see 'toRecord()' for more details 9 9 int const Event::sTable2ColCount = 5; // see 'toRecord()' for more details 10 const QString Event::XID_ACTIVITY = "xid_activity";11 const QString Event::START = "start";12 13 14 10 15 11 QSqlRecord const Event::sColumns = Event::toRecord(QList<QSqlField>() … … 19 15 << QSqlField("start", QVariant::DateTime) 20 16 << QSqlField("duration", QVariant::Int) 21 << QSqlField("xid_ activity", QVariant::Int)17 << QSqlField("xid_track", QVariant::Int) 22 18 << QSqlField("type", QVariant::String) 23 19 << QSqlField("language", QVariant::String) -
src/mvc/event.h
r926f106 r4693fa6 24 24 static const int sTable1ColCount; 25 25 static const int sTable2ColCount; 26 static const QString XID_ACTIVITY;27 static const QString START;28 26 public: 29 27 static Event getById(int id, int conferenceId); … … 34 32 int id() const { return value("id").toInt(); } 35 33 int conferenceId() const { return value("xid_conference").toInt(); } 36 QDateTime start() const { return value( START).toDateTime(); }34 QDateTime start() const { return value("start").toDateTime(); } 37 35 int duration() const { return value("duration").toInt(); } 38 int activityId() const { return value(XID_ACTIVITY).toInt(); }36 int trackId() const { return value("xid_track").toInt(); } 39 37 QString type() const { return value("type").toString(); } 40 38 QString language() const { return value("language").toString(); } … … 55 53 void setId(int id) { setValue("id", id); } 56 54 void setConferenceId(int conferenceId) { setValue("xid_conference", conferenceId); } 57 void setStart(const QDateTime & start) { setValue( START, start); }55 void setStart(const QDateTime & start) { setValue("start", start); } 58 56 void setDuration(int duration) { setValue("duration", duration); } 59 void set ActivityId(int activityId) { setValue(XID_ACTIVITY, activityId); }57 void setTrackId(int trackId) { setValue("xid_track", trackId); } 60 58 void setType(const QString & type) { setValue("type", type); } 61 59 void setLanguage(const QString & language) { setValue("language", language); } -
src/mvc/eventmodel.cpp
r926f106 r4693fa6 1 1 #include "eventmodel.h" 2 2 #include <conference.h> 3 #include <activity.h> 4 5 const QString EventModel::COMMA_SEPARATOR = ", "; 3 #include <track.h> 6 4 7 5 EventModel::EventModel() … … 46 44 } 47 45 48 void EventModel::create ActivityGroups() {46 void EventModel::createTrackGroups() { 49 47 mGroups.clear(); 50 48 mParents.clear(); … … 53 51 return; 54 52 } 55 int activityId = mEvents.first().activityId();56 57 mGroups << EventModel::Group( Activity::getActivityName(activityId), 0);58 int next ActivityId = activityId;53 int trackId = mEvents.first().trackId(); 54 55 mGroups << EventModel::Group(Track::getTrackName(trackId), 0); 56 int nextTrackId = trackId; 59 57 60 58 for (int i=0; i<mEvents.count(); i++) 61 59 { 62 activityId = mEvents.at(i).activityId();63 if (next ActivityId != activityId)60 trackId = mEvents.at(i).trackId(); 61 if (nextTrackId != trackId) 64 62 { 65 63 mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex; 66 mGroups << EventModel::Group( Activity::getActivityName(activityId), i);67 next ActivityId = activityId;64 mGroups << EventModel::Group(Track::getTrackName(trackId), i); 65 nextTrackId = trackId; 68 66 } 69 67 // add parent-child relation … … 168 166 { 169 167 qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate; 170 mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::START);168 mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start"); 171 169 } 172 170 createTimeGroups(); … … 185 183 } 186 184 187 void EventModel::loadEventsBy Activities(const QDate &aDate, int aConferenceId)185 void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId) 188 186 { 189 187 clearModel(); 190 188 if(Conference::getAll().count()) 191 189 { 192 qDebug() << "Loading Conference Data (by Activities): [" << Conference::getById(aConferenceId).title() << "] " << aDate;193 mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::XID_ACTIVITY + COMMA_SEPARATOR + Event::START);194 } 195 create ActivityGroups();190 qDebug() << "Loading Conference Data (by Track): [" << Conference::getById(aConferenceId).title() << "] " << aDate; 191 mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "xid_track, start"); 192 } 193 createTrackGroups(); 196 194 } 197 195 -
src/mvc/eventmodel.h
r926f106 r4693fa6 19 19 void loadEvents(const QDate &aDate, int aConferenceId); // loads Events from the DB 20 20 void loadFavEvents(const QDate &aDate, int aConferenceId); // loads Favourite events from the DB 21 void loadEventsBy Activities(const QDate &aDate, int aConferenceId); // loads Events grouped by Activitiesfrom the DB21 void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events grouped by Track from the DB 22 22 // a method to force 'EventModel' emit signal 'dataChanged()' 23 23 // a 'view', eg. 'TreeView' listens for this signal and redraws changed items(indexes) … … 42 42 private: 43 43 void createTimeGroups(); 44 void create ActivityGroups();44 void createTrackGroups(); 45 45 void clearModel(); 46 46 -
src/mvc/mvc.pro
r926f106 r4693fa6 19 19 } 20 20 21 HEADERS += activity.h \ 22 event.h \ 21 HEADERS += event.h \ 23 22 conference.h \ 23 track.h \ 24 24 delegate.h \ 25 25 eventmodel.h \ 26 26 treeview.h 27 27 28 SOURCES += activity.cpp \ 29 event.cpp \ 28 SOURCES += event.cpp \ 30 29 conference.cpp \ 30 track.cpp \ 31 31 delegate.cpp \ 32 32 eventmodel.cpp \ -
src/mvc/track.h
r926f106 r4693fa6 1 1 /* 2 * activity.h2 * track.h 3 3 * 4 4 * Created on: Dec 27, 2009 … … 6 6 */ 7 7 8 #ifndef ACTIVITY_H_9 #define ACTIVITY_H_8 #ifndef TRACK_H 9 #define TRACK_H 10 10 11 11 #include <ormrecord.h> 12 12 13 class Activity : public OrmRecord<Activity>13 class Track : public OrmRecord<Track> 14 14 { 15 15 public: … … 18 18 static const int sTableColCount; 19 19 public: 20 static QMap<int, Activity> mIdToActivity;20 static QMap<int, Track> mIdToTrack; 21 21 public: 22 static QList< Activity> getAll();22 static QList<Track> getAll(); 23 23 int id() const { return value("id").toInt(); } 24 24 void setId(int id) { setValue("id", id); } … … 26 26 void setName(const QString & type) { setValue("name", type); } 27 27 public: 28 static void update ActivityMap();29 static QString get ActivityName(int id);28 static void updateTrackMap(); 29 static QString getTrackName(int id); 30 30 }; 31 31 32 #endif /* ACTIVITY_H_ */ 32 #endif /* TRACK_H */ 33
Note: See TracChangeset
for help on using the changeset viewer.