caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

some graph adjustments

Browse source
This commit is contained in:
Milos Kozak 2016-06-09 09:17:55 +02:00
parent 45cceddfcc
commit b1cf867410
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
View file

@ -143,7 +143,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
return null; return null;
} }
public List<BgReading> get12HoursOfBg() { public List<BgReading> getHoursOfBg(int hoursToFetch) {
try { try {
Dao<BgReading, Long> daoBgreadings = getDaoBgReadings(); Dao<BgReading, Long> daoBgreadings = getDaoBgReadings();
List<BgReading> bgReadings; List<BgReading> bgReadings;
@ -151,7 +151,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
queryBuilder.orderBy("timeIndex", false); queryBuilder.orderBy("timeIndex", false);
Where where = queryBuilder.where(); Where where = queryBuilder.where();
long now = new Date().getTime(); long now = new Date().getTime();
long dayAgo = now - 12 * 60 * 60 * 1000l; long dayAgo = now - hoursToFetch * 60 * 60 * 1000l;
where.ge("timeIndex", (long) Math.ceil(dayAgo / 60000d)); where.ge("timeIndex", (long) Math.ceil(dayAgo / 60000d));
PreparedQuery<BgReading> preparedQuery = queryBuilder.prepare(); PreparedQuery<BgReading> preparedQuery = queryBuilder.prepare();
bgReadings = daoBgreadings.query(preparedQuery); bgReadings = daoBgreadings.query(preparedQuery);

27
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -4,6 +4,7 @@ import android.app.Activity;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.ShareCompat;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -17,6 +18,8 @@ import com.squareup.otto.Subscribe;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.List; import java.util.List;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
@ -76,10 +79,15 @@ public class OverviewFragment extends Fragment {
if (bgGraph == null) if (bgGraph == null)
return; return;
List<BgReading> bgReadingsArray = MainApp.getDbHelper().get12HoursOfBg(); int hoursToFetch = 6;
List<BgReading> bgReadingsArray = MainApp.getDbHelper().getHoursOfBg(hoursToFetch);
BgReading[] bgReadings = new BgReading[bgReadingsArray.size()]; BgReading[] bgReadings = new BgReading[bgReadingsArray.size()];
bgReadings = bgReadingsArray.toArray(bgReadings); bgReadings = bgReadingsArray.toArray(bgReadings);
if (bgReadings.length == 0)
return;
PointsGraphSeries<BgReading> series = new PointsGraphSeries<BgReading>(bgReadings); PointsGraphSeries<BgReading> series = new PointsGraphSeries<BgReading>(bgReadings);
bgGraph.addSeries(series); bgGraph.addSeries(series);
series.setShape(PointsGraphSeries.Shape.POINT); series.setShape(PointsGraphSeries.Shape.POINT);
@ -87,16 +95,23 @@ public class OverviewFragment extends Fragment {
series.setColor(Color.GREEN); series.setColor(Color.GREEN);
// set date label formatter // set date label formatter
bgGraph.getGridLabelRenderer().setLabelFormatter(new DateAsXAxisLabelFormatter(getActivity(), android.text.format.DateFormat.getTimeFormat(getActivity()))); bgGraph.getGridLabelRenderer().setLabelFormatter(new DateAsXAxisLabelFormatter(getActivity(), new SimpleDateFormat("HH")));
bgGraph.getGridLabelRenderer().setNumVerticalLabels(5); // only 4 because of the space bgGraph.getGridLabelRenderer().setNumVerticalLabels(11); // only 5 because of the space
//bgGraph.getGridLabelRenderer().setNumHorizontalLabels(3); // only 4 because of the space bgGraph.getGridLabelRenderer().setNumHorizontalLabels(7); // only 7 because of the space
// allign to hours
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(bgReadings[0].timestamp);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.add(Calendar.HOUR, 1);
// set manual x bounds to have nice steps // set manual x bounds to have nice steps
bgGraph.getViewport().setMaxX(bgReadings[0].timestamp); bgGraph.getViewport().setMaxX(calendar.getTimeInMillis());
bgGraph.getViewport().setMinX(bgReadings[bgReadings.length-1].timestamp); bgGraph.getViewport().setMinX(calendar.getTimeInMillis() - hoursToFetch * 60 * 60 * 1000l);
bgGraph.getViewport().setXAxisBoundsManual(true); bgGraph.getViewport().setXAxisBoundsManual(true);
// set manual y bounds to have nice steps // set manual y bounds to have nice steps
// TODO: MGDL support
bgGraph.getViewport().setMaxY(20); bgGraph.getViewport().setMaxY(20);
bgGraph.getViewport().setMinY(0); bgGraph.getViewport().setMinY(0);
bgGraph.getViewport().setYAxisBoundsManual(true); bgGraph.getViewport().setYAxisBoundsManual(true);