Changeset 16696 for trunk

Timestamp:

06/04/13 19:43:24 (11 years ago)

Author:

tbretz

Message:

Ignore non finite values. This can happen if a board is diabled and there is a devision by zero; fixed the size.

File:

• trunk/FACT++/gui/FactGui.h (modified) (4 diffs)

trunk/FACT++/gui/FactGui.h

@@ -811 +811 @@
         }
 
-        if (!CheckSize(d, sizeof(uint16_t)+40*sizeof(float)))
+        if (!CheckSize(d, sizeof(uint16_t)+160*sizeof(float)))
             return;
 
@@ -826 +826 @@
         for (int i=0; i<160; i++)
         {
+            if (!finite(ptr[i])
+                continue;
+
             if (ptr[i]<min)
                 min = ptr[i];
@@ -854 +857 @@
         }
 
-        if (!CheckSize(d, sizeof(uint16_t)+160*sizeof(float)))
+        if (!CheckSize(d, sizeof(uint16_t)+40*sizeof(float)))
             return;
 
@@ -866 +869 @@
         for (int i=0; i<40; i++)
         {
+            if (!finite(ptr[i])
+                continue;
+
             if (ptr[i]<min)
                 min = ptr[i];