diff --git a/xchart/src/main/java/org/knowm/xchart/Styler_Pie.java b/xchart/src/main/java/org/knowm/xchart/Styler_Pie.java index 916590fc03ab5e611ceafc79744f0ff13b0df414..7b1d1dc0614ab9d623ce250264e2a7f86776b168 100644 --- a/xchart/src/main/java/org/knowm/xchart/Styler_Pie.java +++ b/xchart/src/main/java/org/knowm/xchart/Styler_Pie.java @@ -29,10 +29,10 @@ public class Styler_Pie extends Styler { private ChartPieSeriesRenderStyle chartPieSeriesRenderStyle; - private double pieFillPercentage; + private double pieSize; private boolean isCircular; private double startAngleInDegrees; - private Font pieFont; + private Font annotationFont; private double annotationDistance; /** @@ -48,9 +48,9 @@ public class Styler_Pie extends Styler { protected void setAllStyles() { chartPieSeriesRenderStyle = ChartPieSeriesRenderStyle.Pie; // set default to pie, donut may be a future one - pieFillPercentage = theme.getPieFillPercentage(); + pieSize = theme.getPieSize(); isCircular = theme.isCircular(); - pieFont = theme.getPieFont(); + annotationFont = theme.getPieFont(); annotationDistance = theme.getAnnotationDistance(); } @@ -69,19 +69,19 @@ public class Styler_Pie extends Styler { this.chartPieSeriesRenderStyle = chartPieSeriesRenderStyle; } - public double getPieFillPercentage() { + public double getPieSize() { - return pieFillPercentage; + return pieSize; } /** * Sets the amount of space that the pie chart fills. Full fill is 100%, i.e. 1.0 * - * @param pieFillPercentage + * @param pieSize */ - public void setPieFillPercentage(double pieFillPercentage) { + public void setPieSize(double pieSize) { - this.pieFillPercentage = pieFillPercentage; + this.pieSize = pieSize; } public boolean isCircular() { @@ -114,9 +114,9 @@ public class Styler_Pie extends Styler { this.startAngleInDegrees = startAngleInDegrees; } - public Font getPieFont() { + public Font getAnnotationFont() { - return pieFont; + return annotationFont; } /** @@ -124,9 +124,9 @@ public class Styler_Pie extends Styler { * * @param pieFont */ - public void setPieFont(Font pieFont) { + public void setAnnotationFont(Font pieFont) { - this.pieFont = pieFont; + this.annotationFont = pieFont; } public double getAnnotationDistance() { diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java index 907f9b89025bba1e843f24bbd63461d92d221c0e..22449798aa1bb01588b8362d5d9b06d5aad37ed0 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java @@ -72,7 +72,7 @@ public class PlotContent_Pie<ST extends Styler, S extends Series> extends PlotCo g.setClip(bounds.createIntersection(rectangle)); // pie bounds - double pieFillPercentage = stylerPie.getPieFillPercentage(); + double pieFillPercentage = stylerPie.getPieSize(); // if (stylerPie.isCircular()) { // @@ -127,7 +127,7 @@ public class PlotContent_Pie<ST extends Styler, S extends Series> extends PlotCo // draw percentage on slice double percentage = y.doubleValue() / total * 100; - TextLayout textLayout = new TextLayout(df.format(percentage) + "%", stylerPie.getPieFont(), new FontRenderContext(null, true, false)); + TextLayout textLayout = new TextLayout(df.format(percentage) + "%", stylerPie.getAnnotationFont(), new FontRenderContext(null, true, false)); Rectangle2D percentageRectangle = textLayout.getBounds(); double xCenter = pieBounds.getX() + pieBounds.getWidth() / 2 - percentageRectangle.getWidth() / 2; diff --git a/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_.java b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_.java index f985dcfb35c81a58c85f66ebb78cc1ccd98af747..2ec970b97bc2c1bc682aa628ca15ea46af9bf337 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_.java @@ -134,7 +134,7 @@ public interface Theme_ extends SeriesMarkers, SeriesLines, SeriesColors { // Pie Charts /////////////////////////////// - public double getPieFillPercentage(); + public double getPieSize(); public boolean isCircular(); diff --git a/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_GGPlot2.java b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_GGPlot2.java index f5cc3279eaa9ad5b92c41221ee82b7822280d97e..4c7b74017ffb9352a2db6c1281c7c0af6640ec74 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_GGPlot2.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_GGPlot2.java @@ -337,7 +337,7 @@ public class Theme_GGPlot2 implements Theme_ { // Pie Charts /////////////////////////////// @Override - public double getPieFillPercentage() { + public double getPieSize() { return .90; } diff --git a/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_Matlab.java b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_Matlab.java index 04f12954e54b7aab595419e83064a8fd7ab785f8..e8e13b326f0c9a2ffb7aa8784e0d06b2a979b4af 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_Matlab.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_Matlab.java @@ -341,7 +341,7 @@ public class Theme_Matlab implements Theme_ { // Pie Charts /////////////////////////////// @Override - public double getPieFillPercentage() { + public double getPieSize() { return .90; } diff --git a/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_XChart.java b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_XChart.java index ceaacec3839f3f92b40c47b0677b6572f01ec79f..d61cc6b257d340f0e3ddbcb5ca72b8bb85b08591 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_XChart.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme_XChart.java @@ -337,7 +337,7 @@ public class Theme_XChart implements Theme_ { // Pie Charts /////////////////////////////// @Override - public double getPieFillPercentage() { + public double getPieSize() { return .90; }