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

show days of year if average data is not set in the diagram

Browse Source
This commit is contained in:
OliE
2017-09-26 19:41:35 +02:00
parent b6357ff018
commit bfea2d6c3e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,9 +207,14 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
if (field == Calendar.DAY_OF_MONTH) { if (field == Calendar.DAY_OF_MONTH) {
day_date = new SimpleDateFormat("dd", Locale.getDefault()); day_date = new SimpleDateFormat("dd", Locale.getDefault());
} else if (field == Calendar.MONTH) { } else if (field == Calendar.DAY_OF_YEAR) {
day_date = new SimpleDateFormat("D", Locale.getDefault());
if (prefs.getBoolean("averageData", true)) {
field = Calendar.MONTH;
day_date = new SimpleDateFormat("MMM", Locale.getDefault()); day_date = new SimpleDateFormat("MMM", Locale.getDefault());
} }
}
Calendar calDays = (Calendar)calLastSelected.clone(); Calendar calDays = (Calendar)calLastSelected.clone();
@@ -347,7 +352,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
chartBottom.setLineChartData(lineData); chartBottom.setLineChartData(lineData);
defaultTopViewport = new Viewport(0, chartBottom.getCurrentViewport().top+4, axisValues.size()-1, chartBottom.getCurrentViewport().bottom-4); defaultTopViewport = new Viewport(calDays.getActualMinimum(field), chartBottom.getCurrentViewport().top, maxDays+1, chartBottom.getCurrentViewport().bottom);
if (prefs.getBoolean("goalLine", true)) { if (prefs.getBoolean("goalLine", true)) {
Stack<PointValue> valuesGoalLine = new Stack<PointValue>(); Stack<PointValue> valuesGoalLine = new Stack<PointValue>();
@@ -355,7 +360,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
float goalWeight = openScale.getSelectedScaleUser().goal_weight; float goalWeight = openScale.getSelectedScaleUser().goal_weight;
valuesGoalLine.push(new PointValue(0, goalWeight)); valuesGoalLine.push(new PointValue(0, goalWeight));
valuesGoalLine.push(new PointValue(31, goalWeight)); valuesGoalLine.push(new PointValue(maxDays, goalWeight));
Line goalLine = new Line(valuesGoalLine) Line goalLine = new Line(valuesGoalLine)
.setHasPoints(false); .setHasPoints(false);
@@ -377,7 +382,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
Stack<PointValue> valuesLinearRegression = new Stack<PointValue>(); Stack<PointValue> valuesLinearRegression = new Stack<PointValue>();
if (!valuesWeight.isEmpty()) { if (!valuesWeight.isEmpty()) {
for (int i = (int)valuesWeight.peek().getX(); i <= 31; i++) { for (int i = (int)valuesWeight.peek().getX(); i <= maxDays; i++) {
double y_value = polynom.getY(i); double y_value = polynom.getY(i);
valuesLinearRegression.push(new PointValue((float) i, (float) y_value)); valuesLinearRegression.push(new PointValue((float) i, (float) y_value));
} }
@@ -447,7 +452,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
scaleDataList = openScale.getScaleDataOfYear(calYears.get(Calendar.YEAR)); scaleDataList = openScale.getScaleDataOfYear(calYears.get(Calendar.YEAR));
generateLineData(Calendar.MONTH); generateLineData(Calendar.DAY_OF_YEAR);
} }
} }