Buggy but tolerable

[kitchenalert] / src / currentalertstablemodel.cpp

diff --git a/src/currentalertstablemodel.cpp b/src/currentalertstablemodel.cpp
index ca4b463..b7afc18 100644 (file)
--- a/src/currentalertstablemodel.cpp
+++ b/src/currentalertstablemodel.cpp
@@ -84,16 +84,16 @@ QVariant CurrentAlertsTableModel::data(const QModelIndex &index, int role) const
 
             case alertTextColumnNumber_:
 
-                return int (Qt::AlignLeft || Qt::AlignVCenter);
+                return int (Qt::AlignLeft | Qt::AlignVCenter);
 
 
             case timeRemainingColumnNumber_:
 
-                return int (Qt::AlignRight || Qt::AlignVCenter);
+                return int (Qt::AlignRight | Qt::AlignVCenter);
 
             case statusColumnNumber_:
 
-                return int (Qt::AlignLeft || Qt::AlignVCenter);
+                return int (Qt::AlignLeft | Qt::AlignVCenter);
 
             }
 
@@ -140,7 +140,7 @@ QVariant CurrentAlertsTableModel::data(const QModelIndex &index, int role) const
 
 //                    qDebug () << timeAsText;
 
-                   return timeAsText;
+                    return timeAsText;
 
 
                 case statusColumnNumber_:
@@ -165,24 +165,24 @@ QVariant CurrentAlertsTableModel::data(const QModelIndex &index, int role) const
 
 
 
-      case Qt::BackgroundRole :
+//      case Qt::BackgroundRole :
 
-            //For some reason, these have no effect at all!!! They are asked by the view though.
+//            //For some reason, these have no effect at all!!! They are asked by the view though.
 
-            //No need to care for the column number, all have the same color
+//            //No need to care for the column number, all have the same color
 
 //            qDebug() << "BackgroundRole asked";
 
-            if (currentTimers_.at(index.row())->isAlerting())
-            {
+//            if (currentTimers_.at(index.row())->isAlerting())
+//            {
 //                qDebug() << "black background";
-                return QBrush (QColor(Qt::black));
-            }
-            else
-            {
+//                return QBrush (QColor(Qt::black));
+//            }
+//            else
+//            {
 //                qDebug() << "red background";
-                return QBrush (QColor(Qt::red));
-            }
+//                return QBrush (QColor(Qt::red));
+//            }
         default:
             return QVariant();
 
@@ -195,31 +195,43 @@ QVariant CurrentAlertsTableModel::data(const QModelIndex &index, int role) const
 
 
 
-void CurrentAlertsTableModel::addTimers(QList <Timer *> timers)
+void CurrentAlertsTableModel::addTimers(QList <Timer *> timers, bool startImmediately)
 {
+
+//preparatory work
     foreach (Timer* timer, timers)
     {
-        connect (timer,SIGNAL(remainingTimeChanged()),this,SLOT(refreshTimeColumn()));
+        connect (timer,SIGNAL(remainingTimeChanged()),this,SLOT(refreshTimeAndStatusColumns()));
 //        qDebug() << "timer connected";
         timer->setParent(this); //The model becomes the timers parent giving the timer access to model
     }
 
-    int nextRow = rowCount(QModelIndex()); //As row numbering starts from zero, number of the rows is the row number of the row after current ones
-    int lastRow = nextRow + timers.length()-1;
-    beginInsertRows(QModelIndex(),nextRow,lastRow);
+
+//Add the timers
+
+    beginResetModel();
     currentTimers_.append(timers);
-    endInsertRows();
-//    qDebug() << "Timers should be appended";
-//    reset();
+    endResetModel();
+
+    //start the timers if requested
+
+    if (startImmediately)
+    {
+        foreach (Timer* timer, timers)
+        {
+            timer->start();
+        }
+    }
+
 }
 
 
-void CurrentAlertsTableModel::refreshTimeColumn()
+void CurrentAlertsTableModel::refreshTimeAndStatusColumns()
 {
     if (updateViewOnChanges_ == true) //Only update GUI if active to save battery
     {
-        emit dataChanged(createIndex(0,1),createIndex(rowCount(QModelIndex())-1,1));  //Entire time column refreshed
-//        qDebug() << "Refresh time column";
+        emit dataChanged(createIndex(0,1),createIndex((rowCount(QModelIndex())-1),2));  //Entire time and status columns refreshed
+
 
     }
 
@@ -233,7 +245,7 @@ void CurrentAlertsTableModel::startTimer(QModelIndex index)
     if (ptimer != NULL)
     {
         ptimer->start();
-        refreshTimeColumn();
+        refreshTimeAndStatusColumns();
     }
 }
 
@@ -243,7 +255,7 @@ void CurrentAlertsTableModel::stopTimer(QModelIndex index)
     if (ptimer != NULL)
     {
         ptimer->stop();
-        refreshTimeColumn();
+        refreshTimeAndStatusColumns();
     }
 }
 
@@ -253,7 +265,7 @@ void CurrentAlertsTableModel::snoozeTimer(QModelIndex index)
     if (ptimer != NULL)
     {
         ptimer->snooze();
-        refreshTimeColumn();
+        refreshTimeAndStatusColumns();
     }
 }
 
@@ -281,8 +293,11 @@ void CurrentAlertsTableModel::setUpdateViewOnChanges(bool update)
 {
     updateViewOnChanges_ = update;
     if (update == true)
-        reset(); //Refresh view to catch up with past changes
-}
+    {
+        refreshTimeAndStatusColumns(); //Refresh to catch up with past changes
+//        qDebug() << "Just refreshed time and status colums after returning to the app";
+    }
+    }
 
 bool CurrentAlertsTableModel::isThisTimerAlerting(QModelIndex index)
 {
@@ -299,12 +314,14 @@ bool CurrentAlertsTableModel::isThisTimerAlerting(QModelIndex index)
 
 void CurrentAlertsTableModel::removeTimer(QModelIndex index)
 {
-    if (index.isValid())
-    {
-        int row = index.row();
-        beginRemoveRows(QModelIndex(),row,row);
-        Timer* p_timer = currentTimers_.takeAt(row);
-        endRemoveRows();
-        delete p_timer;
-    }
+    if (index.isValid() == false)
+        return;
+
+    int i = index.row();
+    beginRemoveRows(QModelIndex(),i,i);
+    Timer * p_timer = currentTimers_.takeAt(i);
+    delete p_timer;
+    endRemoveRows();
+
 }
+