Fix for linear chart

mwwojcik · Feb 5, 2021 · 025428d · 025428d
1 parent 3c2c2ff
commit 025428d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/gui-commons/src/main/java/pl/ks/profiling/gui/commons/Chart.java b/gui-commons/src/main/java/pl/ks/profiling/gui/commons/Chart.java
@@ -64,22 +64,16 @@ private String emptyForNull(String value) {
         return value;
     }
 
-    public Object[] getHighChartYAxisLabels() {
-        int numberOfSeries = data.length - 1;
-        Object[] ret = new Object[numberOfSeries];
-        for (int i = 1; i < data.length; i++) {
-            ret[i - 1] = data[i][0];
-        }
-        return ret;
-    }
-
     public List<HighChartSeries> getHighChartSeriesData() {
         int numberOfSeries = data[0].length;
         List<HighChartSeries> ret = new ArrayList<>(numberOfSeries - 1);
         for (int i = 1; i < numberOfSeries; i++) {
-            Object[] series = new Object[data.length - 1];
+            Object[][] series = new Object[data.length - 1][];
             for (int j = 1; j < data.length; j++) {
-                series[j - 1] = data[j][i];
+                Object[] seriesData = new Object[2];
+                seriesData[0] = data[j][0];
+                seriesData[1] = data[j][i];
+                series[j - 1] = seriesData;
             }
             ret.add(new HighChartSeries(data[0][i].toString(), series));
         }

diff --git a/web-commons/src/main/resources/templates/welcome.html b/web-commons/src/main/resources/templates/welcome.html
@@ -193,7 +193,6 @@ <h3 th:if="${content.title != null}">[[${content.title}]]</h3>
 
                                     xAxis: {
                                         ...common.xAxis,
-                                        categories:  /*[[${content.getHighChartYAxisLabels()}]]*/,
                                     },
                                     series: /*[[${content.getHighChartSeriesData()}]]*/,
                                 });
@@ -212,7 +211,6 @@ <h3 th:if="${content.title != null}">[[${content.title}]]</h3>
 
                                     xAxis: {
                                         ...common.xAxis,
-                                        categories:  /*[[${content.getHighChartYAxisLabels()}]]*/,
                                     },
                                     series: /*[[${content.getHighChartSeriesData()}]]*/,
                                 });