From c8f14308298ba2c1ee70f1566682079ebf139d0e Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Tue, 24 Nov 2015 22:16:27 +0000
Subject: [PATCH] Added indicators to show margin to alarm for both spectral
 power and ratio.

---
 .../org/openseizuredetector/MainActivity.java | 38 +++++++++++++++----
 app/src/main/res/layout/main.xml              | 33 ++++++++++++----
 2 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index ee9c9d9..ae43b08 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -37,6 +37,7 @@ import android.content.pm.PackageInfo;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -50,6 +51,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.WindowManager;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Button;
 
@@ -359,13 +361,35 @@ public class MainActivity extends Activity {
                     if (mConnection.mSdServer.mSdData.batteryPc >= 40)
                         tv.setBackgroundColor(okColour);
 
-                    tv = (TextView) findViewById(R.id.debugTv);
-                    String specStr = "";
-                    for (int i = 0; i < 10; i++)
-                        specStr = specStr
-                                + mConnection.mSdServer.mSdData.simpleSpec[i]
-                                + ", ";
-                    tv.setText("Spec = " + specStr);
+                    // Set ProgressBars to show margin to alarm.
+                    long powerPc = mConnection.mSdServer.mSdData.roiPower * 100 /
+                            mConnection.mSdServer.mSdData.alarmThresh;
+                    long specPc = 100 * (mConnection.mSdServer.mSdData.roiPower * 10 /
+                            mConnection.mSdServer.mSdData.specPower) /
+                            mConnection.mSdServer.mSdData.alarmRatioThresh;
+
+                    ((TextView)findViewById(R.id.powerTv)).setText("Power = "+mConnection.mSdServer.mSdData.roiPower+
+                        " (threshold = "+mConnection.mSdServer.mSdData.alarmThresh+")");
+                    ((TextView)findViewById(R.id.spectrumTv)).setText("Spectrum Ratio = "+10 * mConnection.mSdServer.mSdData.roiPower /
+                            mConnection.mSdServer.mSdData.specPower+
+                            " (threshold = "+mConnection.mSdServer.mSdData.alarmRatioThresh+")");
+
+                    ProgressBar pb;
+                    pb =   ((ProgressBar)findViewById(R.id.powerProgressBar));
+                    pb.setMax(100);
+                    pb.setProgress((int)powerPc);
+                    int colour = Color.BLUE;
+                    if (powerPc>75) colour = Color.YELLOW;
+                    if (powerPc>100) colour = Color.RED;
+                    pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
+
+                    pb =   ((ProgressBar)findViewById(R.id.spectrumProgressBar));
+                    pb.setMax(100);
+                    pb.setProgress((int)specPc);
+                    colour = Color.BLUE;
+                    if (specPc>75) colour = Color.YELLOW;
+                    if (specPc>100) colour = Color.RED;
+                    pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
                 } else {
                     tv = (TextView) findViewById(R.id.alarmTv);
                     tv.setText("Not Connected to Server");
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 1aa7f94..ef0af83 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -87,12 +87,31 @@
   </LinearLayout>
 
 
-  <TextView  
-      android:id="@+id/debugTv"
-      android:layout_width="wrap_content" 
-      android:layout_height="wrap_content" 
-      android:text="battTv"
-      />
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Power"
+		android:id="@+id/powerTv" />
+
+	<ProgressBar
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/powerProgressBar" />
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Spectal Range"
+		android:id="@+id/spectrumTv" />
+
+	<ProgressBar
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/spectrumProgressBar"
+		android:indeterminate="false" />
 
 	<Button
 		android:layout_width="wrap_content"
@@ -104,6 +123,6 @@
         android:id="@+id/chart1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/seekBar1" />
+         />
 </LinearLayout>