some performance optimizations

 - favourities reloaded only if they have really changed
 - otherwise only event in the question is updated

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 12838a55246a92d194814cd6454bcad61b0a3090..91c92629303ea8c8b38a522b4391b3d535375be2 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -66,13 +66,13 @@ void EventDialog::favouriteClicked()
 
     qDebug() << " FAVOURITE [" << event.id() << "] -> " << event.isFavourite();
 
 
     qDebug() << " FAVOURITE [" << event.id() << "] -> " << event.isFavourite();
 

-    // since the Favourite icon has changed, update TreeViews accordingly
-    // all TreeViews have to listen on this signal
-    emit(eventHasChanged(event.id()));
-

     // have to emit 'eventHasChanged' signal on all events in conflict
     for(int i=0; i<conflicts.count(); i++)
         emit(eventHasChanged(conflicts[i].id()));
     // have to emit 'eventHasChanged' signal on all events in conflict
     for(int i=0; i<conflicts.count(); i++)
         emit(eventHasChanged(conflicts[i].id()));

+
+    // since the Favourite icon has changed, update TreeViews accordingly
+    // all TreeViews have to listen on this signal
+    emit(eventHasChanged(event.id(),true));

 }
 
 void EventDialog::alarmClicked()
 }
 
 void EventDialog::alarmClicked()

diff --git a/src/gui/eventdialog.h b/src/gui/eventdialog.h
index 2f13f259fc1deb6f6384367cceaa3cc54327f4a7..9b6ce04be0a1720cee2d84b35fa4259d44c1d0a0 100644 (file)
--- a/src/gui/eventdialog.h
+++ b/src/gui/eventdialog.h
@@ -15,7 +15,7 @@ private slots:
     void favouriteClicked();
     void alarmClicked();
 signals:
     void favouriteClicked();
     void alarmClicked();
 signals:

-    void eventHasChanged(int aEventId); // emited when user changes some event details, eg. sets it Favourite
+    void eventHasChanged(int aEventId, bool aReloadModel = false); // emited when user changes some event details, eg. sets it Favourite

 private:
     int mEventId;
 };
 private:
     int mEventId;
 };

diff --git a/src/gui/favtabcontainer.cpp b/src/gui/favtabcontainer.cpp
index 80bd6bb924063f5771efb80eea64dc40baada5db..1ad12154cb1249a77fd9b81d42b19b81ae9938a8 100644 (file)
--- a/src/gui/favtabcontainer.cpp
+++ b/src/gui/favtabcontainer.cpp
@@ -10,17 +10,3 @@ void FavTabContainer::loadEvents( const QDate &aDate, const int aConferenceId )
     static_cast<EventModel*>(treeView->model())->loadFavEvents( aDate, aConferenceId );
 }
 
     static_cast<EventModel*>(treeView->model())->loadFavEvents( aDate, aConferenceId );
 }
 

-void FavTabContainer::updateTreeViewModel(int aEventId)
-{
-    Q_UNUSED(aEventId);
-
-    // requires special handling
-    // we need to reload favourites, because some favourite could be deleted
-    //static_cast<EventModel*>(favTreeView->model())->updateModel(aEventId);
-    int confId = Conference::activeConference();
-    QDate startDate = Conference::getById(confId).start();
-    QDate endDate = Conference::getById(confId).end();
-    dayNavigator->setDates(startDate, endDate);
-    updateTreeView( Conference::getById(confId).start() );
-}
-

diff --git a/src/gui/favtabcontainer.h b/src/gui/favtabcontainer.h
index 233757c0a216b1e3ab6805506d0e7a8f161cab44..55fed4ea04b55645d3729ff75ddb81b4fcf16b39 100644 (file)
--- a/src/gui/favtabcontainer.h
+++ b/src/gui/favtabcontainer.h
@@ -11,9 +11,6 @@ public:
     FavTabContainer(QWidget *aParent);
     virtual ~FavTabContainer(){}
 
     FavTabContainer(QWidget *aParent);
     virtual ~FavTabContainer(){}
 

-public slots:
-    virtual void updateTreeViewModel(int aEventId);
-

 protected:
     virtual void loadEvents( const QDate &aDate, const int aConferenceId );
 };
 protected:
     virtual void loadEvents( const QDate &aDate, const int aConferenceId );
 };

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 130204ea9f17b7ae745498d1226adf9a74ec9c83..8283787a4cf0104114031ee360f9eb15ea484b2b 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -31,12 +31,12 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int)));
 
     // event details have changed
     connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int)));
 
     // event details have changed

