From 4d9a8d347d43e1d8cc37c84f29e3fbe4c137136c Mon Sep 17 00:00:00 2001
From: Enzo <enzo.jolys@gmail.com>
Date: Thu, 9 Nov 2023 15:52:12 +0100
Subject: [PATCH] getSpeedWithTime finie

---
 lib/Modele/manager_file.dart | 28 ++++++++++++++++++----------
 lib/View/page_test.dart      |  4 ++--
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/Modele/manager_file.dart b/lib/Modele/manager_file.dart
index fa13c6e..dd3ea85 100644
--- a/lib/Modele/manager_file.dart
+++ b/lib/Modele/manager_file.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:ffi';
 import 'dart:io';
 import 'package:csv/csv.dart';
 import 'package:fit_tool/fit_tool.dart';
@@ -102,7 +103,8 @@ class ManagerFile {
           firtTimeStamp = ligne[4];
         }
         //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[7].toInt()]);
-        result.add(FlSpot((ligne[4] - firtTimeStamp) ~/ 100, ligne[7]));
+        result
+            .add(FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[7].toDouble()));
       }
     }
     return result;
@@ -118,27 +120,27 @@ class ManagerFile {
           firtTimeStamp = ligne[4];
         }
         //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[13].toInt()]);
-        result.add(FlSpot((ligne[4] - firtTimeStamp) ~/ 100, ligne[13]));
+        result.add(
+            FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[13].toDouble()));
       }
     }
     return result;
   }
 
-  int getDistance(ActivityOfUser activity) {
-    int result = 0;
+  double getDistance(ActivityOfUser activity) {
+    double result = 0.0;
     for (int i = activity.contentActivity.length - 1; i >= 0; i--) {
       if (activity.contentActivity[i].length >= 8 &&
           activity.contentActivity[i][0] == "Data" &&
           activity.contentActivity[i][6] == "distance") {
         if (activity.contentActivity[i][7] > result) {
-          result = activity.contentActivity[i][7].toInt();
+          result = activity.contentActivity[i][7].toDouble();
         }
       }
     }
     return result;
   }
 
-  /* En Cours 
   List<FlSpot> getSpeedWithTime(ActivityOfUser activityOfUser) {
     List<FlSpot> result = List.empty(growable: true);
     int firtTimeStamp = 0;
@@ -148,11 +150,17 @@ class ManagerFile {
         if (firtTimeStamp == 0) {
           firtTimeStamp = ligne[4];
         }
-        result
-            .add(FlSpot((ligne[4] - firtTimeStamp) ~/ 100, ligne[19].toInt()));
-        //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[19].toInt()]);
+        result.add(
+            FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[19].toDouble()));
+      }
+      if (ligne[0] == "Data" && ligne[1] == 2) {
+        if (firtTimeStamp == 0) {
+          firtTimeStamp = ligne[4];
+        }
+        result.add(
+            FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[25].toDouble()));
       }
     }
     return result;
-  }*/
+  }
 }
diff --git a/lib/View/page_test.dart b/lib/View/page_test.dart
index b718819..c42bae4 100644
--- a/lib/View/page_test.dart
+++ b/lib/View/page_test.dart
@@ -66,11 +66,11 @@ class _TestPage extends State<TestPage> {
       print("t");
     } else {
       List<dynamic> result = await x.readFitFile(y!);
-      print(result);
-      print(x.getHeartRateWithTime(ActivityOfUser(result)));
+      //print(x.getHeartRateWithTime(ActivityOfUser(result)));
       //print(x.getDistanceWithTime(ActivityOfUser(result)));
       //print(x.getDistance(ActivityOfUser(result)));
       //print(x.getAltitudeWithTime(ActivityOfUser(result)));
+      print(x.getSpeedWithTime(ActivityOfUser(result)));
     }
   }