bg data smoothing

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

@@ -290,7 +290,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         val graphData = GraphData(injector, binding.bgGraph, historyBrowserData.overviewData)
         val menuChartSettings = overviewMenus.setting
         graphData.addInRangeArea(historyBrowserData.overviewData.fromTime, historyBrowserData.overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
-        graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal], context)
+        graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal], menuChartSettings[0][OverviewMenus.CharType.RAW.ordinal], context)
         if (buildHelper.isDev()) graphData.addBucketedData()
         graphData.addTreatments(context)
         graphData.addEps(context, 0.95)

app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt

@@ -377,7 +377,7 @@ class WizardDialog : DaggerDialogFragment() {
             binding.bgInput.step = if (units == GlucoseUnit.MGDL) 1.0 else 0.1
 
             // Set BG if not old
-            binding.bgInput.value = iobCobCalculator.ads.actualBg()?.valueToUnits(units) ?: 0.0
+            binding.bgInput.value = iobCobCalculator.ads.actualBg()?.valueToUnits(units, sp) ?: 0.0
 
             binding.ttCheckbox.isEnabled = tempTarget is ValueWrapper.Existing
             binding.ttCheckboxIcon.visibility = binding.ttCheckbox.isEnabled.toVisibility()

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

@@ -800,7 +800,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         val lastBgDescription = overviewData.lastBgDescription
         runOnUiThread {
             _binding ?: return@runOnUiThread
-            binding.infoLayout.bg.text = lastBg?.valueToUnitsString(units)
+            binding.infoLayout.bg.text = lastBg?.valueToUnitsString(units, sp)
                 ?: rh.gs(R.string.value_unavailable_short)
             binding.infoLayout.bg.setTextColor(lastBgColor)
             binding.infoLayout.arrow.setImageResource(trendArrow.directionToIcon())
@@ -1020,7 +1020,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         val menuChartSettings = overviewMenus.setting
         if (menuChartSettings.isEmpty()) return
         graphData.addInRangeArea(overviewData.fromTime, overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
-        graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal], context)
+        graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal], menuChartSettings[0][OverviewMenus.CharType.RAW.ordinal], context)
         if (buildHelper.isDev()) graphData.addBucketedData()
         graphData.addTreatments(context)
         graphData.addEps(context, 0.95)

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

