From 1fb20926b3a74b942eab5f044600dd908d66f7dc Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sun, 21 Jun 2015 19:43:45 +0200 Subject: [PATCH] Fix previous commit, disable LimitLines for this release --- .../activities/SleepChartActivity.java | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepChartActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepChartActivity.java index 18e4f13c3..40313c427 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepChartActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepChartActivity.java @@ -225,17 +225,15 @@ public class SleepChartActivity extends Activity { LOG.info("number of samples:" + samples.size()); if (samples.size() > 1) { float movement_divisor; - boolean annotate; + boolean annotate = true; boolean use_steps_as_movement; switch (getProvider(mGBDevice)) { case GBActivitySample.PROVIDER_MIBAND: movement_divisor = 256.0f; - annotate = false; // sample density to high? use_steps_as_movement = true; break; default: // Morpheuz movement_divisor = 5000.0f; - annotate = false; use_steps_as_movement = false; break; } @@ -301,23 +299,23 @@ public class SleepChartActivity extends Activity { date = cal.getTime(); String dateString = annotationDateFormat.format(date); xLabel = dateString; - if (last_type != type) { - if (isSleep(last_type) && !isSleep(type)) { - // woken up - LimitLine line = new LimitLine(i, dateString); - line.enableDashedLine(8, 8, 0); - line.setTextColor(Color.WHITE); - line.setTextSize(15); - mChart.getXAxis().addLimitLine(line); - } else if (!isSleep(last_type) && isSleep(type)) { - // fallen asleep - LimitLine line = new LimitLine(i, dateString); - line.enableDashedLine(8, 8, 0); - line.setTextSize(15); - line.setTextColor(Color.WHITE); - mChart.getXAxis().addLimitLine(line); - } - } +// if (last_type != type) { +// if (isSleep(last_type) && !isSleep(type)) { +// // woken up +// LimitLine line = new LimitLine(i, dateString); +// line.enableDashedLine(8, 8, 0); +// line.setTextColor(Color.WHITE); +// line.setTextSize(15); +// mChart.getXAxis().addLimitLine(line); +// } else if (!isSleep(last_type) && isSleep(type)) { +// // fallen asleep +// LimitLine line = new LimitLine(i, dateString); +// line.enableDashedLine(8, 8, 0); +// line.setTextSize(15); +// line.setTextColor(Color.WHITE); +// mChart.getXAxis().addLimitLine(line); +// } +// } last_type = type; } xLabels.add(xLabel);