mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-26 09:44:31 +02:00
Code Issues Releases Wiki Activity

fix automatic viewport adjustment in the graph fragment

Browse Source
This commit is contained in:
OliE
2015-08-04 13:55:49 +02:00
parent e4c784d772
commit 14bdfc3353
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import lecho.lib.hellocharts.formatter.SimpleLineChartValueFormatter; import lecho.lib.hellocharts.formatter.SimpleLineChartValueFormatter;
import lecho.lib.hellocharts.gesture.ZoomType;
import lecho.lib.hellocharts.listener.ColumnChartOnValueSelectListener; import lecho.lib.hellocharts.listener.ColumnChartOnValueSelectListener;
import lecho.lib.hellocharts.listener.LineChartOnValueSelectListener; import lecho.lib.hellocharts.listener.LineChartOnValueSelectListener;
import lecho.lib.hellocharts.model.Axis; import lecho.lib.hellocharts.model.Axis;
@@ -121,7 +120,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
private void generateLineData(Calendar calMonth) private void generateLineData(Calendar calMonth)
{ {
scaleDataList = openScale.getScaleDataOfMonth(calYears.get(Calendar.YEAR), calMonth.get(Calendar.MONTH)); scaleDataList = openScale.getScaleDataOfMonth(calYears.get(Calendar.YEAR), calMonth.get(Calendar.MONTH));
float maxValue = openScale.getMaxValueOfScaleData(calYears.get(Calendar.YEAR), calMonth.get(Calendar.MONTH));
SimpleDateFormat day_date = new SimpleDateFormat("dd", Locale.getDefault()); SimpleDateFormat day_date = new SimpleDateFormat("dd", Locale.getDefault());
@@ -208,19 +206,11 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
chartTop.setLineChartData(lineData); chartTop.setLineChartData(lineData);
chartTop.setViewportCalculationEnabled(false);
if (maxValue == 0.0) { Viewport v = new Viewport(0, chartTop.getCurrentViewport().top+4, maxDays-1, chartTop.getCurrentViewport().bottom-4);
maxValue = 100;
} else {
maxValue += 20;
}
Viewport v = new Viewport(0, (int)maxValue, maxDays-1, 0);
chartTop.setMaximumViewport(v); chartTop.setMaximumViewport(v);
chartTop.setCurrentViewport(v); chartTop.setCurrentViewport(v);
chartTop.setZoomType(ZoomType.HORIZONTAL);
} }
private void generateColumnData() private void generateColumnData()