Changeset c718a77

Timestamp:

01/21/10 23:03:07 (12 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

d336730

Parents:

1735f55

Message:

EventModel? signaling changed

• if some of the data (favourite,alarm) has changed on the event, signal 'eventHasChanged' is emitted
• all treeViews (eg. DayView?, FavsView?, TracksView?, ...) have to listen on this signal

Only favouritiesView is 'reset' when current tab is changed in mainWindow

• 'cause time groupings have to be recreated, since favs may have changed

Location:

src

Files:

• gui/mainwindow.cpp (modified) (5 diffs)
• gui/mainwindow.h (modified) (2 diffs)
• mvc/eventmodel.cpp (modified) (2 diffs)
• mvc/eventmodel.h (modified) (2 diffs)
• mvc/mvc.pro (modified) (1 diff)
• mvc/treeview.cpp (modified) (4 diffs)
• mvc/treeview.h (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -79 +79 @@
         searchTreeView->setModel(new EventModel());
         searchTreeView->setItemDelegate(new Delegate(searchTreeView));
+
+    // event details have changed
+    connect(dayTreeView, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
+    connect(favTreeView, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
+    connect(trackTreeView, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
+    connect(searchTreeView, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
 
     // event clicked
@@ -97 +103 @@
     // event search button clicked
     connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));
-
-    // TESTING: load some 'fav' data
-    if(Conference::getAll().count()) // no conference(s) in the DB
-    {
-        static_cast<EventModel*>(favTreeView->model())->loadFavEvents(Conference::getById(AppSettings::confId()).start(),AppSettings::confId());
-        favTreeView->reset();
-    }
+    //
+    connect(tabWidget, SIGNAL(currentChanged(int)), SLOT(tabHasChanged(int)));
 
     if(!Conference::getAll().count()) // no conference(s) in the DB
@@ -128 +129 @@
     }
 
-    connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTab(int)));
-
     searchTreeView->hide();
     searchDayNavigator->hide();
@@ -188 +187 @@
 }
 
-void MainWindow::updateTab(const int aIndex)
-{
-    switch(aIndex)
-    {
-    case 0://index 0 of tabWidget: dayViewTab
-        {
-            updateDayView(dayNavigator->getCurrentDate());
-        }
-        break;
-    case 1: //index 1 of tabWidget: favouritesTab
-        {
-            updateFavouritesView(favouriteDayNavigator->getCurrentDate());
-        }
-        break;
-    case 2: //index 2 of tabWidget: activitiesTab
-        {
-            updateTracksView(trackDayNavigator->getCurrentDate());
-        }
-        break;
-    case 3: //index 3 of tabWidget: searchTab
-       {
-           updateSearchView( searchDayNavigator->getCurrentDate() );
-       }
-       break;
-    default:
-        {
-
-        }
-    };
-}
-
 void MainWindow::updateTracksView(const QDate &aDate)
 {
@@ -301 +269 @@
 }
 
+void MainWindow::eventHasChanged(int aEventId)
+{
+    static_cast<EventModel*>(dayTreeView->model())->updateModel(aEventId);
+    static_cast<EventModel*>(favTreeView->model())->updateModel(aEventId);
+    static_cast<EventModel*>(trackTreeView->model())->updateModel(aEventId);
+    static_cast<EventModel*>(searchTreeView->model())->updateModel(aEventId);
+}
+
+void MainWindow::tabHasChanged(int aIndex)
+{
+    Q_UNUSED(aIndex);
+
+    updateFavouritesView(favouriteDayNavigator->getCurrentDate());
+}
+

src/gui/mainwindow.h

@@ -20 +20 @@
     void aboutApp();
     void updateDayView(const QDate &aDate);
-    void updateTab(const int n);
     void updateTracksView(const QDate &aDate);
     void updateFavouritesView(const QDate &aDate);
@@ -28 +27 @@
     void displayWarning(const QModelIndex &aIndex);
     void searchClicked();
+    void tabHasChanged(int aIndex);
+    void eventHasChanged(int aEventId);
 private:
     SqlEngine *mSqlEngine;

src/mvc/eventmodel.cpp

