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

Convert goal weight to user's unit before plotting in graph

Browse Source 
Fix #292
This commit is contained in:
Erik Johansson
2018-06-21 18:08:30 +02:00
parent e27a8f4e9c
commit a8ff04b5d7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,8 @@ import android.widget.TextView;
import com.health.openscale.R; import com.health.openscale.R;
import com.health.openscale.core.OpenScale; import com.health.openscale.core.OpenScale;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser;
import com.health.openscale.core.utils.Converters;
import com.health.openscale.core.utils.PolynomialFitter; import com.health.openscale.core.utils.PolynomialFitter;
import com.health.openscale.gui.activities.DataEntryActivity; import com.health.openscale.gui.activities.DataEntryActivity;
import com.health.openscale.gui.views.BMRMeasurementView; import com.health.openscale.gui.views.BMRMeasurementView;
@@ -412,7 +414,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
if (prefs.getBoolean("goalLine", true)) { if (prefs.getBoolean("goalLine", true)) {
Stack<PointValue> valuesGoalLine = new Stack<>(); Stack<PointValue> valuesGoalLine = new Stack<>();
float goalWeight = openScale.getSelectedScaleUser().getGoalWeight(); final ScaleUser user = openScale.getSelectedScaleUser();
float goalWeight = Converters.fromKilogram(user.getGoalWeight(), user.getScaleUnit());
valuesGoalLine.push(new PointValue(0, goalWeight)); valuesGoalLine.push(new PointValue(0, goalWeight));
valuesGoalLine.push(new PointValue(maxDays, goalWeight)); valuesGoalLine.push(new PointValue(maxDays, goalWeight));