diff --git a/lib/Modele/manager_file.dart b/lib/Modele/manager_file.dart index 8444ac2..babd950 100644 --- a/lib/Modele/manager_file.dart +++ b/lib/Modele/manager_file.dart @@ -3,6 +3,7 @@ import 'dart:ffi'; import 'dart:io'; import 'package:csv/csv.dart'; import 'package:fit_tool/fit_tool.dart'; +import 'package:fl_chart/fl_chart.dart'; import 'package:path_provider/path_provider.dart'; import 'package:smartfit_app_mobile/Modele/Api/i_data_strategy.dart'; import 'package:smartfit_app_mobile/Modele/Api/request_api.dart'; @@ -66,8 +67,8 @@ class ManagerFile { // ---------------- Fonction to get data --------- // - List> getHeartRateWithTime(ActivityOfUser activity) { - List> result = List.empty(growable: true); + List getHeartRateWithTime(ActivityOfUser activity) { + List result = List.empty(growable: true); int firtTimeStamp = 0; for (List ligne in activity.contentActivity) { @@ -76,20 +77,22 @@ class ManagerFile { if (firtTimeStamp == 0) { firtTimeStamp = ligne[4]; } - result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[10]]); + //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[10]]); + result.add(FlSpot((ligne[4] - firtTimeStamp) ~/ 100, ligne[10])); } else if (ligne.length >= 16 && ligne[16] == "heart_rate") { if (firtTimeStamp == 0) { firtTimeStamp = ligne[4]; } - result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[17]]); + //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[17]]); + result.add(FlSpot((ligne[4] - firtTimeStamp) ~/ 100, ligne[17])); } } } return result; } - List> getDistanceWithTime(ActivityOfUser activityOfUser) { - List> result = List.empty(growable: true); + List getDistanceWithTime(ActivityOfUser activityOfUser) { + List result = List.empty(growable: true); int firtTimeStamp = 0; for (List ligne in activityOfUser.contentActivity) { @@ -97,14 +100,15 @@ class ManagerFile { if (firtTimeStamp == 0) { firtTimeStamp = ligne[4]; } - result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[7].toInt()]); + //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[7].toInt()]); + result.add(FlSpot((ligne[4] - firtTimeStamp) ~/ 100, ligne[7])); } } return result; } - List> getAltitudeWithTime(ActivityOfUser activityOfUser) { - List> result = List.empty(growable: true); + List getAltitudeWithTime(ActivityOfUser activityOfUser) { + List result = List.empty(growable: true); int firtTimeStamp = 0; for (List ligne in activityOfUser.contentActivity) { @@ -112,7 +116,8 @@ class ManagerFile { if (firtTimeStamp == 0) { firtTimeStamp = ligne[4]; } - result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[13].toInt()]); + //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[13].toInt()]); + result.add(FlSpot((ligne[4] - firtTimeStamp) ~/ 100, ligne[13])); } } return result; @@ -131,4 +136,22 @@ class ManagerFile { } return result; } + + /* En Cours + List getSpeedWithTime(ActivityOfUser activityOfUser) { + List result = List.empty(growable: true); + int firtTimeStamp = 0; + + for (List ligne in activityOfUser.contentActivity) { + if (ligne[0] == "Data" && ligne[1] == 1) { + 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()]); + } + } + return result; + }*/ } diff --git a/pubspec.yaml b/pubspec.yaml index 655f261..b45cf0b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,6 +35,7 @@ dependencies: file_picker: ^6.1.1 csv: ^5.1.1 fit_tool: ^1.0.5 + fl_chart: ^0.64.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.