mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-22 08:13:43 +02:00
Code Issues Releases Wiki Activity

diagram labels don't disappear anymore after fragment changes

Browse Source
This commit is contained in:
OliE
2015-01-04 17:18:23 +01:00
parent 3278b6c16c
commit 0b88c307cd
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ import lecho.lib.hellocharts.model.ColumnValue;
import lecho.lib.hellocharts.model.Line; import lecho.lib.hellocharts.model.Line;
import lecho.lib.hellocharts.model.LineChartData; import lecho.lib.hellocharts.model.LineChartData;
import lecho.lib.hellocharts.model.PointValue; import lecho.lib.hellocharts.model.PointValue;
import lecho.lib.hellocharts.model.SelectedValue;
import lecho.lib.hellocharts.model.SimpleValueFormatter; import lecho.lib.hellocharts.model.SimpleValueFormatter;
import lecho.lib.hellocharts.model.Viewport; import lecho.lib.hellocharts.model.Viewport;
import lecho.lib.hellocharts.util.Utils; import lecho.lib.hellocharts.util.Utils;
@@ -65,6 +66,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
private Calendar calYears; private Calendar calYears;
private Calendar calLastSelected; private Calendar calLastSelected;
private SelectedValue valueLastSelected;
private ArrayList<ScaleData> scaleDataList; private ArrayList<ScaleData> scaleDataList;
private enum lines {WEIGHT, FAT, WATER, MUSCLE} private enum lines {WEIGHT, FAT, WATER, MUSCLE}
@@ -73,6 +76,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
public GraphFragment() { public GraphFragment() {
calYears = Calendar.getInstance(); calYears = Calendar.getInstance();
calLastSelected = Calendar.getInstance(); calLastSelected = Calendar.getInstance();
valueLastSelected = new SelectedValue(0,0,0);
} }
@Override @Override
@@ -262,6 +266,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
chartBottom.setColumnChartData(columnData); chartBottom.setColumnChartData(columnData);
chartBottom.setValueSelectionEnabled(true); chartBottom.setValueSelectionEnabled(true);
chartBottom.setZoomEnabled(false); chartBottom.setZoomEnabled(false);
chartBottom.selectValue(valueLastSelected);
generateLineData(calLastSelected); generateLineData(calLastSelected);
} }
@@ -274,6 +279,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
cal.add(Calendar.MONTH, selectedLine); cal.add(Calendar.MONTH, selectedLine);
calLastSelected = cal; calLastSelected = cal;
valueLastSelected = new SelectedValue(selectedLine, selectedValue, 0);
generateLineData(cal); generateLineData(cal);
} }