From a2ae6b939c5ec883dabd80a7e86fe4d4e8e07fa7 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Thu, 9 May 2024 21:41:04 +0100
Subject: [PATCH] Added CNN based seizure probability to OSDAlg fragment -
 addresses #189 and #182

---
 .../openseizuredetector/FragmentOsdAlg.java    | 18 ++++++++++++++++++
 app/src/main/res/layout/fragment_osdalg.xml    | 14 ++++++++++++++
 app/src/main/res/values/strings.xml            |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/uk/org/openseizuredetector/FragmentOsdAlg.java b/app/src/main/java/uk/org/openseizuredetector/FragmentOsdAlg.java
index 98a016c..31ea009 100644
--- a/app/src/main/java/uk/org/openseizuredetector/FragmentOsdAlg.java
+++ b/app/src/main/java/uk/org/openseizuredetector/FragmentOsdAlg.java
@@ -103,6 +103,24 @@ public class FragmentOsdAlg extends FragmentOsdBaseClass {
                 pbDrawable = mContext.getDrawable(R.drawable.progress_bar_red);
             pb.setProgressDrawable(pbDrawable);
 
+            ////////////////////////////////////////////////////////////
+            // set progressbar seizure probability
+            ////////////////////////////////////////////////////////////
+
+            long pSeizurePc;
+            pSeizurePc = (long) (mConnection.mSdServer.mSdData.mPseizure * 100);
+
+            pb = ((ProgressBar) mRootView.findViewById(R.id.pSeizureProgressBarM2));
+            pb.setMax(100);
+            pb.setProgress((int) pSeizurePc);
+            pbDrawable = mContext.getDrawable(R.drawable.progress_bar_blue);
+            if (pSeizurePc > 30)
+                pbDrawable = mContext.getDrawable(R.drawable.progress_bar_yellow);
+            if (pSeizurePc > 50)
+                pbDrawable = mContext.getDrawable(R.drawable.progress_bar_red);
+            //pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
+            pb.setProgressDrawable(pbDrawable);
+
             ////////////////////////////////////////////////////////////
             // Produce graph
             BarChart mChart = (BarChart) mRootView.findViewById(R.id.chart1);
diff --git a/app/src/main/res/layout/fragment_osdalg.xml b/app/src/main/res/layout/fragment_osdalg.xml
index cdf49dc..f3d61d8 100644
--- a/app/src/main/res/layout/fragment_osdalg.xml
+++ b/app/src/main/res/layout/fragment_osdalg.xml
@@ -47,6 +47,20 @@
             android:indeterminate="false"
             android:minHeight="20dp" />
 
+        <TextView
+            android:id="@+id/pSeizureTvM2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/seizure_probability"
+            android:textColor="@color/okTextColor" />
+
+        <ProgressBar
+            android:id="@+id/pSeizureProgressBarM2"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+
         <com.github.mikephil.charting.charts.BarChart
             android:id="@+id/chart1"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f49b232..2d9f845 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -461,7 +461,7 @@
     <string name="NDATimeRemaining">"NDA Logging Time Remaining (hours): "</string>
     <string name="stop_nda_menu_title">Stop NDA</string>
     <string name="start_nda_menu_title">Start NDA</string>
-    <string name="seizure_probability">Seizure Probability (%)</string>
+    <string name="seizure_probability">Seizure Probability (from CNN) (%)</string>
     <string name="eventid">EventId</string>
     <string name="event_date">Event Date</string>
     <string name="alarm_state">Alarm State</string>