From 6c11751720d94bdadc435a1e81e6388dd9a613d0 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 2 Jun 2016 20:45:24 +0200 Subject: [PATCH] Fixed null points in charts --- src/se/hal/page/PCOverviewHttpPage.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/se/hal/page/PCOverviewHttpPage.java b/src/se/hal/page/PCOverviewHttpPage.java index 48a0618e..b06873a5 100755 --- a/src/se/hal/page/PCOverviewHttpPage.java +++ b/src/se/hal/page/PCOverviewHttpPage.java @@ -37,10 +37,6 @@ public class PCOverviewHttpPage extends HalHttpPage implements HalHttpPage.HalJs DBConnection db = HalContext.getDB(); List users = User.getUsers(db); - ArrayList minDataList = new ArrayList<>(); - ArrayList hourDataList = new ArrayList<>(); - ArrayList dayDataList = new ArrayList<>(); - ArrayList weekDataList = new ArrayList<>(); List sensors = getSensorList(db); Templator tmpl = new Templator(FileUtil.find(TEMPLATE)); @@ -103,7 +99,7 @@ public class PCOverviewHttpPage extends HalHttpPage implements HalHttpPage.HalJs for (AggregateDataListSqlResult.AggregateData data : dataList) { DataNode dataNode = new DataNode(DataNode.DataType.Map); dataNode.set("time", data.timestamp); - if (data.data == Float.NaN) + if (Float.isNaN(data.data)) dataNode.set("" + data.id, (String)null); else dataNode.set("" + data.id, data.data);