- Timestamp:
- 05/05/10 15:57:37 (13 years ago)
- Branches:
- master, qt5
- Children:
- 508de33
- Parents:
- 58eb7cc
- Location:
- src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gui/tabcontainer.cpp
r58eb7cc r0d995ed 86 86 Event *event = static_cast<Event*>(aIndex.internalPointer()); 87 87 88 Room room = Room::retrieve(event->roomId()); 89 QVariant mapPathV = room.map(); 88 QVariant mapPathV = event->room()->map(); 90 89 QString mapPath; 91 90 if (!mapPathV.isValid()) { … … 101 100 102 101 QPixmap map(mapPath); 103 MapWindow window(map, room.name(),this);102 MapWindow window(map, event->room()->name(),this); 104 103 window.exec(); 105 104 } -
src/mvc/delegate.cpp
r58eb7cc r0d995ed 154 154 QTime start = event->start().time(); 155 155 painter->setFont(fontBig); 156 painter->drawText(titlePointF,start.toString("hh:mm") + "-" + start.addSecs(event->duration()).toString("hh:mm") + ", " + event->room ());156 painter->drawText(titlePointF,start.toString("hh:mm") + "-" + start.addSecs(event->duration()).toString("hh:mm") + ", " + event->roomName()); 157 157 // title 158 158 titlePointF.setY(titlePointF.y()+fmBig.height()-fmBig.descent()); -
src/mvc/event.cpp
r58eb7cc r0d995ed 39 39 40 40 Event::Event() : 41 mRoomId( 0)41 room_(NULL) 42 42 { 43 43 } … … 120 120 } 121 121 122 QString Event::room() 123 { 124 if ( mRoomName.isEmpty() ) 125 { 126 QSqlQuery query; 127 // TODO: conference ID isn't used here 128 query.prepare("SELECT name FROM room WHERE id = :roomId"); 129 query.bindValue(":roomId", roomId()); 130 query.exec(); 131 // TODO: handle qeury error 132 //qDebug() << query.lastError(); 133 if(query.next()) 134 mRoomName = query.record().value("name").toString(); 135 else 136 mRoomName = QString("not-available"); 137 } 138 return mRoomName; 139 } 140 141 int Event::roomId() 142 { 143 if ( mRoomId == 0 ) 122 Room* Event::room() 123 { 124 if (room_ == NULL) 144 125 { 145 126 QSqlQuery query; … … 155 136 throw OrmNoObjectException(); 156 137 } 157 mRoomId = query.record().value("xid_room").toInt(); 158 } 159 return mRoomId; 138 int id = query.record().value("xid_room").toInt(); 139 room_ = new Room(Room::retrieve(id)); 140 } 141 return room_; 142 } 143 144 QString Event::roomName() 145 { 146 return room()->name(); 147 } 148 149 int Event::roomId() 150 { 151 return room()->id(); 160 152 } 161 153 -
src/mvc/event.h
r58eb7cc r0d995ed 25 25 26 26 #include <ormrecord.h> 27 28 class Room; 27 29 28 30 /** … … 65 67 QString description() const { return value("description").toString(); } 66 68 // records from other tables associated with 'id' 67 QString room(); 69 Room* room(); 70 QString roomName(); 68 71 int roomId(); 69 72 QStringList persons(); … … 96 99 int mRoomId; 97 100 QString mRoomName; 101 Room* room_; 98 102 }; 99 103
Note: See TracChangeset
for help on using the changeset viewer.