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

Commit

Permalink
- Added BoxPlotChartPlotOptions.
Browse files Browse the repository at this point in the history
- Added BubbleChartPlotOptions.
- Added ColumnRangeChartPlotOptions.
- Added ErrorBarChartPlotOptions.
- Added FunnelChartPlotOptions.

- Added heatmap.js

Several changes in HighChartsPlotOptionsImpl
  • Loading branch information
downdrown committed Sep 2, 2015
1 parent ad56cf1 commit cc8ed07
Show file tree
Hide file tree
Showing 10 changed files with 376 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import at.downdrown.vaadinaddons.highchartsapi.model.ChartConfiguration;
import com.vaadin.ui.AbstractJavaScriptComponent;
import com.vaadin.ui.AbstractOrderedLayout;
import com.vaadin.ui.JavaScript;


public abstract class AbstractHighChart extends AbstractJavaScriptComponent {
private static final long serialVersionUID = 7738496276049495017L;
Expand Down Expand Up @@ -91,4 +93,12 @@ public ChartConfiguration getChartConfiguration() {
public void setChartConfiguration(ChartConfiguration chartConfiguration) {
this.chartConfiguration = chartConfiguration;
}

/**
* Rerenders your chart configuration.
*/
public void redraw(ChartConfiguration configuration) throws HighChartsException {
this.setChartoptions(configuration.getHighChartValue());
JavaScript.getCurrent().execute("$(#" + this.getDomId() + ").redraw();");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.vaadin.annotations.JavaScript;

@JavaScript({"jquery-2.1.3.min.js", "exporting.js", "funnel.js", "highcharts-more.js", "highcharts.js", "highcharts-connector.js"})
@JavaScript({"jquery-2.1.3.min.js", "exporting.js", "funnel.js", "heatmap.js", "highcharts-more.js", "highcharts.js", "highcharts-connector.js"})
public class HighChart extends AbstractHighChart {
private static final long serialVersionUID = -7326315426217377753L;


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;

import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;

/**
* Projekt: VaadinHighChartsAPI<br>
* Package: at.downdrown.vaadinaddons.highchartsapi.model.plotoptions<br>
* Klasse: BoxPlotChartPlotOptions.class<br>
* Erstellt am 24. August 2015.<br>
* Copyright &copy; HSWE Allg. Applikationen.<br>
* <br>
*
* @author Manfred Huber (02ub0j08)<br>
*/
public class BoxPlotChartPlotOptions extends HighChartsPlotOptionsImpl {

public BoxPlotChartPlotOptions() {
this.chartType = ChartType.BOXPLOT;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;

import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;

/**
* Projekt: VaadinHighChartsAPI<br>
* Package: at.downdrown.vaadinaddons.highchartsapi.model.plotoptions<br>
* Klasse: BoxPlotChartPlotOptions.class<br>
* Erstellt am 24. August 2015.<br>
* Copyright &copy; HSWE Allg. Applikationen.<br>
* <br>
*
* @author Manfred Huber (02ub0j08)<br>
*/
public class BubbleChartPlotOptions extends HighChartsPlotOptionsImpl {

public BubbleChartPlotOptions() {
this.chartType = ChartType.BUBBLE;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* Copyright (c) 2015 by Manfred Huber.
*/

package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;

import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;

public class ColumnRangeChartPlotOptions extends HighChartsPlotOptionsImpl {
public ColumnRangeChartPlotOptions() {
chartType = ChartType.COLUMNRANGE;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;

import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;

/**
* Projekt: VaadinHighChartsAPI<br>
* Package: at.downdrown.vaadinaddons.highchartsapi.model.plotoptions<br>
* Klasse: ErrorBarChartPlotOptions.class<br>
* Erstellt am 25. August 2015.<br>
* Copyright &copy; HSWE Allg. Applikationen.<br>
* <br>
*
* @author Manfred Huber (02ub0j08)<br>
*/
public class ErrorBarChartPlotOptions extends HighChartsPlotOptionsImpl {

public ErrorBarChartPlotOptions() {
this.chartType = ChartType.ERRORBAR;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* Copyright (c) 2015 by Manfred Huber.
*/

package at.downdrown.vaadinaddons.highchartsapi.model.plotoptions;

import at.downdrown.vaadinaddons.highchartsapi.model.ChartType;

public class FunnelChartPlotOptions extends HighChartsPlotOptionsImpl {
public FunnelChartPlotOptions() {
chartType = ChartType.FUNNEL;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public ChartType getChartType() {
public String getHighChartValue() {
StringBuilder builder = new StringBuilder();
builder.append(", plotOptions: { ");
builder.append(chartType.getHighChartValue().toLowerCase() + ": { ");
builder.append(chartType.getHighChartValue() + ": { ");
builder.append("allowPointSelect: " + allowPointSelect);
builder.append(", dashStyle: '" + dashStyle.name() +"'");
builder.append(", showCheckbox: " + showCheckBox);
Expand Down Expand Up @@ -287,7 +287,7 @@ public enum DashStyle {
LongDash,
DashDot,
LongDashDot,
LongDashDotDot;
LongDashDotDot
}

public enum Steps {
Expand Down
Loading

0 comments on commit cc8ed07

Please sign in to comment.