@@ -38,6 +38,7 @@ class OverviewMenus @Inject constructor(
 ) {
 
     enum class CharType(@StringRes val nameId: Int, @AttrRes val attrId: Int, @AttrRes val attrTextId: Int, val primary: Boolean, val secondary: Boolean, @StringRes val shortnameId: Int) {
+        RAW(R.string.overview_show_raw_bg, R.attr.defaultTextColor, R.attr.menuTextColorInverse, primary = true, secondary = false, shortnameId = R.string.activity_shortname),
         PRE(R.string.overview_show_predictions, R.attr.predictionColor, R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.prediction_shortname),
         TREAT(R.string.overview_show_treatments, R.attr.cobColor, R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.treatments_shortname),
         BAS(R.string.overview_show_basals, R.attr.basal, R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.basal_shortname),
@@ -126,6 +127,7 @@ class OverviewMenus @Inject constructor(
                     if (g == 0 && !m.primary) return@forEach
                     if (g > 0 && !m.secondary) return@forEach
                     var insert = true
+                    if (m == CharType.RAW) insert = sp.getBoolean(info.nightscout.androidaps.core.R.string.key_use_data_smoothing, false)
                     if (m == CharType.PRE) insert = predictionsAvailable
                     if (m == CharType.DEVSLOPE) insert = buildHelper.isDev()
                     if (used.contains(m.ordinal)) insert = false

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

@@ -52,11 +52,12 @@ class GraphData(
         addSeries(overviewData.bucketedGraphSeries)
     }
 
-    fun addBgReadings(addPredictions: Boolean, context: Context?) {
+    fun addBgReadings(addPredictions: Boolean, addRawBg: Boolean, context: Context?) {
         maxY = if (overviewData.bgReadingsArray.isEmpty()) {
             if (units == GlucoseUnit.MGDL) 180.0 else 10.0
         } else overviewData.maxBgValue
         minY = 0.0
+        if (addRawBg && !overviewData.bgReadingRawGraphSeries.isEmpty) addSeries(overviewData.bgReadingRawGraphSeries)
         addSeries(overviewData.bgReadingGraphSeries)
         if (addPredictions) addSeries(overviewData.predictionsGraphSeries)
         overviewData.bgReadingGraphSeries.setOnDataPointTapListener { _, dataPoint ->

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt

@@ -31,6 +31,7 @@ import info.nightscout.rx.events.EventAutosensCalculationFinished
 import info.nightscout.rx.events.EventInitializationChanged
 import info.nightscout.rx.events.EventRefreshOverview
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.sharedPreferences.SP
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
@@ -42,6 +43,7 @@ class PersistentNotificationPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     rh: ResourceHelper,
+    private val sp: SP,
     private val aapsSchedulers: AapsSchedulers,
     private val profileFunction: ProfileFunction,
     private val fabricPrivacy: FabricPrivacy,
@@ -120,7 +122,7 @@ class PersistentNotificationPlugin @Inject constructor(
             val lastBG = iobCobCalculator.ads.lastBg()
             val glucoseStatus = glucoseStatusProvider.glucoseStatusData
             if (lastBG != null) {
-                line1aa = lastBG.valueToUnitsString(units)
+                line1aa = lastBG.valueToUnitsString(units, sp)
                 line1 = line1aa
                 if (glucoseStatus != null) {
                     line1 += ("  Δ" + Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt

@@ -391,7 +391,7 @@ class DataHandlerMobile @Inject constructor(
             tempTarget = tempTarget,
             carbs = carbsAfterConstraints,
             cob = cobInfo.displayCob!!,
-            bg = bgReading.valueToUnits(profileFunction.getUnits()),
+            bg = bgReading.valueToUnits(profileFunction.getUnits(), sp),
             correction = 0.0,
             percentageCorrection = percentage,
             useBg = sp.getBoolean(R.string.key_wearwizard_bg, true),
@@ -855,7 +855,7 @@ class DataHandlerMobile @Inject constructor(
         val finalLastRun = loop.lastRun
         if (sp.getBoolean("wear_predictions", true) && finalLastRun?.request?.hasPredictions == true && finalLastRun.constraintsProcessed != null) {
             val predArray = finalLastRun.constraintsProcessed!!.predictions
-                .stream().map { bg: GlucoseValue -> GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, rh) }
+                .stream().map { bg: GlucoseValue -> GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, rh, sp) }
                 .collect(Collectors.toList())
             if (predArray.isNotEmpty())
                 for (bg in predArray) if (bg.data.value > 39)
@@ -942,7 +942,7 @@ class DataHandlerMobile @Inject constructor(
 
         return EventData.SingleBg(
             timeStamp = glucoseValue.timestamp,
-            sgvString = glucoseValue.valueToUnitsString(units),
+            sgvString = glucoseValue.valueToUnitsString(units, sp),
             glucoseUnits = units.asText,
             slopeArrow = trendCalculator.getTrendArrow(glucoseValue).symbol,
             delta = glucoseStatus?.let { deltaString(it.delta, it.delta * Constants.MGDL_TO_MMOLL, units) } ?: "--",

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt

@@ -85,7 +85,7 @@ class IobCobCalculatorPlugin @Inject constructor(
     private var iobTable = LongSparseArray<IobTotal>() // oldest at index 0
     private var basalDataTable = LongSparseArray<BasalData>() // oldest at index 0
 
-    override var ads: AutosensDataStore = AutosensDataStore()
+    override var ads: AutosensDataStore = AutosensDataStore(sp)
 
     private val dataLock = Any()
     private var thread: Thread? = null

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt

@@ -134,14 +134,14 @@ class IobCobOref1Worker(
                 //console.error(bgTime , bucketed_data[i].glucose);
                 var avgDelta: Double
                 var delta: Double
-                val bg: Double = bucketedData[i].value
-                if (bg < 39 || bucketedData[i + 3].value < 39) {
+                val bg: Double = bucketedData[i].rawOrSmoothed(sp)
+                if (bg < 39 || bucketedData[i + 3].rawOrSmoothed(sp) < 39) {
                     aapsLogger.error("! value < 39")
                     continue
                 }
                 autosensData.bg = bg
-                delta = bg - bucketedData[i + 1].value
-                avgDelta = (bg - bucketedData[i + 3].value) / 3
+                delta = bg - bucketedData[i + 1].rawOrSmoothed(sp)
+                avgDelta = (bg - bucketedData[i + 3].rawOrSmoothed(sp)) / 3
                 val iob = data.iobCobCalculator.calculateFromTreatmentsAndTemps(bgTime, profile)
                 val bgi = -iob.activity * sens * 5
                 val deviation = delta - bgi

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt

@@ -128,14 +128,14 @@ class IobCobOrefWorker @Inject internal constructor(
                 //console.error(bgTime , bucketed_data[i].glucose);
                 var avgDelta: Double
                 var delta: Double
-                val bg: Double = bucketedData[i].value
-                if (bg < 39 || bucketedData[i + 3].value < 39) {
+                val bg: Double = bucketedData[i].rawOrSmoothed(sp)
+                if (bg < 39 || bucketedData[i + 3].rawOrSmoothed(sp) < 39) {
                     aapsLogger.error("! value < 39")
                     continue
                 }
                 autosensData.bg = bg
-                delta = bg - bucketedData[i + 1].value
-                avgDelta = (bg - bucketedData[i + 3].value) / 3
+                delta = bg - bucketedData[i + 1].rawOrSmoothed(sp)
+                avgDelta = (bg - bucketedData[i + 3].rawOrSmoothed(sp)) / 3
                 val iob = data.iobCobCalculatorPlugin.calculateFromTreatmentsAndTemps(bgTime, profile)
                 val bgi = -iob.activity * sens * 5
                 val deviation = delta - bgi

app/src/main/java/info/nightscout/androidaps/plugins/source/AidexPlugin.kt

@@ -99,6 +99,7 @@ class AidexPlugin @Inject constructor(
             glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
                 timestamp = timestamp,
                 value = bgValueTarget,
+                smoothed = null,
                 raw = null,
                 noise = null,
                 trendArrow = GlucoseValue.TrendArrow.fromString(bundle.getString(Intents.AIDEX_BG_SLOPE_NAME)),

app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt

@@ -150,8 +150,9 @@ class DexcomPlugin @Inject constructor(
                         glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
                             timestamp = timestamp,
                             value = glucoseValueBundle.getInt("glucoseValue").toDouble(),
-                            noise = null,
                             raw = null,
+                            smoothed = null,
+                            noise = null,
                             trendArrow = GlucoseValue.TrendArrow.fromString(glucoseValueBundle.getString("trendArrow")!!),
                             sourceSensor = sourceSensor
                         )

app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt

@@ -107,6 +107,7 @@ class EversensePlugin @Inject constructor(
                             timestamp = glucoseTimestamps[i],
                             value = glucoseLevels[i].toDouble(),
                             raw = glucoseLevels[i].toDouble(),
+                            smoothed = null,
                             noise = null,
                             trendArrow = GlucoseValue.TrendArrow.NONE,
                             sourceSensor = GlucoseValue.SourceSensor.EVERSENSE

app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt

@@ -67,6 +67,7 @@ class GlimpPlugin @Inject constructor(
                 timestamp = inputData.getLong("myTimestamp", 0),
                 value = inputData.getDouble("mySGV", 0.0),
                 raw = inputData.getDouble("mySGV", 0.0),
+                smoothed = null,
                 noise = null,
                 trendArrow = GlucoseValue.TrendArrow.fromString(inputData.getString("myTrend")),
                 sourceSensor = GlucoseValue.SourceSensor.GLIMP

app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt

@@ -124,6 +124,7 @@ class GlunovoPlugin @Inject constructor(
                             timestamp = timestamp,
                             value = value * Constants.MMOLL_TO_MGDL,
                             raw = 0.0,
+                        smoothed = null,
                             noise = null,
                             trendArrow = GlucoseValue.TrendArrow.NONE,
                             sourceSensor = GlucoseValue.SourceSensor.GLUNOVO_NATIVE

app/src/main/java/info/nightscout/androidaps/plugins/source/IntelligoPlugin.kt

@@ -135,6 +135,7 @@ class IntelligoPlugin @Inject constructor(
                         timestamp = timestamp,
                         value = value * Constants.MMOLL_TO_MGDL,
                         raw = 0.0,
+                        smoothed = null,
                         noise = null,
                         trendArrow = GlucoseValue.TrendArrow.NONE,
                         sourceSensor = GlucoseValue.SourceSensor.INTELLIGO_NATIVE

app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt

@@ -80,6 +80,7 @@ class MM640gPlugin @Inject constructor(
                                         timestamp = jsonObject.getLong("date"),
                                         value = jsonObject.getDouble("sgv"),
                                         raw = jsonObject.getDouble("sgv"),
+                                        smoothed = null,
                                         noise = null,
                                         trendArrow = GlucoseValue.TrendArrow.fromString(jsonObject.getString("direction")),
                                         sourceSensor = GlucoseValue.SourceSensor.MM_600_SERIES

app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt

@@ -74,6 +74,7 @@ class PoctechPlugin @Inject constructor(
                         timestamp = json.getLong("date"),
                         value = if (safeGetString(json, "units", Constants.MGDL) == "mmol/L") json.getDouble("current") * Constants.MMOLL_TO_MGDL
                         else json.getDouble("current"),
+                        smoothed = null,
                         raw = json.getDouble("raw"),
                         noise = null,
                         trendArrow = GlucoseValue.TrendArrow.fromString(json.getString("direction")),

app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt

@@ -115,6 +115,7 @@ class RandomBgPlugin @Inject constructor(
             value = bgMgdl,
             raw = 0.0,
             noise = null,
+            smoothed = null,
             trendArrow = GlucoseValue.TrendArrow.NONE,
             sourceSensor = GlucoseValue.SourceSensor.RANDOM
         )

app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt

@@ -68,6 +68,7 @@ class TomatoPlugin @Inject constructor(
                 value = inputData.getDouble("com.fanqies.tomatofn.Extras.BgEstimate", 0.0),
                 raw = 0.0,
                 noise = null,
+                smoothed = null,
                 trendArrow = GlucoseValue.TrendArrow.NONE,
                 sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_TOMATO
             )

app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt

@@ -85,6 +85,7 @@ class XdripPlugin @Inject constructor(
                 timestamp = bundle.getLong(Intents.EXTRA_TIMESTAMP, 0),
                 value = bundle.getDouble(Intents.EXTRA_BG_ESTIMATE, 0.0),
                 raw = bundle.getDouble(Intents.EXTRA_RAW, 0.0),
+                smoothed = null,
                 noise = null,
                 trendArrow = GlucoseValue.TrendArrow.fromString(bundle.getString(Intents.EXTRA_BG_SLOPE_NAME)),
                 sourceSensor = GlucoseValue.SourceSensor.fromString(bundle.getString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION)

app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt

@@ -103,7 +103,7 @@ class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjec
         //BG
         var bg = 0.0
         if (useBG() == YES) {
-            bg = lastBG.valueToUnits(profileFunction.getUnits())
+            bg = lastBG.valueToUnits(profileFunction.getUnits(), sp)
         }
         // COB
         val cob =

app/src/main/java/info/nightscout/androidaps/workflow/PrepareBgDataWorker.kt

@@ -5,7 +5,9 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.extensions.rawOrSmoothed
 import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Profile
@@ -18,6 +20,7 @@ import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.shared.sharedPreferences.SP
 import java.util.ArrayList
 import javax.inject.Inject
 
@@ -29,6 +32,7 @@ class PrepareBgDataWorker(
     @Inject lateinit var dataWorkerStorage: DataWorkerStorage
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var rh: ResourceHelper
+    @Inject lateinit var sp: SP
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var repository: AppRepository
 
@@ -45,17 +49,21 @@ class PrepareBgDataWorker(
 
         val data = dataWorkerStorage.pickupObject(inputData.getLong(DataWorkerStorage.STORE_KEY, -1)) as PrepareBgData?
             ?: return Result.failure(workDataOf("Error" to "missing input data"))
+        val useSmoothed = sp.getBoolean(R.string.key_use_data_smoothing, false)
 
         data.overviewData.maxBgValue = Double.MIN_VALUE
         data.overviewData.bgReadingsArray = repository.compatGetBgReadingsDataFromTime(data.overviewData.fromTime, data.overviewData.toTime, false).blockingGet()
         val bgListArray: MutableList<DataPointWithLabelInterface> = ArrayList()
+        val bgListRawArray: MutableList<DataPointWithLabelInterface> = ArrayList()
         for (bg in data.overviewData.bgReadingsArray) {
             if (bg.timestamp < data.overviewData.fromTime || bg.timestamp > data.overviewData.toTime) continue
-            if (bg.value > data.overviewData.maxBgValue) data.overviewData.maxBgValue = bg.value
-            bgListArray.add(GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, rh))
+            if (bg.rawOrSmoothed(useSmoothed) > data.overviewData.maxBgValue) data.overviewData.maxBgValue = bg.rawOrSmoothed(useSmoothed)
+            bgListArray.add(GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, rh, useSmoothed))
+            if (useSmoothed) bgListRawArray.add(GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, rh, false, isAdditional = true))
         }
         bgListArray.sortWith { o1: DataPointWithLabelInterface, o2: DataPointWithLabelInterface -> o1.x.compareTo(o2.x) }
         data.overviewData.bgReadingGraphSeries = PointsWithLabelGraphSeries(Array(bgListArray.size) { i -> bgListArray[i] })
+        data.overviewData.bgReadingRawGraphSeries = PointsWithLabelGraphSeries(Array(bgListRawArray.size) { i -> bgListRawArray[i] })
         data.overviewData.maxBgValue = Profile.fromMgdlToUnits(data.overviewData.maxBgValue, profileFunction.getUnits())
         if (defaultValueHelper.determineHighLine() > data.overviewData.maxBgValue) data.overviewData.maxBgValue = defaultValueHelper.determineHighLine()
         data.overviewData.maxBgValue = addUpperChartMargin(data.overviewData.maxBgValue)