Changeset 699d5b8

Timestamp:

01/21/10 14:38:39 (13 years ago)

Author:

fortefr <fortefr@…>

Branches:

master, qt5

Children:

6a807e7

Parents:

06570e9

Message:

Time conflict warning

Location:

src/mvc

Files:

• delegate.cpp (modified) (4 diffs)
• delegate.h (modified) (1 diff)

src/mvc/delegate.cpp

@@ -35 +35 @@
 
     painter->save();
-
     QColor bkgrColor = Qt::cyan;
+
     QPen borderPen(bkgrColor.darker());
     //QColor bkgrColor = QColor(0,0,113);
@@ -64 +64 @@
 
         //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
+
+        //Time conflicts are colored differently
+        if ((static_cast<Event*>(index.internalPointer())->isFavourite())
+            && (hasTimeConflict(index, index.parent())))
+        {
+            bkgrColor = Qt::yellow;
+        }
 
         if(isLast(index))
@@ -127 +134 @@
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
         // Time conflict
-        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
+        //if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
+        if(bkgrColor == Qt::yellow)
             painter->drawImage(mControls[WarningControlOn]->drawPoint(option.rect),*mControls[WarningControlOn]->image());
         else
@@ -406 +414 @@
 }
 
+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;
+}

src/mvc/delegate.h

@@ -72 +72 @@
         int numberOfFavourities(const QModelIndex &index) const;
         int numberOfAlarms(const QModelIndex &index) const;
+        bool hasTimeConflict(const QModelIndex &index, const QModelIndex &parent) const;
 
     private: