Fixes for chart

common/src/main/java/de/michelinside/glucodatahandler/common/chart/ChartBitmapCreator.kt

@@ -1,13 +1,20 @@
 package de.michelinside.glucodatahandler.common.chart
 
 import android.content.Context
+import android.graphics.Bitmap
+import android.os.Bundle
 import android.util.Log
 import com.github.mikephil.charting.data.LineData
 import com.github.mikephil.charting.data.LineDataSet
+import de.michelinside.glucodatahandler.common.Constants
 import de.michelinside.glucodatahandler.common.database.dbAccess
+import de.michelinside.glucodatahandler.common.notifier.InternalNotifier
+import de.michelinside.glucodatahandler.common.notifier.NotifySource
 
 class ChartBitmapCreator(chart: GlucoseChart, context: Context): ChartCreator(chart, context) {
     private val LOG_ID = "GDH.Chart.BitmapCreator"
+    private var bitmap: Bitmap? = null
+    override val resetChart = true
 
     override fun initXaxis() {
         Log.v(LOG_ID, "initXaxis")
@@ -45,9 +52,18 @@ class ChartBitmapCreator(chart: GlucoseChart, context: Context): ChartCreator(ch
         addEmptyTimeData()
         chart.notifyDataSetChanged()
         chart.invalidate()
+        chart.waitForInvalidate()
+        bitmap = createBitmap()
+        InternalNotifier.notify(context, NotifySource.GRAPH_CHANGED, Bundle().apply { putInt(Constants.GRAPH_ID, chart.id) })
     }
 
     override fun updateTimeElapsed() {
         update(dbAccess.getGlucoseValues(getMinTime()))
     }
+
+    fun getBitmap(): Bitmap? {
+        if(bitmap == null)
+            bitmap = createBitmap()
+        return bitmap
+    }
 }

common/src/main/java/de/michelinside/glucodatahandler/common/chart/ChartCreator.kt

@@ -25,6 +25,7 @@ import de.michelinside.glucodatahandler.common.notifier.InternalNotifier
 import de.michelinside.glucodatahandler.common.notifier.NotifierInterface
 import de.michelinside.glucodatahandler.common.notifier.NotifySource
 import de.michelinside.glucodatahandler.common.utils.Utils
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -33,6 +34,7 @@ import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import java.util.concurrent.TimeUnit
+import kotlin.math.abs
 
 
 open class ChartCreator(protected val chart: GlucoseChart, protected val context: Context): NotifierInterface,
@@ -43,8 +45,9 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
     protected var init = false
     protected var hasTimeNotifier = false
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
-    private var currentJob: Job? = null
+    private var createJob: Job? = null
     private var dataSyncJob: Job? = null
+    protected open val resetChart = false
 
     private var graphPrefList = mutableSetOf(
         Constants.SHARED_PREF_LOW_GLUCOSE,
@@ -80,14 +83,18 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
         }
     }
 
-    fun create() {
-        if(currentJob?.isActive == true) {
+    private fun waitForCreation() {
+        if(createJob?.isActive == true) {
+            Log.d(LOG_ID, "waitForCreation - wait for current execution")
             runBlocking {
-                Log.d(LOG_ID, "create - wait for current execution")
-                currentJob!!.join()
+                createJob!!.join()
             }
         }
-        currentJob = scope.launch {
+    }
+
+    fun create() {
+        waitForCreation()
+        createJob = scope.launch {
             Log.d(LOG_ID, "create")
             try {
                 init()
@@ -98,7 +105,7 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
                 initData()
                 created = true
             } catch (exc: Exception) {
-                Log.e(LOG_ID, "create exception: " + exc.message.toString() )
+                Log.e(LOG_ID, "create exception: " + exc.message + " - " + exc.stackTraceToString())
             }
         }
     }
@@ -115,12 +122,7 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
                         dataSyncJob!!.cancelAndJoin()
                     }
                 }
-                if(currentJob?.isActive == true) {
-                    runBlocking {
-                        Log.d(LOG_ID, "close current job - wait for current execution")
-                        currentJob!!.join()
-                    }
-                }
+                waitForCreation()
                 init = false
             }
         } catch (exc: Exception) {
@@ -264,6 +266,8 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
                 update(values)
             }
             Log.d(LOG_ID, "dataSync done")
+        } catch (exc: CancellationException) {
+            Log.d(LOG_ID, "dataSync cancelled")
         } catch (exc: Exception) {
             Log.e(LOG_ID, "dataSync exception: " + exc.message.toString() )
         }