@@ -1 +1 @@
 #include "eventmodel.h"
+#include <appsettings.h>
 #include <conference.h>
 #include <track.h>
@@ -220 +221 @@
 }
 
-void EventModel::emitDataChangedSignal(const QModelIndex &aTopLeft, const QModelIndex &aBottomRight)
-{
-    emit(dataChanged(aTopLeft,aBottomRight));
-}
-
+void EventModel::updateModel(int aEventId)
+{
+    for(int i=0; i<mEvents.count(); i++)
+    {
+        if(mEvents[i].id() == aEventId)
+            mEvents[i] = Event::getById(aEventId,AppSettings::confId());
+    }
+
+    // find the ModelIndex for given aEventId
+    for(int i=0; i<mGroups.count(); i++)
+    {
+        QModelIndex groupIndex = index(i,0,QModelIndex());
+        for(int j=0; j<mGroups[i].mChildCount; j++)
+        {
+            QModelIndex eventIndex = index(j,0,groupIndex);
+            if(static_cast<Event*>(eventIndex.internalPointer())->id() == aEventId)
+            {
+                emit(dataChanged(eventIndex,eventIndex));
+            }
+        }
+    }
+}
+

src/mvc/eventmodel.h

@@ -21 +21 @@
     void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events grouped by Track from the DB
     int loadSearchResultEvents(const QDate &aDate, int aConferenceId);
-    // a method to force 'EventModel' emit signal 'dataChanged()'
-    // a 'view', eg. 'TreeView' listens for this signal and redraws changed items(indexes)
-    void emitDataChangedSignal(const QModelIndex &aTopLeft, const QModelIndex &aBottomRight);
 
 private:
@@ -46 +43 @@
     void clearModel();
 
+public slots:
+    void updateModel(int aEventId);
+
 private:
     QList<Event> mEvents;

src/mvc/mvc.pro

@@ -8 +8 @@
 # module dependencies
 LIBS += -L$$DESTDIR -lorm
-INCLUDEPATH += ../orm
+INCLUDEPATH += ../orm ../app
 DEPENDPATH += . ../orm
 TARGETDEPS += $$DESTDIR/liborm.a

src/mvc/treeview.cpp

@@ -49 +49 @@
                 Event event = Event::getById(aIndex.data().toInt(),1);
                 if(event.isFavourite())
-                {
-                    static_cast<Event*>(aIndex.internalPointer())->setFavourite(false); // list of events
-                    event.setFavourite(false); // update DB
-                }
+                    event.setFavourite(false);
                 else
-                {
-                    static_cast<Event*>(aIndex.internalPointer())->setFavourite(true); // list of events
                     event.setFavourite(true);
-                }
+                event.update("favourite");
                 qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.isFavourite();
-                event.update("favourite");
-                // since the Favourite icon has changed, update TreeView accordingly
-                static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);
+                // since the Favourite icon has changed, update TreeViews accordingly
+                // all TreeViews have to listen on this signal
+                emit(eventHasChanged(event.id()));
                 handled = true;
             }
@@ -72 +67 @@
                 if(event.hasAlarm())
                 {
-                    static_cast<Event*>(aIndex.internalPointer())->setHasAlarm(false); // list of events
                     event.setHasAlarm(false); // update DB
 #ifdef MAEMO
@@ -83 +77 @@
                 else
                 {
-                    static_cast<Event*>(aIndex.internalPointer())->setHasAlarm(true); // list of events
                     event.setHasAlarm(true);
 #ifdef MAEMO
@@ -92 +85 @@
 #endif /* MAEMO */
                 }
+                event.update("alarm");
                 qDebug() << " ALARM [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.hasAlarm();
-                event.update("alarm");
                 // since the Alarm icon has changed, update TreeView accordingly
-                static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);
+                // all TreeViews have to listen on this signal
+                emit(eventHasChanged(event.id()));
                 handled = true;
             }

src/mvc/treeview.h

@@ -18 +18 @@
     void requestForMap(const QModelIndex &aIndex);
     void requestForWarning(const QModelIndex &aIndex);
+    void eventHasChanged(int aEventId); // emited when user changes some event details, eg. sets it Favourite
 };