Merge pull request #260 from nightscout/fix/include-treatments-in-chartheight

include treatments in chart height

app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt

@@ -308,8 +308,6 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 // **** BG ****
                 graphData.addBgReadings(fromTime, toTime, lowLine, highLine, null)
 
-                // set manual x bounds to have nice steps
-                graphData.formatAxis(fromTime, toTime)
 
                 // add target line
                 graphData.addTargetLine(fromTime, toTime, profile, null)
@@ -363,6 +361,10 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                         }
                     }
                 }
+
+                // set manual x bounds to have nice steps
+                graphData.setNumVerticalLables()
+                graphData.formatAxis(fromTime, toTime)
             }
             // finally enforce drawing of graphs in UI thread
             graphData.performUpdate()

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt

@@ -846,11 +846,14 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     graphData.addBgReadings(fromTime, toTime, lowLine, highLine, apsResult?.predictions)
                 else graphData.addBgReadings(fromTime, toTime, lowLine, highLine, null)
 
-                // set manual x bounds to have nice steps
-                graphData.formatAxis(fromTime, endTime)
-
                 // Treatments
                 graphData.addTreatments(fromTime, endTime)
+
+                // set manual x bounds to have nice steps
+                graphData.setNumVerticalLables()
+                graphData.formatAxis(fromTime, endTime)
+
+
                 if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
                     graphData.addActivity(fromTime, endTime, false, 0.8)
 

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt

@@ -17,11 +17,11 @@ import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.LoopInterface
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.TreatmentsInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.*
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
@@ -80,16 +80,20 @@ class GraphData(
             for (prediction in predictions) if (prediction.value >= 40) bgListArray.add(prediction)
         }
         maxBgValue = Profile.fromMgdlToUnits(maxBgValue, units)
-        maxBgValue = if (units == Constants.MGDL) Round.roundTo(maxBgValue, 40.0) + 80 else Round.roundTo(maxBgValue, 2.0) + 4
+        maxBgValue = addUpperChartMargin(maxBgValue)
         if (highLine > maxBgValue) maxBgValue = highLine
-        val numOfVerticalLines = if (units == Constants.MGDL) (maxBgValue / 40 + 1).toInt() else (maxBgValue / 2 + 1).toInt()
         maxY = maxBgValue
         minY = 0.0
-        // set manual y bounds to have nice steps
-        graph.gridLabelRenderer.numVerticalLabels = numOfVerticalLines
         addSeries(PointsWithLabelGraphSeries(Array(bgListArray.size) { i -> bgListArray[i] }))
     }
 
+    internal fun setNumVerticalLables() {
+        graph.gridLabelRenderer.numVerticalLabels = if (units == Constants.MGDL) (maxY / 40 + 1).toInt() else (maxY / 2 + 1).toInt()
+    }
+
+    private fun addUpperChartMargin(maxBgValue: Double) =
+        if (units == Constants.MGDL) Round.roundTo(maxBgValue, 40.0) + 80 else Round.roundTo(maxBgValue, 2.0) + 4
+
     fun addInRangeArea(fromTime: Long, toTime: Long, lowLine: Double, highLine: Double) {
         val inRangeAreaSeries: AreaGraphSeries<DoubleDataPoint>
         val inRangeAreaDataPoints = arrayOf(
@@ -233,44 +237,45 @@ class GraphData(
 
     fun addTreatments(fromTime: Long, endTime: Long) {
         val filteredTreatments: MutableList<DataPointWithLabelInterface> = ArrayList()
-        val treatments = treatmentsPlugin.treatmentsFromHistory
+        treatmentsPlugin.treatmentsFromHistory
-        for (tx in treatments.indices) {
+            .filterTimeframe(fromTime, endTime)
-            val t = treatments[tx]
+            .filter { !it.isSMB || it.isValid }
-            if (t.x < fromTime || t.x > endTime) continue
+            .forEach {
-            if (t.isSMB && !t.isValid) continue
+                it.y = getNearestBg(it.x.toLong())
-            t.y = getNearestBg(t.x.toLong())
+                filteredTreatments.add(it)
-            filteredTreatments.add(t)
+            }
-        }
 
         // ProfileSwitch
-        val profileSwitches = treatmentsPlugin.profileSwitchesFromHistory.list
+        treatmentsPlugin.profileSwitchesFromHistory.list
-        for (tx in profileSwitches.indices) {
+            .filterTimeframe(fromTime, endTime)
-            val t: DataPointWithLabelInterface = profileSwitches[tx]
+            .forEach(filteredTreatments::add)
-            if (t.x < fromTime || t.x > endTime) continue
-            filteredTreatments.add(t)
-        }
 
         // Extended bolus
         if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) {
-            val extendedBoluses = treatmentsPlugin.extendedBolusesFromHistory.list
+            treatmentsPlugin.extendedBolusesFromHistory.list
-            for (tx in extendedBoluses.indices) {
+                .filterTimeframe(fromTime, endTime)
-                val t: DataPointWithLabelInterface = extendedBoluses[tx]
+                .filter { it.duration != 0L }
-                if (t.x + t.duration < fromTime || t.x > endTime) continue
+                .forEach {
-                if (t.duration == 0L) continue
+                    it.y = getNearestBg(it.x.toLong())
-                t.y = getNearestBg(t.x.toLong())
+                    filteredTreatments.add(it)
-                filteredTreatments.add(t)
+                }
-            }
         }
 
         // Careportal
-        val careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime - 6 * 60 * 60 * 1000, true)
+        MainApp.getDbHelper().getCareportalEventsFromTime(fromTime - 6 * 60 * 60 * 1000, true)
-        for (tx in careportalEvents.indices) {
+            .filterTimeframe(fromTime, endTime)
-            val t: DataPointWithLabelInterface = careportalEvents[tx]
+            .forEach {
-            if (t.x + t.duration < fromTime || t.x > endTime) continue
+                it.y = getNearestBg(it.x.toLong())
-            t.y = getNearestBg(t.x.toLong())
+                filteredTreatments.add(it)
-            filteredTreatments.add(t)
+            }
-        }
+
-        addSeries(PointsWithLabelGraphSeries(Array(filteredTreatments.size) { i -> filteredTreatments[i] }))
+        // increase maxY if a treatment forces it's own height that's higher than a BG value
+        filteredTreatments.map { it.y }
+            .maxOrNull()
+            ?.let(::addUpperChartMargin)
+            ?.let { maxY = maxOf(maxY, it) }
+
+        addSeries(PointsWithLabelGraphSeries(filteredTreatments.toTypedArray()))
     }
 
     private fun getNearestBg(date: Long): Double {
@@ -603,4 +608,7 @@ class GraphData(
         // draw it
         graph.onDataChanged(false, false)
     }
-}
+}
+
+private fun <E : DataPointWithLabelInterface> List<E>.filterTimeframe(fromTime: Long, endTime: Long): List<E> =
+    filter { it.x + it.duration >= fromTime && it.x <= endTime }