From 0de09895b00c1516b24a88b2e449095705bcca31 Mon Sep 17 00:00:00 2001 From: Yuri Date: Sun, 22 Jan 2017 18:36:17 +0100 Subject: [PATCH] fix(graph) fixed wrong pitch ranges in graph background after library update --- .../voicepitchanalyzer/utils/GraphLayout.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/de/lilithwittmann/voicepitchanalyzer/utils/GraphLayout.java b/app/src/main/java/de/lilithwittmann/voicepitchanalyzer/utils/GraphLayout.java index bd616df..f466917 100644 --- a/app/src/main/java/de/lilithwittmann/voicepitchanalyzer/utils/GraphLayout.java +++ b/app/src/main/java/de/lilithwittmann/voicepitchanalyzer/utils/GraphLayout.java @@ -57,8 +57,9 @@ public static BarLineChartBase FormatChart(BarLineChartBase chart) chart.setDrawBorders(false); // set min/max values etc. for axes - chart.getAxisLeft().setStartAtZero(false); - chart.getAxisRight().setStartAtZero(false); + chart.getAxisLeft().setAxisMinValue(PitchCalculator.minMalePitch.floatValue()); + chart.getAxisRight().setAxisMinValue(PitchCalculator.minMalePitch.floatValue()); +// chart.getAxisRight().setStartAtZero(false); chart.setHardwareAccelerationEnabled(true); // chart.getLegend().setEnabled(false); @@ -80,12 +81,13 @@ public static BarDataSet getOverallRange(Context context, int amount) { BarDataSet set = new BarDataSet(GraphLayout.getRangeEntries(amount), ""); set.setDrawValues(false); - set.setColors(new int[]{context.getResources().getColor(R.color.female_range), + set.setColors(new int[]{context.getResources().getColor(R.color.male_range), context.getResources().getColor(R.color.androgynous_range), - context.getResources().getColor(R.color.male_range)}); - set.setStackLabels(new String[]{context.getResources().getString(R.string.female_range), + context.getResources().getColor(R.color.female_range)}); + set.setStackLabels(new String[]{context.getResources().getString(R.string.male_range), context.getResources().getString(R.string.androgynous_range), - context.getResources().getString(R.string.male_range)}); + context.getResources().getString(R.string.female_range) + }); // List setList = new ArrayList(); // setList.add(set); @@ -106,12 +108,10 @@ private static List getRangeEntries(int amount) for (int i = 0; i < amount; i++) { result.add(new BarEntry(new float[]{ - PitchCalculator.maxFemalePitch.floatValue() - PitchCalculator.maxMalePitch.floatValue(), + PitchCalculator.minMalePitch.floatValue()*2, PitchCalculator.maxMalePitch.floatValue() - PitchCalculator.minFemalePitch.floatValue(), - PitchCalculator.minFemalePitch.floatValue()// - PitchCalculator.minPitch.floatValue(), - }, i)); - - // result.add(new BarEntry(new float[]{25, 50, 100, 200}, i)); + PitchCalculator.maxFemalePitch.floatValue() - PitchCalculator.maxMalePitch.floatValue(), + }, i)); } return result;