Skip to content
Snippets Groups Projects
Commit 4d798319 authored by Pogman's avatar Pogman
Browse files

chart cleanup for mmol & mg/dl

parent 5d4477d2
No related branches found
No related tags found
No related merge requests found
...@@ -645,8 +645,8 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc ...@@ -645,8 +645,8 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
public static String strFormatSGV(double sgvValue) { public static String strFormatSGV(double sgvValue) {
ConfigurationStore configurationStore = ConfigurationStore.getInstance(); ConfigurationStore configurationStore = ConfigurationStore.getInstance();
if (configurationStore.isMmolxl()) {
NumberFormat sgvFormatter; NumberFormat sgvFormatter;
if (configurationStore.isMmolxl()) {
if (configurationStore.isMmolxlDecimals()) { if (configurationStore.isMmolxlDecimals()) {
sgvFormatter = new DecimalFormat("0.00"); sgvFormatter = new DecimalFormat("0.00");
} else { } else {
...@@ -654,7 +654,8 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc ...@@ -654,7 +654,8 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
} }
return sgvFormatter.format(sgvValue / MMOLXLFACTOR); return sgvFormatter.format(sgvValue / MMOLXLFACTOR);
} else { } else {
return String.valueOf(sgvValue); sgvFormatter = new DecimalFormat("0");
return sgvFormatter.format(sgvValue);
} }
} }
...@@ -824,13 +825,9 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc ...@@ -824,13 +825,9 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
mChart.getViewport().setMinX(left); mChart.getViewport().setMinX(left);
mChart.getViewport().setYAxisBoundsManual(true); mChart.getViewport().setYAxisBoundsManual(true);
if (configurationStore.isMmolxl()) {
mChart.getViewport().setMinY(80 / MMOLXLFACTOR);
mChart.getViewport().setMaxY(120 / MMOLXLFACTOR);
} else {
mChart.getViewport().setMinY(80); mChart.getViewport().setMinY(80);
mChart.getViewport().setMaxY(120); mChart.getViewport().setMaxY(120);
}
mChart.postInvalidate(); mChart.postInvalidate();
return; return;
} }
...@@ -874,7 +871,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc ...@@ -874,7 +871,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
@Override @Override
public void draw(Canvas canvas, Paint paint, float x, float y, DataPointInterface dataPoint) { public void draw(Canvas canvas, Paint paint, float x, float y, DataPointInterface dataPoint) {
double sgv = dataPoint.getY(); double sgv = dataPoint.getY();
boolean mmolxl = configurationStore.isMmolxl();
if (sgv < 80) if (sgv < 80)
paint.setColor(Color.RED); paint.setColor(Color.RED);
else if (sgv <= 180) else if (sgv <= 180)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment