smarter faster conflict search

4 files changed, 56 insertions, 8 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 1f06f1e..c0d63e5 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -4,8 +4,9 @@ Info about the changes in new versions of KDE-Pim/Pi
 
 Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus.
 Added columns for datetime in todo view: Last modified, created and last modified subtodo
 Fixed a bug in agenda view displaying recurring multiday events which are longer than two days.
+Made conflict detection up to 4 times faster.
 
 ********** VERSION 2.1.15 ************
 
 Fixed two layout problems on the Z:
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a9e402e..427d71b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -658,9 +658,11 @@ CalendarView::~CalendarView()
 
 
 void CalendarView::nextConflict( bool all, bool allday )
 {
-    
+    static bool block = false;
+    if ( block ) return;
+    block = true;
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     while ( test ) {
         test->setTagged( false );
@@ -679,19 +681,32 @@ void CalendarView::nextConflict( bool all, bool allday )
     QPtrList<Event> testlist2 = testlist;
     test = testlist.first();
     bool skip = false;
     topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
+    //QTime tm;
+    //tm.start();
     while ( test ) {
         qApp->processEvents();
         skip = false;
         if ( !all ) skip = ( allday != test->doesFloat() );
         if ( !skip ) {
+            if ( found )
+                skip =  !test->matchTime( &startDT, &conflict );
+            else 
+               skip =  !test->matchTime( &startDT, 0 ); 
+        }
+        if ( !skip ) {
             Event * test2 = testlist2.first();
             while ( test2 ) { 
-                skip = false;
-                if ( !all ) skip = ( allday != test2->doesFloat() );
+                skip = test2->isTagged();
+                if ( !skip  && !all ) skip = ( allday != test2->doesFloat() );
+                if ( !skip ) {
+                    if ( found )
+                        skip =  !test2->matchTime( &startDT, &conflict );
+                    else 
+                        skip =  !test2->matchTime( &startDT, 0 ); 
+                }
                 if ( !skip ) {
-                    if ( !test2->isTagged() ) {
                         if ( test->isOverlapping ( test2, &retVal, &startDT ) ) {
                             //qDebug("overlap ");
                             if ( ! found ) {
                                 if ( retVal >= startDT ) {
@@ -708,27 +723,29 @@ void CalendarView::nextConflict( bool all, bool allday )
                                 }
                             }
                         }
                     }
-                }
                 test2 = testlist2.next();
             }
         }
         test->setTagged( true );
         test = testlist.next();
     }
+    //qDebug("Search time : %d", tm.elapsed());
     if ( found ) {
         if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
             mViewManager->showDayView();
         mNavigator->slotDaySelect( conflict.date() );
         int hour = conflict.time().hour();
         mViewManager->agendaView()->setStartHour( hour  );
         topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) );
+        block = false;
         return;
     }
 
     topLevelWidget()->setCaption( i18n("No conflict found") );
     qDebug("No conflict found ");
+    block = false;
     return;
 }
 
 void CalendarView::conflictAll()
@@ -2771,19 +2788,28 @@ void CalendarView::checkConflictForEvent()
 
     if (!KOPrefs::instance()->mConfirm)
         return;
     if ( ! mConflictingEvent ) return;
-    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
+    QDateTime current = QDateTime::currentDateTime();
+    if ( ! mConflictingEvent->matchTime( &current, 0 ) ) {
+        mConflictingEvent = 0;
+        return;
+    }
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
-    QDateTime current = QDateTime::currentDateTime();
+    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     while ( test ) {
         qApp->processEvents();
-        if ( !test->doesFloat() ) {
+        bool skip = false;
+        if ( found )
+            skip =  !test->matchTime( &current, &conflict );
+        else 
+            skip =  !test->matchTime( &current, 0 ); 
+        if ( !skip && !test->doesFloat() ) {
             if ( mConflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                 if ( ! found ) {
                     conflict = retVal; 
                     cE = test;
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 5285559..ad66639 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -170,8 +170,28 @@ void Event::setDuration(int seconds)
 {
   setHasEndDate(false);
   Incidence::setDuration(seconds);
 }
+bool Event::matchTime(QDateTime*startDT, QDateTime* endDT)
+{
+    if ( ! doesRecur() ) {
+        if ( doesFloat() ) {
+            if ( mDtEnd.addDays( 1 ) < *startDT)
+                return false;
+            if ( endDT && mDtStart > * endDT)
+                return false;
+        } else {
+            if ( mDtEnd < *startDT )
+                return false;
+            if ( endDT && mDtStart > * endDT)
+                return false;
+        }
+    } else {
+        if ( endDT && mDtStart > * endDT)
+            return false;
+    }
+    return true;
+}
 bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, QDateTime* startDT )
 {
     if ( testEvent == this )
         return false;
diff --git a/libkcal/event.h b/libkcal/event.h
index e6055a5..2da9770 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -37,8 +37,9 @@ class Event : public Incidence
     typedef ListBase<Event> List;
     Event();
     Event(const Event &);
     ~Event();
+    bool matchTime(QDateTime*startDT, QDateTime* endDT);
 
     QCString type() const { return "Event"; }
     IncTypeID typeID() const { return eventID; }