Skip to content
This repository was archived by the owner on Feb 14, 2020. It is now read-only.

Commit cc8ed07

Browse files
committed
- Added BoxPlotChartPlotOptions.
- Added BubbleChartPlotOptions. - Added ColumnRangeChartPlotOptions. - Added ErrorBarChartPlotOptions. - Added FunnelChartPlotOptions. - Added heatmap.js Several changes in HighChartsPlotOptionsImpl
1 parent ad56cf1 commit cc8ed07

File tree

10 files changed

+376
-4
lines changed

10 files changed

+376
-4
lines changed

src/main/java/at/downdrown/vaadinaddons/highchartsapi/AbstractHighChart.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import at.downdrown.vaadinaddons.highchartsapi.model.ChartConfiguration;
99
import com.vaadin.ui.AbstractJavaScriptComponent;
1010
import com.vaadin.ui.AbstractOrderedLayout;
11+
import com.vaadin.ui.JavaScript;
12+
1113

1214
public abstract class AbstractHighChart extends AbstractJavaScriptComponent {
1315
private static final long serialVersionUID = 7738496276049495017L;
@@ -91,4 +93,12 @@ public ChartConfiguration getChartConfiguration() {
9193
public void setChartConfiguration(ChartConfiguration chartConfiguration) {
9294
this.chartConfiguration = chartConfiguration;
9395
}
96+
97+
/**
98+
* Rerenders your chart configuration.
99+
*/
100+
public void redraw(ChartConfiguration configuration) throws HighChartsException {
101+
this.setChartoptions(configuration.getHighChartValue());
102+
JavaScript.getCurrent().execute("$(#" + this.getDomId() + ").redraw();");
103+
}
94104
}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/HighChart.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.vaadin.annotations.JavaScript;
44

5-
@JavaScript({"jquery-2.1.3.min.js", "exporting.js", "funnel.js", "highcharts-more.js", "highcharts.js", "highcharts-connector.js"})
5+
@JavaScript({"jquery-2.1.3.min.js", "exporting.js", "funnel.js", "heatmap.js", "highcharts-more.js", "highcharts.js", "highcharts-connector.js"})
66
public class HighChart extends AbstractHighChart {
77
private static final long serialVersionUID = -7326315426217377753L;
8+
9+
810
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;
2+
3+
import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;
4+
5+
/**
6+
* Projekt: VaadinHighChartsAPI<br>
7+
* Package: at.downdrown.vaadinaddons.highchartsapi.model.plotoptions<br>
8+
* Klasse: BoxPlotChartPlotOptions.class<br>
9+
* Erstellt am 24. August 2015.<br>
10+
* Copyright &copy; HSWE Allg. Applikationen.<br>
11+
* <br>
12+
*
13+
* @author Manfred Huber (02ub0j08)<br>
14+
*/
15+
public class BoxPlotChartPlotOptions extends HighChartsPlotOptionsImpl {
16+
17+
public BoxPlotChartPlotOptions() {
18+
this.chartType = ChartType.BOXPLOT;
19+
}
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;
2+
3+
import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;
4+
5+
/**
6+
* Projekt: VaadinHighChartsAPI<br>
7+
* Package: at.downdrown.vaadinaddons.highchartsapi.model.plotoptions<br>
8+
* Klasse: BoxPlotChartPlotOptions.class<br>
9+
* Erstellt am 24. August 2015.<br>
10+
* Copyright &copy; HSWE Allg. Applikationen.<br>
11+
* <br>
12+
*
13+
* @author Manfred Huber (02ub0j08)<br>
14+
*/
15+
public class BubbleChartPlotOptions extends HighChartsPlotOptionsImpl {
16+
17+
public BubbleChartPlotOptions() {
18+
this.chartType = ChartType.BUBBLE;
19+
}
20+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* Copyright (c) 2015 by Manfred Huber.
3+
*/
4+
5+
package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;
6+
7+
import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;
8+
9+
public class ColumnRangeChartPlotOptions extends HighChartsPlotOptionsImpl {
10+
public ColumnRangeChartPlotOptions() {
11+
chartType = ChartType.COLUMNRANGE;
12+
}
13+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;
2+
3+
import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;
4+
5+
/**
6+
* Projekt: VaadinHighChartsAPI<br>
7+
* Package: at.downdrown.vaadinaddons.highchartsapi.model.plotoptions<br>
8+
* Klasse: ErrorBarChartPlotOptions.class<br>
9+
* Erstellt am 25. August 2015.<br>
10+
* Copyright &copy; HSWE Allg. Applikationen.<br>
11+
* <br>
12+
*
13+
* @author Manfred Huber (02ub0j08)<br>
14+
*/
15+
public class ErrorBarChartPlotOptions extends HighChartsPlotOptionsImpl {
16+
17+
public ErrorBarChartPlotOptions() {
18+
this.chartType = ChartType.ERRORBAR;
19+
}
20+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* Copyright (c) 2015 by Manfred Huber.
3+
*/
4+
5+
package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;
6+
7+
import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;
8+
9+
public class FunnelChartPlotOptions extends HighChartsPlotOptionsImpl {
10+
public FunnelChartPlotOptions() {
11+
chartType = ChartType.FUNNEL;
12+
}
13+
}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/plotoptions/HighChartsPlotOptionsImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public ChartType getChartType() {
253253
public String getHighChartValue() {
254254
StringBuilder builder = new StringBuilder();
255255
builder.append(", plotOptions: { ");
256-
builder.append(chartType.getHighChartValue().toLowerCase() + ": { ");
256+
builder.append(chartType.getHighChartValue() + ": { ");
257257
builder.append("allowPointSelect: " + allowPointSelect);
258258
builder.append(", dashStyle: '" + dashStyle.name() +"'");
259259
builder.append(", showCheckbox: " + showCheckBox);
@@ -287,7 +287,7 @@ public enum DashStyle {
287287
LongDash,
288288
DashDot,
289289
LongDashDot,
290-
LongDashDotDot;
290+
LongDashDotDot
291291
}
292292

293293
public enum Steps {

0 commit comments

Comments
 (0)