From 5789f4c0dd63bcc849aea464fb6f3e1a87ec91b2 Mon Sep 17 00:00:00 2001 From: Luca Warmenhoven Date: Tue, 28 May 2024 15:58:25 +0200 Subject: [PATCH] Attempt to make good --- .../java/com/example/fitbot/exercise/ExerciseManager.java | 2 +- .../fitbot/ui/components/PersonalMotionPreviewElement.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java index 716b1ba..a500943 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java @@ -76,7 +76,7 @@ public class ExerciseManager { content.get(PROPERTY_NAME).getAsString(), content.get(PROPERTY_DESC).getAsString(), gesturePathFromString(content.get(PROPERTY_VECTORS).getAsString()), - DEFAULT_SEGMENT_SPEED + gesturePathFromString(content.get(PROPERTY_SEGMENT_SPEED).getAsString()) ); } catch (Exception e) { e.printStackTrace(); diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java index 5df9df5..113bdc7 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java @@ -108,9 +108,10 @@ public class PersonalMotionPreviewElement extends View { // Handler that is called every time the motion processor receives new data. this.motionProcessor.setMotionDataEventHandler((processed, preprocessed, sampleIndex, sampleRate, deviceId) -> { - this.exerciseProgress = Math.min(1, Math.max(0, this.motionProcessor.getAverageError(this.paths[0], 0) / 10)); + double progress = this.motionProcessor.getAverageError(this.paths[0], 0); + this.exerciseProgress = Math.min(1, Math.max(0, progress)); this.invalidate(); - Log.i("MotionProcessor", "Processed data: " + processed); + Log.i("MotionProcessor", "Processed data: " + progress + " (" + preprocessed + ")"); }); saySomethingNice(); }