Changeset 15081

Timestamp:

03/15/13 13:43:50 (12 years ago)

Author:

tbretz

Message:

Fixed the deletion of alarms from the list

File:

• trunk/FACT++/src/smartfact.cc (modified) (5 diffs)

trunk/FACT++/src/smartfact.cc

@@ -394 +394 @@
 
             push_back(EventElement(t, s));
+        }
+
+        void clean()
+        {
+            for (auto it=begin(); it!=end();)
+                for (it=begin(); it!=end(); it++)
+                    if (!it->time)
+                    {
+                        erase(it);
+                        break;
+                    }
         }
 
@@ -726 +737 @@
         if (d.GetQoS()==MessageImp::kAlarm)
         {
-            if (d.GetSize()==1)
+            if (d.GetSize()<2)
                 for (auto it=fControlAlarmHist.begin(); it!=fControlAlarmHist.end(); it++)
                     it->time = Time(Time::none);
@@ -733 +744 @@
         }
 
-        if (d.GetQoS()==MessageImp::kComment)
+        if (d.GetQoS()==MessageImp::kComment && d.GetSize()>1)
             HandleControlMessageImp(d);
 
@@ -759 +770 @@
         // [1] DimControl::kLoading
         // [2] DimControl::kCompiling
-        // [3] DimControl::kRinning
+        // [3] DimControl::kRunning
         if (d.GetQoS()==1)
         {
@@ -2393 +2404 @@
 
         for (auto it=fControlAlarmHist.begin(); it!=fControlAlarmHist.end(); it++)
-        {
             newerr |= SetError(it->time.IsValid(), it->msg);
-            if (!it->time)
-                fControlAlarmHist.erase(it);
-        }
+        fControlAlarmHist.clean();;
 
         fLastRunFinishedWithZeroEvents = false;