@@ -435,6 +439,14 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
         return 0L
     }
 
+    private fun getEntryCount(): Int {
+        if(chart.data != null && chart.data.dataSetCount > 0) {
+            val dataSet = chart.data.getDataSetByIndex(0) as LineDataSet
+            return dataSet.entryCount
+        }
+        return 0
+    }
+
     private fun getLastTimestamp(): Long {
         if(chart.data != null && chart.data.dataSetCount > 0) {
             val dataSet = chart.data.getDataSetByIndex(0) as LineDataSet
@@ -448,7 +460,7 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
     protected fun update(values: List<GlucoseValue>) {
         Log.d(LOG_ID, "update called for ${values.size} value")
         if(values.isNotEmpty()) {
-            if(values.first().timestamp != getFirstTimestamp()) {
+            if(resetChart || values.first().timestamp != getFirstTimestamp() || (abs(values.size-getEntryCount()) > 5)) {
                 resetData(values)
                 return
             }
@@ -470,6 +482,7 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
             dataSet.clear()
             dataSet.setColors(0)
             dataSet.setCircleColor(0)
+            chart.data.clearValues()
             chart.data.notifyDataChanged()
             chart.notifyDataSetChanged()
         }
@@ -478,28 +491,27 @@ open class ChartCreator(protected val chart: GlucoseChart, protected val context
     }
 
     override fun OnNotifyData(context: Context, dataSource: NotifySource, extras: Bundle?) {
-        if(currentJob?.isActive == true) {
-            runBlocking {
-                Log.d(LOG_ID, "OnNotifyData - wait for current execution")
-                currentJob!!.join()
-            }
+        Log.d(LOG_ID, "OnNotifyData: $dataSource")
+        if(!init) {
+            Log.w(LOG_ID, "Chart still not init - create!")
+            create()
         }
-        currentJob = scope.launch {
-            try {
-                Log.d(LOG_ID, "OnNotifyData: $dataSource")
-                if(dataSource == NotifySource.TIME_VALUE) {
-                    Log.d(LOG_ID, "time elapsed: ${ReceiveData.getElapsedTimeMinute()}")
-                    if(ReceiveData.getElapsedTimeMinute().mod(2) == 0)
+        if(dataSource == NotifySource.TIME_VALUE) {
+            Log.d(LOG_ID, "time elapsed: ${ReceiveData.getElapsedTimeMinute()}")
+            if(ReceiveData.getElapsedTimeMinute().mod(2) == 0) {
+                waitForCreation()
+                createJob = scope.launch {
+                    try {
                         updateTimeElapsed()
+                    } catch (exc: Exception) {
+                        Log.e(LOG_ID, "OnNotifyData exception: " + exc.message.toString() + " - " + exc.stackTraceToString() )
+                    }
                 }
-            } catch (exc: Exception) {
-                Log.e(LOG_ID, "OnNotifyData exception: " + exc.message.toString() + " - " + exc.stackTraceToString() )
             }
         }
-        //currentJob!!.start()
     }
 
-    fun getBitmap(): Bitmap? {
+    protected fun createBitmap(): Bitmap? {
         try {
             if(chart.width > 0 && chart.height > 0)
                 return chart.drawToBitmap()

common/src/main/java/de/michelinside/glucodatahandler/common/chart/CustomBubbleMarker.kt

@@ -81,7 +81,7 @@ class CustomBubbleMarker(context: Context) : MarkerView(context, R.layout.marker
             val paint = Paint().apply {
                 style = Paint.Style.FILL
                 strokeJoin = Paint.Join.ROUND
-                color = if(isGlucose) ContextCompat.getColor(context, R.color.transparent_widget_background) else 0
+                color = if(isGlucose) ContextCompat.getColor(context, R.color.transparent_marker_background) else 0
             }
 
             val chart = chartView

common/src/main/java/de/michelinside/glucodatahandler/common/chart/GlucoseChart.kt

@@ -2,14 +2,10 @@ package de.michelinside.glucodatahandler.common.chart
 
 import android.content.Context
 import android.graphics.Canvas
-import android.os.Bundle
 import android.util.AttributeSet
 import android.util.Log
 import android.view.View
 import com.github.mikephil.charting.charts.LineChart
-import de.michelinside.glucodatahandler.common.Constants
-import de.michelinside.glucodatahandler.common.notifier.InternalNotifier
-import de.michelinside.glucodatahandler.common.notifier.NotifySource
 
 class GlucoseChart: LineChart {
     private val LOG_ID = "GDH.Chart.GlucoseChart"
@@ -26,16 +22,17 @@ class GlucoseChart: LineChart {
 
     private var processing = false
 
+    override fun getId(): Int {
+        if(super.getId() == View.NO_ID) {
+            id = generateViewId()
+        }
+        return super.getId()
+    }
+
     override fun invalidate() {
         processing = true
         try {
-            if(id == View.NO_ID) {
-                id = generateViewId()
-            }
-            //Log.v(LOG_ID, "start invalidate - notify ID: $id")
             super.invalidate()
-            //Log.i(LOG_ID, "invalidate finished - notify ID: $id")
-            InternalNotifier.notify(context, NotifySource.GRAPH_CHANGED, Bundle().apply { putInt(Constants.GRAPH_ID, id) })
         } catch (exc: Exception) {
             Log.e(LOG_ID, "invalidate exception: ${exc.message}\n${exc.stackTraceToString()}")
         }

common/src/main/java/de/michelinside/glucodatahandler/common/notifier/InternalNotifier.kt

@@ -39,10 +39,18 @@ object InternalNotifier {
         return notifiers.contains(notifier)
     }
 
+    private fun getNotifiers(): MutableMap<NotifierInterface, MutableSet<NotifySource>?> {
+        Log.d(LOG_ID, "getNotifiers")
+        synchronized(notifiers) {
+            Log.d(LOG_ID, "getNotifiers synchronized")
+            return notifiers.toMutableMap()
+        }
+    }
+
     fun notify(context: Context, notifySource: NotifySource, extras: Bundle?)
     {
         Log.d(LOG_ID, "Sending new data from " + notifySource.toString() + " to " + getNotifierCount(notifySource) + " notifier(s).")
-        val curNotifiers = notifiers.toMutableMap()
+        val curNotifiers = getNotifiers()
         curNotifiers.forEach{
             try {
                 if (it.value == null || it.value!!.contains(notifySource)) {
@@ -57,8 +65,8 @@ object InternalNotifier {
 
     fun getNotifierCount(notifySource: NotifySource): Int {
         var count = 0
-        val curNotifiers = notifiers.toMutableMap()
-        curNotifiers.forEach {
+        val curNotifiers = getNotifiers()
+        curNotifiers.forEach{
             if (it.value == null || it.value!!.contains(notifySource)) {
                 Log.v(LOG_ID, "Notifier " + it.toString() + " has source " + notifySource.toString())
                 count++
@@ -92,8 +100,12 @@ object InternalNotifier {
 
     private fun hasSource(notifier: NotifierInterface, notifySource: NotifySource): Boolean {
         if(hasNotifier(notifier)) {
-            Log.v(LOG_ID, "Check notifier ${notifier} has source $notifySource: ${notifiers[notifier]}")
-            return notifiers[notifier]!!.contains(notifySource)
+            synchronized(notifiers) {
+                if(notifiers.contains(notifier) && notifiers[notifier] != null) {
+                    Log.v(LOG_ID, "Check notifier ${notifier} has source $notifySource: ${notifiers[notifier]}")
+                    return notifiers[notifier]!!.contains(notifySource)
+                }
+            }
         }
         return false
     }

common/src/main/res/layout/marker_layout.xml

@@ -5,7 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/transparent_widget_background"
+    android:background="@color/transparent_marker_background"
     android:paddingHorizontal="12dp"
     android:paddingVertical="8dp">
 

common/src/main/res/values-night/colors.xml

@@ -17,4 +17,5 @@
     <color name="table_row">#FF666666</color>
     <color name="transparent_widget_background">#55000000</color>
     <color name="transparent_widget_textcolor">@color/white</color>
+    <color name="transparent_marker_background">#AA000000</color>
 </resources>

common/src/main/res/values/colors.xml

@@ -18,4 +18,5 @@
     <color name="table_row">#FFF0F0F0</color>
     <color name="transparent_widget_background">#55000000</color>
     <color name="transparent_widget_textcolor">@color/white</color>
+    <color name="transparent_marker_background">#77000000</color>
 </resources>

mobile/src/main/res/layout-land/activity_main.xml

@@ -143,6 +143,16 @@
                     android:layout_marginTop="20dp"
                     android:text="@string/menu_sources"
                     />
+                <de.michelinside.glucodatahandler.common.chart.GlucoseChart
+                    android:id="@+id/chart"
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp"
+                    />
+
+                <ImageView
+                    android:id="@+id/graphImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp" />
             </LinearLayout>
         </ScrollView>