-    connect(dayTabContainer, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
-    connect(favsTabContainer, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
-    connect(tracksTabContainer, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
-    connect(roomsTabContainer, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
-    connect(nowTabContainer, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
-    connect(searchTabContainer, SIGNAL(eventHasChanged(int)), SLOT(eventHasChanged(int)));
+    connect(dayTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool)));
+    connect(favsTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool)));
+    connect(tracksTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool)));
+    connect(roomsTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool)));
+    connect(nowTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool)));
+    connect(searchTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool)));

 
     // event conference map button clicked
     connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
 
     // event conference map button clicked
     connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));


@@ -104,10 +104,10 @@ void MainWindow::conferenceMapClicked()
     window.exec();
 }
 
     window.exec();
 }
 

-void MainWindow::eventHasChanged(int aEventId)
+void MainWindow::eventHasChanged(int aEventId, bool aReloadModel)

 {
     dayTabContainer->updateTreeViewModel(aEventId);
 {
     dayTabContainer->updateTreeViewModel(aEventId);

-    favsTabContainer->updateTreeViewModel(aEventId);
+    favsTabContainer->updateTreeViewModel(aEventId,aReloadModel);

     tracksTabContainer->updateTreeViewModel(aEventId);
     nowTabContainer->updateTreeViewModel(aEventId);
     roomsTabContainer->updateTreeViewModel(aEventId);
     tracksTabContainer->updateTreeViewModel(aEventId);
     nowTabContainer->updateTreeViewModel(aEventId);
     roomsTabContainer->updateTreeViewModel(aEventId);


@@ -137,8 +137,8 @@ void MainWindow::initTabs()
     dayTabContainer->setDates(startDate, endDate);
     tracksTabContainer->setDates(startDate, endDate);
     roomsTabContainer->setDates(startDate, endDate);
     dayTabContainer->setDates(startDate, endDate);
     tracksTabContainer->setDates(startDate, endDate);
     roomsTabContainer->setDates(startDate, endDate);

-    //favsTabContainer->setDates(startDate, endDate);
-    //searchTabContainer->setDates(startDate, endDate);
+    favsTabContainer->setDates(startDate, endDate);
+    searchTabContainer->setDates(startDate, endDate);

     searchTabContainer->searchAgainClicked();
     nowTabContainer->updateTreeView(QDate::currentDate());
 }
     searchTabContainer->searchAgainClicked();
     nowTabContainer->updateTreeView(QDate::currentDate());
 }

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index e5678c3dbddcdb51e1fd889e647d2d99428fb65d..a02a193bcbf25a865ed302b0af46e3d68ed94016 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -17,7 +17,7 @@ private slots:
     void scheduleImported(int aConfId);
     void aboutApp();
     void conferenceMapClicked();
     void scheduleImported(int aConfId);
     void aboutApp();
     void conferenceMapClicked();

-    void eventHasChanged(int aEventId);
+    void eventHasChanged(int aEventId, bool aReloadModel);

 private:
     void fillAndShowConferenceHeader();
     void initTabs();
 private:
     void fillAndShowConferenceHeader();
     void initTabs();

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 7a5da45567634943c3e2b49d39ae654874a3949a..6e71ba22029c9908bc6b6f426098865c7497d522 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -26,7 +26,7 @@ TabContainer::TabContainer(QWidget *aParent)
 
     connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateTreeView(const QDate &)));
 
 
     connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateTreeView(const QDate &)));
 

-    connect(treeView, SIGNAL(eventHasChanged(int)), SIGNAL(eventHasChanged(int)));
+    connect(treeView, SIGNAL(eventHasChanged(int,bool)), SIGNAL(eventHasChanged(int,bool)));

     connect(treeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(treeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(treeView, SIGNAL(requestForConflicts(const QModelIndex &)), SLOT(displayConflicts(const QModelIndex &)));
     connect(treeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(treeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(treeView, SIGNAL(requestForConflicts(const QModelIndex &)), SLOT(displayConflicts(const QModelIndex &)));


@@ -49,9 +49,9 @@ void TabContainer::itemClicked(const QModelIndex &aIndex)
         return;
 
     EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
         return;
 
     EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);

-    connect(&dialog, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
+    connect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));

     dialog.exec();
     dialog.exec();

-    disconnect(&dialog, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
+    disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));

 }
 
 void TabContainer::displayMap(const QModelIndex &aIndex)
 }
 
 void TabContainer::displayMap(const QModelIndex &aIndex)


