From e2b0eee3541f16bfe1a98dbfe4281c57c4d81e1d Mon Sep 17 00:00:00 2001
From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com>
Date: Thu, 10 Apr 2025 10:52:58 -0600
Subject: [PATCH] Fix candlestick problems

---
 .../ridgebotics/ridgescout/ui/CandlestickView.java | 14 ++++++++------
 .../ridgescout/ui/data/FieldDataFragment.java      |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/CandlestickView.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/CandlestickView.java
index 57771de..95842db 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/CandlestickView.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/CandlestickView.java
@@ -135,12 +135,14 @@ public class CandlestickView extends View {
         float scaledMax = PADDING_LEFT + (max - absoluteMin) * scale;
 
         // Draw the box (interquartile range)
-        RectF box = new RectF(
-                scaledLQ,
-                centerY - CANDLESTICK_HEIGHT / 2,
-                scaledUQ,
-                centerY + CANDLESTICK_HEIGHT / 2);
-        canvas.drawRect(box, boxPaint);
+        if(lowerQuartile != upperQuartile) {
+            RectF box = new RectF(
+                    scaledLQ,
+                    centerY - CANDLESTICK_HEIGHT / 2,
+                    scaledUQ,
+                    centerY + CANDLESTICK_HEIGHT / 2);
+            canvas.drawRect(box, boxPaint);
+        }
 
         // Draw whiskers (min to lower quartile and upper quartile to max)
         // Left whisker
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/data/FieldDataFragment.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/data/FieldDataFragment.java
index caa6fa7..c414333 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/data/FieldDataFragment.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/data/FieldDataFragment.java
@@ -63,7 +63,7 @@ public class FieldDataFragment extends Fragment {
                 for (int i = 0; i < filenames.size(); i++) {
                     try {
                         ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(filenames.get(i), match_values, match_transferValues);
-                        if (psda.data.array[fieldIndex] != null && psda.data.array[fieldIndex].get() != null)
+                        if (psda.data.array[fieldIndex] != null && psda.data.array[fieldIndex].get() != null && !psda.data.array[fieldIndex].isNull())
                             teamData.add(psda.data.array[fieldIndex]);
                     } catch (Exception e) {
                         AlertManager.error("Failure to load file " + filenames.get(i), e);