Changeset 9f367eb for src/mvc/delegate.cpp

Timestamp:

01/27/10 07:41:47 (12 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

001c8cf

Parents:

336fa33

Message:

'conflicts' modifications

• preparing for the dialog showing also list of events in the conflict
• created 'EVENT_CONFLICT' for flaging events in conflict state
• TODO: not finished

File:

• src/mvc/delegate.cpp (modified) (5 diffs)

src/mvc/delegate.cpp

@@ -66 +66 @@
 
         //Time conflicts are colored differently
-        if(hasTimeConflict(index, index.parent()))
+        if(static_cast<Event*>(index.internalPointer())->isFavourite())
+        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
         {
             bkgrColor = Qt::yellow;
@@ -133 +134 @@
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
         // Time conflict
-        //if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
-
-        if(hasTimeConflict(index, index.parent()))
+        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
             painter->drawImage(mControls[WarningControl]->drawPoint(option.rect),*mControls[WarningControl]->image());
 
@@ -312 +311 @@
             if(id == WarningControl)
             {
-                if(mControls[id]->hasConflict)
+                if(static_cast<Event*>(aIndex.internalPointer())->hasTimeConflict())
                     return id;
             }
@@ -374 +373 @@
     control = new Control(WarningControl,QString(":icons/exclamation.png"));
     p = mControls[MapControl]->drawPoint();
-    control->hasConflict = false;
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
@@ -414 +412 @@
 }
 
-bool Delegate::hasTimeConflict(const QModelIndex &index, const QModelIndex &parent) const
-{
-    Event *event = static_cast<Event*>(index.internalPointer());
-    QTime start = event->start().time();
-    QTime end = start.addSecs(event->duration());
-    for(int i=0; i<parent.model()->rowCount(parent); i++)
-    {
-        if((event->id()!=static_cast<Event*>(parent.child(i,0).internalPointer())->id())
-        &&
-        (static_cast<Event*>(parent.child(i,0).internalPointer())->isFavourite()))
-        {
-            if (((start >= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
-            &&
-            (start < static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration())))
-            ||
-            ((end > static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
-            &&
-            (end <= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration()))))
-            {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-