From 0b025e5110ab4578ecc96c4a95c28e0dfe641c87 Mon Sep 17 00:00:00 2001 From: zhenxiong han Date: Tue, 6 Jul 2021 17:35:32 +0800 Subject: [PATCH] update --- .../java/org/achartengine/chart/AbstractChart.java | 2 +- .../java/org/achartengine/chart/CombinedXYChart.java | 9 +++++---- .../src/main/java/org/achartengine/chart/XYChart.java | 4 ++-- .../chartdemo/demo/chart/SensorValuesChart.java | 3 ++- .../java/org/achartengine/renderer/BasicStroke.java | 7 +++++-- .../org/achartengine/renderer/DefaultRenderer.java | 5 +++-- .../renderer/XYMultipleSeriesRenderer.java | 10 ++++++---- .../org/achartengine/renderer/XYSeriesRenderer.java | 5 +++-- 8 files changed, 27 insertions(+), 18 deletions(-) diff --git a/entry/src/main/java/org/achartengine/chart/AbstractChart.java b/entry/src/main/java/org/achartengine/chart/AbstractChart.java index 206110f..d89e104 100644 --- a/entry/src/main/java/org/achartengine/chart/AbstractChart.java +++ b/entry/src/main/java/org/achartengine/chart/AbstractChart.java @@ -420,7 +420,7 @@ public abstract class AbstractChart implements Serializable { legendSize = defaultHeight; } if (!renderer.isShowLegend() && renderer.isShowXLabels()) { - legendSize = (int) (renderer.getLabelsTextSize() * 4 / 3 + extraHeight); + legendSize = (int) (renderer.getLabelsTextSize() * 4 / 3f + extraHeight); } return legendSize; } diff --git a/entry/src/main/java/org/achartengine/chart/CombinedXYChart.java b/entry/src/main/java/org/achartengine/chart/CombinedXYChart.java index add7184..3f12a48 100644 --- a/entry/src/main/java/org/achartengine/chart/CombinedXYChart.java +++ b/entry/src/main/java/org/achartengine/chart/CombinedXYChart.java @@ -53,7 +53,7 @@ public class CombinedXYChart extends XYChart { public CombinedXYChart(XYMultipleSeriesDataset dataset, XYMultipleSeriesRenderer renderer, XYCombinedChartDef[] chartDefinitions) { super(dataset, renderer); - this.chartDefinitions = chartDefinitions; + this.chartDefinitions = chartDefinitions.clone(); int length = chartDefinitions.length; mCharts = new XYChart[length]; for (int i = 0; i < length; i++) { @@ -91,8 +91,8 @@ public class CombinedXYChart extends XYChart { public CombinedXYChart(XYMultipleSeriesDataset dataset, XYMultipleSeriesRenderer renderer, XYCombinedChartDef[] chartDefinitions, XYChart[] charts) { super(dataset, renderer); - this.chartDefinitions = chartDefinitions; - this.mCharts = charts; + this.chartDefinitions = chartDefinitions.clone(); + this.mCharts = charts.clone(); } /** @@ -247,7 +247,8 @@ public class CombinedXYChart extends XYChart { } public int[] getSeriesIndex() { - return seriesIndex; + int[] i=seriesIndex; + return i; } } diff --git a/entry/src/main/java/org/achartengine/chart/XYChart.java b/entry/src/main/java/org/achartengine/chart/XYChart.java index f4c1697..f91429d 100644 --- a/entry/src/main/java/org/achartengine/chart/XYChart.java +++ b/entry/src/main/java/org/achartengine/chart/XYChart.java @@ -133,11 +133,11 @@ public abstract class XYChart extends AbstractChart { int angle = or.getAngle(); boolean rotate = angle == 90; mScale = (float) (height) / width; - mTranslate = Math.abs(width - height) / 2; + mTranslate = Math.abs(width - height) / 2f; if (mScale < 1) { mTranslate *= -1; } - mCenter = new org.achartengine.model.Point((x + width) / 2, (y + height) / 2); + mCenter = new org.achartengine.model.Point((x + width) / 2f, (y + height) / 2f); if (rotate) { transform(canvas, angle, false); } diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java index cc48542..a939dc5 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java @@ -64,7 +64,8 @@ public class SensorValuesChart extends AbstractDemoChart { */ public Intent execute(Context context) { String[] titles = new String[] { "Inside", "Outside" }; - long now = Math.round(new Date().getTime() / DAY) * DAY; + float v = (new Date().getTime() / (float)DAY); + long now = Math.round(v) * DAY; List x = new ArrayList(); for (int i = 0; i < titles.length; i++) { Date[] dates = new Date[HOURS]; diff --git a/entry/src/main/java/org/achartengine/renderer/BasicStroke.java b/entry/src/main/java/org/achartengine/renderer/BasicStroke.java index 922b70e..65986e9 100644 --- a/entry/src/main/java/org/achartengine/renderer/BasicStroke.java +++ b/entry/src/main/java/org/achartengine/renderer/BasicStroke.java @@ -55,7 +55,9 @@ public class BasicStroke implements Serializable { mCap = cap; mJoin = join; mMiter = miter; - mIntervals = intervals; + if (intervals!=null) { + mIntervals = intervals.clone(); + } } /** @@ -91,7 +93,8 @@ public class BasicStroke implements Serializable { * @return the path effect intervals */ public float[] getIntervals() { - return mIntervals; + float[] floats=mIntervals; + return floats; } /** diff --git a/entry/src/main/java/org/achartengine/renderer/DefaultRenderer.java b/entry/src/main/java/org/achartengine/renderer/DefaultRenderer.java index 0e2cf44..f0bfb3f 100644 --- a/entry/src/main/java/org/achartengine/renderer/DefaultRenderer.java +++ b/entry/src/main/java/org/achartengine/renderer/DefaultRenderer.java @@ -839,7 +839,8 @@ public class DefaultRenderer implements Serializable { * @return the margin sizes */ public int[] getMargins() { - return mMargins; + int[] i=mMargins; + return i; } /** @@ -849,7 +850,7 @@ public class DefaultRenderer implements Serializable { * top, left, bottom, right */ public void setMargins(int[] margins) { - mMargins = margins; + this.mMargins = margins.clone(); } /** diff --git a/entry/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java b/entry/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java index 7247050..791577f 100644 --- a/entry/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java +++ b/entry/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java @@ -911,7 +911,8 @@ public class XYMultipleSeriesRenderer extends DefaultRenderer { * @return the pan limits */ public double[] getPanLimits() { - return mPanLimits; + double[] i=mPanLimits; + return i; } /** @@ -922,7 +923,7 @@ public class XYMultipleSeriesRenderer extends DefaultRenderer { * @param panLimits the pan limits */ public void setPanLimits(double[] panLimits) { - mPanLimits = panLimits; + this.mPanLimits = panLimits.clone(); } /** @@ -931,7 +932,8 @@ public class XYMultipleSeriesRenderer extends DefaultRenderer { * @return the zoom limits */ public double[] getZoomLimits() { - return mZoomLimits; + double[] i=mZoomLimits; + return i; } /** @@ -942,7 +944,7 @@ public class XYMultipleSeriesRenderer extends DefaultRenderer { * @param zoomLimits the zoom limits */ public void setZoomLimits(double[] zoomLimits) { - mZoomLimits = zoomLimits; + mZoomLimits = zoomLimits.clone(); } /** diff --git a/entry/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java b/entry/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java index 70914d8..e6d4f48 100644 --- a/entry/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java +++ b/entry/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java @@ -114,7 +114,8 @@ public class XYSeriesRenderer extends SimpleSeriesRenderer { * @return the fill range */ public int[] getFillRange() { - return mFillRange; + int[] i=mFillRange; + return i; } /** @@ -124,7 +125,7 @@ public class XYSeriesRenderer extends SimpleSeriesRenderer { * @param range the fill range */ public void setFillRange(int[] range) { - mFillRange = range; + mFillRange = range.clone(); } } -- Gitee