@@ -78,14 +78,29 @@ void TabContainer::displayMap(const QModelIndex &aIndex)
 void TabContainer::displayConflicts(const QModelIndex &aIndex)
 {
     ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
 void TabContainer::displayConflicts(const QModelIndex &aIndex)
 {
     ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);

-    connect(&dialog, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
+    connect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));

     dialog.exec();
     dialog.exec();

-    disconnect(&dialog, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
+    disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));

 }
 
 }
 

-void TabContainer::updateTreeViewModel(int aEventId)
+void TabContainer::updateTreeViewModel(int aEventId, bool aReloadModel)

 {
 {

-    static_cast<EventModel*>(treeView->model())->updateModel(aEventId);
+    if(aReloadModel)
+    {
+        // requires special handling
+        // eg. in case of favourities - some favourities may have changed
+        // and so we need to reload them
+        int confId = Conference::activeConference();
+        QDate startDate = Conference::getById(confId).start();
+        QDate endDate = Conference::getById(confId).end();
+        dayNavigator->setDates(startDate, endDate);
+        updateTreeView( Conference::getById(confId).start() );
+    }
+    else
+    {
+        // just update event in the question
+        static_cast<EventModel*>(treeView->model())->updateModel(aEventId);
+    }

 }
 
 void TabContainer::setDates(const QDate &aStart, const QDate &aEnd)
 }
 
 void TabContainer::setDates(const QDate &aStart, const QDate &aEnd)

diff --git a/src/gui/tabcontainer.h b/src/gui/tabcontainer.h
index c6c0c1fd12e2ec7365b40b2b461d9553673cda54..3ecc779e355ccedb96edb1871bee95101fa42986 100644 (file)
--- a/src/gui/tabcontainer.h
+++ b/src/gui/tabcontainer.h
@@ -25,10 +25,10 @@ protected:
     };
 
 signals:
     };
 
 signals:

-    void eventHasChanged(int aEventId);
+    void eventHasChanged(int aEventId, bool aReloadModel);

 
 public slots:
 
 public slots:

-    virtual void updateTreeViewModel(int aEventId);
+    virtual void updateTreeViewModel(int aEventId, bool aReloadModel = false);

     void setDates(const QDate &aStart, const QDate &aEnd);
 
 protected slots:
     void setDates(const QDate &aStart, const QDate &aEnd);
 
 protected slots:

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 36f1f69fbfe33b8ffda702cee4f9fe41ea90a620..f907830696c085ccc2af5229b5e9b5424ae65589 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -64,13 +64,13 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                     conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
                 }
 
                     conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
                 }
 

-                // since the Favourite icon has changed, update TreeViews accordingly
-                // all TreeViews have to listen on this signal
-                emit(eventHasChanged(event.id()));
-

                 // have to emit 'eventHasChanged' signal on all events in conflict
                 for(int i=0; i<conflicts.count(); i++)
                     emit(eventHasChanged(conflicts[i].id()));
                 // have to emit 'eventHasChanged' signal on all events in conflict
                 for(int i=0; i<conflicts.count(); i++)
                     emit(eventHasChanged(conflicts[i].id()));

+                
+                // since the Favourite icon has changed, update TreeViews accordingly
+                // all TreeViews have to listen on this signal
+                emit(eventHasChanged(event.id(),true));

 
                 handled = true;
             }
 
                 handled = true;
             }

diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h
index cbd4854a37175b5f2532ec6282d2918f9d590c40..dac7deedfa6a0b08d2ab78fec40fbf6a1e5486ed 100644 (file)
--- a/src/mvc/treeview.h
+++ b/src/mvc/treeview.h
@@ -19,7 +19,7 @@ private slots:
 signals:
     void requestForMap(const QModelIndex &aIndex);
     void requestForConflicts(const QModelIndex &aIndex);
 signals:
     void requestForMap(const QModelIndex &aIndex);
     void requestForConflicts(const QModelIndex &aIndex);

-    void eventHasChanged(int aEventId); // emited when user changes some event details, eg. sets it Favourite
+    void eventHasChanged(int aEventId, bool aReloadModel = false); // emited when user changes some event details, eg. sets it Favourite

 };
 
 #endif /* TREEVIEW_H */
 };
 
 #endif /* TREEVIEW_H */