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

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 7fa5c6411d44768255ebb8a99b2bed89978bc4bb..d2d1138df507de48386a29d68a09c08a52f3d961 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -79,6 +79,12 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
        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
     connect(dayTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(favTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
@@ -96,13 +102,8 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     connect(searchTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
     // 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
     {
@@ -127,8 +128,6 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
                 Conference::getById(AppSettings::confId()).end().toString("dd-MM-yyyy"));
     }
 
-    connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTab(int)));
-
     searchTreeView->hide();
     searchDayNavigator->hide();
 
@@ -187,37 +186,6 @@ void MainWindow::updateDayView(const QDate &aDate)
     dayNavigator->show();
 }
 
-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)
 {
     static_cast<EventModel*>(trackTreeView->model())->loadEventsByTrack(aDate, AppSettings::confId());
@@ -300,3 +268,18 @@ void MainWindow::displayWarning(const QModelIndex &aIndex)
     tr("This event happens at the same time than another one of your favourites.") );
 }
 
+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());
+}
+

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 3ee01f8e1bd4705632bf101a94ceed4e0b100f13..00b35dcfdb0cd46a6b6d1bf02c0175f4e746398c 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -19,7 +19,6 @@ private slots:
     void importSchedule();
     void aboutApp();
     void updateDayView(const QDate &aDate);
-    void updateTab(const int n);
     void updateTracksView(const QDate &aDate);
     void updateFavouritesView(const QDate &aDate);
     void updateSearchView(const QDate &aDate);
@@ -27,6 +26,8 @@ private slots:
     void displayMap(const QModelIndex &aIndex);
     void displayWarning(const QModelIndex &aIndex);
     void searchClicked();
+    void tabHasChanged(int aIndex);
+    void eventHasChanged(int aEventId);
 private:
     SqlEngine *mSqlEngine;
 };

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 629581563b6e8495047f7aab53b3d1087022d895..813844fe4177a887a374a513c40fcaaaf020e3d4 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -1,4 +1,5 @@
 #include "eventmodel.h"
+#include <appsettings.h>
 #include <conference.h>
 #include <track.h>
 
@@ -219,8 +220,26 @@ void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId)
     createTrackGroups();
 }
 
-void EventModel::emitDataChangedSignal(const QModelIndex &aTopLeft, const QModelIndex &aBottomRight)
+void EventModel::updateModel(int aEventId)
 {
-    emit(dataChanged(aTopLeft,aBottomRight));
+    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));
+            }
+        }
+    }
 }
 

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index bba57643561d171d41d39c14536b52f393b22278..c23ba9e98f347e5e25c31fc0b32ad5a5c0e86e46 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -20,9 +20,6 @@ public:
     void loadFavEvents(const QDate &aDate, int aConferenceId); // loads Favourite events from the DB
     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:
     struct Group
@@ -45,6 +42,9 @@ private:
     void createTrackGroups();
     void clearModel();
 
+public slots:
+    void updateModel(int aEventId);
+
 private:
     QList<Event> mEvents;
     QList<Group> mGroups;

diff --git a/src/mvc/mvc.pro b/src/mvc/mvc.pro
index 6dfbec70eafa699838865b07ecdad86a25b20452..7c2aec9722bd3ef368880537500551236156018c 100644 (file)
--- a/src/mvc/mvc.pro
+++ b/src/mvc/mvc.pro
@@ -7,7 +7,7 @@ QT += sql
 
 # module dependencies
 LIBS += -L$$DESTDIR -lorm
-INCLUDEPATH += ../orm
+INCLUDEPATH += ../orm ../app
 DEPENDPATH += . ../orm
 TARGETDEPS += $$DESTDIR/liborm.a
 

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 4a7a98676d4cd612ab43f813c06f0fbcc6e2b9de..8b3b64715051480ffdc6abf25af641fc79ebdc02 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -48,19 +48,14 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 // handle Favourite Control clicked
                 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);
-                }
-                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);
+                qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.isFavourite();
+                // since the Favourite icon has changed, update TreeViews accordingly
+                // all TreeViews have to listen on this signal
+                emit(eventHasChanged(event.id()));
                 handled = true;
             }
             break;
@@ -71,7 +66,6 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 Event event = Event::getById(aIndex.data().toInt(),1);
                 if(event.hasAlarm())
                 {
-                    static_cast<Event*>(aIndex.internalPointer())->setHasAlarm(false); // list of events
                     event.setHasAlarm(false); // update DB
 #ifdef MAEMO
                     // remove alarm from the 'alarmd' alrms list
@@ -82,7 +76,6 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 }
                 else
                 {
-                    static_cast<Event*>(aIndex.internalPointer())->setHasAlarm(true); // list of events
                     event.setHasAlarm(true);
 #ifdef MAEMO
                     // add alarm to the 'alarmd'
@@ -91,10 +84,11 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                     qDebug() << "cookie: " << cookie;
 #endif /* MAEMO */
                 }
-                qDebug() << " ALARM [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.hasAlarm();
                 event.update("alarm");
+                qDebug() << " ALARM [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.hasAlarm();
                 // 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;
             }
             break;

diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h
index e608ff12525d40111c386b73e4f0dae1241ba1ba..d46ae4ca2228f16adc60ab6e72722be83acb39db 100644 (file)
--- a/src/mvc/treeview.h
+++ b/src/mvc/treeview.h
@@ -17,6 +17,7 @@ private slots:
 signals:
     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
 };
 
 #endif /* TREEVIEW_H */