mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-29 11:10:35 +02:00
Code Issues Releases Wiki Activity

set a maximum viewport for the bottom graph

Browse Source
This commit is contained in:
OliE
2018-08-05 17:26:03 +02:00
parent e15ce4eba3
commit 5e3fe90c6b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
View File

@@ -333,6 +333,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
PolynomialFitter polyFitter = new PolynomialFitter(Math.min(regressLineOrder, 100)); PolynomialFitter polyFitter = new PolynomialFitter(Math.min(regressLineOrder, 100));
float maxYValue = 0;
for (MeasurementView view : measurementViews) { for (MeasurementView view : measurementViews) {
if (view instanceof FloatMeasurementView) { if (view instanceof FloatMeasurementView) {
FloatMeasurementView measurementView = (FloatMeasurementView) view; FloatMeasurementView measurementView = (FloatMeasurementView) view;
@@ -383,6 +385,11 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
if (avgBin.size() > 1) { if (avgBin.size() > 1) {
avgValue.setLabel(String.format("Ø %.2f", avgValue.getY())); avgValue.setLabel(String.format("Ø %.2f", avgValue.getY()));
} }
if (avgValue.getY() > maxYValue) {
maxYValue = avgValue.getY();
}
valuesStack.push(avgValue); valuesStack.push(avgValue);
pointIndexScaleMeasurementList.add(indexScaleMeasurement[i]); pointIndexScaleMeasurementList.add(indexScaleMeasurement[i]);
} }
@@ -459,6 +466,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
chartBottom.setLineChartData(lineData); chartBottom.setLineChartData(lineData);
chartBottom.setCurrentViewport(defaultTopViewport); chartBottom.setCurrentViewport(defaultTopViewport);
chartBottom.setMaximumViewport(new Viewport(0, maxYValue + (maxYValue / 100) * 20, calDays.getMaximum(field)+1, 0));
} }
private void generateColumnData() private void generateColumnData()
@@ -485,7 +493,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
for (int i=0; i<12; i++) { for (int i=0; i<12; i++) {
normNumOfMonth[i] = (numOfMonth[i] - min) / (float)(max - min); // normalize data to [0..1] normNumOfMonth[i] = (numOfMonth[i] - min) / (float)(max - min); // normalize data to [0..1]
if (normNumOfMonth[i] != 1.0f && normNumOfMonth[i] != 0.0f) { if (normNumOfMonth[i] != 0.0f) {
normNumOfMonth[i] += heightOffset; normNumOfMonth[i] += heightOffset;
} }
} }