author | zautrix <zautrix> | 2005-07-10 20:11:56 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-10 20:11:56 (UTC) |
commit | f06311e58cb5887fd673eb1c2c48acf7cd987ad9 (patch) (unidiff) | |
tree | 301c74302cdddaa3716d79117023228005ebd265 /korganizer | |
parent | cb784d21ad22ab72a4e3231974f67816185675fd (diff) | |
download | kdepimpi-f06311e58cb5887fd673eb1c2c48acf7cd987ad9.zip kdepimpi-f06311e58cb5887fd673eb1c2c48acf7cd987ad9.tar.gz kdepimpi-f06311e58cb5887fd673eb1c2c48acf7cd987ad9.tar.bz2 |
smarter faster conflict search
-rw-r--r-- | korganizer/calendarview.cpp | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a9e402e..427d71b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -660,5 +660,7 @@ CalendarView::~CalendarView() | |||
660 | void CalendarView::nextConflict( bool all, bool allday ) | 660 | void CalendarView::nextConflict( bool all, bool allday ) |
661 | { | 661 | { |
662 | 662 | static bool block = false; | |
663 | if ( block ) return; | ||
664 | block = true; | ||
663 | QPtrList<Event> testlist = mCalendar->events(); | 665 | QPtrList<Event> testlist = mCalendar->events(); |
664 | Event * test = testlist.first(); | 666 | Event * test = testlist.first(); |
@@ -681,4 +683,6 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
681 | bool skip = false; | 683 | bool skip = false; |
682 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | 684 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
685 | //QTime tm; | ||
686 | //tm.start(); | ||
683 | while ( test ) { | 687 | while ( test ) { |
684 | qApp->processEvents(); | 688 | qApp->processEvents(); |
@@ -686,10 +690,21 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
686 | if ( !all ) skip = ( allday != test->doesFloat() ); | 690 | if ( !all ) skip = ( allday != test->doesFloat() ); |
687 | if ( !skip ) { | 691 | if ( !skip ) { |
692 | if ( found ) | ||
693 | skip = !test->matchTime( &startDT, &conflict ); | ||
694 | else | ||
695 | skip = !test->matchTime( &startDT, 0 ); | ||
696 | } | ||
697 | if ( !skip ) { | ||
688 | Event * test2 = testlist2.first(); | 698 | Event * test2 = testlist2.first(); |
689 | while ( test2 ) { | 699 | while ( test2 ) { |
690 | skip = false; | 700 | skip = test2->isTagged(); |
691 | if ( !all ) skip = ( allday != test2->doesFloat() ); | 701 | if ( !skip && !all ) skip = ( allday != test2->doesFloat() ); |
702 | if ( !skip ) { | ||
703 | if ( found ) | ||
704 | skip = !test2->matchTime( &startDT, &conflict ); | ||
705 | else | ||
706 | skip = !test2->matchTime( &startDT, 0 ); | ||
707 | } | ||
692 | if ( !skip ) { | 708 | if ( !skip ) { |
693 | if ( !test2->isTagged() ) { | ||
694 | if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { | 709 | if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { |
695 | //qDebug("overlap "); | 710 | //qDebug("overlap "); |
@@ -710,5 +725,4 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
710 | } | 725 | } |
711 | } | 726 | } |
712 | } | ||
713 | test2 = testlist2.next(); | 727 | test2 = testlist2.next(); |
714 | } | 728 | } |
@@ -717,4 +731,5 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
717 | test = testlist.next(); | 731 | test = testlist.next(); |
718 | } | 732 | } |
733 | //qDebug("Search time : %d", tm.elapsed()); | ||
719 | if ( found ) { | 734 | if ( found ) { |
720 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) | 735 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) |
@@ -724,4 +739,5 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
724 | mViewManager->agendaView()->setStartHour( hour ); | 739 | mViewManager->agendaView()->setStartHour( hour ); |
725 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); | 740 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); |
741 | block = false; | ||
726 | return; | 742 | return; |
727 | } | 743 | } |
@@ -729,4 +745,5 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
729 | topLevelWidget()->setCaption( i18n("No conflict found") ); | 745 | topLevelWidget()->setCaption( i18n("No conflict found") ); |
730 | qDebug("No conflict found "); | 746 | qDebug("No conflict found "); |
747 | block = false; | ||
731 | return; | 748 | return; |
732 | } | 749 | } |
@@ -2773,5 +2790,9 @@ void CalendarView::checkConflictForEvent() | |||
2773 | return; | 2790 | return; |
2774 | if ( ! mConflictingEvent ) return; | 2791 | if ( ! mConflictingEvent ) return; |
2775 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | 2792 | QDateTime current = QDateTime::currentDateTime(); |
2793 | if ( ! mConflictingEvent->matchTime( ¤t, 0 ) ) { | ||
2794 | mConflictingEvent = 0; | ||
2795 | return; | ||
2796 | } | ||
2776 | QPtrList<Event> testlist = mCalendar->events(); | 2797 | QPtrList<Event> testlist = mCalendar->events(); |
2777 | Event * test = testlist.first(); | 2798 | Event * test = testlist.first(); |
@@ -2780,8 +2801,13 @@ void CalendarView::checkConflictForEvent() | |||
2780 | bool found = false; | 2801 | bool found = false; |
2781 | Event * cE = 0; | 2802 | Event * cE = 0; |
2782 | QDateTime current = QDateTime::currentDateTime(); | 2803 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
2783 | while ( test ) { | 2804 | while ( test ) { |
2784 | qApp->processEvents(); | 2805 | qApp->processEvents(); |
2785 | if ( !test->doesFloat() ) { | 2806 | bool skip = false; |
2807 | if ( found ) | ||
2808 | skip = !test->matchTime( ¤t, &conflict ); | ||
2809 | else | ||
2810 | skip = !test->matchTime( ¤t, 0 ); | ||
2811 | if ( !skip && !test->doesFloat() ) { | ||
2786 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { | 2812 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { |
2787 | if ( ! found ) { | 2813 | if ( ! found ) { |