Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Give the possibility to supply a custom label generator for pie charts #847

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Give the possibility to supply a custom label generator for pie charts #847

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d044293
Give the possibility to supply a custom label generator for pie charts
ggiambo Apr 26, 2024
44f6a18
Avoid call to to Chart#getSeriesMap (Marked for removal)
ggiambo Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package org.knowm.xchart.demo.charts.pie;

import java.awt.Color;
import java.util.Collection;
import java.util.function.Function;

import org.knowm.xchart.PieChart;
import org.knowm.xchart.PieChartBuilder;
import org.knowm.xchart.PieSeries;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
import org.knowm.xchart.style.PieStyler.LabelType;

/**
* Pie Chart Custom Color Palette
Expand Down Expand Up @@ -35,6 +38,13 @@ public PieChart getChart() {
PieChart chart =
new PieChartBuilder().width(800).height(600).title(getClass().getSimpleName()).build();

// Series
chart.addSeries("Gold", 24);
chart.addSeries("Silver", 21);
chart.addSeries("Platinum", 39);
chart.addSeries("Copper", 17);
chart.addSeries("Zinc", 40);

// Customize Chart
Color[] sliceColors =
new Color[] {
Expand All @@ -45,18 +55,11 @@ public PieChart getChart() {
new Color(246, 199, 182)
};
chart.getStyler().setSeriesColors(sliceColors);
chart.getStyler().setLabelType(LabelType.Value);
chart.getStyler().setCustomSeriesLabelFunction(generateSeriesLabel(chart.getSeriesMap().values()));
// chart.getStyler().setDecimalPattern("#0.000");
chart.getStyler().setToolTipsEnabled(true);
// chart.getStyler().setToolTipsAlwaysVisible(true);

// Series
chart.addSeries("Gold", 24);
chart.addSeries("Silver", 21);
chart.addSeries("Platinum", 39);
chart.addSeries("Copper", 17);
chart.addSeries("Zinc", 40);

return chart;
}

Expand All @@ -65,4 +68,12 @@ public String getExampleChartName() {

return getClass().getSimpleName() + " - Pie Chart Custom Color Palette";
}
}

private Function<PieSeries, String> generateSeriesLabel(Collection<PieSeries> values) {
double total = values.stream().map(PieSeries::getValue).mapToDouble(Number::doubleValue).sum();
return pieSeries -> {
double percent = (pieSeries.getValue().doubleValue() / total) * 100;
return String.format("%s (%.2f%%)", pieSeries.getValue(), percent);
};
}
}
2 changes: 2 additions & 0 deletions xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ private void paintLabels(Graphics2D g, Rectangle2D pieBounds, double total, doub
} else {
label = series.getName() + " (" + y.toString() + ")";
}
} else if (pieStyler.getCustomSeriesLabelFunction() != null) {
label = pieStyler.getCustomSeriesLabelFunction().apply(series);
}

TextLayout textLayout =
Expand Down
19 changes: 19 additions & 0 deletions xchart/src/main/java/org/knowm/xchart/style/PieStyler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

import java.awt.Color;
import java.awt.Font;
import java.util.function.Function;

import org.knowm.xchart.PieSeries;
import org.knowm.xchart.PieSeries.PieSeriesRenderStyle;
import org.knowm.xchart.style.colors.FontColorDetector;
import org.knowm.xchart.style.theme.Theme;
Expand All @@ -25,6 +28,7 @@ public class PieStyler extends Styler {
private Color labelsFontColor;
private double labelsDistance;
private LabelType labelType;
private Function<PieSeries, String> customSeriesLabelFunction;
private boolean isForceAllLabelsVisible;
private boolean isLabelsFontColorAutomaticEnabled;
private Color labelsFontColorAutomaticLight;
Expand Down Expand Up @@ -143,6 +147,21 @@ public PieStyler setLabelType(LabelType labelType) {
return this;
}

public Function<PieSeries, String> getCustomSeriesLabelFunction() {
return this.customSeriesLabelFunction;
}

/**
* Sets the Pie custom label generator
*
* @param customSeriesLabelFunction
*/
public PieStyler setCustomSeriesLabelFunction(Function<PieSeries, String> customSeriesLabelFunction) {
this.customSeriesLabelFunction = customSeriesLabelFunction;
this.setLabelType(null);
return this;
}

public boolean isForceAllLabelsVisible() {

return isForceAllLabelsVisible;
Expand Down
Loading