Time conflict warning

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 54808b88936da19b024c803c7da550125ad350a3..6f620b2a3e098638c837e388ba556e040366e9c4 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -34,8 +34,8 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         return;
 
     painter->save();
         return;
 
     painter->save();

-

     QColor bkgrColor = Qt::cyan;
     QColor bkgrColor = Qt::cyan;

+

     QPen borderPen(bkgrColor.darker());
     //QColor bkgrColor = QColor(0,0,113);
     //QPen borderPen(Qt::cyan);
     QPen borderPen(bkgrColor.darker());
     //QColor bkgrColor = QColor(0,0,113);
     //QPen borderPen(Qt::cyan);


@@ -64,6 +64,13 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
 
         //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
 
 
         //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))
         {
             QLinearGradient lastGradient(option.rect.topLeft(), option.rect.bottomLeft());
         if(isLast(index))
         {
             QLinearGradient lastGradient(option.rect.topLeft(), option.rect.bottomLeft());


@@ -126,7 +133,8 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         // map
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
         // Time conflict
         // map
         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
             painter->drawImage(mControls[WarningControlOff]->drawPoint(option.rect),*mControls[WarningControlOff]->image());
             painter->drawImage(mControls[WarningControlOn]->drawPoint(option.rect),*mControls[WarningControlOn]->image());
         else
             painter->drawImage(mControls[WarningControlOff]->drawPoint(option.rect),*mControls[WarningControlOff]->image());


@@ -405,3 +413,28 @@ int Delegate::numberOfAlarms(const QModelIndex &index) const
     return nrofAlarms;
 }
 
     return nrofAlarms;
 }
 

+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;
+}

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index 269e35eb58ef2e84f6fc4d1124d8367abac0b25e..98bef422711466300b172132b24acbe7814b8379 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -71,6 +71,7 @@ class Delegate : public QItemDelegate
         // every time it requires them
         int numberOfFavourities(const QModelIndex &index) const;
         int numberOfAlarms(const QModelIndex &index) const;
         // every time it requires them
         int numberOfFavourities(const QModelIndex &index) const;
         int numberOfAlarms(const QModelIndex &index) const;

+        bool hasTimeConflict(const QModelIndex &index, const QModelIndex &parent) const;

 
     private:
         QPointer<QTreeView> mViewPtr;
 
     private:
         QPointer<QTreeView> mViewPtr;