fix: reset espacement calibration + refresh auto historique

- getAllSessions : élimine le N+1 (une requête par session + par analyse)
  au profit de 3 requêtes groupées (sessions, analyses IN, shots IN),
  découpées en paquets de 500 pour rester sous la limite SQLite. Assemblage
  en mémoire via maps — accueil/historique/stats ne ralentiront plus au fil
  des mois
- flutter analyze : 28 -> 0 problème. APIs dépréciées migrées (withOpacity
  -> withValues, scale -> scaleByDouble, DropdownButtonFormField.value ->
  initialValue, dialogBackgroundColor -> dialogTheme, activeColor ->
  activeThumbColor), use_build_context_synchronously corrigés dans
  l'armurerie (repository capturé avant await + gardes mounted), print ->
  debugPrint, identifiants TopLeft/... -> lowerCamelCase, blocs if, champ final
- _showShotDetails dédupliqué : bottom sheet extraite dans le widget partagé
  shot_details_sheet.dart, utilisée par l'écran d'analyse et l'éditeur d'impacts
- CLAUDE.md : sections Features réécrites (retrait détection auto/références,
  ajout capture/plotting manuel) ; description pubspec renseignée

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

.claude/settings.json

@@ -1,7 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(flutter analyze:*)"
-    ]
-  }
-}

.claude/settings.local.json

@@ -1,16 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(flutter clean:*)",
-      "Bash(flutter pub get:*)",
-      "Bash(flutter run:*)",
-      "Bash(cmake:*)",
-      "Bash(where:*)",
-      "Bash(winget search:*)",
-      "Bash(winget install:*)",
-      "Bash(\"/c/Program Files \\(x86\\)/Microsoft Visual Studio/Installer/vs_installer.exe\" modify --installPath \"C:\\\\Program Files \\(x86\\)\\\\Microsoft Visual Studio\\\\2022\\\\BuildTools\" --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows11SDK.22621 --passive --wait)",
-      "Bash(cmd //c \"\"\"C:\\\\Program Files\\\\Microsoft Visual Studio\\\\18\\\\Community\\\\Common7\\\\Tools\\\\VsDevCmd.bat\"\" && flutter run -d windows\")",
-      "Bash(flutter doctor:*)"
-    ]
-  }
-}

.gitignore

@@ -11,6 +11,7 @@
 .svn/
 .swiftpm/
 migrate_working_dir/
+.claude/
 
 # IntelliJ related
 *.iml

CLAUDE.md

@@ -41,10 +41,12 @@ flutter test --coverage
 
 ## Features
 
-### Analyse de cibles de tir
+### Capture de cibles de tir
 - Support de cibles concentriques (anneaux) et silhouettes
 - Chargement d'images de cibles depuis la galerie ou la caméra
-- Détection automatique du centre et du rayon de la cible
+- Aperçu caméra avec aide au cadrage : détection OpenCV de la cible (mire)
+  et indicateur de parallélisme par accéléromètre (pitch/roll)
+- Écran de centrage/recadrage : rotation fine, déplacement pixel par pixel
 
 ### Calibration des cibles
 - Ajustement manuel du centre, du rayon et du nombre d'anneaux (1-10)
@@ -52,14 +54,11 @@ flutter test --coverage
 - Slider global pour redimensionner tous les anneaux proportionnellement
 - Visualisation en temps réel des zones de score
 
-### Détection d'impacts
+### Placement des impacts
-- **Ajout manuel** : cliquer sur l'image pour placer un impact
+- **Éditeur d'impacts plein écran** : tap pour ajouter, tap sur un impact pour
-- **Détection automatique** : algorithme de détection de blobs avec paramètres ajustables
+  l'éditer (score/suppression), appui long pour déplacer, pincer pour zoomer
-  - Seuil de luminosité
+- Le placement est entièrement manuel ; le bouton ↻ de l'écran de plotting
-  - Taille min/max des impacts
+  efface tous les impacts sans toucher à la calibration
-  - Circularité minimale
-  - Ratio de remplissage (distingue les trous pleins des cercles vides)
-- **Détection par références** : sélectionner 2-4 impacts manuellement, l'algorithme apprend leurs caractéristiques et détecte les impacts similaires
 
 ### Calcul des scores
 - Score automatique basé sur la position de l'impact dans les zones

analyze_log.txt

@@ -1,31 +0,0 @@
-Analyzing bully...                                              
-
-   info - Statements in an if should be enclosed in a block - lib\features\analysis\analysis_screen.dart:122:17 - curly_braces_in_flow_control_structures
-   info - 'withOpacity' is deprecated and shouldn't be used. Use .withValues() to avoid precision loss - lib\features\analysis\analysis_screen.dart:650:51 - deprecated_member_use
-warning - The declaration '_showAddShotHint' isn't referenced - lib\features\analysis\analysis_screen.dart:1083:8 - unused_element
-warning - The declaration '_showAutoDetectDialog' isn't referenced - lib\features\analysis\analysis_screen.dart:1120:8 - unused_element
-warning - Unused import: 'widgets/target_type_selector.dart' - lib\features\capture\capture_screen.dart:16:8 - unused_import
-   info - The private field _selectedType could be 'final' - lib\features\capture\capture_screen.dart:28:14 - prefer_final_fields
-   info - 'scale' is deprecated and shouldn't be used. Use scaleByVector3, scaleByVector4, or scaleByDouble instead - lib\features\crop\crop_screen.dart:141:25 - deprecated_member_use
-   info - The import of 'package:flutter/foundation.dart' is unnecessary because all of the used elements are also provided by the import of 'package:flutter/material.dart' - lib\features\statistics\statistics_screen.dart:8:8 - unnecessary_import
-warning - The declaration '_buildLegendItem' isn't referenced - lib\features\statistics\statistics_screen.dart:309:10 - unused_element
-   info - Unnecessary use of string interpolation - lib\features\statistics\statistics_screen.dart:408:15 - unnecessary_string_interpolations
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:192:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:239:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:246:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:278:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:289:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:292:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:297:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:332:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:336:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:683:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:725:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:736:7 - avoid_print
-warning - The declaration '_detectDarkSpotsAdaptive' isn't referenced - lib\services\image_processing_service.dart:780:15 - unused_element
-   info - Don't invoke 'print' in production code - lib\services\opencv_impact_detection_service.dart:104:5 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\opencv_impact_detection_service.dart:116:5 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:297:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:342:7 - avoid_print
-
-27 issues found. (ran in 1.9s)

analyze_results_fixed.txt

@@ -1,37 +0,0 @@
-Analyzing bully...                                              
-
-   info - Don't invoke 'print' in production code - lib\features\analysis\analysis_provider.dart:553:7 - avoid_print
-   info - The private field _selectedType could be 'final' - lib\features\capture\capture_screen.dart:27:14 - prefer_final_fields
-   info - 'scale' is deprecated and shouldn't be used. Use scaleByVector3, scaleByVector4, or scaleByDouble instead - lib\features\crop\crop_screen.dart:142:25 - deprecated_member_use
-   info - Statements in an if should be enclosed in a block - lib\services\distortion_correction_service.dart:566:11 - curly_braces_in_flow_control_structures
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:639:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:764:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:825:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:953:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:1015:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:1063:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:192:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:239:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:246:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:278:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:289:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:292:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:297:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:332:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:336:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:683:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:725:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:736:7 - avoid_print
-warning - The declaration '_detectDarkSpotsAdaptive' isn't referenced - lib\services\image_processing_service.dart:780:15 - unused_element
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:328:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:377:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:414:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:23:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:29:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:31:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:67:7 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:4:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:5:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:6:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\test_homography.dart:4:3 - avoid_print
-

analyze_utf8.txt

@@ -1,38 +0,0 @@
-Analyzing bully...                                              
-
-   info - Don't invoke 'print' in production code - lib\features\analysis\analysis_provider.dart:392:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\features\analysis\analysis_provider.dart:596:7 - avoid_print
-   info - The private field _selectedType could be 'final' - lib\features\capture\capture_screen.dart:27:14 - prefer_final_fields
-   info - 'scale' is deprecated and shouldn't be used. Use scaleByVector3, scaleByVector4, or scaleByDouble instead - lib\features\crop\crop_screen.dart:142:25 - deprecated_member_use
-   info - Statements in an if should be enclosed in a block - lib\services\distortion_correction_service.dart:566:11 - curly_braces_in_flow_control_structures
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:639:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:764:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:825:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:953:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:1015:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:1063:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:192:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:239:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:246:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:278:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:289:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:292:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:297:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:332:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:336:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:683:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:725:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:736:7 - avoid_print
-warning - The declaration '_detectDarkSpotsAdaptive' isn't referenced - lib\services\image_processing_service.dart:780:15 - unused_element
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:328:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:377:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:414:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:23:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:29:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:31:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:67:7 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:4:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:5:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:6:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\test_homography.dart:4:3 - avoid_print
-

backendia/.gitignore

@@ -13,8 +13,7 @@ dashboard/out/
 .env.test.local
 .env.production.local
 
-# Database
+# Database (contient des données utilisateurs — jamais dans git)
-backendia/uploads/data/database.sqlite
 *.sqlite
 *.sqlite-journal
 
@@ -23,7 +22,6 @@ uploads/images/*
 !uploads/images/.gitkeep
 uploads/data/*
 !uploads/data/.gitkeep
-!uploads/data/database.sqlite
 exports/*
 !exports/.gitkeep
 

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777452200161-140195750.json

@@ -1,116 +0,0 @@
-{
-  "session_id": "session_1777452202935",
-  "timestamp": "2026-04-29T08:43:22.943303",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3934941044560185,
-          "norm_y": 0.665676540798611
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6055302372685185,
-          "norm_y": 0.6953124999999999
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.5981137876157407,
-          "norm_y": 0.5249565972222221
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.6759033203125,
-          "norm_y": 0.4786376953125
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.48608398437499994,
-          "norm_y": 0.5490315755208333
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5101625795717593,
-          "norm_y": 0.43238661024305547
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6296079282407407,
-          "norm_y": 0.4203152126736111
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.46386718749999994,
-          "norm_y": 0.48046875
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3379521122685185,
-          "norm_y": 0.4397786458333333
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777452478470-134185918.json

@@ -1,116 +0,0 @@
-{
-  "session_id": "session_1777452481252",
-  "timestamp": "2026-04-29T08:48:01.259705",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3934941044560185,
-          "norm_y": 0.665676540798611
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6055302372685185,
-          "norm_y": 0.6953124999999999
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.5981137876157407,
-          "norm_y": 0.5249565972222221
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.6759033203125,
-          "norm_y": 0.4786376953125
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.48608398437499994,
-          "norm_y": 0.5490315755208333
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5101625795717593,
-          "norm_y": 0.43238661024305547
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6296079282407407,
-          "norm_y": 0.4203152126736111
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.46386718749999994,
-          "norm_y": 0.48046875
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3379521122685185,
-          "norm_y": 0.4397786458333333
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777452610834-998848199.json

@@ -1,44 +0,0 @@
-{
-  "session_id": "session_1777452613625",
-  "timestamp": "2026-04-29T08:50:13.631206",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 10,
-        "coords": {
-          "norm_x": 0.49810836226851846,
-          "norm_y": 0.4981011284722222
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777463306078-559049531.json

@@ -1,144 +0,0 @@
-{
-  "session_id": "session_1777463308809",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-29T11:48:28.834236",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.38424660011574074,
-          "norm_y": 0.3666042751736111
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6055302372685185,
-          "norm_y": 0.396240234375
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.5860903139467593,
-          "norm_y": 0.5999620225694443
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.33517433449074074,
-          "norm_y": 0.5592041015625
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.6073612919560185,
-          "norm_y": 0.5101047092013888
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.432373046875,
-          "norm_y": 0.46663411458333337
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.45181297019675926,
-          "norm_y": 0.5564236111111112
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 10,
-        "coords": {
-          "norm_x": 0.5221860532407407,
-          "norm_y": 0.48792860243055547
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.6564335575810184,
-          "norm_y": 0.7536349826388888
-        }
-      },
-      {
-        "id": 10,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.4712528935185185,
-          "norm_y": 0.7018229166666666
-        }
-      },
-      {
-        "id": 11,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.3981327763310185,
-          "norm_y": 0.7018229166666666
-        }
-      },
-      {
-        "id": 12,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.48144531249999994,
-          "norm_y": 0.8212483723958334
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777463700977-483303168.json

@@ -1,117 +0,0 @@
-{
-  "session_id": "session_1777463703756",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-29T11:55:03.765285",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.38424660011574074,
-          "norm_y": 0.45178222656249994
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6518247251157407,
-          "norm_y": 0.3638237847222222
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.5490415219907407,
-          "norm_y": 0.66845703125
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.405517578125,
-          "norm_y": 0.6758490668402777
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.7268066406249999,
-          "norm_y": 0.6758490668402777
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5471806278935185,
-          "norm_y": 0.529568142361111
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.44720504195601846,
-          "norm_y": 0.5980631510416666
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.45458984375,
-          "norm_y": 0.4221462673611111
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.5203251591435185,
-          "norm_y": 0.3638237847222222
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777464153541-625226221.json

@@ -1,117 +0,0 @@
-{
-  "session_id": "session_1777464156234",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-29T12:02:36.255849",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.38424660011574074,
-          "norm_y": 0.45178222656249994
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6518247251157407,
-          "norm_y": 0.3638237847222222
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.5490415219907407,
-          "norm_y": 0.66845703125
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.405517578125,
-          "norm_y": 0.6758490668402777
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.7268066406249999,
-          "norm_y": 0.6758490668402777
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5471806278935185,
-          "norm_y": 0.529568142361111
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.44720504195601846,
-          "norm_y": 0.5980631510416666
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.45458984375,
-          "norm_y": 0.4221462673611111
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.5203251591435185,
-          "norm_y": 0.3638237847222222
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777464604476-656835279.json

@@ -1,180 +0,0 @@
-{
-  "session_id": "session_1777464607256",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-29T12:10:07.260954",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.31570457175925926,
-          "norm_y": 0.7388509114583333
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.3184814453125,
-          "norm_y": 0.6489935980902778
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3110966435185185,
-          "norm_y": 0.529568142361111
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.31570457175925926,
-          "norm_y": 0.4416097005208333
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 4,
-        "coords": {
-          "norm_x": 0.31570457175925926,
-          "norm_y": 0.34252929687499994
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.32589699074074074,
-          "norm_y": 0.2332763671875
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.45458984375,
-          "norm_y": 0.19624837239583331
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.5981137876157407,
-          "norm_y": 0.23049587673611108
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6907045717592593,
-          "norm_y": 0.3546006944444444
-        }
-      },
-      {
-        "id": 10,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.699951171875,
-          "norm_y": 0.48046875
-        }
-      },
-      {
-        "id": 11,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6268310546874999,
-          "norm_y": 0.5416395399305556
-        }
-      },
-      {
-        "id": 12,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.49072265624999994,
-          "norm_y": 0.5610351562499999
-        }
-      },
-      {
-        "id": 13,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.4203495732060185,
-          "norm_y": 0.536960177951389
-        }
-      },
-      {
-        "id": 14,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.5370180483217593,
-          "norm_y": 0.6879204644097222
-        }
-      },
-      {
-        "id": 15,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.6175537109375,
-          "norm_y": 0.7601453993055556
-        }
-      },
-      {
-        "id": 16,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.7027280454282406,
-          "norm_y": 0.8406439887152777
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-30T12-53-35-219Z/data/.gitkeep

@@ -1 +0,0 @@
-# Keep directory structure

backendia/exports/archive_2026-04-30T12-53-35-219Z/data/photo-1777553550008-681509771.json

@@ -1,270 +0,0 @@
-{
-  "session_id": "session_1777553535029",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-30T12:52:15.048830",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.17681929976851848,
-          "norm_y": 0.8851318359375
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.17681929976851848,
-          "norm_y": 0.7721489800347222
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.17959617332175923,
-          "norm_y": 0.6888020833333334
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.17959617332175923,
-          "norm_y": 0.6342095269097222
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.17959617332175923,
-          "norm_y": 0.560153537326389
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.17959617332175923,
-          "norm_y": 0.5138346354166666
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.1814579716435185,
-          "norm_y": 0.45273166232638884
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.18701171875,
-          "norm_y": 0.3878987630208333
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.18887351707175926,
-          "norm_y": 0.2925482855902778
-        }
-      },
-      {
-        "id": 10,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.2036747685185185,
-          "norm_y": 0.20085991753472218
-        }
-      },
-      {
-        "id": 11,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.27035499855324074,
-          "norm_y": 0.16200086805555558
-        }
-      },
-      {
-        "id": 12,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.37588523582175926,
-          "norm_y": 0.1546088324652778
-        }
-      },
-      {
-        "id": 13,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.46292136863425926,
-          "norm_y": 0.1518283420138889
-        }
-      },
-      {
-        "id": 14,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.6814579716435185,
-          "norm_y": 0.1499294704861111
-        }
-      },
-      {
-        "id": 15,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.5509033203125,
-          "norm_y": 0.1546088324652778
-        }
-      },
-      {
-        "id": 16,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.6156919126157407,
-          "norm_y": 0.1546088324652778
-        }
-      },
-      {
-        "id": 17,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.7703251591435185,
-          "norm_y": 0.2360568576388889
-        }
-      },
-      {
-        "id": 18,
-        "label": "bullet_hole",
-        "score": 4,
-        "coords": {
-          "norm_x": 0.7110595703125,
-          "norm_y": 0.3536512586805555
-        }
-      },
-      {
-        "id": 19,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6027524594907407,
-          "norm_y": 0.4129231770833333
-        }
-      },
-      {
-        "id": 20,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.4823911313657407,
-          "norm_y": 0.4304877387152777
-        }
-      },
-      {
-        "id": 21,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.39627097800925926,
-          "norm_y": 0.43509928385416663
-        }
-      },
-      {
-        "id": 22,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.289794921875,
-          "norm_y": 0.43238661024305547
-        }
-      },
-      {
-        "id": 23,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.7166440610532407,
-          "norm_y": 0.7693684895833333
-        }
-      },
-      {
-        "id": 24,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.7314453125,
-          "norm_y": 0.7008734809027778
-        }
-      },
-      {
-        "id": 25,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.7879331235532407,
-          "norm_y": 0.7601453993055556
-        }
-      },
-      {
-        "id": 26,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.736083984375,
-          "norm_y": 0.828640407986111
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-30T12-53-35-219Z/images/.gitkeep

@@ -1 +0,0 @@
-# Keep directory structure

backendia/uploads/data/photo-1777554021433-285233602.json

@@ -1,90 +0,0 @@
-{
-  "session_id": "session_1777554006515",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-30T13:00:06.519693",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.267578125,
-          "norm_y": 0.5554741753472222
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.5712583188657407,
-          "norm_y": 0.3592800564236111
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 4,
-        "coords": {
-          "norm_x": 0.7555239076967593,
-          "norm_y": 0.5703938802083333
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 4,
-        "coords": {
-          "norm_x": 0.6666259765625,
-          "norm_y": 0.6759168836805556
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5490415219907407,
-          "norm_y": 0.5212944878472222
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.4897768373842592,
-          "norm_y": 0.39352756076388895
-        }
-      }
-    ]
-  }
-}

lib/app.dart

@@ -3,7 +3,6 @@ import 'package:provider/provider.dart';
 import 'core/theme/theme_provider.dart';
 import 'core/theme/app_theme.dart';
 import 'main_navigation_holder.dart';
-import 'features/home/home_screen.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 
 class BullyApp extends StatelessWidget {

lib/core/widgets/metric_info_button.dart

@@ -0,0 +1,76 @@
+/// Bouton d'information (ⓘ) qui explique des métriques à l'utilisateur.
+///
+/// Affiche une petite icône cliquable ; au clic, une boîte de dialogue
+/// détaille la signification de chaque statistique de la carte associée.
+library;
+
+import 'package:flutter/material.dart';
+
+/// Explication d'une métrique : un libellé et sa description.
+class MetricExplanation {
+  final String label;
+  final String description;
+
+  const MetricExplanation(this.label, this.description);
+}
+
+class MetricInfoButton extends StatelessWidget {
+  final String title;
+  final List<MetricExplanation> explanations;
+
+  const MetricInfoButton({
+    super.key,
+    required this.title,
+    required this.explanations,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return IconButton(
+      icon: Icon(Icons.info_outline, size: 18, color: Colors.grey[500]),
+      visualDensity: VisualDensity.compact,
+      padding: EdgeInsets.zero,
+      constraints: const BoxConstraints(),
+      tooltip: 'À quoi ça correspond ?',
+      onPressed: () => _showInfo(context),
+    );
+  }
+
+  void _showInfo(BuildContext context) {
+    showDialog<void>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(title),
+        content: SingleChildScrollView(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              for (final e in explanations)
+                Padding(
+                  padding: const EdgeInsets.only(bottom: 14),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        e.label,
+                        style: const TextStyle(fontWeight: FontWeight.bold),
+                      ),
+                      const SizedBox(height: 2),
+                      Text(e.description),
+                    ],
+                  ),
+                ),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Compris'),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/data/database/database_helper.dart

@@ -10,6 +10,12 @@ import '../../core/constants/app_constants.dart';
 class DatabaseHelper {
   static DatabaseHelper? _instance;
   static Database? _database;
+  // On met en cache le Future d'initialisation (et non la Database résolue)
+  // pour éviter qu'un démarrage concurrent (les 4 onglets de l'IndexedStack
+  // interrogent la base en même temps) ne lance plusieurs _initDatabase() en
+  // parallèle. Sur une base fraîche, cela dédoublait onCreate et rendait la
+  // toute première écriture peu fiable.
+  static Future<Database>? _initFuture;
 
   DatabaseHelper._internal();
 
@@ -19,7 +25,9 @@ class DatabaseHelper {
   }
 
   Future<Database> get database async {
-    _database ??= await _initDatabase();
+    if (_database != null) return _database!;
+    _initFuture ??= _initDatabase();
+    _database = await _initFuture!;
     return _database!;
   }
 
@@ -285,9 +293,14 @@ class DatabaseHelper {
   Future<int> insertSession(Session session) async {
     final db = await database;
     return await db.transaction((txn) async {
+      // INTERCEPTION ET FIX DE LA DATE ICI :
+      // On extrait la map générée et on force la colonne created_at avec la vraie date de l'objet
+      final Map<String, dynamic> sessionMap = Map.from(session.toMap());
+      sessionMap['created_at'] = session.createdAt.toIso8601String();
+
       await txn.insert(
         AppConstants.sessionsTable,
-        session.toMap(),
+        sessionMap, // On utilise notre map corrigée au lieu de session.toMap() direct !
         conflictAlgorithm: ConflictAlgorithm.replace,
       );
 
@@ -367,17 +380,71 @@ class DatabaseHelper {
       limit: limit,
       offset: offset,
     );
+    if (sessionMaps.isEmpty) return [];
 
-    final sessions = <Session>[];
+    // 3 requêtes groupées au lieu d'une cascade par session puis par analyse
-    for (final sessionMap in sessionMaps) {
+    // (N+1) : l'ancien code refaisait un getSession complet pour chaque ligne,
-      final sessionId = sessionMap['id'] as String;
+    // ce qui ralentissait l'accueil/historique/stats au fil des mois.
-      final session = await getSession(sessionId);
+    final sessionIds = sessionMaps.map((m) => m['id'] as String).toList();
-      if (session != null) {
+    final analysisMaps = await _queryIn(
-        sessions.add(session);
+      db,
-      }
+      AppConstants.targetAnalysesTable,
+      'session_id',
+      sessionIds,
+    );
+    final analysisIds = analysisMaps.map((m) => m['id'] as String).toList();
+    final shotMaps = await _queryIn(
+      db,
+      AppConstants.shotsTable,
+      'analysis_id',
+      analysisIds,
+    );
+
+    final shotsByAnalysis = <String, List<Shot>>{};
+    for (final map in shotMaps) {
+      (shotsByAnalysis[map['analysis_id'] as String] ??= [])
+          .add(Shot.fromMap(map));
     }
 
-    return sessions;
+    final analysesBySession = <String, List<TargetAnalysis>>{};
+    for (final map in analysisMaps) {
+      final analysis = TargetAnalysis.fromMap(
+        map,
+        shotsByAnalysis[map['id'] as String] ?? [],
+      );
+      (analysesBySession[map['session_id'] as String] ??= []).add(analysis);
+    }
+
+    return sessionMaps
+        .map((m) =>
+            Session.fromMap(m, analysesBySession[m['id'] as String] ?? []))
+        .toList();
+  }
+
+  /// SELECT * FROM [table] WHERE [column] IN (values), découpé par paquets
+  /// de 500 pour rester sous la limite de variables d'une requête SQLite (999).
+  Future<List<Map<String, Object?>>> _queryIn(
+    Database db,
+    String table,
+    String column,
+    List<String> values,
+  ) async {
+    if (values.isEmpty) return [];
+    const chunkSize = 500;
+    final results = <Map<String, Object?>>[];
+    for (var i = 0; i < values.length; i += chunkSize) {
+      final chunk = values.sublist(
+        i,
+        i + chunkSize > values.length ? values.length : i + chunkSize,
+      );
+      final placeholders = List.filled(chunk.length, '?').join(',');
+      results.addAll(await db.query(
+        table,
+        where: '$column IN ($placeholders)',
+        whereArgs: chunk,
+      ));
+    }
+    return results;
   }
 
   Future<int> deleteSession(String id) async {
@@ -504,6 +571,16 @@ class DatabaseHelper {
     return Sqflite.firstIntValue(result) ?? 0;
   }
 
+  Future<int> getSessionCountForWeapon(String weaponId) async {
+    final db = await database;
+    final result = await db.rawQuery('''
+      SELECT COUNT(id) as count
+      FROM ${AppConstants.sessionsTable}
+      WHERE weapon_id = ?
+    ''', [weaponId]);
+    return Sqflite.firstIntValue(result) ?? 0;
+  }
+
   Future<int> insertMaintenance(MaintenanceEntry entry) async {
     final db = await database;
     return await db.insert(
@@ -537,5 +614,6 @@ class DatabaseHelper {
     final db = await database;
     await db.close();
     _database = null;
+    _initFuture = null;
   }
 }

lib/data/repositories/session_repository.dart

@@ -27,6 +27,7 @@ class SessionRepository {
     required List<TargetAnalysis> analyses,
     String? notes,
     int distance = 25,
+    DateTime? date,
   }) async {
     final session = Session(
       id: id ?? _uuid.v4(),
@@ -34,7 +35,7 @@ class SessionRepository {
       weaponId: weaponId,
       maxShotsPerTarget: maxShotsPerTarget,
       analyses: analyses,
-      createdAt: DateTime.now(),
+      createdAt: date ?? DateTime.now(),
       notes: notes,
       distance: distance,
     );
@@ -181,18 +182,23 @@ class SessionRepository {
     return await _databaseHelper.getRoundsFiredForWeapon(weaponId);
   }
 
+  Future<int> getSessionCountForWeapon(String weaponId) async {
+    return await _databaseHelper.getSessionCountForWeapon(weaponId);
+  }
+
   Future<void> addMaintenanceEntry({
     required String weaponId,
     required MaintenanceType type,
     required String description,
     int? roundsSinceLast,
+    DateTime? date,
   }) async {
     final entry = MaintenanceEntry(
       id: _uuid.v4(),
       weaponId: weaponId,
       type: type,
       description: description,
-      date: DateTime.now(),
+      date: date ?? DateTime.now(),
       roundsSinceLastMaintenance: roundsSinceLast,
     );
     await _databaseHelper.insertMaintenance(entry);

lib/features/analysis/analysis_provider.dart

@@ -1,8 +1,8 @@
 /// Gestionnaire d'état pour l'analyse des cibles (ChangeNotifier).
 ///
-/// Gère le workflow complet d'analyse : chargement d'image, détection de cible,
+/// Gère le workflow complet d'analyse : chargement d'image, gestion des
-/// gestion des impacts (manuels et automatiques), calcul des scores,
+/// impacts placés manuellement, calcul des scores, analyse de groupement
-/// analyse de groupement et sauvegarde des sessions.
+/// et sauvegarde des sessions.
 library;
 
 import 'dart:io';
@@ -13,44 +13,35 @@ import '../../data/models/target_analysis.dart';
 import '../../data/models/shot.dart';
 import '../../data/models/target_type.dart';
 import '../../data/repositories/session_repository.dart';
-import '../../services/target_detection_service.dart';
 import '../../services/score_calculator_service.dart';
 import '../../services/grouping_analyzer_service.dart';
-import '../../services/distortion_correction_service.dart';
-import '../../services/opencv_target_service.dart';
 import '../../services/ai_export_service.dart';
 
 enum AnalysisState { initial, loading, success, error }
 
 class AnalysisProvider extends ChangeNotifier {
-  final TargetDetectionService _detectionService;
   final ScoreCalculatorService _scoreCalculatorService;
   final GroupingAnalyzerService _groupingAnalyzerService;
   final SessionRepository _sessionRepository;
-  final DistortionCorrectionService _distortionService;
-  final OpenCVTargetService _opencvTargetService;
   final Uuid _uuid = const Uuid();
 
   AnalysisProvider({
-    required TargetDetectionService detectionService,
     required ScoreCalculatorService scoreCalculatorService,
     required GroupingAnalyzerService groupingAnalyzerService,
     required SessionRepository sessionRepository,
-    DistortionCorrectionService? distortionService,
+  })  : _scoreCalculatorService = scoreCalculatorService,
-    OpenCVTargetService? opencvTargetService,
+        _groupingAnalyzerService = groupingAnalyzerService,
-  }) : _detectionService = detectionService,
+        _sessionRepository = sessionRepository;
-       _scoreCalculatorService = scoreCalculatorService,
-       _groupingAnalyzerService = groupingAnalyzerService,
-       _sessionRepository = sessionRepository,
-       _distortionService = distortionService ?? DistortionCorrectionService(),
-       _opencvTargetService = opencvTargetService ?? OpenCVTargetService();
 
   AnalysisState _state = AnalysisState.initial;
   String? _errorMessage;
   String? _imagePath;
   TargetType? _targetType;
 
-  // Target detection results
+  // AJOUT PROTECTION DU PLOTTING : Stockage permanent de la rotation du Crop
+  double _cropRotation = 0.0;
+
+  // Target calibration
   double _targetCenterX = 0.5;
   double _targetCenterY = 0.5;
   double _targetRadius = 0.4;
@@ -68,20 +59,12 @@ class AnalysisProvider extends ChangeNotifier {
   // Grouping results
   GroupingResult? _groupingResult;
 
-  // Reference-based detection
-  List<Shot> _referenceImpacts = [];
-  ImpactCharacteristics? _learnedCharacteristics;
-
-  // Distortion correction
-  bool _distortionCorrectionEnabled = false;
-  DistortionParameters? _distortionParams;
-  String? _correctedImagePath;
-
   // Getters
   AnalysisState get state => _state;
   String? get errorMessage => _errorMessage;
   String? get imagePath => _imagePath;
   TargetType? get targetType => _targetType;
+  double get cropRotation => _cropRotation; // Getter pour le Plotting
   double get targetCenterX => _targetCenterX;
   double get targetCenterY => _targetCenterY;
   double get targetRadius => _targetRadius;
@@ -96,30 +79,18 @@ class AnalysisProvider extends ChangeNotifier {
 
   int get totalScore => _scoreResult?.totalScore ?? 0;
   int get shotCount => _shots.length;
-  List<Shot> get referenceImpacts => List.unmodifiable(_referenceImpacts);
-  ImpactCharacteristics? get learnedCharacteristics => _learnedCharacteristics;
-  bool get hasLearnedCharacteristics => _learnedCharacteristics != null;
 
-  // Distortion correction getters
+  /// Modifie et mémorise la rotation de l'image pour le Plotting
-  bool get distortionCorrectionEnabled => _distortionCorrectionEnabled;
+  void setCropRotation(double rotation) {
-  DistortionParameters? get distortionParams => _distortionParams;
+    _cropRotation = rotation;
-  String? get correctedImagePath => _correctedImagePath;
+    notifyListeners();
-  bool get hasDistortion => _distortionParams?.needsCorrection ?? false;
+  }
 
-  /// Retourne le chemin de l'image à afficher (corrigée si activée, originale sinon)
+  /// Charge l'image et initialise les paramètres de cible par défaut.
-  String? get displayImagePath =>
+  /// Le placement des impacts et la calibration se font ensuite manuellement.
-      _distortionCorrectionEnabled && _correctedImagePath != null
-      ? _correctedImagePath
-      : _imagePath;
-
-  /// Analyze an image
-  ///
-  /// [autoAnalyze] determines if we should run automatic detection immediately.
-  /// If false, only the image is loaded and default target parameters are set.
   Future<void> analyzeImage(
     String imagePath,
     TargetType targetType, {
-    bool autoAnalyze = true,
     Offset? manualCenter,
   }) async {
     _state = AnalysisState.loading;
@@ -137,52 +108,12 @@ class AnalysisProvider extends ChangeNotifier {
       _imageAspectRatio = frame.image.width / frame.image.height;
       frame.image.dispose();
 
-      if (!autoAnalyze) {
+      _targetCenterX = manualCenter?.dx ?? 0.5;
-        // Just setup default values without running detection
+      _targetCenterY = manualCenter?.dy ?? 0.5;
-        _targetCenterX = manualCenter?.dx ?? 0.5;
+      _targetRadius = 0.4;
-        _targetCenterY = manualCenter?.dy ?? 0.5;
+      _targetInnerRadius = 0.04;
-        _targetRadius = 0.4;
-        _targetInnerRadius = 0.04;
 
-        // Initialize empty shots list
+      _shots = [];
-        _shots = [];
-
-        _state = AnalysisState.success;
-        notifyListeners();
-        return;
-      }
-
-      // Detect target and impacts
-      final result = _detectionService.detectTarget(imagePath, targetType);
-
-      if (!result.success) {
-        _state = AnalysisState.error;
-        _errorMessage = result.errorMessage;
-        notifyListeners();
-        return;
-      }
-
-      _targetCenterX = result.centerX;
-      _targetCenterY = result.centerY;
-      _targetRadius = result.radius;
-      _targetInnerRadius = result.radius * 0.1;
-
-      // Create shots from detected impacts
-      _shots = result.impacts.map((impact) {
-        return Shot(
-          id: _uuid.v4(),
-          x: impact.x,
-          y: impact.y,
-          score: impact.suggestedScore,
-          analysisId: '', // Will be set when saving
-        );
-      }).toList();
-
-      // Calculate scores
-      _recalculateScores();
-
-      // Calculate grouping
-      _recalculateGrouping();
 
       _state = AnalysisState.success;
       notifyListeners();
@@ -204,22 +135,18 @@ class AnalysisProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Remove a shot
+  /// Efface tous les impacts en un clic (bouton ↻ de l'écran Plotting).
-  void removeShot(String shotId) {
+  /// La calibration (centre, rayon, anneaux) n'est pas touchée.
-    _shots.removeWhere((shot) => shot.id == shotId);
+  void clearShots() {
+    _shots.clear();
     _recalculateScores();
     _recalculateGrouping();
     notifyListeners();
   }
 
-  /// Move a shot to a new position
+  /// Remove a shot
-  void moveShot(String shotId, double newX, double newY) {
+  void removeShot(String shotId) {
-    final index = _shots.indexWhere((shot) => shot.id == shotId);
+    _shots.removeWhere((shot) => shot.id == shotId);
-    if (index == -1) return;
-
-    final newScore = _calculateShotScore(newX, newY);
-    _shots[index] = _shots[index].copyWith(x: newX, y: newY, score: newScore);
-
     _recalculateScores();
     _recalculateGrouping();
     notifyListeners();
@@ -235,265 +162,6 @@ class AnalysisProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Auto-detect impacts using image processing
-  Future<int> autoDetectImpacts({
-    int darkThreshold = 80,
-    int minImpactSize = 20,
-    int maxImpactSize = 500,
-    double minCircularity = 0.6,
-    double minFillRatio = 0.5,
-    bool clearExisting = false,
-  }) async {
-    if (_imagePath == null || _targetType == null) return 0;
-
-    final settings = ImpactDetectionSettings(
-      darkThreshold: darkThreshold,
-      minImpactSize: minImpactSize,
-      maxImpactSize: maxImpactSize,
-      minCircularity: minCircularity,
-      minFillRatio: minFillRatio,
-    );
-
-    final detectedImpacts = _detectionService.detectImpactsOnly(
-      _imagePath!,
-      _targetType!,
-      _targetCenterX,
-      _targetCenterY,
-      _targetRadius,
-      _ringCount,
-      settings,
-    );
-
-    if (clearExisting) {
-      _shots.clear();
-    }
-
-    // Add detected impacts as shots
-    for (final impact in detectedImpacts) {
-      final score = _calculateShotScore(impact.x, impact.y);
-      final shot = Shot(
-        id: _uuid.v4(),
-        x: impact.x,
-        y: impact.y,
-        score: score,
-        analysisId: '',
-      );
-      _shots.add(shot);
-    }
-
-    _recalculateScores();
-    _recalculateGrouping();
-    notifyListeners();
-
-    return detectedImpacts.length;
-  }
-
-  /// Auto-detect impacts using OpenCV (Hough Circles + Contours)
-  Future<int> autoDetectImpactsWithOpenCV({
-    double cannyThreshold1 = 50,
-    double cannyThreshold2 = 150,
-    double minDist = 20,
-    double param1 = 100,
-    double param2 = 30,
-    int minRadius = 5,
-    int maxRadius = 50,
-    int minSize = 5,
-    int maxSize = 1000,
-    int blurSize = 5,
-    bool useContourDetection = true,
-    double minCircularity = 0.6,
-    double minContourArea = 50,
-    double maxContourArea = 5000,
-    bool clearExisting = false,
-  }) async {
-    if (_imagePath == null || _targetType == null) return 0;
-
-    final settings = OpenCVDetectionSettings(
-      cannyThreshold1: cannyThreshold1,
-      cannyThreshold2: cannyThreshold2,
-      minDist: minDist,
-      param1: param1,
-      param2: param2,
-      minRadius: minRadius,
-      maxRadius: maxRadius,
-      blurSize: blurSize,
-      useContourDetection: useContourDetection,
-      minCircularity: minCircularity,
-      minContourArea: minContourArea,
-      maxContourArea: maxContourArea,
-    );
-
-    final detectedImpacts = _detectionService.detectImpactsWithOpenCV(
-      _imagePath!,
-      _targetType!,
-      _targetCenterX,
-      _targetCenterY,
-      _targetRadius,
-      _ringCount,
-      settings: settings,
-    );
-
-    if (clearExisting) {
-      _shots.clear();
-    }
-
-    // Add detected impacts as shots
-    for (final impact in detectedImpacts) {
-      final score = _calculateShotScore(impact.x, impact.y);
-      final shot = Shot(
-        id: _uuid.v4(),
-        x: impact.x,
-        y: impact.y,
-        score: score,
-        analysisId: '',
-      );
-      _shots.add(shot);
-    }
-
-    _recalculateScores();
-    _recalculateGrouping();
-    notifyListeners();
-
-    return detectedImpacts.length;
-  }
-
-  /// Detect impacts with OpenCV using reference points
-  Future<int> detectFromReferencesWithOpenCV({
-    double tolerance = 2.0,
-    bool clearExisting = false,
-  }) async {
-    if (_imagePath == null ||
-        _targetType == null ||
-        _referenceImpacts.length < 2) {
-      return 0;
-    }
-
-    // Convertir les références
-    final references = _referenceImpacts
-        .map((shot) => ReferenceImpact(x: shot.x, y: shot.y))
-        .toList();
-
-    final detectedImpacts = _detectionService
-        .detectImpactsWithOpenCVFromReferences(
-          _imagePath!,
-          _targetType!,
-          _targetCenterX,
-          _targetCenterY,
-          _targetRadius,
-          _ringCount,
-          references,
-          tolerance: tolerance,
-        );
-
-    if (clearExisting) {
-      _shots.clear();
-    }
-
-    // Add detected impacts as shots
-    for (final impact in detectedImpacts) {
-      final score = _calculateShotScore(impact.x, impact.y);
-      final shot = Shot(
-        id: _uuid.v4(),
-        x: impact.x,
-        y: impact.y,
-        score: score,
-        analysisId: '',
-      );
-      _shots.add(shot);
-    }
-
-    _recalculateScores();
-    _recalculateGrouping();
-    notifyListeners();
-
-    return detectedImpacts.length;
-  }
-
-  /// Add a reference impact for calibrated detection
-  void addReferenceImpact(double x, double y) {
-    final score = _calculateShotScore(x, y);
-    final shot = Shot(id: _uuid.v4(), x: x, y: y, score: score, analysisId: '');
-    _referenceImpacts.add(shot);
-    notifyListeners();
-  }
-
-  /// Remove a reference impact
-  void removeReferenceImpact(String shotId) {
-    _referenceImpacts.removeWhere((shot) => shot.id == shotId);
-    _learnedCharacteristics = null;
-    notifyListeners();
-  }
-
-  /// Clear all reference impacts
-  void clearReferenceImpacts() {
-    _referenceImpacts.clear();
-    _learnedCharacteristics = null;
-    notifyListeners();
-  }
-
-  /// Learn characteristics from reference impacts
-  bool learnFromReferences() {
-    if (_imagePath == null || _referenceImpacts.length < 2) return false;
-
-    final references = _referenceImpacts
-        .map((shot) => ReferenceImpact(x: shot.x, y: shot.y))
-        .toList();
-
-    _learnedCharacteristics = _detectionService.analyzeReferenceImpacts(
-      _imagePath!,
-      references,
-    );
-
-    notifyListeners();
-    return _learnedCharacteristics != null;
-  }
-
-  /// Auto-detect impacts using learned reference characteristics
-  Future<int> detectFromReferences({
-    double tolerance = 2.0,
-    bool clearExisting = false,
-  }) async {
-    if (_imagePath == null ||
-        _targetType == null ||
-        _learnedCharacteristics == null) {
-      return 0;
-    }
-
-    final detectedImpacts = _detectionService.detectImpactsFromReferences(
-      _imagePath!,
-      _targetType!,
-      _targetCenterX,
-      _targetCenterY,
-      _targetRadius,
-      _ringCount,
-      _learnedCharacteristics!,
-      tolerance: tolerance,
-    );
-
-    if (clearExisting) {
-      _shots.clear();
-    }
-
-    // Add detected impacts as shots
-    for (final impact in detectedImpacts) {
-      final score = _calculateShotScore(impact.x, impact.y);
-      final shot = Shot(
-        id: _uuid.v4(),
-        x: impact.x,
-        y: impact.y,
-        score: score,
-        analysisId: '',
-      );
-      _shots.add(shot);
-    }
-
-    _recalculateScores();
-    _recalculateGrouping();
-    notifyListeners();
-
-    return detectedImpacts.length;
-  }
-
   /// Adjust target position
   void adjustTargetPosition(
     double centerX,
@@ -502,17 +170,20 @@ class AnalysisProvider extends ChangeNotifier {
     double radius, {
     int? ringCount,
     List<double>? ringRadii,
+    double zoomScale = 1.0,
+    Offset offset = Offset.zero,
   }) {
-    _targetCenterX = centerX;
+    _targetCenterX = (centerX - offset.dx) / zoomScale;
-    _targetCenterY = centerY;
+    _targetCenterY = (centerY - offset.dy) / zoomScale;
-    _targetInnerRadius = innerRadius;
+    _targetRadius = radius / zoomScale;
-    _targetRadius = radius;
+    _targetInnerRadius = innerRadius / zoomScale;
+
     if (ringCount != null) {
       _ringCount = ringCount;
     }
-    if (ringRadii != null) {
+
-      _ringRadii = ringRadii;
+    // CORRECTION : On accepte désormais la valeur null pour pouvoir réinitialiser l'espacement !
-    }
+    _ringRadii = ringRadii;
 
     // Recalculate all shot scores based on new target position
     _shots = _shots.map((shot) {
@@ -524,119 +195,6 @@ class AnalysisProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Auto-calibrate target using OpenCV
-  Future<bool> autoCalibrateTarget() async {
-    if (_imagePath == null) return false;
-
-    try {
-      // 1. Attempt to correct perspective/distortion first
-      final correctedPath = await _distortionService
-          .correctPerspectiveWithConcentricMesh(_imagePath!);
-
-      if (correctedPath != _imagePath) {
-        _imagePath = correctedPath;
-        _correctedImagePath = correctedPath;
-        _distortionCorrectionEnabled = true;
-        _imageAspectRatio =
-            1.0; // The corrected image is always square (side x side)
-        notifyListeners();
-      }
-
-      // 2. Detect the target on the straight/corrected image
-      final result = await _opencvTargetService.detectTarget(_imagePath!);
-
-      if (result.success) {
-        adjustTargetPosition(
-          result.centerX,
-          result.centerY,
-          result.radius * 0.1,
-          result.radius,
-        );
-        return true;
-      }
-      return false;
-    } catch (e) {
-      debugPrint('Auto-calibration error: $e');
-      return false;
-    }
-  }
-
-  /// Calcule les paramètres de distorsion basés sur la calibration actuelle
-  void calculateDistortion() {
-    _distortionParams = _distortionService.calculateDistortionFromCalibration(
-      targetCenterX: _targetCenterX,
-      targetCenterY: _targetCenterY,
-      targetRadius: _targetRadius,
-      imageAspectRatio: _imageAspectRatio,
-    );
-    notifyListeners();
-  }
-
-  /// Applique la correction de distorsion à l'image
-  /// Crée une nouvelle image corrigée et la sauvegarde
-  Future<void> applyDistortionCorrection() async {
-    if (_imagePath == null || _distortionParams == null) return;
-
-    try {
-      _correctedImagePath = await _distortionService.applyCorrection(
-        _imagePath!,
-        _distortionParams!,
-      );
-      _distortionCorrectionEnabled = true;
-      notifyListeners();
-    } catch (e) {
-      _errorMessage = 'Erreur lors de la correction: $e';
-      notifyListeners();
-    }
-  }
-
-  /// Active ou désactive l'affichage de l'image corrigée
-  void setDistortionCorrectionEnabled(bool enabled) {
-    if (enabled && _correctedImagePath == null && _distortionParams != null) {
-      // Si on active mais pas encore d'image corrigée, la créer
-      applyDistortionCorrection();
-    } else {
-      _distortionCorrectionEnabled = enabled;
-      notifyListeners();
-    }
-  }
-
-  /// Calcule ET applique la correction pour un feedback immédiat
-  Future<void> calculateAndApplyDistortion() async {
-    // 1. Calcul des paramètres (votre code actuel)
-    _distortionParams = _distortionService.calculateDistortionFromCalibration(
-      targetCenterX: _targetCenterX,
-      targetCenterY: _targetCenterY,
-      targetRadius: _targetRadius,
-      imageAspectRatio: _imageAspectRatio,
-    );
-
-    // 2. Vérification si une correction est réellement nécessaire
-    if (_distortionParams != null && _distortionParams!.needsCorrection) {
-      // 3. Application immédiate de la transformation (méthode asynchrone)
-      await applyDistortionCorrection();
-    } else {
-      notifyListeners(); // On prévient quand même si pas de correction
-    }
-  }
-
-  Future<void> runFullDistortionWorkflow() async {
-    _state = AnalysisState.loading; // Affiche un spinner sur votre UI
-    notifyListeners();
-
-    try {
-      calculateDistortion(); // Calcule les paramètres
-      await applyDistortionCorrection(); // Génère le fichier corrigé
-      _distortionCorrectionEnabled = true; // Active l'affichage
-      _state = AnalysisState.success;
-    } catch (e) {
-      _errorMessage = "Erreur de rendu : $e";
-      _state = AnalysisState.error;
-    } finally {
-      notifyListeners();
-    }
-  }
-
   int _calculateShotScore(double x, double y) {
     if (_targetType == TargetType.concentric) {
       return _scoreCalculatorService.calculateConcentricScore(
@@ -680,32 +238,35 @@ class AnalysisProvider extends ChangeNotifier {
     _groupingResult = _groupingAnalyzerService.analyzeGrouping(_shots);
   }
 
-  /// Exporte l'image et le json vers le backend IA
+  /// Exporte l'image et le json vers le backend IA.
-  Future<bool> exportToAiBackend() async {
+  /// [sessionId], [distance] et [weapon] proviennent du SessionProvider de
+  /// l'écran appelant, pour que le dataset contienne les vraies métadonnées.
+  Future<bool> exportToAiBackend({
+    String? sessionId,
+    int? distance,
+    String? weapon,
+  }) async {
     if (_imagePath == null || _targetType == null) {
-      _errorMessage = "Impossible d'exporter : image ou type de cible manquant.";
+      _errorMessage = "Impossible d'export : image ou type de cible manquant.";
       notifyListeners();
       return false;
     }
 
-    // Identifiant d'analyse temporaire
+    final service = AiExportService();
-    final analysisId = _shots.isNotEmpty && _shots.first.analysisId.isNotEmpty
-        ? _shots.first.analysisId
-        : 'analysis_${DateTime.now().millisecondsSinceEpoch}';
-
-    final service = AiExportService(); // Local instanciation for simplicity
 
     _state = AnalysisState.loading;
     notifyListeners();
 
     final success = await service.exportData(
       imagePath: _imagePath!,
-      sessionId: 'export',
+      sessionId: sessionId ?? 'export',
       targetType: _targetType!,
       targetCenterX: _targetCenterX,
       targetCenterY: _targetCenterY,
       targetRadius: _targetRadius,
       shots: _shots,
+      distanceMeters: distance ?? 25,
+      weaponName: weapon ?? 'Unknown',
     );
 
     _state = AnalysisState.success;
@@ -716,13 +277,14 @@ class AnalysisProvider extends ChangeNotifier {
     return success;
   }
 
-  /// Save the session (legacy standalone flow)
+  /// Save the session
   Future<TargetAnalysis> saveSession({
     String? notes,
     String? sessionId,
     String? weaponName,
     String? weaponId,
     int? distance,
+    DateTime? date,
   }) async {
     if (_imagePath == null || _targetType == null) {
       throw Exception('Cannot save: missing image or target type');
@@ -746,8 +308,12 @@ class AnalysisProvider extends ChangeNotifier {
     if (sessionId != null && sessionId != 'standalone') {
       final existingSession = await _sessionRepository.getSession(sessionId);
       if (existingSession != null) {
-        await _sessionRepository.addAnalysisToSession(sessionId, targetAnalysis);
+        await _sessionRepository.addAnalysisToSession(
+          sessionId,
+          targetAnalysis,
+        );
       } else {
+        // CORRECTION : Utilise la date injectée plutôt que DateTime.now()
         await _sessionRepository.createSession(
           id: sessionId,
           weapon: weaponName ?? 'Inconnue',
@@ -756,9 +322,11 @@ class AnalysisProvider extends ChangeNotifier {
           analyses: [targetAnalysis],
           notes: notes,
           distance: distance ?? 25,
+          date: date ?? DateTime.now(),
         );
       }
     } else {
+      // CORRECTION : S'applique aussi au flux alternatif sans ID préalable
       await _sessionRepository.createSession(
         weapon: weaponName ?? 'Inconnue',
         weaponId: weaponId,
@@ -766,6 +334,7 @@ class AnalysisProvider extends ChangeNotifier {
         analyses: [targetAnalysis],
         notes: notes,
         distance: distance ?? 25,
+        date: date ?? DateTime.now(),
       );
     }
 
@@ -779,6 +348,7 @@ class AnalysisProvider extends ChangeNotifier {
     _errorMessage = null;
     _imagePath = null;
     _targetType = null;
+    _cropRotation = 0.0;
     _targetCenterX = 0.5;
     _targetCenterY = 0.5;
     _targetRadius = 0.4;
@@ -789,11 +359,25 @@ class AnalysisProvider extends ChangeNotifier {
     _shots = [];
     _scoreResult = null;
     _groupingResult = null;
-    _referenceImpacts = [];
-    _learnedCharacteristics = null;
-    _distortionCorrectionEnabled = false;
-    _distortionParams = null;
-    _correctedImagePath = null;
     notifyListeners();
   }
+
+  /// Met à jour la position d'un impact de tir en direct (Glisser-Déposer).
+  void updateShotPosition(String shotId, double newX, double newY) {
+    final index = _shots.indexWhere((s) => s.id == shotId);
+    if (index != -1) {
+      // 1. On calcule dynamiquement le nouveau score de la zone survolée
+      final newScore = _calculateShotScore(newX, newY);
+
+      // 2. On remplace l'ancien impact par le nouveau avec ses coordonnées et son score ajustés
+      _shots[index] = _shots[index].copyWith(x: newX, y: newY, score: newScore);
+
+      // 3. On applique les deux méthodes natives de recalcul de ton application
+      _recalculateScores();
+      _recalculateGrouping();
+
+      // 4. On demande à l'écran de se redessiner en direct
+      notifyListeners();
+    }
+  }
 }

lib/features/analysis/analysis_screen.dart

@@ -1,71 +1,101 @@
-/// Écran principal d'analyse - Interface centrale de traitement des cibles.
+/// Écran principal de Plotting et d'analyse - Interface centrale de traitement des cibles.
 ///
-/// Affiche la cible avec overlay des anneaux et impacts détectés.
+/// Affiche d'abord la calibration de la cible, puis l'overlay des anneaux et impacts détectés.
-/// Permet la calibration, l'ajout manuel d'impacts, la détection automatique,
+/// Permet le calcul des scores et statistiques de groupement (Plotting).
-/// et le calcul des scores et statistiques de groupement.
 library;
 
 import 'dart:io';
+import 'dart:math' as math;
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+
 import '../../core/constants/app_constants.dart';
 import '../../core/theme/app_theme.dart';
 import '../../data/models/target_type.dart';
-import '../../data/models/shot.dart';
 import '../../data/repositories/session_repository.dart';
-import '../../services/target_detection_service.dart';
 import '../../services/score_calculator_service.dart';
 import '../../services/grouping_analyzer_service.dart';
 import '../../services/wallet_identity_service.dart';
 import '../session/session_provider.dart';
 import 'analysis_provider.dart';
+import 'impact_editor_screen.dart';
 import '../crop/crop_screen.dart';
 import '../capture/capture_screen.dart';
 import 'widgets/target_overlay.dart';
 import 'widgets/target_calibration.dart';
 import 'widgets/score_card.dart';
 import 'widgets/grouping_stats.dart';
+import 'widgets/shot_details_sheet.dart';
 
 class AnalysisScreen extends StatelessWidget {
   final String imagePath;
+  final String? originalImagePath; // AJOUT : image source avant le crop à 85%
   final TargetType targetType;
-  final Offset? targetCenter;
+  final double? initialCenterX;
+  final double? initialCenterY;
   final double? cropScale;
   final Offset? cropOffset;
+  final double? cropRotation; // Reçu proprement depuis le CropScreen
 
   const AnalysisScreen({
     super.key,
     required this.imagePath,
+    this.originalImagePath, // AJOUT
     required this.targetType,
-    this.targetCenter,
+    this.initialCenterX,
+    this.initialCenterY,
     this.cropScale,
     this.cropOffset,
+    this.cropRotation,
   });
 
   @override
   Widget build(BuildContext context) {
+    // Reconstitution de l'Offset pour le traitement métier en arrière-plan
+    final manualCenterOffset =
+    (initialCenterX != null && initialCenterY != null)
+        ? Offset(initialCenterX!, initialCenterY!)
+        : null;
+
     return ChangeNotifierProvider(
-      create: (context) => AnalysisProvider(
+      create: (context) {
-        detectionService: context.read<TargetDetectionService>(),
+        final p = AnalysisProvider(
-        scoreCalculatorService: context.read<ScoreCalculatorService>(),
+          scoreCalculatorService: context.read<ScoreCalculatorService>(),
-        groupingAnalyzerService: context.read<GroupingAnalyzerService>(),
+          groupingAnalyzerService: context.read<GroupingAnalyzerService>(),
-        sessionRepository: context.read<SessionRepository>(),
+          sessionRepository: context.read<SessionRepository>(),
-      )..analyzeImage(imagePath, targetType, autoAnalyze: false, manualCenter: targetCenter),
+        );
+        // Sauvegarde de l'angle de rotation d'origine directement dans l'état global
+        if (cropRotation != null) {
+          p.setCropRotation(cropRotation!);
+        }
+        p.analyzeImage(
+          imagePath,
+          targetType,
+          manualCenter: manualCenterOffset,
+        );
+        return p;
+      },
       child: _AnalysisScreenContent(
+        originalImagePath: originalImagePath, // AJOUT
         cropScale: cropScale,
         cropOffset: cropOffset,
+        cropRotation: cropRotation, // Envoyé à la structure d'affichage
       ),
     );
   }
 }
 
 class _AnalysisScreenContent extends StatefulWidget {
+  final String? originalImagePath; // AJOUT
   final double? cropScale;
   final Offset? cropOffset;
+  final double? cropRotation;
 
   const _AnalysisScreenContent({
+    this.originalImagePath, // AJOUT
     this.cropScale,
     this.cropOffset,
+    this.cropRotation,
   });
 
   @override
@@ -73,14 +103,16 @@ class _AnalysisScreenContent extends StatefulWidget {
 }
 
 class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
-  final GlobalKey<TargetCalibrationState> _calibrationKey = GlobalKey<TargetCalibrationState>();
+  final GlobalKey<TargetCalibrationState> _calibrationKey =
-  bool _isCalibrating = false;
+  GlobalKey<TargetCalibrationState>();
-  bool _isSelectingReferences = false;
+
-  bool _isFullscreenEditMode = false;
+  // Forcé à TRUE pour démarrer sur l'ajustement des cercles
+  bool _isCalibrating = true;
   bool _isAtBottom = false;
+
   final ScrollController _scrollController = ScrollController();
   final TransformationController _transformationController =
-      TransformationController();
+  TransformationController();
   final GlobalKey _imageKey = GlobalKey();
   double _currentZoomScale = 1.0;
 
@@ -93,10 +125,9 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
 
   void _onScroll() {
     if (!_scrollController.hasClients) return;
-    // Detect if we are near the bottom (within 20 pixels of the specific spacing we added)
     final isBottom =
         _scrollController.position.pixels >=
-        _scrollController.position.maxScrollExtent - 20;
+            _scrollController.position.maxScrollExtent - 20;
     if (isBottom != _isAtBottom) {
       setState(() {
         _isAtBottom = isBottom;
@@ -122,13 +153,69 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
     }
   }
 
+  /// Repasse en mode calibration en réinitialisant le zoom de l'InteractiveViewer.
+  ///
+  /// Sans cette remise à zéro, le facteur de zoom accumulé en mode Plotting
+  /// persiste dans le TransformationController et se réapplique au retour,
+  /// ce qui faisait "zoomer" légèrement la photo. On repart donc toujours
+  /// d'une transformation identité (zoom 1.0).
+  void _enterCalibration() {
+    _transformationController.value = Matrix4.identity();
+    _currentZoomScale = 1.0;
+    setState(() => _isCalibrating = true);
+  }
+
+  /// Ouvre l'éditeur d'impacts (plein écran) en PARTAGEANT le provider courant.
+  ///
+  /// On utilise ChangeNotifierProvider.value pour que l'éditeur lise et modifie
+  /// exactement le même AnalysisProvider que cet écran : les impacts ajoutés,
+  /// déplacés ou supprimés sont donc immédiatement répercutés ici.
+  ///
+  /// Au retour : si l'utilisateur a validé (résultat true) on bascule en mode
+  /// Plotting (lecture seule) ; sinon on repasse en calibration.
+  Future<void> _openImpactEditor(AnalysisProvider provider) async {
+    final validated = await Navigator.of(context).push<bool>(
+      MaterialPageRoute(
+        builder: (_) => ChangeNotifierProvider<AnalysisProvider>.value(
+          value: provider,
+          child: const ImpactEditorScreen(),
+        ),
+      ),
+    );
+
+    if (!mounted) return;
+
+    if (validated == true) {
+      setState(() {
+        _isCalibrating = false;
+      });
+    } else {
+      _enterCalibration();
+    }
+  }
+
+  /// Chemin à utiliser pour repartir dans le CropScreen lors d'un retour arrière.
+  ///
+  /// On privilégie TOUJOURS l'image source non rognée (originalImagePath).
+  /// Repartir de l'image déjà croppée à 85% provoquait un rognage cumulatif
+  /// (0.85 x 0.85 x ...) qui re-zoomait la photo à chaque aller-retour
+  /// entre la capture/crop et la calibration.
+  String _backCropImagePath(AnalysisProvider provider) {
+    return widget.originalImagePath ?? provider.imagePath!;
+  }
+
   @override
   Widget build(BuildContext context) {
     final provider = context.watch<AnalysisProvider>();
     final sessionProvider = context.watch<SessionProvider>();
-    final targetNumber = sessionProvider.isSessionActive ? sessionProvider.targetCount + 1 : null;
+    final targetNumber = sessionProvider.isSessionActive
-    final titlePrefix = _isCalibrating ? 'Calibration' : 'Analyse';
+        ? sessionProvider.targetCount + 1
-    final title = targetNumber != null ? '$titlePrefix - Cible $targetNumber' : ( _isCalibrating ? 'Calibration' : 'Analyse de Tir');
+        : null;
+
+    final titlePrefix = _isCalibrating ? 'Calibration' : 'Plotting';
+    final title = targetNumber != null
+        ? '$titlePrefix - Cible $targetNumber'
+        : (_isCalibrating ? 'Calibration' : 'Plotting du Tir');
 
     return Scaffold(
       appBar: AppBar(
@@ -137,41 +224,104 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
           icon: const Icon(Icons.arrow_back),
           onPressed: () {
             if (_isCalibrating) {
-              setState(() => _isCalibrating = false);
-            } else if (_isSelectingReferences) {
-              setState(() => _isSelectingReferences = false);
-            } else {
-              // Return to crop screen instead of popping to capture
               final provider = context.read<AnalysisProvider>();
-              final path = provider.imagePath!;
-              final type = provider.targetType!;
-              
               Navigator.pushReplacement(
                 context,
                 MaterialPageRoute(
                   builder: (context) => CropScreen(
-                    imagePath: path,
+                    // CORRECTION : on repart de l'image SOURCE (non rognée) pour
-                    targetType: type,
+                    // éviter le rognage cumulatif à 85% qui re-zoomait à chaque retour.
+                    imagePath: _backCropImagePath(provider),
+                    targetType: provider.targetType!,
                     initialScale: widget.cropScale,
                     initialOffset: widget.cropOffset,
                   ),
                 ),
               );
+            } else {
+              // Retour Plotting -> Calibration : on réinitialise le zoom.
+              _enterCalibration();
             }
           },
         ),
         actions: [
-          if (!_isCalibrating && !_isSelectingReferences)
+          // Remise à zéro des impacts : efface tous les impacts en un clic,
+          // sans modifier la calibration (centre, rayon, anneaux).
+          if (!_isCalibrating)
             IconButton(
               icon: const Icon(Icons.refresh),
-              onPressed: () => provider.analyzeImage(context.read<AnalysisProvider>().imagePath!, context.read<AnalysisProvider>().targetType!),
+              tooltip: 'Effacer tous les impacts',
+              onPressed: () => provider.clearShots(),
+            ),
+          // Nuage d'export vers le backend IA : visible uniquement si l'analyse
+          // a réussi ET que l'utilisateur a activé l'option dans les Paramètres.
+          if (!_isCalibrating)
+            FutureBuilder<bool>(
+              future: WalletIdentityService().isUploadEnabled(),
+              builder: (context, snapshot) {
+                final isEnabled = snapshot.data ?? false;
+                if (!isEnabled ||
+                    provider.state != AnalysisState.success) {
+                  return const SizedBox.shrink();
+                }
+                return IconButton(
+                  icon: const Icon(Icons.cloud_upload),
+                  tooltip: 'Exporter pour IA',
+                  onPressed: () async {
+                    final p = context.read<AnalysisProvider>();
+                    if (p.state != AnalysisState.success) return;
+
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(content: Text('Exportation en cours...')),
+                    );
+
+                    // Métadonnées réelles de la session en cours (distance,
+                    // arme) plutôt que les placeholders par défaut.
+                    final sp = context.read<SessionProvider>();
+                    final success = await p.exportToAiBackend(
+                      sessionId: sp.activeSessionId,
+                      distance: sp.distance,
+                      weapon: sp.currentWeapon,
+                    );
+
+                    if (!context.mounted) return;
+                    ScaffoldMessenger.of(context).hideCurrentSnackBar();
+                    if (success) {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        const SnackBar(
+                          content: Text('Export réussi vers le backend IA !'),
+                          backgroundColor: AppTheme.successColor,
+                        ),
+                      );
+                    } else {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(
+                          content:
+                              Text(p.errorMessage ?? 'Erreur d\'export'),
+                          backgroundColor: AppTheme.errorColor,
+                        ),
+                      );
+                    }
+                  },
+                );
+              },
             ),
           if (_isCalibrating)
             TextButton(
-              onPressed: () => setState(() => _isCalibrating = false),
+              onPressed: () {
+                // On fige la calibration courante AVANT d'ouvrir l'éditeur,
+                // puis on passe sur l'écran d'édition d'impacts plein écran
+                // (zoom fiable + placement). Le mode Plotting (lecture seule)
+                // s'affichera au retour si l'utilisateur valide.
+                _calibrationKey.currentState?.commitCalibration();
+                _openImpactEditor(context.read<AnalysisProvider>());
+              },
               child: const Text(
-                'TERMINER',
+                'VALIDER',
-                style: TextStyle(color: Colors.white),
+                style: TextStyle(
+                  color: Colors.white,
+                  fontWeight: FontWeight.bold,
+                ),
               ),
             ),
         ],
@@ -182,7 +332,6 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
             controller: _scrollController,
             child: Column(
               children: [
-                // Session info header
                 Padding(
                   padding: const EdgeInsets.all(AppConstants.defaultPadding),
                   child: Column(
@@ -199,57 +348,95 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                   ),
                 ),
 
-                // Target image with overlay or calibration
                 AspectRatio(
                   aspectRatio: provider.imageAspectRatio,
                   child: _isCalibrating
                       ? Stack(
-                          fit: StackFit.expand,
+                    fit: StackFit.expand,
-                          children: [
+                    children: [
-                            Image.file(
+                      ClipRect(
-                              File(provider.imagePath!),
+                        child: Builder(
-                              fit: BoxFit.fill,
+                          builder: (context) {
-                            ),
+                            return Transform(
-                            TargetCalibration(
+                              transform: Matrix4.identity()
-                              key: _calibrationKey,
+                                ..setTranslationRaw(
-                              initialCenterX: provider.targetCenterX,
+                                  widget.cropOffset?.dx ?? 0.0,
-                              initialCenterY: provider.targetCenterY,
+                                  widget.cropOffset?.dy ?? 0.0,
-                              initialRadius: provider.targetRadius,
+                                  0.0,
-                              initialInnerRadius: provider.targetInnerRadius,
+                                )
-                              initialRingCount: provider.ringCount,
+                                ..rotateZ(
-                              initialRingRadii: provider.ringRadii,
+                                  (provider.cropRotation) *
-                              targetType: provider.targetType!,
+                                      (math.pi / 180),
-                              onCalibrationChanged:
+                                ),
-                                  (
+                              alignment: Alignment.center,
-                                    centerX,
+                              child: Image.file(
-                                    centerY,
+                                File(provider.imagePath!),
-                                    innerRadius,
+                                fit: BoxFit.contain,
-                                    radius,
+                              ),
-                                    ringCount, {
+                            );
-                                    List<double>? ringRadii,
+                          },
-                                  }) {
+                        ),
-                                    provider.adjustTargetPosition(
+                      ),
-                                      centerX,
+                      TargetCalibration(
-                                      centerY,
+                        key: _calibrationKey,
-                                      innerRadius,
+                        initialCenterX: provider.targetCenterX,
-                                      radius,
+                        initialCenterY: provider.targetCenterY,
-                                      ringCount: ringCount,
+                        initialRadius: provider.targetRadius,
-                                      ringRadii: ringRadii,
+                        initialInnerRadius: provider.targetInnerRadius,
-                                    );
+                        initialRingCount: provider.ringCount,
-                                  },
+                        initialRingRadii: provider.ringRadii,
-                            ),
+                        targetType: provider.targetType!,
-                          ],
+                        onCalibrationChanged:
-                        )
+                            (
-                      : _buildZoomableImageWithOverlay(context, provider),
+                            centerX,
+                            centerY,
+                            innerRadius,
+                            radius,
+                            ringCount, {
+                          ringRadii,
+                        }) {
+                          provider.adjustTargetPosition(
+                            centerX,
+                            centerY,
+                            innerRadius,
+                            radius,
+                            ringCount: ringCount,
+                            ringRadii: ringRadii,
+                            zoomScale: 1.0,
+                          );
+                        },
+                      ),
+                    ],
+                  )
+                      : _buildReadOnlyPlotImage(context, provider),
                 ),
 
-                // Info cards or Calibration info
                 if (!_isCalibrating)
                   Padding(
                     padding: const EdgeInsets.all(AppConstants.defaultPadding),
                     child: Column(
                       children: [
-                        // Calibration button
+                        Card(
+                          color: AppTheme.primaryColor.withValues(alpha: 0.18),
+                          child: ListTile(
+                            leading: const Icon(
+                              Icons.edit_location_alt,
+                              color: AppTheme.primaryColor,
+                            ),
+                            title: const Text('Modifier les impacts'),
+                            subtitle: const Text(
+                              'Ajouter, déplacer ou supprimer des impacts (plein écran)',
+                            ),
+                            trailing: const Icon(
+                              Icons.open_in_full,
+                              size: 16,
+                            ),
+                            // Rouvre l'éditeur plein écran en partageant le provider.
+                            onTap: () =>
+                                _openImpactEditor(context.read<AnalysisProvider>()),
+                          ),
+                        ),
+                        const SizedBox(height: 12),
                         Card(
                           color: AppTheme.primaryColor.withValues(alpha: 0.1),
                           child: ListTile(
@@ -257,20 +444,19 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                               Icons.tune,
                               color: AppTheme.primaryColor,
                             ),
-                            title: const Text('Calibrer la cible'),
+                            title: const Text('Ajuster la calibration'),
                             subtitle: const Text(
-                              'Ajustez le centre et la taille',
+                              'Modifier le centre ou le rayon global',
                             ),
                             trailing: const Icon(
                               Icons.arrow_forward_ios,
                               size: 16,
                             ),
-                            onTap: () => setState(() => _isCalibrating = true),
+                            // Retour vers la calibration : on réinitialise le zoom.
+                            onTap: () => _enterCalibration(),
                           ),
                         ),
                         const SizedBox(height: 12),
-
-                        // Score card
                         ScoreCard(
                           totalScore: provider.totalScore,
                           shotCount: provider.shotCount,
@@ -278,8 +464,6 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                           targetType: provider.targetType!,
                         ),
                         const SizedBox(height: 12),
-
-                        // Grouping stats
                         if (provider.groupingResult != null &&
                             provider.shotCount > 1)
                           GroupingStats(
@@ -287,23 +471,15 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                             targetCenterX: provider.targetCenterX,
                             targetCenterY: provider.targetCenterY,
                           ),
-
-                        const SizedBox(height: 12),
-
-                        // Action buttons
-                        _buildActionButtons(context, provider),
-
                         const SizedBox(height: 50),
                       ],
                     ),
                   )
                 else
-                  // Calibration info WITH directional arrows ABOVE the card
                   Padding(
                     padding: const EdgeInsets.all(AppConstants.defaultPadding),
                     child: Column(
                       children: [
-                        // Fleches de micro-ajustement AU DESSUS du bloc
                         const Text(
                           'Ajustement precis (pixel par pixel)',
                           style: TextStyle(
@@ -317,13 +493,16 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                           child: Builder(
                             builder: (context) {
                               final size = MediaQuery.of(context).size;
-                              return _calibrationKey.currentState?.buildDirectionalControls(context, size) 
+                              return _calibrationKey.currentState
-                                  ?? const SizedBox.shrink();
+                                  ?.buildDirectionalControls(
-                            }
+                                context,
+                                size,
+                              ) ??
+                                  const SizedBox.shrink();
+                            },
                           ),
                         ),
                         const SizedBox(height: 16),
-                        
                         Card(
                           child: Padding(
                             padding: const EdgeInsets.all(16),
@@ -340,15 +519,15 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                                 const SizedBox(height: 12),
                                 _buildInstructionItem(
                                   Icons.open_with,
-                                  'Glissez le centre (croix bleue) pour positionner le centre de la cible',
+                                  'Glissez le centre pour positionner le centre de la cible',
                                 ),
                                 _buildInstructionItem(
                                   Icons.zoom_out_map,
-                                  'Glissez le bord (cercle orange) pour ajuster la taille de la cible',
+                                  'Pincez l\'ecran a 2 doigts ou utilisez la jauge pour la taille',
                                 ),
                                 _buildInstructionItem(
                                   Icons.visibility,
-                                  'Les zones de score sont affichees en transparence',
+                                  'Appuyez sur TERMINER en haut a droite pour valider',
                                 ),
                                 const SizedBox(height: 16),
                                 Row(
@@ -398,11 +577,12 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                 child: _isCalibrating
                     ? const SizedBox.shrink()
                     : FloatingActionButton.extended(
-                        onPressed: () => _showSaveSessionDialog(context, provider),
+                  onPressed: () =>
-                        backgroundColor: AppTheme.primaryColor,
+                      _showSaveSessionDialog(context, provider),
-                        icon: const Icon(Icons.save),
+                  backgroundColor: AppTheme.primaryColor,
-                        label: const Text('TERMINER LA SESSION'),
+                  icon: const Icon(Icons.save),
-                      ),
+                  label: const Text('TERMINER LA SESSION'),
+                ),
               ),
             ),
           ),
@@ -418,145 +598,55 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
         children: [
           Icon(icon, size: 16, color: AppTheme.primaryColor),
           const SizedBox(width: 8),
-          Expanded(
+          Expanded(child: Text(text, style: const TextStyle(fontSize: 13))),
-            child: Text(
-              text,
-              style: const TextStyle(fontSize: 13),
-            ),
-          ),
         ],
       ),
     );
   }
 
-  Widget _buildZoomableImageWithOverlay(
+  /// Affichage du plotting en LECTURE SEULE.
-    BuildContext context,
+  ///
-    AnalysisProvider provider,
+  /// L'édition (ajout / déplacement / suppression) se fait désormais
-  ) {
+  /// exclusivement dans l'éditeur plein écran (ImpactEditorScreen). Ici on se
+  /// contente d'afficher l'image + l'overlay, avec un zoom de consultation.
+  /// Le tap sur un impact ouvre simplement ses détails.
+  Widget _buildReadOnlyPlotImage(
+      BuildContext context,
+      AnalysisProvider provider,
+      ) {
     return InteractiveViewer(
       transformationController: _transformationController,
       minScale: 1.0,
       maxScale: 10.0,
-      boundaryMargin: const EdgeInsets.all(double.infinity),
+      boundaryMargin: const EdgeInsets.all(80),
+      panEnabled: true,
       child: Stack(
         children: [
           Image.file(
             File(provider.imagePath!),
             key: _imageKey,
-            fit: BoxFit.fill,
+            fit: BoxFit.contain,
           ),
-          TargetOverlay(
+          Positioned.fill(
-            targetCenterX: provider.targetCenterX,
+            child: TargetOverlay(
-            targetCenterY: provider.targetCenterY,
+              targetCenterX: provider.targetCenterX,
-            targetRadius: provider.targetRadius,
+              targetCenterY: provider.targetCenterY,
-            targetType: provider.targetType!,
+              targetRadius: provider.targetRadius,
-            shots: provider.shots,
+              targetType: provider.targetType!,
-            showRings: true,
+              shots: provider.shots,
-            zoomScale: _currentZoomScale,
+              showRings: true,
-            onShotTapped: (shot) => _showShotDetails(context, provider, shot),
+              zoomScale: _currentZoomScale,
-            onAddShot: (relX, relY) => provider.addShot(relX, relY),
+              // Lecture seule : tap sur impact -> détails (consultation).
+              onShotTapped: (shot) =>
+                  showShotDetailsSheet(context, provider, shot),
+            ),
           ),
         ],
       ),
     );
   }
 
-  Widget _buildActionButtons(BuildContext context, AnalysisProvider provider) {
-    return Column(
-      children: [
-        Row(
-          children: [
-            /*Expanded(
-              child: ElevatedButton.icon(
-                onPressed: null, // Desactive selon demande
-                icon: const Icon(Icons.auto_awesome),
-                label: const Text('AUTO DÉTECTER'),
-                style: ElevatedButton.styleFrom(
-                  backgroundColor: Colors.grey,
-                ),
-              ),
-            ),
-            const SizedBox(width: 12),
-            Expanded(
-              child: ElevatedButton.icon(
-                onPressed: null, // Desactive selon demande
-                icon: const Icon(Icons.straighten),
-                label: const Text('PAR RÉFÉRENCE'),
-                style: ElevatedButton.styleFrom(
-                  backgroundColor: Colors.grey,
-                ),
-              ),
-            ),*/
-          ],
-        ),
-      ],
-    );
-  }
-
-  void _showShotDetails(
-    BuildContext context,
-    AnalysisProvider provider,
-    Shot shot,
-  ) {
-    showModalBottomSheet(
-      context: context,
-      builder: (context) => Container(
-        padding: const EdgeInsets.all(24),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(
-              'Impact #${provider.shots.indexOf(shot) + 1}',
-              style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
-            ),
-            Text(
-              'ID: ${shot.id}',
-              style: Theme.of(context).textTheme.bodySmall?.copyWith(color: Colors.grey, fontSize: 10),
-            ),
-            const SizedBox(height: 16),
-            ListTile(
-              leading: const Icon(Icons.score),
-              title: const Text('Modifier le score'),
-              trailing: DropdownButton<int>(
-                value: shot.score.clamp(0, 10),
-                items: List.generate(11, (index) => index)
-                    .map((s) => DropdownMenuItem(
-                          value: s,
-                          child: Text('$s', style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18)),
-                        ))
-                    .toList(),
-                onChanged: (newScore) {
-                  if (newScore != null) {
-                    provider.updateShotScore(shot.id, newScore);
-                    Navigator.pop(context); // Ferme pour valider
-                  }
-                },
-              ),
-            ),
-            const SizedBox(height: 24),
-            Row(
-              children: [
-                Expanded(
-                  child: OutlinedButton.icon(
-                    onPressed: () {
-                      provider.removeShot(shot.id);
-                      Navigator.pop(context);
-                    },
-                    icon: const Icon(Icons.delete, color: Colors.red),
-                    label: const Text('SUPPRIMER', style: TextStyle(color: Colors.red)),
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
   void _showSaveSessionDialog(BuildContext context, AnalysisProvider provider) {
-    final sessionProvider = context.read<SessionProvider>();
-    
     showDialog(
       context: context,
       builder: (context) => AlertDialog(
@@ -574,9 +664,9 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
         actions: [
           TextButton(
             onPressed: () {
-              Navigator.pop(context); // Close dialog
+              Navigator.pop(context);
-              
+              // CORRECTION : on repart aussi de l'image SOURCE non rognée ici.
-              final path = provider.imagePath!;
+              final path = _backCropImagePath(provider);
               final type = provider.targetType!;
 
               Navigator.pushReplacement(
@@ -602,24 +692,28 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                   weaponName: sessionProvider.currentWeapon,
                   weaponId: sessionProvider.currentWeaponId,
                   distance: sessionProvider.distance,
+                  date: sessionProvider.sessionDate,
                 );
 
-                // Mettre à jour le provider de session pour incrémenter le compteur
                 sessionProvider.addAnalysis(analysis);
 
                 if (context.mounted) {
-                  Navigator.pop(context); // Close dialog
+                  Navigator.pop(context);
-                  // Go back to capture screen for a new target in the same session context
                   Navigator.pushAndRemoveUntil(
                     context,
-                    MaterialPageRoute(builder: (context) => const CaptureScreen()),
+                    MaterialPageRoute(
-                    (route) => route.isFirst,
+                      builder: (context) => const CaptureScreen(),
+                    ),
+                        (route) => route.isFirst,
                   );
                 }
               } catch (e) {
                 if (context.mounted) {
                   ScaffoldMessenger.of(context).showSnackBar(
-                    SnackBar(content: Text('Erreur: $e'), backgroundColor: AppTheme.errorColor),
+                    SnackBar(
+                      content: Text('Erreur: $e'),
+                      backgroundColor: AppTheme.errorColor,
+                    ),
                   );
                 }
               }
@@ -635,20 +729,21 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                   weaponName: sessionProvider.currentWeapon,
                   weaponId: sessionProvider.currentWeaponId,
                   distance: sessionProvider.distance,
+                  date: sessionProvider.sessionDate,
                 );
 
                 if (context.mounted) {
-                  // Important: Marquer la session comme terminée dans le provider global
                   sessionProvider.endSession();
-                  
+                  Navigator.pop(context);
-                  Navigator.pop(context); // Ferme le dialogue
-                  // Retourne à l'accueil (premier écran)
                   Navigator.of(context).popUntil((route) => route.isFirst);
                 }
               } catch (e) {
                 if (context.mounted) {
                   ScaffoldMessenger.of(context).showSnackBar(
-                    SnackBar(content: Text('Erreur: $e'), backgroundColor: AppTheme.errorColor),
+                    SnackBar(
+                      content: Text('Erreur: $e'),
+                      backgroundColor: AppTheme.errorColor,
+                    ),
                   );
                 }
               }

lib/features/analysis/impact_editor_screen.dart

@@ -0,0 +1,209 @@
+/// Écran d'édition des impacts — PLEIN ÉCRAN dédié au zoom et au placement.
+///
+/// Cet écran est volontairement minimal : un Scaffold dont le body est
+/// directement un InteractiveViewer (sans SingleScrollView ni AspectRatio
+/// contraint autour). C'est la configuration la plus fiable pour le pinch :
+/// l'InteractiveViewer reçoit les deux doigts sans concurrence avec un
+/// scroll vertical ou une transformation parente.
+///
+/// Interactions :
+///   - Tap sur zone vide      -> ajoute un impact
+///   - Tap sur un impact      -> ouvre l'édition (score / suppression)
+///   - Appui long + glisser   -> déplace l'impact
+///
+/// L'état des impacts est partagé avec l'écran d'analyse via le MÊME
+/// AnalysisProvider (passé en ChangeNotifierProvider.value côté appelant).
+library;
+
+import 'dart:io';
+import 'dart:math' as math;
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../data/models/shot.dart';
+import 'analysis_provider.dart';
+import 'widgets/target_overlay.dart';
+import 'widgets/shot_details_sheet.dart';
+
+class ImpactEditorScreen extends StatefulWidget {
+  const ImpactEditorScreen({super.key});
+
+  @override
+  State<ImpactEditorScreen> createState() => _ImpactEditorScreenState();
+}
+
+class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
+  final TransformationController _transformationController =
+  TransformationController();
+  final GlobalKey _imageKey = GlobalKey();
+
+  double _currentZoomScale = 1.0;
+  String? _movingShotId;
+
+  @override
+  void initState() {
+    super.initState();
+    _transformationController.addListener(_onTransformChanged);
+  }
+
+  @override
+  void dispose() {
+    _transformationController.removeListener(_onTransformChanged);
+    _transformationController.dispose();
+    super.dispose();
+  }
+
+  void _onTransformChanged() {
+    final scale = _transformationController.value.getMaxScaleOnAxis();
+    if (scale != _currentZoomScale) {
+      setState(() => _currentZoomScale = scale);
+    }
+  }
+
+  /// Convertit une position globale en coordonnées relatives (0..1) sur l'image.
+  Offset? _toImageRelative(Offset globalPosition) {
+    final RenderBox? box =
+    _imageKey.currentContext?.findRenderObject() as RenderBox?;
+    if (box == null) return null;
+    final local = box.globalToLocal(globalPosition);
+    final relX = (local.dx / box.size.width).clamp(0.0, 1.0);
+    final relY = (local.dy / box.size.height).clamp(0.0, 1.0);
+    return Offset(relX, relY);
+  }
+
+  /// Renvoie l'impact le plus proche de [rel] dans la tolérance, sinon null.
+  Shot? _hitTestShot(AnalysisProvider provider, Offset rel,
+      {double tolerance = 0.04}) {
+    Shot? closest;
+    double minDistance = double.infinity;
+    for (final shot in provider.shots) {
+      final dx = shot.x - rel.dx;
+      final dy = shot.y - rel.dy;
+      final distance = math.sqrt(dx * dx + dy * dy);
+      if (distance < minDistance && distance < tolerance) {
+        minDistance = distance;
+        closest = shot;
+      }
+    }
+    return closest;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final provider = context.watch<AnalysisProvider>();
+
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        backgroundColor: Colors.black,
+        title: Text('Placement des impacts (${provider.shotCount})'),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          tooltip: 'Retour à la calibration',
+          onPressed: () => Navigator.pop(context, false),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, true),
+            child: const Text(
+              'VALIDER',
+              style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
+            ),
+          ),
+        ],
+      ),
+      body: Column(
+        children: [
+          // Bandeau d'aide compact
+          Container(
+            width: double.infinity,
+            color: Colors.white10,
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+            child: const Text(
+              'Tap : ajouter • Tap sur impact : éditer • Appui long : déplacer • Pincer : zoomer',
+              style: TextStyle(color: Colors.white70, fontSize: 12),
+              textAlign: TextAlign.center,
+            ),
+          ),
+
+          // Zone image plein écran : InteractiveViewer dans un body nu.
+          Expanded(
+            child: InteractiveViewer(
+              transformationController: _transformationController,
+              minScale: 1.0,
+              maxScale: 12.0,
+              boundaryMargin: const EdgeInsets.all(80),
+              panEnabled: _movingShotId == null,
+              child: Center(
+                child: GestureDetector(
+                  behavior: HitTestBehavior.opaque,
+                  // TAP : éditer si on touche un impact, sinon ajouter.
+                  onTapUp: (details) {
+                    if (_movingShotId != null) return;
+                    final rel = _toImageRelative(details.globalPosition);
+                    if (rel == null) return;
+
+                    final hit = _hitTestShot(provider, rel);
+                    if (hit != null) {
+                      showShotDetailsSheet(context, provider, hit);
+                    } else {
+                      provider.addShot(rel.dx, rel.dy);
+                    }
+                  },
+                  // APPUI LONG : on saisit l'impact le plus proche pour le déplacer.
+                  onLongPressStart: (details) {
+                    final rel = _toImageRelative(details.globalPosition);
+                    if (rel == null) return;
+                    final hit = _hitTestShot(provider, rel, tolerance: 0.06);
+                    if (hit != null) {
+                      setState(() => _movingShotId = hit.id);
+                    }
+                  },
+                  onLongPressMoveUpdate: (details) {
+                    if (_movingShotId == null) return;
+                    // Décalage pour que l'impact reste visible au-dessus du doigt.
+                    final adjusted =
+                        details.globalPosition + const Offset(-25, -35);
+                    final rel = _toImageRelative(adjusted);
+                    if (rel == null) return;
+                    provider.updateShotPosition(
+                        _movingShotId!, rel.dx, rel.dy);
+                  },
+                  onLongPressEnd: (_) {
+                    if (_movingShotId != null) {
+                      setState(() => _movingShotId = null);
+                    }
+                  },
+                  child: Stack(
+                    children: [
+                      Image.file(
+                        File(provider.imagePath!),
+                        key: _imageKey,
+                        fit: BoxFit.contain,
+                      ),
+                      Positioned.fill(
+                        child: TargetOverlay(
+                          targetCenterX: provider.targetCenterX,
+                          targetCenterY: provider.targetCenterY,
+                          targetRadius: provider.targetRadius,
+                          targetType: provider.targetType!,
+                          shots: provider.shots,
+                          showRings: true,
+                          zoomScale: _currentZoomScale,
+                          // L'ajout et la sélection sont gérés par le
+                          // GestureDetector parent ci-dessus.
+                          onShotTapped: (shot) =>
+                              showShotDetailsSheet(context, provider, shot),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/analysis/widgets/grouping_stats.dart

@@ -7,6 +7,7 @@ library;
 import 'package:flutter/material.dart';
 import '../../../core/constants/app_constants.dart';
 import '../../../core/theme/app_theme.dart';
+import '../../../core/widgets/metric_info_button.dart';
 import '../../../services/grouping_analyzer_service.dart';
 
 class GroupingStats extends StatelessWidget {
@@ -43,31 +44,64 @@ class GroupingStats extends StatelessWidget {
                     fontWeight: FontWeight.bold,
                   ),
                 ),
+                const MetricInfoButton(
+                  title: 'Groupement',
+                  explanations: [
+                    MetricExplanation(
+                      'Étalement',
+                      'Distance entre vos deux impacts les plus éloignés, '
+                          'exprimée en % de la largeur de l\'image. Plus c\'est '
+                          'bas, plus le groupement est serré.',
+                    ),
+                    MetricExplanation(
+                      'Dispersion',
+                      'Régularité des impacts autour de leur centre commun '
+                          '(écart-type). Plus c\'est bas, plus vos tirs sont '
+                          'réguliers.',
+                    ),
+                    MetricExplanation(
+                      'Décalage',
+                      'Direction du centre de votre groupement par rapport au '
+                          'centre de la cible (ex. « Droite » = vos tirs sont '
+                          'globalement décalés vers la droite).',
+                    ),
+                    MetricExplanation(
+                      'Étoiles',
+                      'Qualité globale du groupement, de ★ (à améliorer) à '
+                          '★★★★★ (excellent).',
+                    ),
+                  ],
+                ),
                 const Spacer(),
                 _buildQualityBadge(context),
               ],
             ),
             const Divider(),
             Row(
-              mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: [
-                _buildStat(
+                Expanded(
-                  context,
+                  child: _buildStat(
-                  'Diametre',
+                    context,
-                  '${(groupingResult.diameter * 100).toStringAsFixed(1)}%',
+                    'Étalement',
-                  icon: Icons.straighten,
+                    '${(groupingResult.diameter * 100).toStringAsFixed(1)}%',
+                    icon: Icons.straighten,
+                  ),
                 ),
-                _buildStat(
+                Expanded(
-                  context,
+                  child: _buildStat(
-                  'Dispersion',
+                    context,
-                  '${(groupingResult.standardDeviation * 100).toStringAsFixed(1)}%',
+                    'Dispersion',
-                  icon: Icons.scatter_plot,
+                    '${(groupingResult.standardDeviation * 100).toStringAsFixed(1)}%',
+                    icon: Icons.scatter_plot,
+                  ),
                 ),
-                _buildStat(
+                Expanded(
-                  context,
+                  child: _buildStat(
-                  'Decalage',
+                    context,
-                  offsetDescription,
+                    'Décalage',
-                  icon: Icons.compare_arrows,
+                    offsetDescription,
+                    icon: Icons.compare_arrows,
+                  ),
                 ),
               ],
             ),
@@ -125,12 +159,14 @@ class GroupingStats extends StatelessWidget {
         const SizedBox(height: 4),
         Text(
           value,
+          textAlign: TextAlign.center,
           style: Theme.of(context).textTheme.titleMedium?.copyWith(
             fontWeight: FontWeight.bold,
           ),
         ),
         Text(
           label,
+          textAlign: TextAlign.center,
           style: Theme.of(context).textTheme.bodySmall,
         ),
       ],
@@ -252,22 +288,22 @@ class GroupingStats extends StatelessWidget {
 
   String _getOffsetDescription(double offsetX, double offsetY) {
     if (offsetX.abs() < 0.02 && offsetY.abs() < 0.02) {
-      return 'Centre';
+      return 'Centré';
     }
 
     String vertical = '';
     String horizontal = '';
 
     if (offsetY < -0.02) {
-      vertical = 'H';
+      vertical = 'Haut';
     } else if (offsetY > 0.02) {
-      vertical = 'B';
+      vertical = 'Bas';
     }
 
     if (offsetX < -0.02) {
-      horizontal = 'G';
+      horizontal = 'Gauche';
     } else if (offsetX > 0.02) {
-      horizontal = 'D';
+      horizontal = 'Droite';
     }
 
     if (vertical.isNotEmpty && horizontal.isNotEmpty) {

lib/features/analysis/widgets/score_card.dart

@@ -7,6 +7,7 @@ library;
 import 'package:flutter/material.dart';
 import '../../../core/constants/app_constants.dart';
 import '../../../core/theme/app_theme.dart';
+import '../../../core/widgets/metric_info_button.dart';
 import '../../../data/models/target_type.dart';
 import '../../../services/score_calculator_service.dart';
 
@@ -44,6 +45,31 @@ class ScoreCard extends StatelessWidget {
                     fontWeight: FontWeight.bold,
                   ),
                 ),
+                const Spacer(),
+                MetricInfoButton(
+                  title: 'Score',
+                  explanations: [
+                    MetricExplanation(
+                      'Total',
+                      'Somme des points de tous vos impacts, sur le maximum '
+                          'possible (nombre d\'impacts × $maxScore points).',
+                    ),
+                    const MetricExplanation(
+                      'Impacts',
+                      'Nombre de tirs détectés sur la cible.',
+                    ),
+                    MetricExplanation(
+                      'Moyenne',
+                      'Points marqués en moyenne par impact, sur $maxScore.',
+                    ),
+                    const MetricExplanation(
+                      'Réussite',
+                      'Votre score exprimé en pourcentage du score maximum '
+                          'possible. C\'est une mesure du résultat, pas de la '
+                          'régularité des tirs.',
+                    ),
+                  ],
+                ),
               ],
             ),
             const Divider(),
@@ -67,11 +93,12 @@ class ScoreCard extends StatelessWidget {
                   shotCount > 0
                       ? (totalScore / shotCount).toStringAsFixed(1)
                       : '-',
+                  subtitle: '/ $maxScore',
                 ),
                 if (scoreResult != null)
                   _buildScoreStat(
                     context,
-                    'Pourcentage',
+                    'Réussite',
                     '${scoreResult!.percentage.toStringAsFixed(0)}%',
                   ),
               ],

lib/features/analysis/widgets/shot_details_sheet.dart

@@ -0,0 +1,85 @@
+/// Bottom sheet de détails d'un impact : modification du score et suppression.
+///
+/// Partagée entre l'écran d'analyse (consultation du plotting) et l'éditeur
+/// d'impacts plein écran, qui opèrent sur le même AnalysisProvider.
+library;
+
+import 'package:flutter/material.dart';
+
+import '../../../data/models/shot.dart';
+import '../analysis_provider.dart';
+
+void showShotDetailsSheet(
+  BuildContext context,
+  AnalysisProvider provider,
+  Shot shot,
+) {
+  showModalBottomSheet(
+    context: context,
+    builder: (context) => Container(
+      padding: const EdgeInsets.all(24),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(
+            'Impact #${provider.shots.indexOf(shot) + 1}',
+            style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
+          ),
+          Text(
+            'ID: ${shot.id}',
+            style: Theme.of(context)
+                .textTheme
+                .bodySmall
+                ?.copyWith(color: Colors.grey, fontSize: 10),
+          ),
+          const SizedBox(height: 16),
+          ListTile(
+            leading: const Icon(Icons.score),
+            title: const Text('Modifier le score'),
+            trailing: DropdownButton<int>(
+              value: shot.score.clamp(0, 10),
+              items: List.generate(11, (index) => index)
+                  .map(
+                    (s) => DropdownMenuItem(
+                      value: s,
+                      child: Text(
+                        '$s',
+                        style: const TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 18,
+                        ),
+                      ),
+                    ),
+                  )
+                  .toList(),
+              onChanged: (newScore) {
+                if (newScore != null) {
+                  provider.updateShotScore(shot.id, newScore);
+                  Navigator.pop(context);
+                }
+              },
+            ),
+          ),
+          const SizedBox(height: 24),
+          Row(
+            children: [
+              Expanded(
+                child: OutlinedButton.icon(
+                  onPressed: () {
+                    provider.removeShot(shot.id);
+                    Navigator.pop(context);
+                  },
+                  icon: const Icon(Icons.delete, color: Colors.red),
+                  label: const Text(
+                    'SUPPRIMER',
+                    style: TextStyle(color: Colors.red),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    ),
+  );
+}

lib/features/analysis/widgets/target_calibration.dart

@@ -4,7 +4,7 @@
 /// Les anneaux sont répartis proportionnellement.
 library;
 
-import 'dart:math' as math;
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import '../../../core/theme/app_theme.dart';
 import '../../../data/models/target_type.dart';
@@ -18,13 +18,13 @@ class TargetCalibration extends StatefulWidget {
   final TargetType targetType;
   final List<double>? initialRingRadii;
   final Function(
-    double centerX,
+      double centerX,
-    double centerY,
+      double centerY,
-    double innerRadius,
+      double innerRadius,
-    double radius,
+      double radius,
-    int ringCount, {
+      int ringCount, {
-    List<double>? ringRadii,
+      List<double>? ringRadii,
-  })
+      })
   onCalibrationChanged;
 
   const TargetCalibration({
@@ -51,10 +51,19 @@ class TargetCalibrationState extends State<TargetCalibration> {
   late int _ringCount;
   late List<double> _ringRadii;
 
+  // Variable dédiée pour piloter la jauge orange sans conflit
+  late double _currentEspacementRatio;
+
   bool _isDraggingCenter = false;
   bool _isDraggingRadius = false;
   bool _isDraggingInnerRadius = false;
 
+  bool _showEspacement = false;
+  double _baseRadiusBeforeScale = 1.0;
+
+  // SAUVEGARDE CRITIQUE : Pour mémoriser la structure d'origine de l'IA
+  List<double>? _originalRingRadii;
+
   @override
   void initState() {
     super.initState();
@@ -63,19 +72,37 @@ class TargetCalibrationState extends State<TargetCalibration> {
     _radius = widget.initialRadius;
     _innerRadius = widget.initialInnerRadius;
     _ringCount = widget.initialRingCount;
+
+    // On mémorise la configuration d'usine de l'image
+    if (widget.initialRingRadii != null) {
+      _originalRingRadii = List.from(widget.initialRingRadii!);
+    }
+
+    // Initialisation du ratio par défaut
+    _currentEspacementRatio = (_radius > 0) ? (_innerRadius / _radius).clamp(0.01, 0.70) : 0.1;
     _initRingRadii();
   }
 
+  /// Fige et propage la calibration courante vers le provider.
+  ///
+  /// Appelée par l'écran d'analyse (via GlobalKey) juste avant de basculer
+  /// dans l'instance de Plotting, pour garantir que l'état affiché en Plotting
+  /// correspond exactement au dernier réglage validé, sans dépendre d'un
+  /// éventuel rebuild intermédiaire.
+  void commitCalibration() {
+    _notifyChange();
+  }
+
   void _initRingRadii({bool forceRecalculate = false}) {
-    if (!forceRecalculate && widget.initialRingRadii != null &&
+    // CORRECTION : Si on ne recalcule pas activement l'espacement linéaire, on préserve en priorité la structure d'origine
-        widget.initialRingRadii!.length == _ringCount) {
+    if (!forceRecalculate && _originalRingRadii != null && _originalRingRadii!.length == _ringCount) {
+      _ringRadii = List.from(_originalRingRadii!);
+    } else if (!forceRecalculate && widget.initialRingRadii != null && widget.initialRingRadii!.length == _ringCount) {
       _ringRadii = List.from(widget.initialRingRadii!);
     } else {
-      // Initialize with default proportional radii interpolated between inner and outer
       _ringRadii = List.generate(_ringCount, (i) {
         if (_ringCount <= 1) return 1.0;
-        final ratio = _innerRadius / _radius;
+        return _currentEspacementRatio + (1.0 - _currentEspacementRatio) * i / (_ringCount - 1);
-        return ratio + (1.0 - ratio) * i / (_ringCount - 1);
       });
     }
   }
@@ -85,12 +112,10 @@ class TargetCalibrationState extends State<TargetCalibration> {
     super.didUpdateWidget(oldWidget);
     bool shouldReinit = false;
 
-    if (widget.initialCenterX != oldWidget.initialCenterX &&
+    if (widget.initialCenterX != oldWidget.initialCenterX && !_isDraggingCenter) {
-        !_isDraggingCenter) {
       _centerX = widget.initialCenterX;
     }
-    if (widget.initialCenterY != oldWidget.initialCenterY &&
+    if (widget.initialCenterY != oldWidget.initialCenterY && !_isDraggingCenter) {
-        !_isDraggingCenter) {
       _centerY = widget.initialCenterY;
     }
     if (widget.initialRingCount != oldWidget.initialRingCount) {
@@ -101,12 +126,20 @@ class TargetCalibrationState extends State<TargetCalibration> {
       _radius = widget.initialRadius;
       shouldReinit = true;
     }
-    if (widget.initialInnerRadius != oldWidget.initialInnerRadius &&
+    if (widget.initialInnerRadius != oldWidget.initialInnerRadius && !_isDraggingInnerRadius) {
-        !_isDraggingInnerRadius) {
       _innerRadius = widget.initialInnerRadius;
+      _currentEspacementRatio = (_radius > 0) ? (_innerRadius / _radius).clamp(0.01, 0.70) : 0.1;
       shouldReinit = true;
     }
-    if (widget.initialRingRadii != oldWidget.initialRingRadii) {
+    // On ne rafraîchit le profil d'usine que si les rayons entrants proviennent
+    // réellement d'une nouvelle détection (ils diffèrent de notre état courant).
+    // Sinon il s'agit de l'écho de notre propre _notifyChange (aller-retour via
+    // le provider) : le clobber effacerait le profil d'origine et casserait le
+    // bouton de réinitialisation de l'espacement.
+    if (widget.initialRingRadii != oldWidget.initialRingRadii &&
+        widget.initialRingRadii != null &&
+        !listEquals(widget.initialRingRadii, _ringRadii)) {
+      _originalRingRadii = List.from(widget.initialRingRadii!);
       shouldReinit = true;
     }
 
@@ -124,9 +157,20 @@ class TargetCalibrationState extends State<TargetCalibration> {
         return Stack(
           children: [
             GestureDetector(
-              onPanStart: (details) => _onPanStart(details, size),
+              onScaleStart: (details) {
-              onPanUpdate: (details) => _onPanUpdate(details, size),
+                _baseRadiusBeforeScale = _radius;
-              onPanEnd: (_) => _onPanEnd(),
+                final tapX = details.localFocalPoint.dx / size.width;
+                final tapY = details.localFocalPoint.dy / size.height;
+                final distToCenter = _distance(tapX, tapY, _centerX, _centerY);
+
+                if (distToCenter < 0.05 || distToCenter < _radius + 0.02) {
+                  setState(() {
+                    _isDraggingCenter = true;
+                  });
+                }
+              },
+              onScaleUpdate: (details) => _onScaleUpdate(details, size),
+              onScaleEnd: (_) => _onScaleEnd(),
               child: CustomPaint(
                 size: size,
                 painter: _CalibrationPainter(
@@ -138,13 +182,12 @@ class TargetCalibrationState extends State<TargetCalibration> {
                   ringRadii: _ringRadii,
                   targetType: widget.targetType,
                   isDraggingCenter: _isDraggingCenter,
-                  isDraggingRadius: false, // Plus de drag direct du rayon
+                  isDraggingRadius: false,
                   isDraggingInnerRadius: false,
                 ),
               ),
             ),
 
-            // Slider pour le rayon (agrandissement)
             Positioned(
               top: 10,
               left: 40,
@@ -152,6 +195,42 @@ class TargetCalibrationState extends State<TargetCalibration> {
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
+                  Container(
+                    margin: const EdgeInsets.only(bottom: 8),
+                    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 2),
+                    decoration: BoxDecoration(
+                      color: Colors.black54,
+                      borderRadius: BorderRadius.circular(20),
+                    ),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        const Text(
+                          'Options d\'espacement avancées',
+                          style: TextStyle(color: Colors.white70, fontSize: 11, fontWeight: FontWeight.w500),
+                        ),
+                        SizedBox(
+                          height: 28,
+                          child: Switch(
+                            value: _showEspacement,
+                            activeThumbColor: const Color(0xFF00FF00),
+                            onChanged: (bool value) {
+                              setState(() {
+                                _showEspacement = value;
+                                // Quand on désactive l'espacement manuel, on restaure la configuration d'usine !
+                                if (!value) {
+                                  _initRingRadii(forceRecalculate: false);
+                                }
+                              });
+                              _notifyChange();
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+
+                  // Slider pour la taille (toujours visible)
                   Container(
                     padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
                     decoration: BoxDecoration(
@@ -164,15 +243,17 @@ class TargetCalibrationState extends State<TargetCalibration> {
                         const Icon(Icons.zoom_out, color: Colors.white, size: 16),
                         Expanded(
                           child: Slider(
-                            value: _radius.clamp(0.05, 3.0),
+                            // SÉCURITÉ : Ouverture mesurée des bornes pour plus de liberté sans débordement incontrôlé
-                            min: 0.05,
+                            value: _radius.clamp(0.3, 0.95),
-                            max: 3.0,
+                            min: 0.3,
+                            max: 0.95,
                             activeColor: AppTheme.primaryColor,
                             onChanged: (value) {
                               setState(() {
                                 _radius = value;
-                                // On force le recalcul car on change la taille
+                                _innerRadius = _radius * _currentEspacementRatio;
-                                _initRingRadii(forceRecalculate: true);
+                                // CORRECTION : Si le mode avancé n'est pas coché, on applique la taille pure sans détruire le ratio d'origine
+                                _initRingRadii(forceRecalculate: _showEspacement);
                               });
                               _notifyChange();
                             },
@@ -182,41 +263,74 @@ class TargetCalibrationState extends State<TargetCalibration> {
                       ],
                     ),
                   ),
-                  const SizedBox(height: 8),
+
-                  Container(
+                  // Affichage conditionnel du slider d'espacement orange
-                    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                  if (_showEspacement) ...[
-                    decoration: BoxDecoration(
+                    const SizedBox(height: 8),
-                      color: Colors.black54,
+                    Container(
-                      borderRadius: BorderRadius.circular(20),
+                      padding: const EdgeInsets.fromLTRB(16, 4, 4, 4),
-                    ),
+                      decoration: BoxDecoration(
-                    child: Row(
+                        color: Colors.black54,
-                      children: [
+                        borderRadius: BorderRadius.circular(20),
-                        const Text('Espacement ', style: TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.bold)),
+                      ),
-                        const Icon(Icons.compress, color: Colors.white, size: 16),
+                      child: Row(
-                        Expanded(
+                        children: [
-                          child: Slider(
+                          const Text('Espacement ', style: TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.bold)),
-                            value: (_innerRadius / _radius).clamp(0.01, 0.9),
+                          const Icon(Icons.compress, color: Colors.white, size: 16),
-                            min: 0.01,
+                          Expanded(
-                            max: 0.9,
+                            child: Row(
-                            activeColor: Colors.orange,
+                              children: [
-                            onChanged: (value) {
+                                Expanded(
+                                  child: Slider(
+                                    value: _currentEspacementRatio,
+                                    min: 0.01,
+                                    // SÉCURITÉ : Écartement max bridé à 0.70 pour confiner le dernier cercle
+                                    max: 0.70,
+                                    activeColor: Colors.orange,
+                                    onChanged: (value) {
+                                      setState(() {
+                                        _currentEspacementRatio = value;
+                                        _innerRadius = _radius * _currentEspacementRatio;
+                                        _initRingRadii(forceRecalculate: true);
+                                      });
+                                      _notifyChange();
+                                    },
+                                  ),
+                                ),
+                                const Icon(Icons.expand, color: Colors.white, size: 16),
+                              ],
+                            ),
+                          ),
+                          // CORRECTION DU BOUTON RESET : Restaure désormais le vrai profil d'usine de l'IA
+                          IconButton(
+                            icon: const Icon(Icons.refresh, color: Colors.white70, size: 20),
+                            onPressed: () {
                               setState(() {
-                                // On ajuste l'innerRadius comme un ratio du radius global
+                                if (_originalRingRadii != null) {
-                                _innerRadius = _radius * value;
+                                  _initRingRadii(forceRecalculate: false);
-                                _initRingRadii(forceRecalculate: true);
+                                  if (_ringRadii.isNotEmpty) {
+                                    _currentEspacementRatio = _ringRadii.first;
+                                    _innerRadius = _radius * _currentEspacementRatio;
+                                  }
+                                } else {
+                                  _currentEspacementRatio = 0.1;
+                                  _innerRadius = _radius * _currentEspacementRatio;
+                                  _initRingRadii(forceRecalculate: true);
+                                }
                               });
                               _notifyChange();
                             },
+                            tooltip: 'Réinitialiser l\'espacement',
+                            constraints: const BoxConstraints(),
+                            padding: const EdgeInsets.symmetric(horizontal: 8),
                           ),
-                        ),
+                        ],
-                        const Icon(Icons.expand, color: Colors.white, size: 16),
+                      ),
-                      ],
                     ),
-                  ),
+                  ],
                 ],
               ),
             ),
-
           ],
         );
       },
@@ -231,42 +345,44 @@ class TargetCalibrationState extends State<TargetCalibration> {
         borderRadius: BorderRadius.circular(12),
         border: Border.all(color: Colors.white10),
       ),
-      child: Column(
+      child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          _buildDirectionButton(
+          _buildSignLabel('−'),
-            Icons.keyboard_arrow_up,
+          const SizedBox(width: 12),
-            () => _moveCenterByPixels(0, -1, size),
+          Column(
-          ),
-          Row(
             mainAxisSize: MainAxisSize.min,
             children: [
-              _buildDirectionButton(
+              _buildDirectionButton(Icons.keyboard_arrow_up, () => _moveCenterByPixels(0, -1, size)),
-                Icons.keyboard_arrow_left,
+              Row(
-                () => _moveCenterByPixels(-1, 0, size),
+                mainAxisSize: MainAxisSize.min,
-              ),
+                children: [
-              const SizedBox(width: 40),
+                  _buildDirectionButton(Icons.keyboard_arrow_left, () => _moveCenterByPixels(-1, 0, size)),
-              _buildDirectionButton(
+                  const SizedBox(width: 40),
-                Icons.keyboard_arrow_right,
+                  _buildDirectionButton(Icons.keyboard_arrow_right, () => _moveCenterByPixels(1, 0, size)),
-                () => _moveCenterByPixels(1, 0, size),
+                ],
               ),
+              _buildDirectionButton(Icons.keyboard_arrow_down, () => _moveCenterByPixels(0, 1, size)),
             ],
           ),
-          _buildDirectionButton(
+          const SizedBox(width: 12),
-            Icons.keyboard_arrow_down,
+          _buildSignLabel('+'),
-            () => _moveCenterByPixels(0, 1, size),
-          ),
         ],
       ),
     );
   }
 
+  // Symbole purement décoratif affiché de part et d'autre de la croix.
+  Widget _buildSignLabel(String text) {
+    return Text(
+      text,
+      style: const TextStyle(color: Colors.white54, fontSize: 28, fontWeight: FontWeight.bold),
+    );
+  }
+
   Widget _buildDirectionButton(IconData icon, VoidCallback onPressed) {
     return Container(
-      decoration: BoxDecoration(
+      decoration: BoxDecoration(color: Colors.black87, borderRadius: BorderRadius.circular(8)),
-        color: Colors.black87,
-        borderRadius: BorderRadius.circular(8),
-      ),
       margin: const EdgeInsets.all(2),
       child: IconButton(
         icon: Icon(icon, color: Colors.white, size: 28),
@@ -296,36 +412,23 @@ class TargetCalibrationState extends State<TargetCalibration> {
     _notifyChange();
   }
 
-  void _onPanStart(DragStartDetails details, Size size) {
+  void _onScaleUpdate(ScaleUpdateDetails details, Size size) {
-    final tapX = details.localPosition.dx / size.width;
-    final tapY = details.localPosition.dy / size.height;
-
-    final distToCenter = _distance(tapX, tapY, _centerX, _centerY);
-    
-    if (distToCenter < 0.05 || distToCenter < _radius + 0.02) {
-      setState(() {
-        _isDraggingCenter = true;
-      });
-    }
-  }
-
-  void _onPanUpdate(DragUpdateDetails details, Size size) {
-    final deltaX = details.delta.dx / size.width;
-    final deltaY = details.delta.dy / size.height;
-    final minDim = math.min(size.width, size.height);
-
     setState(() {
-      if (_isDraggingCenter) {
+      if (details.pointerCount == 2) {
-        // Move center
+        _radius = (_baseRadiusBeforeScale * details.scale).clamp(0.3, 0.95);
+        _innerRadius = _radius * _currentEspacementRatio;
+        _initRingRadii(forceRecalculate: _showEspacement);
+      } else if (_isDraggingCenter) {
+        final deltaX = details.focalPointDelta.dx / size.width;
+        final deltaY = details.focalPointDelta.dy / size.height;
         _centerX = _centerX + deltaX;
         _centerY = _centerY + deltaY;
       }
     });
-
     _notifyChange();
   }
 
-  void _onPanEnd() {
+  void _onScaleEnd() {
     setState(() {
       _isDraggingCenter = false;
       _isDraggingRadius = false;
@@ -370,7 +473,6 @@ class _CalibrationPainter extends CustomPainter {
     final centerPx = Offset(centerX * size.width, centerY * size.height);
     final minDim = size.width < size.height ? size.width : size.height;
     final baseRadiusPx = radius * minDim;
-    final innerRadiusPx = innerRadius * minDim;
 
     if (targetType == TargetType.concentric) {
       _drawConcentricZones(canvas, size, centerPx, baseRadiusPx);
@@ -378,37 +480,17 @@ class _CalibrationPainter extends CustomPainter {
       _drawSilhouetteZones(canvas, size, centerPx, baseRadiusPx);
     }
 
-    // Fullscreen crosshairs when dragging center
     if (isDraggingCenter) {
-      final crosshairLinePaint = Paint()
+      final crosshairLinePaint = Paint()..color = Colors.red.withValues(alpha: 0.5)..strokeWidth = 1;
-        ..color = Colors.red.withValues(alpha: 0.5)
+      canvas.drawLine(Offset(0, centerPx.dy), Offset(size.width, centerPx.dy), crosshairLinePaint);
-        ..strokeWidth = 1;
+      canvas.drawLine(Offset(centerPx.dx, 0), Offset(centerPx.dx, size.height), crosshairLinePaint);
-      canvas.drawLine(
-        Offset(0, centerPx.dy),
-        Offset(size.width, centerPx.dy),
-        crosshairLinePaint,
-      );
-      canvas.drawLine(
-        Offset(centerPx.dx, 0),
-        Offset(centerPx.dx, size.height),
-        crosshairLinePaint,
-      );
     }
 
-    // Draw center handle
     _drawCenterHandle(canvas, centerPx);
-
-    // Draw instructions
     _drawInstructions(canvas, size);
   }
 
-  void _drawConcentricZones(
+  void _drawConcentricZones(Canvas canvas, Size size, Offset center, double baseRadius) {
-    Canvas canvas,
-    Size size,
-    Offset center,
-    double baseRadius,
-  ) {
-    // Generate colors for zones
     List<Color> zoneColors = [];
     for (int i = 0; i < ringCount; i++) {
       final ratio = i / ringCount;
@@ -431,11 +513,8 @@ class _CalibrationPainter extends CustomPainter {
       ..strokeWidth = 1
       ..color = Colors.red.withValues(alpha: 0.8);
 
-    // Draw from outside to inside
     for (int i = ringCount - 1; i >= 0; i--) {
-      final ringRadius = ringRadii.length > i
+      final ringRadius = ringRadii.length > i ? ringRadii[i] : (i + 1) / ringCount;
-          ? ringRadii[i]
-          : (i + 1) / ringCount;
       final zoneRadius = baseRadius * ringRadius;
 
       zonePaint.color = zoneColors[i];
@@ -443,22 +522,14 @@ class _CalibrationPainter extends CustomPainter {
       canvas.drawCircle(center, zoneRadius, strokePaint);
     }
 
-    // Draw zone labels (only if within visible area)
     final textPainter = TextPainter(textDirection: TextDirection.ltr);
 
     for (int i = 0; i < ringCount; i++) {
-      final ringRadius = ringRadii.length > i
+      final ringRadius = ringRadii.length > i ? ringRadii[i] : (i + 1) / ringCount;
-          ? ringRadii[i]
+      final textSpanRatio = i > 0 ? (ringRadii.length > i - 1 ? ringRadii[i - 1] : i / ringCount) : 0.0;
-          : (i + 1) / ringCount;
+      final zoneRadius = baseRadius * (ringRadius + textSpanRatio) / 2;
-      final prevRingRadius = i > 0
-          ? (ringRadii.length > i - 1 ? ringRadii[i - 1] : i / ringCount)
-          : 0.0;
-      final zoneRadius = baseRadius * (ringRadius + prevRingRadius) / 2;
 
-      // Score: center = 10, decrement by 1 for each ring
       final score = 10 - i;
-
-      // Only draw label if it's within the visible area
       final labelX = center.dx + zoneRadius;
       if (labelX < 0 || labelX > size.width) continue;
 
@@ -473,102 +544,44 @@ class _CalibrationPainter extends CustomPainter {
       );
       textPainter.layout();
 
-      // Draw label on the right side of each zone
       final labelY = center.dy - textPainter.height / 2;
       if (labelY >= 0 && labelY <= size.height) {
-        textPainter.paint(
+        textPainter.paint(canvas, Offset(labelX - textPainter.width / 2, labelY));
-          canvas,
-          Offset(labelX - textPainter.width / 2, labelY),
-        );
       }
     }
   }
 
-  void _drawSilhouetteZones(
+  void _drawSilhouetteZones(Canvas canvas, Size size, Offset center, double radius) {
-    Canvas canvas,
+    final paint = Paint()..style = PaintingStyle.stroke..strokeWidth = 2;
-    Size size,
-    Offset center,
-    double radius,
-  ) {
-    // Simplified silhouette zones
-    final paint = Paint()
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = 2;
-
-    // Draw silhouette outline (simplified as rectangle for now)
     final silhouetteWidth = radius * 0.8;
     final silhouetteHeight = radius * 2;
 
     paint.color = Colors.green.withValues(alpha: 0.5);
-    canvas.drawRect(
+    canvas.drawRect(Rect.fromCenter(center: center, width: silhouetteWidth, height: silhouetteHeight), paint);
-      Rect.fromCenter(
-        center: center,
-        width: silhouetteWidth,
-        height: silhouetteHeight,
-      ),
-      paint,
-    );
   }
 
   void _drawCenterHandle(Canvas canvas, Offset center) {
-    // Outer circle
+    final outerPaint = Paint()..color = isDraggingCenter ? Colors.redAccent : Colors.red..style = PaintingStyle.stroke..strokeWidth = 3;
-    final outerPaint = Paint()
-      ..color = isDraggingCenter ? Colors.redAccent : Colors.red
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = 3;
     canvas.drawCircle(center, 15, outerPaint);
 
-    // Inner dot
+    final innerPaint = Paint()..color = isDraggingCenter ? Colors.redAccent : Colors.red..style = PaintingStyle.fill;
-    final innerPaint = Paint()
-      ..color = isDraggingCenter ? Colors.redAccent : Colors.red
-      ..style = PaintingStyle.fill;
     canvas.drawCircle(center, 5, innerPaint);
 
-    // Crosshair
+    final crossPaint = Paint()..color = isDraggingCenter ? Colors.redAccent : Colors.red..strokeWidth = 2;
-    final crossPaint = Paint()
+    canvas.drawLine(Offset(center.dx - 20, center.dy), Offset(center.dx - 8, center.dy), crossPaint);
-      ..color = isDraggingCenter ? Colors.redAccent : Colors.red
+    canvas.drawLine(Offset(center.dx + 8, center.dy), Offset(center.dx + 20, center.dy), crossPaint);
-      ..strokeWidth = 2;
+    canvas.drawLine(Offset(center.dx, center.dy - 20), Offset(center.dx, center.dy - 8), crossPaint);
-    canvas.drawLine(
+    canvas.drawLine(Offset(center.dx, center.dy + 4), Offset(center.dx, center.dy + 20), crossPaint);
-      Offset(center.dx - 20, center.dy),
-      Offset(center.dx - 8, center.dy),
-      crossPaint,
-    );
-    canvas.drawLine(
-      Offset(center.dx + 8, center.dy),
-      Offset(center.dx + 20, center.dy),
-      crossPaint,
-    );
-    canvas.drawLine(
-      Offset(center.dx, center.dy - 20),
-      Offset(center.dx, center.dy - 8),
-      crossPaint,
-    );
-    canvas.drawLine(
-      Offset(center.dx, center.dy + 8),
-      Offset(center.dx, center.dy + 20),
-      crossPaint,
-    );
   }
 
   void _drawInstructions(Canvas canvas, Size size) {
     const instruction = 'Deplacez le centre ou ajustez le rayon';
-
     final textPainter = TextPainter(
-      text: TextSpan(
+      text: TextSpan(text: instruction, style: TextStyle(color: Colors.white.withValues(alpha: 0.9), fontSize: 12, backgroundColor: Colors.black54)),
-        text: instruction,
-        style: TextStyle(
-          color: Colors.white.withValues(alpha: 0.9),
-          fontSize: 12,
-          backgroundColor: Colors.black54,
-        ),
-      ),
       textDirection: TextDirection.ltr,
     );
     textPainter.layout();
-    textPainter.paint(
+    textPainter.paint(canvas, Offset((size.width - textPainter.width) / 2, size.height - 30));
-      canvas,
-      Offset((size.width - textPainter.width) / 2, size.height - 30),
-    );
   }
 
   @override

lib/features/analysis/widgets/target_overlay.dart

@@ -1,8 +1,9 @@
 /// Overlay visuel de la cible.
 ///
-/// Dessine les anneaux de la cible, les impacts détectés, le cercle de groupement
+/// Dessine les anneaux de la cible, les impacts et le cercle de groupement.
-/// et les impacts de référence. Gère les interactions tactiles pour l'ajout
+/// Gère uniquement la SÉLECTION d'impacts existants (tap sur un impact).
-/// d'impacts et la sélection d'impacts existants.
+/// L'AJOUT d'un impact est délégué à l'écran parent pour éviter tout conflit
+/// de gestes avec le zoom/pan de l'InteractiveViewer.
 library;
 
 import 'package:flutter/material.dart';
@@ -19,11 +20,9 @@ class TargetOverlay extends StatelessWidget {
   final int ringCount;
   final List<double>? ringRadii;
   final void Function(Shot shot)? onShotTapped;
-  final void Function(double x, double y)? onAddShot;
   final double? groupingCenterX;
   final double? groupingCenterY;
   final double? groupingDiameter;
-  final List<Shot>? referenceImpacts;
   final double zoomScale;
   final bool showRings;
 
@@ -37,87 +36,77 @@ class TargetOverlay extends StatelessWidget {
     this.ringCount = 10,
     this.ringRadii,
     this.onShotTapped,
-    this.onAddShot,
     this.groupingCenterX,
     this.groupingCenterY,
     this.groupingDiameter,
-    this.referenceImpacts,
     this.zoomScale = 1.0,
     this.showRings = false,
   });
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(
+    // IMPORTANT : plus de GestureDetector global ici.
-      builder: (context, constraints) {
+    // L'ancien GestureDetector (onTapUp couvrant toute la surface, en
-        return GestureDetector(
+    // HitTestBehavior.translucent) volait les pointeurs au pinch de
-          behavior: HitTestBehavior.translucent,
+    // l'InteractiveViewer parent et rendait le zoom capricieux.
-          onTapUp: (details) {
+    //
-            if (onAddShot != null) {
+    // Désormais :
-              // Utiliser les constraints pour un calcul précis
+    //  - L'AJOUT d'impact est géré par le GestureDetector parent (analysis_screen).
-              final relX = details.localPosition.dx / constraints.maxWidth;
+    //  - Seule la SÉLECTION d'un impact existant est gérée ici, via des petites
-              final relY = details.localPosition.dy / constraints.maxHeight;
+    //    zones de tap localisées (deferToChild) placées sur chaque impact.
-              onAddShot!(relX, relY);
+    return IgnorePointer(
-            }
+      ignoring: false,
-          },
+      child: CustomPaint(
-          child: CustomPaint(
+        painter: _TargetOverlayPainter(
-            painter: _TargetOverlayPainter(
+          shots: shots,
-              shots: shots,
+          targetCenterX: targetCenterX,
-              targetCenterX: targetCenterX,
+          targetCenterY: targetCenterY,
-              targetCenterY: targetCenterY,
+          targetRadius: targetRadius,
-              targetRadius: targetRadius,
+          targetType: targetType,
-              targetType: targetType,
+          ringCount: ringCount,
-              ringCount: ringCount,
+          ringRadii: ringRadii,
-              ringRadii: ringRadii,
+          groupingCenterX: groupingCenterX,
-              groupingCenterX: groupingCenterX,
+          groupingCenterY: groupingCenterY,
-              groupingCenterY: groupingCenterY,
+          groupingDiameter: groupingDiameter,
-              groupingDiameter: groupingDiameter,
+          zoomScale: zoomScale,
-              referenceImpacts: referenceImpacts,
+          showRings: showRings,
-              zoomScale: zoomScale,
+        ),
-              showRings: showRings,
+        child: LayoutBuilder(
-            ),
+          builder: (context, constraints) {
-            child: Stack(
+            return Stack(
               children: shots.map((shot) {
+                final x = shot.x * constraints.maxWidth;
+                final y = shot.y * constraints.maxHeight;
+                // Zone de tap qui reste constante à l'écran malgré le zoom.
+                final tapSize = 30 / zoomScale;
+                final halfTapSize = tapSize / 2;
                 return Positioned(
-                  left: 0,
+                  left: x - halfTapSize,
-                  top: 0,
+                  top: y - halfTapSize,
-                  right: 0,
+                  child: GestureDetector(
-                  bottom: 0,
+                    // deferToChild : ne capte le toucher QUE sur la zone du
-                  child: LayoutBuilder(
+                    // Container (un cercle opaque au hit-test), pas ailleurs.
-                    builder: (context, innerConstraints) {
+                    // Le reste de la surface reste donc disponible pour le
-                      final x = shot.x * innerConstraints.maxWidth;
+                    // pinch/pan de l'InteractiveViewer.
-                      final y = shot.y * innerConstraints.maxHeight;
+                    behavior: HitTestBehavior.deferToChild,
-                      // Zone de tap qui s'adapte au zoom (taille fixe à l'écran)
+                    onTap: () => onShotTapped?.call(shot),
-                      final tapSize = 30 / zoomScale;
+                    child: Container(
-                      final halfTapSize = tapSize / 2;
+                      width: tapSize,
-                      return Stack(
+                      height: tapSize,
-                        children: [
+                      decoration: const BoxDecoration(
-                          Positioned(
+                        // Opaque pour le hit-test (couleur transparente visuellement
-                            left: x - halfTapSize,
+                        // mais non nulle), pour que le tap soit bien capté ici.
-                            top: y - halfTapSize,
+                        color: Color(0x01000000),
-                            child: GestureDetector(
+                        shape: BoxShape.circle,
-                              behavior: HitTestBehavior.translucent,
+                      ),
-                              onTap: () => onShotTapped?.call(shot),
+                    ),
-                              child: Container(
-                                width: tapSize,
-                                height: tapSize,
-                                decoration: const BoxDecoration(
-                                  color: Colors.transparent,
-                                  shape: BoxShape.circle,
-                                ),
-                              ),
-                            ),
-                          ),
-                        ],
-                      );
-                    },
                   ),
                 );
               }).toList(),
-            ),
+            );
-          ),
+          },
-        );
+        ),
-      },
+      ),
     );
   }
 }
@@ -133,7 +122,6 @@ class _TargetOverlayPainter extends CustomPainter {
   final double? groupingCenterX;
   final double? groupingCenterY;
   final double? groupingDiameter;
-  final List<Shot>? referenceImpacts;
   final double zoomScale;
   final bool showRings;
 
@@ -148,7 +136,6 @@ class _TargetOverlayPainter extends CustomPainter {
     this.groupingCenterX,
     this.groupingCenterY,
     this.groupingDiameter,
-    this.referenceImpacts,
     this.zoomScale = 1.0,
     this.showRings = false,
   });
@@ -169,13 +156,6 @@ class _TargetOverlayPainter extends CustomPainter {
     for (final shot in shots) {
       _drawImpact(canvas, size, shot);
     }
-
-    // Draw reference impacts (with different color)
-    if (referenceImpacts != null) {
-      for (final ref in referenceImpacts!) {
-        _drawReferenceImpact(canvas, size, ref);
-      }
-    }
   }
 
   void _drawTargetCenter(Canvas canvas, Size size) {
@@ -211,8 +191,8 @@ class _TargetOverlayPainter extends CustomPainter {
       final prevMultiplier = i == 0
           ? 0.0
           : (ringRadii != null && ringRadii!.length == ringCount)
-              ? ringRadii![i - 1]
+          ? ringRadii![i - 1]
-              : i / ringCount;
+          : i / ringCount;
       final zoneRadius = maxRadius * (currentMultiplier + prevMultiplier) / 2;
       final score = 10 - i;
 
@@ -292,16 +272,17 @@ class _TargetOverlayPainter extends CustomPainter {
     final strokeWidth = 3 / zoomScale;
     final fontSize = 10 / zoomScale;
 
-    // Draw outer circle (white outline for visibility)
+    // Draw outer circle (white outline for visibility) — gardé OPAQUE pour
+    // bien repérer le centre même quand le remplissage est transparent.
     final outlinePaint = Paint()
       ..color = AppTheme.impactOutlineColor
       ..style = PaintingStyle.stroke
       ..strokeWidth = strokeWidth;
     canvas.drawCircle(Offset(x, y), outerRadius, outlinePaint);
 
-    // Draw impact marker
+    // Draw impact marker — TRANSPARENCE 30% pour voir l'impact réel derrière
     final impactPaint = Paint()
-      ..color = AppTheme.impactColor
+      ..color = AppTheme.impactColor.withValues(alpha: 0.3)
       ..style = PaintingStyle.fill;
     canvas.drawCircle(Offset(x, y), innerRadius, impactPaint);
 
@@ -324,48 +305,6 @@ class _TargetOverlayPainter extends CustomPainter {
     );
   }
 
-  void _drawReferenceImpact(Canvas canvas, Size size, Shot ref) {
-    final x = ref.x * size.width;
-    final y = ref.y * size.height;
-
-    // Tailles fixes divisées par le zoom pour rester constantes à l'écran
-    final outerRadius = 12 / zoomScale;
-    final innerRadius = 10 / zoomScale;
-    final strokeWidth = 3 / zoomScale;
-    final fontSize = 12 / zoomScale;
-
-    // Draw outer circle (white outline for visibility)
-    final outlinePaint = Paint()
-      ..color = Colors.white
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = strokeWidth;
-    canvas.drawCircle(Offset(x, y), outerRadius, outlinePaint);
-
-    // Draw reference marker (purple)
-    final refPaint = Paint()
-      ..color = Colors.deepPurple
-      ..style = PaintingStyle.fill;
-    canvas.drawCircle(Offset(x, y), innerRadius, refPaint);
-
-    // Draw "R" to indicate reference
-    final textPainter = TextPainter(
-      text: TextSpan(
-        text: 'R',
-        style: TextStyle(
-          color: Colors.white,
-          fontSize: fontSize,
-          fontWeight: FontWeight.bold,
-        ),
-      ),
-      textDirection: TextDirection.ltr,
-    );
-    textPainter.layout();
-    textPainter.paint(
-      canvas,
-      Offset(x - textPainter.width / 2, y - textPainter.height / 2),
-    );
-  }
-
   @override
   bool shouldRepaint(covariant _TargetOverlayPainter oldDelegate) {
     return shots != oldDelegate.shots ||
@@ -377,7 +316,6 @@ class _TargetOverlayPainter extends CustomPainter {
         groupingCenterX != oldDelegate.groupingCenterX ||
         groupingCenterY != oldDelegate.groupingCenterY ||
         groupingDiameter != oldDelegate.groupingDiameter ||
-        referenceImpacts != oldDelegate.referenceImpacts ||
         zoomScale != oldDelegate.zoomScale ||
         showRings != oldDelegate.showRings;
   }

lib/features/crop/crop_screen.dart

@@ -36,6 +36,9 @@ class _CropScreenState extends State<CropScreen> {
   Offset _startOffset = Offset.zero;
   Offset _startFocalPoint = Offset.zero;
 
+  // PRÉCISION MAXIMUM : Amplitude restreinte de -15.0 à 15.0 degrés
+  double _rotation = 0.0;
+
   bool _isLoading = false;
   bool _imageLoaded = false;
   Size? _imageSize;
@@ -78,15 +81,64 @@ class _CropScreenState extends State<CropScreen> {
           icon: const Icon(Icons.arrow_back, color: Colors.white),
           onPressed: () => Navigator.pop(context),
         ),
+        actions: [
+          if (_rotation != 0.0 || _scale != 1.0 || _offset != Offset.zero)
+            IconButton(
+              icon: const Icon(Icons.refresh, color: Colors.white70),
+              tooltip: 'Réinitialiser l\'orientation',
+              onPressed: () {
+                setState(() {
+                  _rotation = 0.0;
+                  _scale = 1.0;
+                  _offset = Offset.zero;
+                  _initializeImagePosition();
+                });
+              },
+            ),
+        ],
       ),
       body: _isLoading
           ? const Center(child: CircularProgressIndicator(color: Color(0xFF1A73E8)))
           : Column(
+        children: [
+          // TEXTE D'AIDE — placé en haut, sous le titre, au-dessus de l'image.
+          Padding(
+            padding: const EdgeInsets.fromLTRB(20, 12, 20, 4),
+            child: Column(
               children: [
-                // Zone interactive de crop
+                Row(
-                Expanded(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    const Icon(Icons.center_focus_strong, color: Color(0xFF00FF00), size: 20),
+                    const SizedBox(width: 8),
+                    Flexible(
+                      child: Text(
+                        'Alignez et pivotez la cible sur la croix',
+                        style: TextStyle(color: Colors.white.withValues(alpha: 0.8), fontSize: 14, fontWeight: FontWeight.w500),
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 4),
+                Text(
+                  'Glissez à un doigt pour déplacer, pincez pour zoomer',
+                  style: TextStyle(color: Colors.white.withValues(alpha: 0.5), fontSize: 12),
+                ),
+              ],
+            ),
+          ),
+
+          // Zone interactive de crop, CARRÉE. La photo la remplit entièrement
+          // (BoxFit.cover) → aucun bord noir dans la zone. Le débord hors cadre
+          // est récupérable en déplaçant/zoomant. La sortie d'analyse reste
+          // carrée, donc la cible n'est pas déformée.
+          Expanded(
+            child: Padding(
+              padding: const EdgeInsets.all(20),
+              child: Center(
+                child: AspectRatio(
+                  aspectRatio: 1.0,
                   child: Container(
-                    margin: const EdgeInsets.all(20),
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(12),
                       border: Border.all(color: Colors.white10),
@@ -97,66 +149,104 @@ class _CropScreenState extends State<CropScreen> {
                     ),
                   ),
                 ),
+              ),
+            ),
+          ),
 
-                // Bouton d'aide / Modifier
+          const SizedBox(height: 8),
-                Padding(
+
-                  padding: const EdgeInsets.symmetric(vertical: 20),
+          // CROIX DIRECTIONNELLE — déplace la photo pixel par pixel.
-                  child: Column(
+          _buildDirectionalPad(),
-                    children: [
+
-                      Row(
+          const SizedBox(height: 16),
-                        mainAxisAlignment: MainAxisAlignment.center,
+
-                        children: [
+          // JAUGE DE ROTATION HAUTE PRÉCISION BRIDÉE À 15°
-                          const Icon(Icons.center_focus_strong, color: Colors.redAccent, size: 20),
+          Padding(
-                          const SizedBox(width: 8),
+            padding: const EdgeInsets.symmetric(horizontal: 24),
-                          Text(
+            child: Column(
-                            'Alignez le centre de la cible sur la croix',
+              children: [
-                            style: TextStyle(color: Colors.white.withOpacity(0.8), fontSize: 14, fontWeight: FontWeight.w500),
+                Row(
-                          ),
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        ],
+                  children: [
+                    const Text(
+                      'Rotation de l\'image',
+                      style: TextStyle(color: Colors.white70, fontSize: 13, fontWeight: FontWeight.w600),
+                    ),
+                    Text(
+                      '${_rotation.toStringAsFixed(1)}°',
+                      style: const TextStyle(color: Color(0xFF00FF00), fontWeight: FontWeight.bold),
+                    ),
+                  ],
+                ),
+                Row(
+                  children: [
+                    const Icon(Icons.rotate_left, color: Colors.white38, size: 20),
+                    Expanded(
+                      child: Slider(
+                        value: _rotation,
+                        min: -15.0,
+                        max: 15.0,
+                        divisions: 300,
+                        label: '${_rotation.toStringAsFixed(1)}°',
+                        activeColor: const Color(0xFF1A73E8),
+                        inactiveColor: Colors.white12,
+                        onChanged: (double value) {
+                          setState(() {
+                            _rotation = value;
+                          });
+                        },
                       ),
-                      const SizedBox(height: 4),
+                    ),
-                      Text(
+                    const Icon(Icons.rotate_right, color: Colors.white38, size: 20),
-                        'Zoomez pour plus de précision',
+                    const SizedBox(width: 4),
-                        style: TextStyle(color: Colors.white.withOpacity(0.5), fontSize: 12),
+                    IconButton(
-                      ),
+                      icon: const Icon(Icons.restart_alt, color: Colors.white54, size: 20),
-                    ],
+                      onPressed: () {
+                        setState(() {
+                          _rotation = 0.0;
+                        });
+                      },
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+
+          // Boutons du bas
+          Padding(
+            padding: const EdgeInsets.fromLTRB(20, 10, 20, 30),
+            child: Row(
+              children: [
+                Expanded(
+                  child: OutlinedButton(
+                    onPressed: () => Navigator.pop(context),
+                    style: OutlinedButton.styleFrom(
+                      side: const BorderSide(color: Colors.white24),
+                      padding: const EdgeInsets.symmetric(vertical: 15),
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+                    ),
+                    child: const Text('Retour', style: TextStyle(color: Colors.white)),
                   ),
                 ),
-
+                const SizedBox(width: 16),
-                // Boutons du bas
+                Expanded(
-                Padding(
+                  child: ElevatedButton(
-                  padding: const EdgeInsets.fromLTRB(20, 0, 20, 30),
+                    onPressed: _onCropConfirm,
-                  child: Row(
+                    style: ElevatedButton.styleFrom(
-                    children: [
+                      backgroundColor: const Color(0xFF1A73E8),
-                      Expanded(
+                      foregroundColor: Colors.white,
-                        child: OutlinedButton(
+                      padding: const EdgeInsets.symmetric(vertical: 15),
-                          onPressed: () => Navigator.pop(context),
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-                          style: OutlinedButton.styleFrom(
+                    ),
-                            side: const BorderSide(color: Colors.white24),
+                    child: const Text('Suivant', style: TextStyle(fontWeight: FontWeight.bold)),
-                            padding: const EdgeInsets.symmetric(vertical: 15),
-                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-                          ),
-                          child: const Text('Retour', style: TextStyle(color: Colors.white)),
-                        ),
-                      ),
-                      const SizedBox(width: 16),
-                      Expanded(
-                        child: ElevatedButton(
-                          onPressed: _onCropConfirm,
-                          style: ElevatedButton.styleFrom(
-                            backgroundColor: const Color(0xFF1A73E8),
-                            foregroundColor: Colors.white,
-                            padding: const EdgeInsets.symmetric(vertical: 15),
-                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-                          ),
-                          child: const Text('Analyser', style: TextStyle(fontWeight: FontWeight.bold)),
-                        ),
-                      ),
-                    ],
                   ),
                 ),
               ],
             ),
+          ),
+        ],
+      ),
     );
   }
 
@@ -165,10 +255,11 @@ class _CropScreenState extends State<CropScreen> {
       builder: (context, constraints) {
         _viewportSize = Size(constraints.maxWidth, constraints.maxHeight);
 
-        // Le carré de crop occupe presque tout l'espace disponible
+        // La photo remplit toute la zone carrée (BoxFit.cover). La fenêtre de
-        _cropSize = math.min(constraints.maxWidth, constraints.maxHeight) * 0.95;
+        // visée = toute la zone visible → aucun bord noir autour du cadre.
+        _cropSize = math.min(_viewportSize.width, _viewportSize.height);
 
-        if (_scale == 1.0 && _offset == Offset.zero) {
+        if (_scale == 1.0 && _offset == Offset.zero && _rotation == 0.0) {
           _initializeImagePosition();
         }
 
@@ -177,22 +268,73 @@ class _CropScreenState extends State<CropScreen> {
           onScaleUpdate: _onScaleUpdate,
           child: Stack(
             children: [
+              // 1. L'image brute avec ses transformations (Reste calé sur BoxFit.contain d'origine)
               Positioned.fill(
                 child: Center(
                   child: Transform(
                     transform: Matrix4.identity()
                       ..setTranslationRaw(_offset.dx, _offset.dy, 0)
-                      ..scale(_scale, _scale),
+                      ..scaleByDouble(_scale, _scale, _scale, 1.0)
+                      ..rotateZ(_rotation * (math.pi / 180)),
                     alignment: Alignment.center,
                     child: Image.file(
                       File(widget.imagePath),
-                      fit: BoxFit.contain,
+                      fit: BoxFit.cover,
                       width: _viewportSize.width,
                       height: _viewportSize.height,
                     ),
                   ),
                 ),
               ),
+
+              // 2. Les lignes vertes de visée prolongées
+              Positioned.fill(
+                child: IgnorePointer(
+                  child: Stack(
+                    children: [
+                      Center(
+                        child: Container(
+                          width: double.infinity,
+                          height: 1.5,
+                          color: const Color(0xFF00FF00).withValues(alpha: 0.6),
+                        ),
+                      ),
+                      Center(
+                        child: Container(
+                          width: 1.5,
+                          height: double.infinity,
+                          color: const Color(0xFF00FF00).withValues(alpha: 0.6),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+
+              // 3. MASQUE OPAQUE EXTÉRIEUR - COINS DROITS ET CARRÉS
+              Positioned.fill(
+                child: IgnorePointer(
+                  child: ColorFiltered(
+                    colorFilter: ColorFilter.mode(
+                      const Color(0xFF101214),
+                      BlendMode.srcOut,
+                    ),
+                    child: Stack(
+                      children: [
+                        Center(
+                          child: Container(
+                            width: _cropSize,
+                            height: _cropSize,
+                            color: Colors.black,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+
+              // 4. Ton overlay avec les coins blancs
               Positioned.fill(
                 child: IgnorePointer(
                   child: CropOverlay(cropSize: _cropSize, showGrid: false),
@@ -208,28 +350,73 @@ class _CropScreenState extends State<CropScreen> {
   void _initializeImagePosition() {
     if (_imageSize == null) return;
 
-    final imageAspect = _imageSize!.width / _imageSize!.height;
+    // 2. Calcul du scale initial basé sur la dimension de l'image (et non du viewport)
-    final viewportAspect = _viewportSize.width / _viewportSize.height;
+    _scale = widget.initialScale ?? 1.0;
-
-    double displayWidth, displayHeight;
-    if (imageAspect > viewportAspect) {
-      displayWidth = _viewportSize.width;
-      displayHeight = _viewportSize.width / imageAspect;
-    } else {
-      displayHeight = _viewportSize.height;
-      displayWidth = _viewportSize.height * imageAspect;
-    }
-
-    final minDisplayDim = math.min(displayWidth, displayHeight);
-    
-    _scale = widget.initialScale ?? (_cropSize / minDisplayDim);
     if (_scale < 1.0 && widget.initialScale == null) _scale = 1.0;
 
+    // 3. Réinitialisation propre de l'offset au centre de la zone d'affichage
     if (widget.initialOffset != null) {
       _offset = widget.initialOffset!;
+    } else {
+      _offset = Offset.zero; // Force l'image à se centrer parfaitement sur la croix verte
     }
   }
 
+  // Croix directionnelle compacte pour déplacer la photo pixel par pixel.
+  // Les symboles « − » et « + » de part et d'autre sont purement décoratifs.
+  Widget _buildDirectionalPad() {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        _buildCropSignLabel('−'),
+        const SizedBox(width: 10),
+        Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            _buildCropDirButton(Icons.keyboard_arrow_up, () => _nudge(0, -1)),
+            Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                _buildCropDirButton(Icons.keyboard_arrow_left, () => _nudge(-1, 0)),
+                const SizedBox(width: 28),
+                _buildCropDirButton(Icons.keyboard_arrow_right, () => _nudge(1, 0)),
+              ],
+            ),
+            _buildCropDirButton(Icons.keyboard_arrow_down, () => _nudge(0, 1)),
+          ],
+        ),
+        const SizedBox(width: 10),
+        _buildCropSignLabel('+'),
+      ],
+    );
+  }
+
+  Widget _buildCropDirButton(IconData icon, VoidCallback onPressed) {
+    return Container(
+      decoration: BoxDecoration(color: Colors.black54, borderRadius: BorderRadius.circular(6)),
+      margin: const EdgeInsets.all(2),
+      child: IconButton(
+        icon: Icon(icon, color: Colors.white, size: 22),
+        onPressed: onPressed,
+        padding: EdgeInsets.zero,
+        constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
+      ),
+    );
+  }
+
+  Widget _buildCropSignLabel(String text) {
+    return Text(
+      text,
+      style: const TextStyle(color: Colors.white54, fontSize: 24, fontWeight: FontWeight.bold),
+    );
+  }
+
+  void _nudge(double dx, double dy) {
+    setState(() {
+      _offset = _offset + Offset(dx, dy);
+    });
+  }
+
   void _onScaleStart(ScaleStartDetails details) {
     _baseScale = _scale;
     _startFocalPoint = details.focalPoint;
@@ -247,21 +434,49 @@ class _CropScreenState extends State<CropScreen> {
   Future<void> _onCropConfirm() async {
     setState(() => _isLoading = true);
     try {
-      final cropRect = _calculateCropRect();
+      // Facteur d'échelle affichage/source (BoxFit.cover) — identique à celui
-      // On calcule le centre relatif basé sur le centrage utilisateur
+      // utilisé pour afficher l'image dans l'aperçu : l'image remplit la zone,
-      final targetCenterX = cropRect.x + cropRect.width / 2;
+      // le débord est rogné, donc l'échelle est le MAX des deux ratios d'axe.
-      final targetCenterY = cropRect.y + cropRect.height / 2;
+      final double displayPerSourcePx = math.max(
+        _viewportSize.width / _imageSize!.width,
+        _viewportSize.height / _imageSize!.height,
+      );
+
+      // Découpe calée sur la fenêtre de visée : le DÉPLACEMENT (pan) et la
+      // ROTATION sont pris en compte, le ZOOM est ignoré, et les débordements
+      // sont remplis en noir → la position choisie est respectée à l'identique.
+      final croppedImagePath = await _cropService.cropViewport(
+        sourcePath: widget.imagePath,
+        offsetDx: _offset.dx,
+        offsetDy: _offset.dy,
+        displayPerSourcePx: displayPerSourcePx,
+        cropSizeDisplay: _cropSize,
+        // Le zoom sert UNIQUEMENT à viser le bon point (mapping du décalage) ;
+        // il n'agrandit pas le rendu de sortie.
+        zoomScale: _scale,
+        rotationDegrees: _rotation,
+      );
+
+      const targetCenterX = 0.5;
+      const targetCenterY = 0.5;
 
       if (!mounted) return;
+
       Navigator.pushReplacement(
         context,
         MaterialPageRoute(
           builder: (_) => AnalysisScreen(
-            imagePath: widget.imagePath,
+            imagePath: croppedImagePath,
+            // AJOUT : on conserve la SOURCE non rognée pour les retours arrière.
+            // Sans cela, revenir au crop repartait de l'image déjà rognée à 85%,
+            // provoquant un zoom cumulatif (0.85 x 0.85 x ...) à chaque aller-retour.
+            originalImagePath: widget.imagePath,
             targetType: widget.targetType,
-            targetCenter: Offset(targetCenterX, targetCenterY),
+            initialCenterX: targetCenterX,
-            cropScale: _scale,
+            initialCenterY: targetCenterY,
-            cropOffset: _offset,
+            cropScale: 1.0,
+            cropOffset: Offset.zero,
+            cropRotation: 0.0,
           ),
         ),
       );
@@ -269,49 +484,10 @@ class _CropScreenState extends State<CropScreen> {
       if (mounted) {
         setState(() => _isLoading = false);
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Erreur: $e'), backgroundColor: AppTheme.errorColor),
+          SnackBar(content: Text('Erreur de découpe : $e'), backgroundColor: AppTheme.errorColor),
         );
       }
     }
   }
 
-  CropRect _calculateCropRect() {
-    if (_imageSize == null) return const CropRect(x: 0, y: 0, width: 1, height: 1);
-    
-    final imageAspect = _imageSize!.width / _imageSize!.height;
-    final viewportAspect = _viewportSize.width / _viewportSize.height;
-
-    double displayWidth, displayHeight;
-    if (imageAspect > viewportAspect) {
-      displayWidth = _viewportSize.width;
-      displayHeight = _viewportSize.width / imageAspect;
-    } else {
-      displayHeight = _viewportSize.height;
-      displayWidth = _viewportSize.height * imageAspect;
-    }
-
-    final scaledWidth = displayWidth * _scale;
-    final scaledHeight = displayHeight * _scale;
-    
-    final imageCenterX = _viewportSize.width / 2 + _offset.dx;
-    final imageCenterY = _viewportSize.height / 2 + _offset.dy;
-    
-    final imageLeft = imageCenterX - scaledWidth / 2;
-    final imageTop = imageCenterY - scaledHeight / 2;
-    
-    final cropLeft = (_viewportSize.width - _cropSize) / 2;
-    final cropTop = (_viewportSize.height - _cropSize) / 2;
-
-    final relCropLeft = (cropLeft - imageLeft) / scaledWidth;
-    final relCropTop = (cropTop - imageTop) / scaledHeight;
-    final relCropWidth = _cropSize / scaledWidth;
-    final relCropHeight = _cropSize / scaledHeight;
-
-    return CropRect(
-      x: relCropLeft,
-      y: relCropTop,
-      width: relCropWidth,
-      height: relCropHeight,
-    );
-  }
 }

lib/features/crop/widgets/crop_overlay.dart

@@ -68,7 +68,7 @@ class _CropOverlayPainter extends CustomPainter {
       _drawGrid(canvas, cropRect);
     }
 
-    // Dessiner le point central (croix)
+    // Dessiner le point central (croix interne vert fluo)
     _drawCenterPoint(canvas, cropRect);
   }
 
@@ -165,35 +165,40 @@ class _CropOverlayPainter extends CustomPainter {
   }
 
   void _drawCenterPoint(Canvas canvas, Rect rect) {
+    // Peinture de la croix interne (Vert Fluo)
     final centerPaint = Paint()
-      ..color = Colors.white.withValues(alpha: 0.8)
+      ..color = const Color(0xFF00FF00)
       ..style = PaintingStyle.stroke
-      ..strokeWidth = 2;
+      ..strokeWidth = 2.0;
 
-    const size = 10.0;
+    // Cercle extérieur (Vert Fluo fin)
+    final circlePaint = Paint()
+      ..color = const Color(0xFF00FF00).withValues(alpha: 0.9)
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 1.2;
+
+    const circleRadius = 10.0; // Augmenté légèrement à 10 pour que la croix respire
     final centerX = rect.center.dx;
     final centerY = rect.center.dy;
 
-    // Ligne horizontale
+    // 1. Dessiner le cercle de contour
+    canvas.drawCircle(rect.center, circleRadius, circlePaint);
+
+    // 2. Dessiner la croix UNIQUEMENT à l'intérieur du cercle
+
+    // Ligne horizontale (de gauche à droite, reste à l'intérieur)
     canvas.drawLine(
-      Offset(centerX - size, centerY),
+      Offset(centerX - circleRadius, centerY),
-      Offset(centerX + size, centerY),
+      Offset(centerX + circleRadius, centerY),
       centerPaint,
     );
 
-    // Ligne verticale
+    // Ligne verticale (de haut en bas, reste à l'intérieur)
     canvas.drawLine(
-      Offset(centerX, centerY - size),
+      Offset(centerX, centerY - circleRadius),
-      Offset(centerX, centerY + size),
+      Offset(centerX, centerY + circleRadius),
       centerPaint,
     );
-
-    // Petit cercle central pour précision (optionnel, mais aide à viser)
-    canvas.drawCircle(
-      rect.center,
-      2,
-      Paint()..color = Colors.red.withValues(alpha: 0.6),
-    );
   }
 
   @override

lib/features/garage/weapon_detail_screen.dart

@@ -19,6 +19,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
   late Weapon _weapon;
   List<MaintenanceEntry> _maintenance = [];
   int _totalRounds = 0;
+  int _sessionCount = 0;
   bool _isLoading = true;
 
   @override
@@ -32,10 +33,12 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
     final repository = context.read<SessionRepository>();
     final history = await repository.getMaintenanceHistory(_weapon.id);
     final rounds = await repository.getRoundsFiredForWeapon(_weapon.id);
+    final sessions = await repository.getSessionCountForWeapon(_weapon.id);
     if (mounted) {
       setState(() {
         _maintenance = history;
         _totalRounds = rounds;
+        _sessionCount = sessions;
         _isLoading = false;
       });
     }
@@ -49,7 +52,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
         actions: [
           IconButton(
             icon: const Icon(Icons.edit),
-            onPressed: () => _showEditWeaponDialog(context),
+            onPressed: _showEditWeaponDialog,
           ),
         ],
       ),
@@ -71,7 +74,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
               ),
             ),
       floatingActionButton: FloatingActionButton.extended(
-        onPressed: () => _showAddMaintenanceDialog(context),
+        onPressed: _showAddMaintenanceDialog,
         label: const Text('Entretien'),
         icon: const Icon(Icons.build),
       ),
@@ -93,7 +96,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
         Expanded(
           child: _buildStatCard(
             'Sessions',
-            'N/A',
+            _sessionCount.toString(),
             Icons.history,
             Colors.orange,
           ),
@@ -149,7 +152,24 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            const Text('Options & Personnalisation', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16)),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                const Expanded(
+                  child: Text('Options & Personnalisation', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16)),
+                ),
+                IconButton(
+                  tooltip: 'Modifier les accessoires (crée une nouvelle configuration)',
+                  icon: const Icon(Icons.edit, color: Colors.white, size: 18),
+                  style: IconButton.styleFrom(
+                    backgroundColor: AppTheme.primaryColor,
+                    padding: const EdgeInsets.all(8),
+                    minimumSize: const Size(36, 36),
+                  ),
+                  onPressed: _showEditAccessoriesDialog,
+                ),
+              ],
+            ),
             const Divider(),
             _buildInfoRow('Optique / Lunette', _weapon.optic ?? 'Mire fer'),
             _buildInfoRow('Modérateur / Silencieux', _weapon.silencer ?? 'Aucun'),
@@ -203,7 +223,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
                   title: Text(entry.type.displayName),
                   subtitle: Text(entry.description),
                   trailing: Text(DateFormat('dd/MM/yy').format(entry.date), style: const TextStyle(fontSize: 12)),
-                  onLongPress: () => _confirmDeleteMaintenance(context, entry),
+                  onLongPress: () => _confirmDeleteMaintenance(entry),
                 ),
               );
             },
@@ -232,7 +252,36 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
     }
   }
 
-  void _showEditWeaponDialog(BuildContext context) async {
+  // Recentre le champ qui prend le focus au milieu de la vue restante une fois
+  // le clavier ouvert. Sans cela, l'AlertDialog se rétrécit et le champ ciblé
+  // (ex: Modérateur) se retrouve caché sous le clavier.
+  Widget _autoScrollOnFocus(Widget child) {
+    return Builder(
+      builder: (context) => Focus(
+        canRequestFocus: false,
+        skipTraversal: true,
+        onFocusChange: (hasFocus) {
+          if (!hasFocus) return;
+          // On attend que le clavier ait fini de redimensionner la vue.
+          Future.delayed(const Duration(milliseconds: 300), () {
+            if (context.mounted) {
+              Scrollable.ensureVisible(
+                context,
+                alignment: 0.5,
+                duration: const Duration(milliseconds: 250),
+                curve: Curves.easeInOut,
+              );
+            }
+          });
+        },
+        child: child,
+      ),
+    );
+  }
+
+  void _showEditWeaponDialog() async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final nameController = TextEditingController(text: _weapon.name);
     final caliberController = TextEditingController(text: _weapon.caliber);
     final magCountController = TextEditingController(text: _weapon.magazineCount.toString());
@@ -253,41 +302,41 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                TextField(
+                _autoScrollOnFocus(TextField(
                   controller: nameController,
                   decoration: const InputDecoration(labelText: 'Modèle', hintText: 'ex: Glock 17'),
-                ),
+                )),
-                TextField(
+                _autoScrollOnFocus(TextField(
                   controller: customNameController,
                   decoration: const InputDecoration(labelText: 'Surnom / Custom Name', hintText: 'ex: Mon Glock de Compète'),
-                ),
+                )),
                 DropdownButtonFormField<WeaponType>(
-                  value: selectedType,
+                  initialValue: selectedType,
                   decoration: const InputDecoration(labelText: 'Type'),
                   items: WeaponType.values.map((t) => DropdownMenuItem(value: t, child: Text(t.displayName))).toList(),
                   onChanged: (v) => setState(() => selectedType = v!),
                 ),
-                TextField(
+                _autoScrollOnFocus(TextField(
                   controller: caliberController,
                   decoration: const InputDecoration(labelText: 'Calibre'),
-                ),
+                )),
                 const SizedBox(height: 16),
                 const Text('Équipement & Options', style: TextStyle(fontWeight: FontWeight.bold)),
-                TextField(
+                _autoScrollOnFocus(TextField(
                   controller: opticController,
                   decoration: const InputDecoration(labelText: 'Optique / Lunette', hintText: 'ex: Holosun 507C'),
-                ),
+                )),
-                TextField(
+                _autoScrollOnFocus(TextField(
                   controller: silencerController,
                   decoration: const InputDecoration(labelText: 'Modérateur / Silencieux'),
-                ),
+                )),
-                TextField(
+                _autoScrollOnFocus(TextField(
                   controller: triggerController,
                   decoration: const InputDecoration(labelText: 'Détente / Trigger'),
-                ),
+                )),
                 const SizedBox(height: 16),
                 const Text('Logistique', style: TextStyle(fontWeight: FontWeight.bold)),
-                Row(
+                _autoScrollOnFocus(Row(
                   children: [
                     Expanded(
                       child: TextField(
@@ -305,12 +354,12 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
                       ),
                     ),
                   ],
-                ),
+                )),
-                TextField(
+                _autoScrollOnFocus(TextField(
                   controller: notesController,
                   decoration: const InputDecoration(labelText: 'Notes'),
                   maxLines: 2,
-                ),
+                )),
               ],
             ),
           ),
@@ -336,17 +385,125 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
         customName: customNameController.text.isEmpty ? null : customNameController.text,
       );
 
-      final repository = context.read<SessionRepository>();
       await repository.updateWeapon(updatedWeapon);
+      if (!mounted) return;
       setState(() {
         _weapon = updatedWeapon;
       });
     }
   }
 
-  void _showAddMaintenanceDialog(BuildContext context) async {
+  // Édition rapide des accessoires uniquement. Comme la qualité de tir dépend
+  // fortement des accessoires, on ne modifie PAS l'arme existante : on crée une
+  // nouvelle arme (même modèle, accessoires différents) dans l'armurerie afin de
+  // pouvoir comparer les scores selon la configuration utilisée.
+  void _showEditAccessoriesDialog() async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
+    final opticController = TextEditingController(text: _weapon.optic);
+    final silencerController = TextEditingController(text: _weapon.silencer);
+    final triggerController = TextEditingController(text: _weapon.trigger);
+    final customNameController = TextEditingController(text: _weapon.customName);
+
+    final result = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Modifier les accessoires'),
+        content: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Text(
+                'Une nouvelle arme sera créée dans l\'armurerie avec ces accessoires, '
+                'pour pouvoir comparer les scores selon la configuration.',
+                style: TextStyle(fontSize: 12, color: Colors.grey),
+              ),
+              const SizedBox(height: 12),
+              _autoScrollOnFocus(TextField(
+                controller: opticController,
+                decoration: const InputDecoration(labelText: 'Optique / Lunette', hintText: 'ex: Holosun 507C'),
+              )),
+              _autoScrollOnFocus(TextField(
+                controller: silencerController,
+                decoration: const InputDecoration(labelText: 'Modérateur / Silencieux'),
+              )),
+              _autoScrollOnFocus(TextField(
+                controller: triggerController,
+                decoration: const InputDecoration(labelText: 'Détente / Trigger'),
+              )),
+              _autoScrollOnFocus(TextField(
+                controller: customNameController,
+                decoration: const InputDecoration(
+                  labelText: 'Surnom de la configuration',
+                  hintText: 'ex: Echelon + Holosun',
+                ),
+              )),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(context, false), child: const Text('Annuler')),
+          ElevatedButton(onPressed: () => Navigator.pop(context, true), child: const Text('Créer la configuration')),
+        ],
+      ),
+    );
+
+    if (result != true || !mounted) return;
+
+    final newOptic = opticController.text.isEmpty ? null : opticController.text;
+    final newSilencer = silencerController.text.isEmpty ? null : silencerController.text;
+    final newTrigger = triggerController.text.isEmpty ? null : triggerController.text;
+    var newCustomName = customNameController.text.isEmpty ? null : customNameController.text;
+
+    // Rien à faire si aucun accessoire n'a changé.
+    final unchanged = newOptic == _weapon.optic &&
+        newSilencer == _weapon.silencer &&
+        newTrigger == _weapon.trigger;
+    if (unchanged) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Aucun accessoire modifié, aucune configuration créée.')),
+      );
+      return;
+    }
+
+    // Génère un surnom par défaut décrivant la config si l'utilisateur n'en a pas saisi.
+    if (newCustomName == null) {
+      final accessories = [newOptic, newSilencer, newTrigger]
+          .where((a) => a != null && a.isNotEmpty)
+          .join(' / ');
+      newCustomName = accessories.isEmpty ? null : '${_weapon.name} ($accessories)';
+    }
+
+    final newWeapon = await repository.addWeapon(
+      name: _weapon.name,
+      type: _weapon.type,
+      caliber: _weapon.caliber,
+      magazineCount: _weapon.magazineCount,
+      magazineCapacity: _weapon.magazineCapacity,
+      notes: _weapon.notes,
+      optic: newOptic,
+      silencer: newSilencer,
+      trigger: newTrigger,
+      customName: newCustomName,
+    );
+
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text('Nouvelle configuration créée : ${newWeapon.displayName}')),
+    );
+    // On bascule sur la nouvelle arme pour que les sessions suivantes y soient rattachées.
+    Navigator.pushReplacement(
+      context,
+      MaterialPageRoute(builder: (_) => WeaponDetailScreen(weapon: newWeapon)),
+    );
+  }
+
+  void _showAddMaintenanceDialog() async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final descController = TextEditingController();
     MaintenanceType selectedType = MaintenanceType.cleaning;
+    DateTime selectedDate = DateTime.now();
 
     final result = await showDialog<bool>(
       context: context,
@@ -357,7 +514,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
             mainAxisSize: MainAxisSize.min,
             children: [
               DropdownButtonFormField<MaintenanceType>(
-                value: selectedType,
+                initialValue: selectedType,
                 decoration: const InputDecoration(labelText: 'Type d\'intervention'),
                 items: MaintenanceType.values.map((t) => DropdownMenuItem(value: t, child: Text(t.displayName))).toList(),
                 onChanged: (v) => setState(() => selectedType = v!),
@@ -367,6 +524,27 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
                 decoration: const InputDecoration(labelText: 'Description', hintText: 'ex: Nettoyage complet après séance'),
                 maxLines: 2,
               ),
+              const SizedBox(height: 8),
+              InkWell(
+                onTap: () async {
+                  final picked = await showDatePicker(
+                    context: context,
+                    initialDate: selectedDate,
+                    firstDate: DateTime(2000),
+                    lastDate: DateTime.now(),
+                  );
+                  if (picked != null) {
+                    setState(() => selectedDate = picked);
+                  }
+                },
+                child: InputDecorator(
+                  decoration: const InputDecoration(
+                    labelText: 'Date',
+                    suffixIcon: Icon(Icons.calendar_today, size: 18),
+                  ),
+                  child: Text(DateFormat('dd/MM/yyyy').format(selectedDate)),
+                ),
+              ),
             ],
           ),
           actions: [
@@ -378,18 +556,21 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
     );
 
     if (result == true && descController.text.isNotEmpty) {
-      final repository = context.read<SessionRepository>();
       await repository.addMaintenanceEntry(
         weaponId: _weapon.id,
         type: selectedType,
         description: descController.text,
         roundsSinceLast: _totalRounds,
+        date: selectedDate,
       );
+      if (!mounted) return;
       _loadData();
     }
   }
 
-  void _confirmDeleteMaintenance(BuildContext context, MaintenanceEntry entry) async {
+  void _confirmDeleteMaintenance(MaintenanceEntry entry) async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (context) => AlertDialog(
@@ -406,8 +587,8 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
     );
 
     if (confirmed == true) {
-      final repository = context.read<SessionRepository>();
       await repository.deleteMaintenanceEntry(entry.id);
+      if (!mounted) return;
       _loadData();
     }
   }

lib/features/garage/weapon_list_screen.dart

@@ -46,7 +46,7 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
               ? _buildEmptyState()
               : _buildWeaponList(),
       floatingActionButton: FloatingActionButton(
-        onPressed: () => _showAddWeaponDialog(context),
+        onPressed: _showAddWeaponDialog,
         child: const Icon(Icons.add),
       ),
     );
@@ -62,7 +62,7 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
           const Text('Aucune arme enregistrée'),
           const SizedBox(height: 24),
           ElevatedButton(
-            onPressed: () => _showAddWeaponDialog(context),
+            onPressed: _showAddWeaponDialog,
             child: const Text('Ajouter ma première arme'),
           ),
         ],
@@ -76,26 +76,11 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
       itemCount: _weapons.length,
       itemBuilder: (context, index) {
         final weapon = _weapons[index];
+        final accessories = _accessoryChips(weapon);
         return Card(
           margin: const EdgeInsets.only(bottom: 12),
-          child: ListTile(
+          child: InkWell(
-            leading: CircleAvatar(
+            borderRadius: BorderRadius.circular(12),
-              backgroundColor: AppTheme.primaryColor.withValues(alpha: 0.1),
-              child: Icon(
-                weapon.type == WeaponType.handgun ? Icons.shield : Icons.ads_click,
-                color: AppTheme.primaryColor,
-              ),
-            ),
-            title: Text(weapon.displayName, style: const TextStyle(fontWeight: FontWeight.bold)),
-            subtitle: Text('${weapon.type.displayName} • ${weapon.caliber}'),
-            trailing: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text('${weapon.magazineCount} chargeurs', style: const TextStyle(fontSize: 12)),
-                Text('${weapon.magazineCapacity} coups', style: const TextStyle(fontSize: 12, color: Colors.grey)),
-              ],
-            ),
             onTap: () async {
               await Navigator.push(
                 context,
@@ -103,14 +88,100 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
               );
               _loadWeapons(); // Reload in case it was edited or maintenance was added
             },
-            onLongPress: () => _confirmDelete(context, weapon),
+            onLongPress: () => _confirmDelete(weapon),
+            child: Padding(
+              // La hauteur du cadre s'adapte automatiquement à la liste d'accessoires.
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  CircleAvatar(
+                    backgroundColor: AppTheme.primaryColor.withValues(alpha: 0.1),
+                    child: Icon(
+                      weapon.type == WeaponType.handgun ? Icons.shield : Icons.ads_click,
+                      color: AppTheme.primaryColor,
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Text(weapon.displayName, style: const TextStyle(fontWeight: FontWeight.bold)),
+                        if (accessories.isNotEmpty) ...[
+                          const SizedBox(height: 6),
+                          Wrap(
+                            spacing: 6,
+                            runSpacing: 6,
+                            children: accessories,
+                          ),
+                          const SizedBox(height: 6),
+                        ] else
+                          const SizedBox(height: 2),
+                        Text(
+                          '${weapon.type.displayName} • ${weapon.caliber}',
+                          style: const TextStyle(fontSize: 13, color: Colors.grey),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(width: 12),
+                  Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Text('${weapon.magazineCount} chargeurs', style: const TextStyle(fontSize: 12)),
+                      Text('${weapon.magazineCapacity} coups', style: const TextStyle(fontSize: 12, color: Colors.grey)),
+                    ],
+                  ),
+                ],
+              ),
+            ),
           ),
         );
       },
     );
   }
 
-  void _showAddWeaponDialog(BuildContext context) async {
+  // Construit la liste des "puces" d'accessoires renseignés pour une arme.
+  // Seuls les accessoires effectivement définis sont affichés ; la card
+  // s'agrandit donc en fonction du nombre d'accessoires.
+  List<Widget> _accessoryChips(Weapon weapon) {
+    final items = <(IconData, String)>[];
+    if (weapon.optic != null && weapon.optic!.isNotEmpty) {
+      items.add((Icons.center_focus_strong, weapon.optic!));
+    }
+    if (weapon.silencer != null && weapon.silencer!.isNotEmpty) {
+      items.add((Icons.volume_off, weapon.silencer!));
+    }
+    if (weapon.trigger != null && weapon.trigger!.isNotEmpty) {
+      items.add((Icons.touch_app, weapon.trigger!));
+    }
+
+    return items.map((item) {
+      return Container(
+        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+        decoration: BoxDecoration(
+          color: AppTheme.primaryColor.withValues(alpha: 0.08),
+          borderRadius: BorderRadius.circular(20),
+          border: Border.all(color: AppTheme.primaryColor.withValues(alpha: 0.25)),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(item.$1, size: 13, color: AppTheme.primaryColor),
+            const SizedBox(width: 4),
+            Text(item.$2, style: const TextStyle(fontSize: 12)),
+          ],
+        ),
+      );
+    }).toList();
+  }
+
+  void _showAddWeaponDialog() async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final nameController = TextEditingController();
     final caliberController = TextEditingController();
     final magCountController = TextEditingController(text: '2');
@@ -131,7 +202,7 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
                   decoration: const InputDecoration(labelText: 'Nom de l\'arme', hintText: 'ex: Glock 17'),
                 ),
                 DropdownButtonFormField<WeaponType>(
-                  value: selectedType,
+                  initialValue: selectedType,
                   decoration: const InputDecoration(labelText: 'Type'),
                   items: WeaponType.values.map((t) => DropdownMenuItem(value: t, child: Text(t.displayName))).toList(),
                   onChanged: (v) => setState(() => selectedType = v!),
@@ -171,7 +242,6 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
     );
 
     if (result == true && nameController.text.isNotEmpty) {
-      final repository = context.read<SessionRepository>();
       await repository.addWeapon(
         name: nameController.text,
         type: selectedType,
@@ -179,11 +249,14 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
         magazineCount: int.tryParse(magCountController.text) ?? 1,
         magazineCapacity: int.tryParse(magCapController.text) ?? 10,
       );
+      if (!mounted) return;
       _loadWeapons();
     }
   }
 
-  void _confirmDelete(BuildContext context, Weapon weapon) async {
+  void _confirmDelete(Weapon weapon) async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (context) => AlertDialog(
@@ -200,8 +273,8 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
     );
 
     if (confirmed == true) {
-      final repository = context.read<SessionRepository>();
       await repository.deleteWeapon(weapon.id);
+      if (!mounted) return;
       _loadWeapons();
     }
   }

lib/features/history/history_screen.dart

@@ -11,7 +11,13 @@ import 'widgets/session_list_item.dart';
 import 'widgets/history_chart.dart';
 
 class HistoryScreen extends StatefulWidget {
-  const HistoryScreen({super.key});
+  /// Incrémenté par la navigation à chaque ouverture de l'onglet Historique,
+  /// pour forcer un rechargement des sessions (l'écran est gardé vivant par un
+  /// IndexedStack, sinon une session tout juste clôturée n'apparaîtrait pas
+  /// tant qu'on ne tire pas manuellement pour rafraîchir).
+  final int refreshTick;
+
+  const HistoryScreen({super.key, this.refreshTick = 0});
 
   @override
   State<HistoryScreen> createState() => _HistoryScreenState();
@@ -31,6 +37,16 @@ class _HistoryScreenState extends State<HistoryScreen> {
     _loadSessions();
   }
 
+  @override
+  void didUpdateWidget(HistoryScreen oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    // L'onglet vient d'être ré-ouvert : on recharge pour afficher les sessions
+    // récemment clôturées sans avoir à tirer manuellement pour rafraîchir.
+    if (oldWidget.refreshTick != widget.refreshTick) {
+      _loadSessions();
+    }
+  }
+
   Future<void> _loadSessions() async {
     if (!mounted) return;
     setState(() => _isLoading = true);
@@ -43,6 +59,14 @@ class _HistoryScreenState extends State<HistoryScreen> {
         setState(() {
           _sessions = sessions;
 
+          // --- FILTRAGE PAR TYPE DE CIBLE ---
+          // Une session est retenue si au moins une de ses cibles est du type choisi.
+          if (_filterType != null) {
+            _sessions = _sessions
+                .where((s) => s.analyses.any((a) => a.targetType == _filterType))
+                .toList();
+          }
+
           // --- LOGIQUE DE FILTRAGE PAR PÉRIODE ---
           if (_selectedDateRange != null) {
             _sessions = _sessions.where((s) {
@@ -103,7 +127,7 @@ class _HistoryScreenState extends State<HistoryScreen> {
               onSurface: Colors.black87,        // Texte des dates (Noir sur Blanc)
               secondary: AppTheme.primaryColor,
             ),
-            dialogBackgroundColor: Colors.white,
+            dialogTheme: const DialogThemeData(backgroundColor: Colors.white),
             textButtonTheme: TextButtonThemeData(
               style: TextButton.styleFrom(foregroundColor: AppTheme.primaryColor),
             ),
@@ -125,17 +149,29 @@ class _HistoryScreenState extends State<HistoryScreen> {
       appBar: AppBar(
         title: const Text('Historique'),
         actions: [
-          PopupMenuButton<TargetType?>(
+          // NOTE : on passe par un String sentinelle ('all') car un
-            icon: const Icon(Icons.filter_list),
+          // PopupMenuItem avec value null ne déclenche jamais onSelected
-            onSelected: (type) {
+          // (Flutter l'interprète comme une annulation du menu).
-              setState(() => _filterType = type);
+          PopupMenuButton<String>(
+            icon: Icon(
+              Icons.filter_list,
+              // Icône colorée quand un filtre est actif, pour le rendre visible.
+              color: _filterType != null ? AppTheme.primaryColor : null,
+            ),
+            onSelected: (value) {
+              setState(() {
+                _filterType =
+                    value == 'all' ? null : TargetType.fromString(value);
+              });
               _loadSessions();
             },
             itemBuilder: (context) => [
-              const PopupMenuItem(value: null, child: Text('Tous')),
+              const PopupMenuItem(value: 'all', child: Text('Tous')),
               ...TargetType.values.map(
-                (type) =>
+                (type) => PopupMenuItem(
-                    PopupMenuItem(value: type, child: Text(type.displayName)),
+                  value: type.name,
+                  child: Text(type.displayName),
+                ),
               ),
             ],
           ),

lib/features/home/home_screen.dart

@@ -25,12 +25,43 @@ class _HomeScreenState extends State<HomeScreen> {
   List<Session> _recentSessions = [];
   bool _isLoading = true;
 
+  SessionProvider? _sessionProvider;
+  bool _wasSessionActive = false;
+
   @override
   void initState() {
     super.initState();
     _loadStats();
   }
 
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final provider = context.read<SessionProvider>();
+    if (provider != _sessionProvider) {
+      _sessionProvider?.removeListener(_onSessionChanged);
+      _sessionProvider = provider;
+      _sessionProvider!.addListener(_onSessionChanged);
+      _wasSessionActive = provider.isSessionActive;
+    }
+  }
+
+  void _onSessionChanged() {
+    final isActive = _sessionProvider?.isSessionActive ?? false;
+    // Quand une session vient de se terminer, on rafraîchit les stats
+    // automatiquement pour prendre en compte la dernière session.
+    if (_wasSessionActive && !isActive) {
+      _loadStats();
+    }
+    _wasSessionActive = isActive;
+  }
+
+  @override
+  void dispose() {
+    _sessionProvider?.removeListener(_onSessionChanged);
+    super.dispose();
+  }
+
   Future<void> _loadStats() async {
     final repository = context.read<SessionRepository>();
     final stats = await repository.getStatistics();
@@ -125,21 +156,100 @@ class _HomeScreenState extends State<HomeScreen> {
     final sessionProvider = context.watch<SessionProvider>();
     final isSessionActive = sessionProvider.isSessionActive;
 
-    return ElevatedButton.icon(
+    // Si aucune session n'est active, on affiche juste le bouton de départ habituel
-      onPressed: () => _navigateToSessionSetup(context),
+    if (!isSessionActive) {
-      style: ElevatedButton.styleFrom(
+      return ElevatedButton.icon(
-        backgroundColor: isSessionActive ? AppTheme.secondaryColor : AppTheme.primaryColor,
+        onPressed: () => _navigateToSessionSetup(context),
-        foregroundColor: Colors.white,
+        style: ElevatedButton.styleFrom(
-        padding: const EdgeInsets.symmetric(vertical: 20),
+          backgroundColor: AppTheme.primaryColor,
-        shape: RoundedRectangleBorder(
+          foregroundColor: Colors.white,
-          borderRadius: BorderRadius.circular(AppConstants.borderRadius),
+          padding: const EdgeInsets.symmetric(vertical: 20),
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(AppConstants.borderRadius),
+          ),
         ),
-      ),
+        icon: const Icon(Icons.add_circle_outline, size: 28),
-      icon: Icon(isSessionActive ? Icons.play_circle_outline : Icons.add_circle_outline, size: 28),
+        label: const Text(
-      label: Text(
+          'Nouvelle session',
-        isSessionActive ? 'Continuer la session' : 'Démarrer la session',
+          style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-        style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+        ),
-      ),
+      );
+    }
+
+    // MODIFICATION : Alignement sur une seule ligne (80% / 20%) avec une croix pour l'annulation
+    return Row(
+      children: [
+        // 80% de largeur pour continuer la session
+        Expanded(
+          flex: 8,
+          child: ElevatedButton.icon(
+            onPressed: () => _navigateToSessionSetup(context),
+            style: ElevatedButton.styleFrom(
+              backgroundColor: AppTheme.secondaryColor,
+              foregroundColor: Colors.white,
+              padding: const EdgeInsets.symmetric(vertical: 20),
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(AppConstants.borderRadius),
+              ),
+            ),
+            icon: const Icon(Icons.play_circle_outline, size: 28),
+            label: const Text(
+              'Continuer la session',
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ),
+        const SizedBox(width: 12),
+        // 20% de largeur pour terminer/annuler la session (Bouton Croix)
+        Expanded(
+          flex: 2,
+          child: OutlinedButton(
+            onPressed: () {
+              // Boite de dialogue de confirmation pour éviter les erreurs
+              showDialog(
+                context: context,
+                builder: (BuildContext context) {
+                  return AlertDialog(
+                    title: const Text('Terminer la session ?'),
+                    content: const Text('Êtes-vous sûr de vouloir clôturer la session en cours ?'),
+                    actions: [
+                      TextButton(
+                        onPressed: () => Navigator.pop(context),
+                        child: const Text('ANNULER'),
+                      ),
+                      TextButton(
+                        onPressed: () {
+                          Navigator.pop(context);
+                          // Clôture propre de la session dans le State global
+                          context.read<SessionProvider>().endSession();
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            const SnackBar(
+                              content: Text('Session terminée avec succès !'),
+                              backgroundColor: AppTheme.successColor,
+                            ),
+                          );
+                        },
+                        child: const Text('TERMINER', style: TextStyle(color: Colors.redAccent)),
+                      ),
+                    ],
+                  );
+                },
+              );
+            },
+            style: OutlinedButton.styleFrom(
+              foregroundColor: Colors.redAccent,
+              side: const BorderSide(color: Colors.redAccent, width: 1.5),
+              padding: const EdgeInsets.symmetric(vertical: 20), // Même hauteur que le bouton continuer
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(AppConstants.borderRadius),
+              ),
+            ),
+            child: const Icon(Icons.close, size: 28),
+          ),
+        ),
+      ],
     );
   }
 
@@ -197,17 +307,17 @@ class _HomeScreenState extends State<HomeScreen> {
             ),
             child: _recentSessions.length < 2
                 ? const Center(
-                    child: Column(
+              child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
+                children: [
-                        Icon(Icons.show_chart, size: 40, color: Colors.grey),
+                  Icon(Icons.show_chart, size: 40, color: Colors.grey),
-                        Text(
+                  Text(
-                          'Pas assez de données',
+                    'Pas assez de données',
-                          style: TextStyle(color: Colors.grey, fontSize: 12),
+                    style: TextStyle(color: Colors.grey, fontSize: 12),
-                        ),
+                  ),
-                      ],
+                ],
-                    ),
+              ),
-                  )
+            )
                 : _buildHomeTrendChart(),
           ),
         ),
@@ -276,7 +386,7 @@ class _HomeScreenState extends State<HomeScreen> {
     final sorted = List<Session>.from(_recentSessions)
       ..sort((a, b) => a.createdAt.compareTo(b.createdAt));
     final display =
-        sorted.length > 7 ? sorted.sublist(sorted.length - 7) : sorted;
+    sorted.length > 7 ? sorted.sublist(sorted.length - 7) : sorted;
 
     return LineChart(
       LineChartData(

lib/features/session/session_provider.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/foundation.dart';
-import '../../data/models/session.dart';
 import '../../data/models/target_analysis.dart';
-import '../../data/models/weapon.dart';
 
 class SessionProvider extends ChangeNotifier {
+  DateTime? _sessionDate;
+  DateTime? get sessionDate => _sessionDate;
   String? _currentWeaponName;
   String? _currentWeaponId;
   int _shotsPerTarget = 5;
@@ -23,11 +23,12 @@ class SessionProvider extends ChangeNotifier {
   int get totalSessionScore => _currentAnalyses.fold(0, (sum, a) => sum + a.totalScore);
   int get targetCount => _currentAnalyses.length;
 
-  void startSession(String weaponName, int shots, String sessionId, {String? weaponId, int distance = 25}) {
+  void startSession(String weaponName, int shots, String sessionId, {String? weaponId, int distance = 25, DateTime? date}) {
     _currentWeaponName = weaponName;
     _currentWeaponId = weaponId;
     _shotsPerTarget = shots;
     _distance = distance;
+    _sessionDate = date ?? DateTime.now();
     _activeSessionId = sessionId;
     _currentAnalyses.clear();
     _isSessionActive = true;

lib/features/session/session_setup_screen.dart

@@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:intl/intl.dart'; // Utile pour formater proprement la date en français
 import '../../core/constants/app_constants.dart';
 import '../../core/theme/app_theme.dart';
 import '../../data/models/weapon.dart';
 import '../../data/repositories/session_repository.dart';
 import 'session_provider.dart';
 import '../capture/capture_screen.dart';
+import '../garage/weapon_list_screen.dart';
 
 class SessionSetupScreen extends StatefulWidget {
   const SessionSetupScreen({super.key});
@@ -16,13 +18,16 @@ class SessionSetupScreen extends StatefulWidget {
 
 class _SessionSetupScreenState extends State<SessionSetupScreen> {
   final _formKey = GlobalKey<FormState>();
-  final _weaponController = TextEditingController();
+
   int _shotsPerTarget = 5;
   int _distance = 25;
   List<Weapon> _availableWeapons = [];
   Weapon? _selectedWeapon;
   bool _isLoadingWeapons = true;
 
+  // AJOUT DE LA VARIABLE DATE : Initialisée par défaut à maintenant
+  DateTime _selectedDate = DateTime.now();
+
   @override
   void initState() {
     super.initState();
@@ -30,34 +35,63 @@ class _SessionSetupScreenState extends State<SessionSetupScreen> {
   }
 
   Future<void> _loadWeapons() async {
+    setState(() => _isLoadingWeapons = true);
     final repository = context.read<SessionRepository>();
     final weapons = await repository.getWeapons();
+
     if (mounted) {
       setState(() {
         _availableWeapons = weapons;
+        if (_availableWeapons.isNotEmpty && _selectedWeapon == null) {
+          _selectedWeapon = _availableWeapons.first;
+          _updateSettingsForWeapon(_selectedWeapon!);
+        }
         _isLoadingWeapons = false;
       });
     }
   }
 
-  @override
+  void _updateSettingsForWeapon(Weapon weapon) {
-  void dispose() {
+    _shotsPerTarget = weapon.magazineCapacity;
-    _weaponController.dispose();
+    _distance = (weapon.type == WeaponType.handgun) ? 25 : 50;
-    super.dispose();
+  }
+
+  // Fonction pour ouvrir le calendrier si l'utilisateur clique sur le champ
+  Future<void> _pickDate() async {
+    final DateTime? picked = await showDatePicker(
+      context: context,
+      initialDate: _selectedDate,
+      firstDate: DateTime(2020),
+      lastDate: DateTime(2100),
+      locale: const Locale('fr', 'FR'), // Force le calendrier en français
+    );
+    if (picked != null && picked != _selectedDate) {
+      setState(() {
+        // On garde aussi l'heure actuelle lors du changement de date
+        final now = DateTime.now();
+        _selectedDate = DateTime(picked.year, picked.month, picked.day, now.hour, now.minute);
+      });
+    }
   }
 
   void _startSession() {
-    if (_formKey.currentState!.validate()) {
+    if (_formKey.currentState!.validate() && _selectedWeapon != null) {
       final repository = context.read<SessionRepository>();
       final sessionProvider = context.read<SessionProvider>();
 
       final sessionId = repository.generateId();
+
+      // PASSE-PARTOUT : On envoie la session au provider.
+      // Note : Si ton `sessionProvider.startSession` ne prend pas encore la date en paramètre,
+      // pas de panique, la compilation passera car Dart tolère les arguments nommés optionnels
+      // s'ils sont déjà présents, ou tu pourras l'ajouter à ta méthode startSession.
       sessionProvider.startSession(
-        _selectedWeapon != null ? _selectedWeapon!.displayName : _weaponController.text,
+        _selectedWeapon!.displayName,
         _shotsPerTarget,
         sessionId,
-        weaponId: _selectedWeapon?.id,
+        weaponId: _selectedWeapon!.id,
         distance: _distance,
+        date: _selectedDate,
       );
 
       Navigator.pushReplacement(
@@ -69,6 +103,9 @@ class _SessionSetupScreenState extends State<SessionSetupScreen> {
 
   @override
   Widget build(BuildContext context) {
+    // Petit formatage sympa en français (ex: "27 mai 2026")
+    final String formattedDate = DateFormat('dd MMMM yyyy', 'fr_FR').format(_selectedDate);
+
     return Scaffold(
       appBar: AppBar(
         title: const Text('Configuration de la session'),
@@ -83,69 +120,97 @@ class _SessionSetupScreenState extends State<SessionSetupScreen> {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               const Text(
-                'Choix de l\'arme',
+                'Informations générales',
                 style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
               ),
               const SizedBox(height: 16),
 
-              if (_availableWeapons.isNotEmpty) ...[
+              // AFFICHAGE CONDITIONNEL : Armurerie vide vs Armurerie remplie
-                DropdownButtonFormField<Weapon?>(
+              if (_availableWeapons.isEmpty)
-                  value: _selectedWeapon,
+                Container(
-                  decoration: InputDecoration(
+                  padding: const EdgeInsets.all(16),
-                    labelText: 'Sélectionner une arme de l\'armurerie',
+                  decoration: BoxDecoration(
-                    prefixIcon: const Icon(Icons.shield),
+                    color: AppTheme.errorColor.withValues(alpha: 0.1),
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(AppConstants.borderRadius),
-                    ),
-                  ),
-                  items: [
-                    const DropdownMenuItem<Weapon?>(
-                      value: null,
-                      child: Text('Nouvelle arme / Autre'),
-                    ),
-                    ..._availableWeapons.map((w) => DropdownMenuItem(
-                      value: w,
-                      child: Text(w.displayName),
-                    )),
-                  ],
-                  onChanged: (value) {
-                    setState(() {
-                      _selectedWeapon = value;
-                      if (value != null) {
-                        _weaponController.text = value.displayName;
-                        _shotsPerTarget = value.magazineCapacity;
-                        // Auto-set distance based on weapon type if needed
-                        _distance = (value.type == WeaponType.handgun) ? 25 : 50;
-                      } else {
-                        _weaponController.clear();
-                      }
-                    });
-                  },
-                ),
-                const SizedBox(height: 16),
-                const Center(child: Text('OU', style: TextStyle(color: Colors.grey, fontWeight: FontWeight.bold))),
-                const SizedBox(height: 16),
-              ],
-
-              // Weapon field (manual entry if no weapon selected)
-              TextFormField(
-                controller: _weaponController,
-                enabled: _selectedWeapon == null,
-                decoration: InputDecoration(
-                  labelText: 'Nom de l\'arme',
-                  hintText: 'ex: Glock 17, CZ Shadow 2...',
-                  prefixIcon: const Icon(Icons.edit),
-                  border: OutlineInputBorder(
                     borderRadius: BorderRadius.circular(AppConstants.borderRadius),
+                    border: Border.all(color: AppTheme.errorColor.withValues(alpha: 0.5)),
                   ),
+                  child: Column(
+                    children: [
+                      const Icon(Icons.warning_amber_rounded, color: AppTheme.errorColor, size: 48),
+                      const SizedBox(height: 8),
+                      const Text(
+                        'Ton armurerie est vide.',
+                        style: TextStyle(fontWeight: FontWeight.bold),
+                        textAlign: TextAlign.center,
+                      ),
+                      const SizedBox(height: 4),
+                      const Text(
+                        'Tu dois d\'abord ajouter une arme pour pouvoir démarrer une session de tir.',
+                        textAlign: TextAlign.center,
+                      ),
+                      const SizedBox(height: 16),
+                      ElevatedButton.icon(
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(builder: (_) => const WeaponListScreen()),
+                          ).then((_) {
+                            _loadWeapons();
+                          });
+                        },
+                        icon: const Icon(Icons.add),
+                        label: const Text('ALLER À MON ARMURERIE'),
+                      ),
+                    ],
+                  ),
+                )
+              else
+                Column(
+                  children: [
+                    DropdownButtonFormField<Weapon>(
+                      initialValue: _selectedWeapon,
+                      decoration: InputDecoration(
+                        labelText: 'Sélectionner une arme',
+                        prefixIcon: const Icon(Icons.shield),
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(AppConstants.borderRadius),
+                        ),
+                      ),
+                      items: _availableWeapons.map((w) => DropdownMenuItem(
+                        value: w,
+                        child: Text(w.displayName),
+                      )).toList(),
+                      onChanged: (value) {
+                        if (value != null) {
+                          setState(() {
+                            _selectedWeapon = value;
+                            _updateSettingsForWeapon(value);
+                          });
+                        }
+                      },
+                    ),
+                    const SizedBox(height: 16),
+
+                    // NOUVEAU CHAMP : Sélecteur de date interactif
+                    InkWell(
+                      onTap: _availableWeapons.isEmpty ? null : _pickDate,
+                      borderRadius: BorderRadius.circular(AppConstants.borderRadius),
+                      child: IgnorePointer(
+                        child: TextFormField(
+                          decoration: InputDecoration(
+                            labelText: 'Date de la session',
+                            prefixIcon: const Icon(Icons.calendar_today),
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(AppConstants.borderRadius),
+                            ),
+                          ),
+                          controller: TextEditingController(text: formattedDate),
+                        ),
+                      ),
+                    ),
+                  ],
                 ),
-                validator: (value) {
+
-                  if (value == null || value.isEmpty) {
-                    return 'Veuillez renseigner votre arme';
-                  }
-                  return null;
-                },
-              ),
               const SizedBox(height: 24),
 
               // Distance selector
@@ -161,9 +226,9 @@ class _SessionSetupScreenState extends State<SessionSetupScreen> {
                       value: _distance.toDouble(),
                       min: 5,
                       max: 300,
-                      divisions: 59, // (300-5)/5 = 59 divisions for 5m steps
+                      divisions: 59,
                       label: '${_distance}m',
-                      onChanged: (value) {
+                      onChanged: _availableWeapons.isEmpty ? null : (value) {
                         setState(() {
                           _distance = value.round();
                         });
@@ -193,7 +258,7 @@ class _SessionSetupScreenState extends State<SessionSetupScreen> {
 
               // Shots per target
               const Text(
-                'Nombre de balles par cible',
+                'Nombre de balles pour la cible actuelle',
                 style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
               ),
               const SizedBox(height: 8),
@@ -203,10 +268,10 @@ class _SessionSetupScreenState extends State<SessionSetupScreen> {
                     child: Slider(
                       value: _shotsPerTarget.toDouble(),
                       min: 1,
-                      max: 30,
+                      max: 50,
-                      divisions: 29,
+                      divisions: 49,
                       label: '$_shotsPerTarget',
-                      onChanged: (value) {
+                      onChanged: _availableWeapons.isEmpty ? null : (value) {
                         setState(() {
                           _shotsPerTarget = value.round();
                         });
@@ -235,7 +300,9 @@ class _SessionSetupScreenState extends State<SessionSetupScreen> {
               const SizedBox(height: 48),
 
               ElevatedButton.icon(
-                onPressed: _startSession,
+                onPressed: (_availableWeapons.isEmpty || _selectedWeapon == null)
+                    ? null
+                    : _startSession,
                 style: ElevatedButton.styleFrom(
                   backgroundColor: AppTheme.primaryColor,
                   foregroundColor: Colors.white,

lib/features/settings/settings_screen.dart

@@ -67,7 +67,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
         if (mounted) setState(() => _isLoadingStats = false);
       }
     } catch (e) {
-      print('Erreur lors du chargement des statistiques: $e');
+      debugPrint('Erreur lors du chargement des statistiques: $e');
       if (mounted) setState(() => _isLoadingStats = false);
     }
   }
@@ -85,8 +85,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
   }
 
   void _showThemeDialog() {
-    final themeProvider = context.read<ThemeProvider>();
-    
     showDialog(
       context: context,
       builder: (context) => AlertDialog(
@@ -247,6 +245,79 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
+  // Rapport de bug autonome : on collecte une description + les infos
+  // techniques, et on copie un rapport prêt à coller dans un email de support.
+  void _showReportBugDialog() {
+    final descController = TextEditingController();
+    const supportEmail = 'monadressemaildesupport@nomdelapplication.com';
+    const appVersion = '1.0.0';
+    final platform = Theme.of(context).platform.name;
+
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Signaler un bug'),
+        content: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const Text(
+                'Décrivez le problème : ce que vous faisiez, ce qui était attendu et ce qui s\'est passé.',
+                style: TextStyle(fontSize: 13, color: Colors.grey),
+              ),
+              const SizedBox(height: 12),
+              TextField(
+                controller: descController,
+                maxLines: 5,
+                decoration: const InputDecoration(
+                  hintText: 'Ex: l\'application se ferme quand j\'ouvre une session...',
+                  border: OutlineInputBorder(),
+                ),
+              ),
+              const SizedBox(height: 12),
+              Text(
+                'Infos techniques jointes : version $appVersion • $platform',
+                style: const TextStyle(fontSize: 11, color: Colors.grey),
+              ),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: const Text('Annuler'),
+          ),
+          ElevatedButton.icon(
+            icon: const Icon(Icons.copy, size: 18),
+            label: const Text('Copier le rapport'),
+            onPressed: () {
+              final desc = descController.text.trim();
+              final report = StringBuffer()
+                ..writeln('--- Rapport de bug ---')
+                ..writeln('Version : $appVersion')
+                ..writeln('Plateforme : $platform')
+                ..writeln('Date : ${DateTime.now().toIso8601String()}')
+                ..writeln('')
+                ..writeln('Description :')
+                ..writeln(desc.isEmpty ? '(non renseignée)' : desc);
+
+              Clipboard.setData(ClipboardData(text: report.toString()));
+              Navigator.pop(context);
+              ScaffoldMessenger.of(context).showSnackBar(
+                const SnackBar(
+                  content: Text('Rapport copié — collez-le dans un email à $supportEmail'),
+                  backgroundColor: AppTheme.successColor,
+                  duration: Duration(seconds: 5),
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -303,7 +374,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
               subtitle: const Text('Aidez-nous à améliorer la détection tout en gagnant des avantages', style: TextStyle(fontSize: 12)),
               secondary: const Icon(Icons.psychology, color: AppTheme.textPrimary),
               value: _isUploadEnabled,
-              activeColor: AppTheme.primaryColor,
+              activeThumbColor: AppTheme.primaryColor,
               shape: RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(12.0),
                 side: BorderSide(color: Colors.grey.withAlpha(50), width: 1),
@@ -347,6 +418,13 @@ class _SettingsScreenState extends State<SettingsScreen> {
             subtitle: '1.0.0',
             onTap: () {},
           ),
+          _buildSettingsTile(
+            context: context,
+            icon: Icons.bug_report_outlined,
+            title: 'Signaler un bug',
+            subtitle: 'Aidez-nous à corriger les problèmes',
+            onTap: _showReportBugDialog,
+          ),
           _buildSettingsTile(
             context: context,
             icon: Icons.privacy_tip_outlined,

lib/features/statistics/statistics_screen.dart

@@ -3,6 +3,7 @@ import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fl_chart/fl_chart.dart'; // La librairie pour les courbes
+import '../../core/widgets/metric_info_button.dart';
 import '../../data/models/session.dart';
 import '../../data/repositories/session_repository.dart';
 import '../../services/statistics_service.dart';
@@ -10,7 +11,12 @@ import '../../services/statistics_service.dart';
 class StatisticsScreen extends StatefulWidget {
   final Session? singleSession;
 
-  const StatisticsScreen({super.key, this.singleSession});
+  /// Incrémenté par la navigation à chaque fois que l'onglet Stats est ouvert,
+  /// pour forcer un rechargement des données (l'écran est gardé vivant par un
+  /// IndexedStack, sinon les filtres arme/distance resteraient périmés).
+  final int refreshTick;
+
+  const StatisticsScreen({super.key, this.singleSession, this.refreshTick = 0});
 
   @override
   State<StatisticsScreen> createState() => _StatisticsScreenState();
@@ -18,7 +24,7 @@ class StatisticsScreen extends StatefulWidget {
 
 class _StatisticsScreenState extends State<StatisticsScreen> {
   final StatisticsService _statisticsService = StatisticsService();
-  StatsPeriod _selectedPeriod = StatsPeriod.all;
+  final StatsPeriod _selectedPeriod = StatsPeriod.all;
   SessionStatistics? _statistics;
   bool _isLoading = true;
   List<Session> _allSessions = [];
@@ -29,12 +35,30 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
   List<String> _availableWeapons = ['Toutes'];
   List<String> _availableDistances = ['Toutes'];
 
+  // --- Comparateur de sessions ---
+  // Quand 2 sessions sont sélectionnées, l'écran passe en mode comparaison :
+  // un switch permet d'alterner l'affichage des stats entre la session A et B.
+  Session? _compareA;
+  Session? _compareB;
+  bool _showingB = false; // false = on affiche A, true = on affiche B
+  bool get _compareMode => _compareA != null && _compareB != null;
+
   @override
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) => _loadStatistics());
   }
 
+  @override
+  void didUpdateWidget(StatisticsScreen oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    // L'onglet vient d'être ré-ouvert : on recharge pour rafraîchir les listes
+    // de filtres (armes/distances) et les stats avec les nouvelles sessions.
+    if (oldWidget.refreshTick != widget.refreshTick) {
+      _loadStatistics();
+    }
+  }
+
   Future<void> _loadStatistics() async {
     if (!mounted) return;
     setState(() => _isLoading = true);
@@ -79,6 +103,17 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
   }
 
   void _calculateStats() {
+    // Mode comparaison : on calcule les stats sur la seule session active
+    // (A ou B selon le switch), sans filtre de période.
+    if (_compareMode) {
+      final active = _showingB ? _compareB! : _compareA!;
+      _statistics = _statisticsService.calculateStatistics(
+        [active],
+        period: StatsPeriod.all,
+      );
+      return;
+    }
+
     // Filtrer les sessions avant calcul
     final filteredSessions = _allSessions.where((s) {
       final weaponMatch = _selectedWeapon == 'Toutes' || s.weapon == _selectedWeapon;
@@ -92,6 +127,80 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
     );
   }
 
+  String _sessionLabel(Session s) {
+    final d = s.createdAt;
+    final date = '${d.day.toString().padLeft(2, '0')}/${d.month.toString().padLeft(2, '0')}/${d.year}';
+    return '${s.weapon} • $date • ${s.totalScore} pts';
+  }
+
+  // Sélection des 2 sessions à comparer via un dialog à deux listes déroulantes.
+  Future<void> _openCompareDialog() async {
+    if (_allSessions.length < 2) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Il faut au moins 2 sessions enregistrées pour comparer.')),
+      );
+      return;
+    }
+
+    Session? a = _compareA ?? _allSessions[0];
+    Session? b = _compareB ?? _allSessions[1];
+
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (context) => StatefulBuilder(
+        builder: (context, setState) => AlertDialog(
+          title: const Text('Comparer 2 sessions'),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              DropdownButtonFormField<Session>(
+                initialValue: a,
+                isExpanded: true,
+                decoration: const InputDecoration(labelText: 'Session A'),
+                items: _allSessions
+                    .map((s) => DropdownMenuItem(value: s, child: Text(_sessionLabel(s), overflow: TextOverflow.ellipsis)))
+                    .toList(),
+                onChanged: (v) => setState(() => a = v),
+              ),
+              const SizedBox(height: 12),
+              DropdownButtonFormField<Session>(
+                initialValue: b,
+                isExpanded: true,
+                decoration: const InputDecoration(labelText: 'Session B'),
+                items: _allSessions
+                    .map((s) => DropdownMenuItem(value: s, child: Text(_sessionLabel(s), overflow: TextOverflow.ellipsis)))
+                    .toList(),
+                onChanged: (v) => setState(() => b = v),
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(onPressed: () => Navigator.pop(context, false), child: const Text('Annuler')),
+            ElevatedButton(onPressed: () => Navigator.pop(context, true), child: const Text('Comparer')),
+          ],
+        ),
+      ),
+    );
+
+    if (confirmed == true && a != null && b != null) {
+      setState(() {
+        _compareA = a;
+        _compareB = b;
+        _showingB = false;
+        _calculateStats();
+      });
+    }
+  }
+
+  void _exitCompareMode() {
+    setState(() {
+      _compareA = null;
+      _compareB = null;
+      _showingB = false;
+      _calculateStats();
+    });
+  }
+
   List<double> _getScoreHistory() {
     if (_statistics == null || _statistics!.sessions.isEmpty) return [0];
     // Sort sessions by date and take last 10
@@ -123,47 +232,64 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
       ),
       body: _isLoading
           ? const Center(child: CircularProgressIndicator())
-          : RefreshIndicator(
+          : Column(
-              onRefresh: _loadStatistics,
+              children: [
-              child: SingleChildScrollView(
+                // HEADER COLLANT : filtres + comparateur toujours visibles
-                physics: const AlwaysScrollableScrollPhysics(),
+                Material(
-                padding: const EdgeInsets.all(16),
+                  elevation: 2,
-              child: Column(
+                  color: Theme.of(context).scaffoldBackgroundColor,
-                children: [
+                  child: Padding(
-                  // 1. FILTRES (Arme et Distance)
+                    padding: const EdgeInsets.fromLTRB(16, 16, 16, 12),
-                  Row(
+                    child: Column(
-                    children: [
+                      children: [
-                      Expanded(
+                        // 1. FILTRES (Arme et Distance)
-                        child: _buildDropdown(
+                        Row(
-                          'Arme utilisée', 
+                          children: [
-                          _selectedWeapon, 
+                            Expanded(
-                          _availableWeapons,
+                              child: _buildDropdown(
-                          (val) {
+                                'Arme utilisée',
-                            setState(() {
+                                _selectedWeapon,
-                              _selectedWeapon = val!;
+                                _availableWeapons,
-                              _calculateStats();
+                                (val) {
-                            });
+                                  setState(() {
-                          },
+                                    _selectedWeapon = val!;
+                                    _calculateStats();
+                                  });
+                                },
+                              ),
+                            ),
+                            const SizedBox(width: 12),
+                            Expanded(
+                              child: _buildDropdown(
+                                'Distance',
+                                _selectedDistance,
+                                _availableDistances,
+                                (val) {
+                                  setState(() {
+                                    _selectedDistance = val!;
+                                    _calculateStats();
+                                  });
+                                },
+                              ),
+                            ),
+                          ],
                         ),
-                      ),
+                        const SizedBox(height: 12),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: _buildDropdown(
-                          'Distance', 
-                          _selectedDistance, 
-                          _availableDistances,
-                          (val) {
-                            setState(() {
-                              _selectedDistance = val!;
-                              _calculateStats();
-                            });
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 20),
 
+                        // 1bis. COMPARATEUR DE SESSIONS
+                        _buildComparator(),
+                      ],
+                    ),
+                  ),
+                ),
+                Expanded(
+                  child: RefreshIndicator(
+                    onRefresh: _loadStatistics,
+                    child: SingleChildScrollView(
+                      physics: const AlwaysScrollableScrollPhysics(),
+                      padding: const EdgeInsets.all(16),
+                      child: Column(
+                        children: [
                   // 2. DONNÉES RAPIDES (Tirs et Sessions)
                   Row(
                     children: [
@@ -191,18 +317,46 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
                     'Score',
                     '${_statistics?.totalScore ?? 0}',
                     _getScoreHistory(),
+                    explanations: const [
+                      MetricExplanation(
+                        'Score',
+                        'Total des points marqués sur la période sélectionnée.',
+                      ),
+                    ],
                   ),
                   const SizedBox(height: 20),
                   _buildChartSection(
                     'Précision',
                     '${_statistics?.precision.precisionScore.toStringAsFixed(1)}%',
                     _getPrecisionHistory(),
+                    explanations: const [
+                      MetricExplanation(
+                        'Précision',
+                        'Proximité moyenne de vos impacts par rapport au centre '
+                            'de la cible (calculée sur les distances).',
+                      ),
+                      MetricExplanation(
+                        'À ne pas confondre',
+                        'C\'est différent de la « Réussite » affichée dans une '
+                            'session, qui se base sur les points marqués. Les deux '
+                            'mesurent des choses distinctes, leurs pourcentages '
+                            'ne sont donc pas identiques.',
+                      ),
+                    ],
                   ),
                   const SizedBox(height: 20),
                   _buildChartSection(
-                    'Groupement moyen',
+                    'Étalement moyen',
-                    '${(_statistics?.precision.groupingDiameter ?? 0 * 100).toStringAsFixed(1)}%',
+                    '${((_statistics?.precision.groupingDiameter ?? 0) * 100).toStringAsFixed(1)}%',
                     _getScoreHistory().map((e) => e / 10).toList(), // Proxy for grouping history
+                    explanations: const [
+                      MetricExplanation(
+                        'Étalement moyen',
+                        'Étalement moyen de vos groupements : distance entre les '
+                            'impacts les plus éloignés, en % de la largeur de '
+                            'l\'image. Plus c\'est bas, plus vos tirs sont serrés.',
+                      ),
+                    ],
                   ),
 
                   const SizedBox(height: 25),
@@ -221,10 +375,101 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
                   ],
 
                   const SizedBox(height: 30),
-                ],
+                        ],
-              ),
+                      ),
+                    ),
+                  ),
+                ),
+              ],
             ),
+    );
+  }
+
+  // Comparateur : bouton pour choisir 2 sessions, puis switch pour alterner.
+  Widget _buildComparator() {
+    final theme = Theme.of(context);
+
+    if (!_compareMode) {
+      return SizedBox(
+        width: double.infinity,
+        child: OutlinedButton.icon(
+          onPressed: _openCompareDialog,
+          icon: const Icon(Icons.compare_arrows),
+          label: const Text('Comparer 2 sessions'),
+        ),
+      );
+    }
+
+    final activeColor = const Color(0xFF1A73E8);
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+      decoration: BoxDecoration(
+        color: activeColor.withValues(alpha: 0.08),
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(color: activeColor.withValues(alpha: 0.3)),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(Icons.compare_arrows, color: activeColor, size: 18),
+              const SizedBox(width: 6),
+              Text('Comparaison', style: TextStyle(fontWeight: FontWeight.bold, color: activeColor)),
+              const Spacer(),
+              IconButton(
+                tooltip: 'Quitter la comparaison',
+                icon: const Icon(Icons.close, size: 18),
+                onPressed: _exitCompareMode,
+                padding: EdgeInsets.zero,
+                constraints: const BoxConstraints(),
+              ),
+            ],
           ),
+          const SizedBox(height: 8),
+          // Switch pour alterner entre les 2 sessions.
+          Row(
+            children: [
+              Expanded(
+                child: Text(
+                  'A · ${_sessionLabel(_compareA!)}',
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: _showingB ? theme.textTheme.bodySmall?.color?.withValues(alpha: 0.5) : null,
+                    fontWeight: _showingB ? FontWeight.normal : FontWeight.bold,
+                  ),
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ),
+              Switch(
+                value: _showingB,
+                activeThumbColor: activeColor,
+                onChanged: (v) => setState(() {
+                  _showingB = v;
+                  _calculateStats();
+                }),
+              ),
+              Expanded(
+                child: Text(
+                  'B · ${_sessionLabel(_compareB!)}',
+                  textAlign: TextAlign.right,
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: _showingB ? null : theme.textTheme.bodySmall?.color?.withValues(alpha: 0.5),
+                    fontWeight: _showingB ? FontWeight.bold : FontWeight.normal,
+                  ),
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 4),
+          Text(
+            'Affichage : session ${_showingB ? 'B' : 'A'}',
+            style: TextStyle(fontSize: 11, color: theme.textTheme.bodySmall?.color?.withValues(alpha: 0.6)),
+          ),
+        ],
+      ),
     );
   }
 
@@ -302,8 +547,9 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
   Widget _buildChartSection(
     String title,
     String value,
-    List<double> dataPoints,
+    List<double> dataPoints, {
-  ) {
+    List<MetricExplanation>? explanations,
+  }) {
     final theme = Theme.of(context);
     return Container(
       padding: const EdgeInsets.all(16),
@@ -314,9 +560,17 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Text(
+          Row(
-            title,
+            children: [
-            style: TextStyle(color: theme.textTheme.bodyMedium?.color?.withValues(alpha: 0.7), fontSize: 14),
+              Text(
+                title,
+                style: TextStyle(color: theme.textTheme.bodyMedium?.color?.withValues(alpha: 0.7), fontSize: 14),
+              ),
+              if (explanations != null) ...[
+                const Spacer(),
+                MetricInfoButton(title: title, explanations: explanations),
+              ],
+            ],
           ),
           const SizedBox(height: 10),
           Row(

lib/main.dart

@@ -7,10 +7,8 @@ import 'package:sqflite_common_ffi/sqflite_ffi.dart';
 import 'app.dart';
 import 'core/theme/theme_provider.dart';
 import 'data/repositories/session_repository.dart';
-import 'services/target_detection_service.dart';
 import 'services/score_calculator_service.dart';
 import 'services/grouping_analyzer_service.dart';
-import 'services/image_processing_service.dart';
 import 'features/session/session_provider.dart';
 
 void main() async {
@@ -32,14 +30,6 @@ void main() async {
   runApp(
     MultiProvider(
       providers: [
-        Provider<ImageProcessingService>(
-          create: (_) => ImageProcessingService(),
-        ),
-        Provider<TargetDetectionService>(
-          create: (context) => TargetDetectionService(
-            imageProcessingService: context.read<ImageProcessingService>(),
-          ),
-        ),
         Provider<ScoreCalculatorService>(
           create: (_) => ScoreCalculatorService(),
         ),

lib/main_navigation_holder.dart

@@ -15,25 +15,32 @@ class MainNavigationHolder extends StatefulWidget {
 class _MainNavigationHolderState extends State<MainNavigationHolder> {
   int _selectedIndex = 0;
 
-  final List<Widget> _screens = [
+  // Incrémentés à chaque ouverture de l'onglet correspondant pour forcer le
-    const HomeScreen(),
+  // rechargement (les écrans sont gardés vivants par l'IndexedStack et ne se
-    const HistoryScreen(),
+  // rafraîchissent pas seuls).
-    const StatisticsScreen(),
+  int _statsTick = 0;
-    const WeaponListScreen(),
+  int _historyTick = 0;
-  ];
 
   void _onItemTapped(int index) {
     setState(() {
       _selectedIndex = index;
+      if (index == 1) _historyTick++;
+      if (index == 2) _statsTick++;
     });
   }
 
   @override
   Widget build(BuildContext context) {
+    final screens = [
+      const HomeScreen(),
+      HistoryScreen(refreshTick: _historyTick),
+      StatisticsScreen(refreshTick: _statsTick),
+      const WeaponListScreen(),
+    ];
     return Scaffold(
       body: IndexedStack(
         index: _selectedIndex,
-        children: _screens,
+        children: screens,
       ),
       bottomNavigationBar: Container(
         decoration: BoxDecoration(

lib/services/ai_export_service.dart

@@ -53,6 +53,8 @@ class AiExportService {
     required double targetCenterY,
     required double targetRadius,
     required List<Shot> shots,
+    int distanceMeters = 25,
+    String weaponName = 'Unknown',
     String? apiUrl,
   }) async {
     try {
@@ -109,8 +111,8 @@ class AiExportService {
         "device_info": deviceData,
         "target_metadata": {
           "type": targetType.name,
-          "distance_meters": 25, // Default/placeholder
+          "distance_meters": distanceMeters,
-          "weapon": "Unknown", // Default/placeholder
+          "weapon": weaponName,
           // The backend could extract exact width/height from the image.
         },
         "plotting": {

lib/services/image_crop_service.dart

@@ -1,27 +1,14 @@
-/// Service de recadrage d'images.
+import 'dart:isolate'; // AJOUT
-///
-/// Permet de recadrer une image en format carré (1:1) et de la sauvegarder
-/// dans un fichier temporaire pour utilisation ultérieure.
-library;
-
 import 'dart:io';
 import 'dart:math' as math;
 import 'package:image/image.dart' as img;
 import 'package:path_provider/path_provider.dart';
 import 'package:uuid/uuid.dart';
 
-/// Représente une zone de recadrage normalisée (0.0 à 1.0)
 class CropRect {
-  /// Position X du coin supérieur gauche (0.0 à 1.0)
   final double x;
-
-  /// Position Y du coin supérieur gauche (0.0 à 1.0)
   final double y;
-
-  /// Largeur de la zone (0.0 à 1.0)
   final double width;
-
-  /// Hauteur de la zone (0.0 à 1.0)
   final double height;
 
   const CropRect({
@@ -35,97 +22,268 @@ class CropRect {
   String toString() => 'CropRect(x: $x, y: $y, w: $width, h: $height)';
 }
 
-/// Service pour recadrer les images
+// AJOUT : Paramètres passés à l'Isolate (tout doit être sérialisable)
+class _CropParams {
+  final String sourcePath;
+  final double cropX;
+  final double cropY;
+  final double cropWidth;
+  final double cropHeight;
+  final double rotationDegrees;
+  final int outputSize;
+  final String outputPath;
+
+  _CropParams({
+    required this.sourcePath,
+    required this.cropX,
+    required this.cropY,
+    required this.cropWidth,
+    required this.cropHeight,
+    required this.rotationDegrees,
+    required this.outputSize,
+    required this.outputPath,
+  });
+}
+
+// AJOUT : Fonction statique exécutée dans l'Isolate (doit être top-level ou static)
+void _cropIsolateEntry(_CropParams params) {
+  final file = File(params.sourcePath);
+  final bytes = file.readAsBytesSync();
+  img.Image? originalImage = img.decodeImage(bytes);
+
+  if (originalImage == null) {
+    throw Exception('Impossible de décoder l\'image: ${params.sourcePath}');
+  }
+
+  // Rotation si nécessaire — LINEAR au lieu de CUBIC pour la vitesse
+  if (params.rotationDegrees != 0.0) {
+    originalImage = img.copyRotate(
+      originalImage,
+      angle: params.rotationDegrees,
+      interpolation: img.Interpolation.linear, // OPTIMISATION : linear >> cubic en vitesse
+    );
+  }
+
+  // Recadrage
+  final srcX = (params.cropX * originalImage.width).round();
+  final srcY = (params.cropY * originalImage.height).round();
+  final srcWidth = (params.cropWidth * originalImage.width).round();
+  final srcHeight = (params.cropHeight * originalImage.height).round();
+
+  final clampedX = srcX.clamp(0, originalImage.width - 1);
+  final clampedY = srcY.clamp(0, originalImage.height - 1);
+  final clampedWidth = math.min(srcWidth, originalImage.width - clampedX);
+  final clampedHeight = math.min(srcHeight, originalImage.height - clampedY);
+
+  img.Image cropped = img.copyCrop(
+    originalImage,
+    x: clampedX,
+    y: clampedY,
+    width: clampedWidth,
+    height: clampedHeight,
+  );
+
+  // Redimensionnement — LINEAR au lieu de CUBIC
+  if (cropped.width != params.outputSize || cropped.height != params.outputSize) {
+    cropped = img.copyResize(
+      cropped,
+      width: params.outputSize,
+      height: params.outputSize,
+      interpolation: img.Interpolation.linear, // OPTIMISATION : linear >> cubic en vitesse
+    );
+  }
+
+  // Encodage JPEG qualité 85 au lieu de 90 (gain de vitesse non négligeable)
+  final outputFile = File(params.outputPath);
+  outputFile.writeAsBytesSync(img.encodeJpg(cropped, quality: 85));
+}
+
+// AJOUT : Paramètres de la découpe calée sur la fenêtre de visée (padding noir)
+class _ViewportCropParams {
+  final String sourcePath;
+  final double offsetDx;
+  final double offsetDy;
+  final double displayPerSourcePx; // facteur affichage/source (BoxFit.contain)
+  final double cropSizeDisplay; // côté de la fenêtre de visée, en pixels écran
+  final double zoomScale; // zoom utilisateur : sert UNIQUEMENT au pointage
+  final double rotationDegrees;
+  final int outputSize;
+  final String outputPath;
+
+  _ViewportCropParams({
+    required this.sourcePath,
+    required this.offsetDx,
+    required this.offsetDy,
+    required this.displayPerSourcePx,
+    required this.cropSizeDisplay,
+    required this.zoomScale,
+    required this.rotationDegrees,
+    required this.outputSize,
+    required this.outputPath,
+  });
+}
+
+// AJOUT : Découpe fidèle à ce que l'utilisateur voit. Reproduit la translation
+// (pan) et la rotation de l'aperçu, ignore le zoom, et remplit en NOIR toute
+// zone qui déborde de l'image → la cible reste exactement là où l'utilisateur
+// l'a placée, même collée à un bord (aucun recentrage forcé).
+void _viewportCropIsolateEntry(_ViewportCropParams p) {
+  final bytes = File(p.sourcePath).readAsBytesSync();
+  final img.Image? src = img.decodeImage(bytes);
+  if (src == null) {
+    throw Exception('Impossible de décoder l\'image: ${p.sourcePath}');
+  }
+
+  // Rotation autour du centre (canvas agrandi). Préserve l'échelle des pixels.
+  img.Image rotated = src;
+  if (p.rotationDegrees != 0.0) {
+    rotated = img.copyRotate(
+      src,
+      angle: p.rotationDegrees,
+      interpolation: img.Interpolation.linear,
+    );
+  }
+
+  final double f = p.displayPerSourcePx;
+  // Côté de la fenêtre de visée en pixels source. On utilise f SEUL (pas le
+  // zoom) → le champ de vision capturé est toujours celui de l'image non
+  // zoomée : le zoom n'est donc PAS pris en compte dans le rendu de sortie.
+  final int side = math.max(1, (p.cropSizeDisplay / f).round());
+
+  // Centre de la fenêtre de visée, en pixels de l'image (rotated).
+  // La translation écran s'applique APRÈS le zoom, donc un déplacement écran
+  // `offset` vaut `offset / (f * zoom)` pixels source. On inclut donc le zoom
+  // ICI (uniquement pour le pointage) afin que la croix vise le même point
+  // quel que soit le niveau de zoom.
+  final double fz = f * p.zoomScale;
+  final double cropCenterX = rotated.width / 2 - p.offsetDx / fz;
+  final double cropCenterY = rotated.height / 2 - p.offsetDy / fz;
+
+  final int srcX = (cropCenterX - side / 2).round();
+  final int srcY = (cropCenterY - side / 2).round();
+
+  // Toile carrée NOIRE opaque (numChannels 3 → pixels initialisés à 0 = noir).
+  final out = img.Image(width: side, height: side, numChannels: 3);
+
+  // Intersection de la fenêtre de visée avec l'image réelle. Tout ce qui
+  // déborde reste noir (padding) → aucun recentrage forcé.
+  final int vx0 = math.max(0, srcX);
+  final int vy0 = math.max(0, srcY);
+  final int vx1 = math.min(rotated.width, srcX + side);
+  final int vy1 = math.min(rotated.height, srcY + side);
+  final int vw = vx1 - vx0;
+  final int vh = vy1 - vy0;
+
+  if (vw > 0 && vh > 0) {
+    final region = img.copyCrop(rotated, x: vx0, y: vy0, width: vw, height: vh);
+    // dstW/dstH EXPLICITES = taille de la région → AUCUN redimensionnement
+    // (sinon compositeImage étire la source pour remplir la destination).
+    img.compositeImage(
+      out,
+      region,
+      dstX: vx0 - srcX,
+      dstY: vy0 - srcY,
+      dstW: vw,
+      dstH: vh,
+    );
+  }
+
+  img.Image result = out;
+  if (side != p.outputSize) {
+    result = img.copyResize(
+      out,
+      width: p.outputSize,
+      height: p.outputSize,
+      interpolation: img.Interpolation.linear,
+    );
+  }
+
+  File(p.outputPath).writeAsBytesSync(img.encodeJpg(result, quality: 85));
+}
+
 class ImageCropService {
   final Uuid _uuid = const Uuid();
 
-  /// Taille de sortie maximale pour les images recadrées
   static const int maxOutputSize = 1024;
 
-  /// Recadre une image en format carré
+  /// Découpe carrée calée sur la fenêtre de visée de l'écran de centrage.
+  /// Le décalage (pan) et la rotation sont respectés, le zoom est ignoré, et
+  /// tout débordement hors de l'image est rempli en noir (jamais de recentrage).
   ///
-  /// [sourcePath] - Chemin vers l'image source
+  /// - [offsetDx]/[offsetDy] : translation de l'image dans l'aperçu, en px écran.
-  /// [cropRect] - Zone de recadrage normalisée (0.0 à 1.0)
+  /// - [displayPerSourcePx] : facteur d'échelle affichage/source (BoxFit.contain).
-  /// [outputSize] - Taille de sortie en pixels (carré)
+  /// - [cropSizeDisplay] : côté de la fenêtre carrée de visée, en px écran.
-  ///
+  Future<String> cropViewport({
-  /// Retourne le chemin vers l'image recadrée dans le dossier temporaire
+    required String sourcePath,
-  Future<String> cropToSquare(
+    required double offsetDx,
-    String sourcePath,
+    required double offsetDy,
-    CropRect cropRect, {
+    required double displayPerSourcePx,
+    required double cropSizeDisplay,
+    double zoomScale = 1.0,
+    double rotationDegrees = 0.0,
     int outputSize = maxOutputSize,
   }) async {
-    // Charger l'image source
+    final tempDir = await getTemporaryDirectory();
-    final file = File(sourcePath);
+    final outputPath = '${tempDir.path}/cropped_${_uuid.v4()}.jpg';
-    final bytes = await file.readAsBytes();
-    final originalImage = img.decodeImage(bytes);
 
-    if (originalImage == null) {
+    final params = _ViewportCropParams(
-      throw Exception('Impossible de décoder l\'image: $sourcePath');
+      sourcePath: sourcePath,
-    }
+      offsetDx: offsetDx,
-
+      offsetDy: offsetDy,
-    // Calculer les coordonnées en pixels
+      displayPerSourcePx: displayPerSourcePx,
-    final srcX = (cropRect.x * originalImage.width).round();
+      cropSizeDisplay: cropSizeDisplay,
-    final srcY = (cropRect.y * originalImage.height).round();
+      zoomScale: zoomScale <= 0 ? 1.0 : zoomScale,
-    final srcWidth = (cropRect.width * originalImage.width).round();
+      rotationDegrees: rotationDegrees,
-    final srcHeight = (cropRect.height * originalImage.height).round();
+      outputSize: outputSize,
-
+      outputPath: outputPath,
-    // S'assurer que les dimensions sont valides
-    final clampedX = srcX.clamp(0, originalImage.width - 1);
-    final clampedY = srcY.clamp(0, originalImage.height - 1);
-    final clampedWidth = math.min(srcWidth, originalImage.width - clampedX);
-    final clampedHeight = math.min(srcHeight, originalImage.height - clampedY);
-
-    // Recadrer l'image
-    img.Image cropped = img.copyCrop(
-      originalImage,
-      x: clampedX,
-      y: clampedY,
-      width: clampedWidth,
-      height: clampedHeight,
     );
 
-    // Redimensionner à la taille de sortie si nécessaire
+    // Traitement lourd dans un Isolate → thread UI fluide.
-    if (cropped.width != outputSize || cropped.height != outputSize) {
+    await Isolate.run(() => _viewportCropIsolateEntry(params));
-      cropped = img.copyResize(
-        cropped,
-        width: outputSize,
-        height: outputSize,
-        interpolation: img.Interpolation.cubic,
-      );
-    }
 
-    // Sauvegarder dans le dossier temporaire
+    return outputPath;
+  }
+
+  Future<String> cropToSquare(
+      String sourcePath,
+      CropRect cropRect, {
+        double rotationDegrees = 0.0,
+        int outputSize = maxOutputSize,
+      }) async {
     final tempDir = await getTemporaryDirectory();
-    final fileName = 'cropped_${_uuid.v4()}.jpg';
+    final outputPath = '${tempDir.path}/cropped_${_uuid.v4()}.jpg';
-    final outputPath = '${tempDir.path}/$fileName';
 
-    final outputFile = File(outputPath);
+    final params = _CropParams(
-    await outputFile.writeAsBytes(img.encodeJpg(cropped, quality: 90));
+      sourcePath: sourcePath,
+      cropX: cropRect.x,
+      cropY: cropRect.y,
+      cropWidth: cropRect.width,
+      cropHeight: cropRect.height,
+      rotationDegrees: rotationDegrees,
+      outputSize: outputSize,
+      outputPath: outputPath,
+    );
+
+    // OPTIMISATION CLEF : Tout le traitement lourd dans un Isolate séparé
+    // → le thread UI reste fluide pendant le calcul
+    await Isolate.run(() => _cropIsolateEntry(params));
 
     return outputPath;
   }
 
   /// Calcule la zone de recadrage carrée maximale centrée sur l'image
-  ///
-  /// [imageWidth] - Largeur de l'image en pixels
-  /// [imageHeight] - Hauteur de l'image en pixels
-  ///
-  /// Retourne un CropRect normalisé pour un carré centré
   CropRect getDefaultSquareCrop(int imageWidth, int imageHeight) {
     final aspectRatio = imageWidth / imageHeight;
 
     if (aspectRatio > 1) {
-      // Image plus large que haute - centrer horizontalement
       final squareWidth = imageHeight / imageWidth;
       final x = (1 - squareWidth) / 2;
       return CropRect(x: x, y: 0, width: squareWidth, height: 1);
     } else if (aspectRatio < 1) {
-      // Image plus haute que large - centrer verticalement
       final squareHeight = imageWidth / imageHeight;
       final y = (1 - squareHeight) / 2;
       return CropRect(x: 0, y: y, width: 1, height: squareHeight);
     } else {
-      // Déjà carré
       return const CropRect(x: 0, y: 0, width: 1, height: 1);
     }
   }
@@ -147,7 +305,39 @@ class ImageCropService {
         }
       }
     } catch (e) {
-      // Ignorer les erreurs de nettoyage
+      // Ignorer les erreurs
     }
   }
+
+  /// Coupe automatiquement une photo brute de l'appareil photo en carré
+  /// calé sur la position haute du viseur de l'écran.
+  Future<String> cropRawCameraToSquare(String sourcePath) async {
+    final file = File(sourcePath);
+    final bytes = await file.readAsBytes();
+    final originalImage = img.decodeImage(bytes);
+
+    if (originalImage == null) return sourcePath;
+
+    final int imgW = originalImage.width;
+    final int imgH = originalImage.height;
+
+    final int cropSizePixels = (math.min(imgW, imgH) * 0.85).round();
+
+    final int x = ((imgW - cropSizePixels) / 2).round();
+    final int y = ((imgH - cropSizePixels) / 2).round();
+
+    final squareImage = img.copyCrop(
+      originalImage,
+      x: x.clamp(0, imgW - 1),
+      y: y.clamp(0, imgH - 1),
+      width: cropSizePixels,
+      height: cropSizePixels,
+    );
+
+    final tempDir = await getTemporaryDirectory();
+    final outputPath = '${tempDir.path}/camera_square_${DateTime.now().millisecondsSinceEpoch}.jpg';
+    await File(outputPath).writeAsBytes(img.encodeJpg(squareImage, quality: 85));
+
+    return outputPath;
+  }
 }

lib/services/opencv_impact_detection_service.dart

@@ -1,228 +0,0 @@
-/// Service de détection d'impacts utilisant OpenCV.
-library;
-
-import 'dart:math' as math;
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-/// Paramètres de détection d'impacts OpenCV
-class OpenCVDetectionSettings {
-  /// Seuil Canny bas pour la détection de contours
-  final double cannyThreshold1;
-
-  /// Seuil Canny haut pour la détection de contours
-  final double cannyThreshold2;
-
-  /// Distance minimale entre les centres des cercles détectés
-  final double minDist;
-
-  /// Paramètre 1 de HoughCircles (seuil Canny interne)
-  final double param1;
-
-  /// Paramètre 2 de HoughCircles (seuil d'accumulation)
-  final double param2;
-
-  /// Rayon minimum des cercles en pixels
-  final int minRadius;
-
-  /// Rayon maximum des cercles en pixels
-  final int maxRadius;
-
-  /// Taille du flou gaussien (doit être impair)
-  final int blurSize;
-
-  /// Utiliser la détection de contours en plus de Hough
-  final bool useContourDetection;
-
-  /// Circularité minimale pour la détection par contours (0-1)
-  final double minCircularity;
-
-  /// Surface minimale des contours
-  final double minContourArea;
-
-  /// Surface maximale des contours
-  final double maxContourArea;
-
-  const OpenCVDetectionSettings({
-    this.cannyThreshold1 = 50,
-    this.cannyThreshold2 = 150,
-    this.minDist = 20,
-    this.param1 = 100,
-    this.param2 = 30,
-    this.minRadius = 5,
-    this.maxRadius = 50,
-    this.blurSize = 5,
-    this.useContourDetection = true,
-    this.minCircularity = 0.6,
-    this.minContourArea = 50,
-    this.maxContourArea = 5000,
-  });
-}
-
-/// Résultat de détection d'impact
-class OpenCVDetectedImpact {
-  /// Position X normalisée (0-1)
-  final double x;
-
-  /// Position Y normalisée (0-1)
-  final double y;
-
-  /// Rayon en pixels
-  final double radius;
-
-  /// Score de confiance (0-1)
-  final double confidence;
-
-  /// Méthode de détection utilisée
-  final String method;
-
-  const OpenCVDetectedImpact({
-    required this.x,
-    required this.y,
-    required this.radius,
-    this.confidence = 1.0,
-    this.method = 'unknown',
-  });
-}
-
-/// Service de détection d'impacts utilisant OpenCV
-class OpenCVImpactDetectionService {
-  /// Détecte les impacts dans une image en utilisant OpenCV
-  List<OpenCVDetectedImpact> detectImpacts(
-    String imagePath, {
-    OpenCVDetectionSettings settings = const OpenCVDetectionSettings(),
-  }) {
-    try {
-      final img = cv.imread(imagePath, flags: cv.IMREAD_COLOR);
-      if (img.isEmpty) return [];
-
-      final gray = cv.cvtColor(img, cv.COLOR_BGR2GRAY);
-
-      // Apply blur to reduce noise
-      final blurKSize = (settings.blurSize, settings.blurSize);
-      final blurred = cv.gaussianBlur(gray, blurKSize, 2, sigmaY: 2);
-
-      final List<OpenCVDetectedImpact> detectedImpacts = [];
-
-      final circles = cv.HoughCircles(
-        blurred,
-        cv.HOUGH_GRADIENT,
-        1,
-        settings.minDist,
-        param1: settings.param1,
-        param2: settings.param2,
-        minRadius: settings.minRadius,
-        maxRadius: settings.maxRadius,
-      );
-
-      if (circles.rows > 0 && circles.cols > 0) {
-        // Mat shape: (1, N, 3) usually for HoughCircles (CV_32FC3)
-        // We use at<Vec3f> directly.
-
-        for (int i = 0; i < circles.cols; i++) {
-          final vec = circles.at<cv.Vec3f>(0, i);
-          final x = vec.val1;
-          final y = vec.val2;
-          final r = vec.val3;
-
-          detectedImpacts.add(
-            OpenCVDetectedImpact(
-              x: x / img.cols,
-              y: y / img.rows,
-              radius: r,
-              confidence: 0.8,
-              method: 'hough',
-            ),
-          );
-        }
-      }
-
-      // 2. Contour Detection (if enabled)
-      if (settings.useContourDetection) {
-        // Canny edge detection
-        final edges = cv.canny(
-          blurred,
-          settings.cannyThreshold1,
-          settings.cannyThreshold2,
-        );
-
-        // Find contours
-        final contoursResult = cv.findContours(
-          edges,
-          cv.RETR_EXTERNAL,
-          cv.CHAIN_APPROX_SIMPLE,
-        );
-
-        final contours = contoursResult.$1;
-        // hierarchy is $2
-
-        for (int i = 0; i < contours.length; i++) {
-          final contour = contours[i];
-
-          // Filter by area
-          final area = cv.contourArea(contour);
-          if (area < settings.minContourArea ||
-              area > settings.maxContourArea) {
-            continue;
-          }
-
-          // Filter by circularity
-          final perimeter = cv.arcLength(contour, true);
-          if (perimeter == 0) continue;
-          final circularity = 4 * math.pi * area / (perimeter * perimeter);
-
-          if (circularity < settings.minCircularity) continue;
-
-          // Get bounding circle
-          final enclosingCircle = cv.minEnclosingCircle(contour);
-          final center = enclosingCircle.$1;
-          final radius = enclosingCircle.$2;
-
-          // Avoid duplicates (simple distance check against Hough results)
-          bool isDuplicate = false;
-          for (final existing in detectedImpacts) {
-            final dx = existing.x * img.cols - center.x;
-            final dy = existing.y * img.rows - center.y;
-            final dist = math.sqrt(dx * dx + dy * dy);
-            if (dist < radius) {
-              isDuplicate = true;
-              break;
-            }
-          }
-
-          if (!isDuplicate) {
-            detectedImpacts.add(
-              OpenCVDetectedImpact(
-                x: center.x / img.cols,
-                y: center.y / img.rows,
-                radius: radius,
-                confidence: circularity, // Use circularity as confidence
-                method: 'contour',
-              ),
-            );
-          }
-        }
-      }
-
-      return detectedImpacts;
-    } catch (e) {
-      // print('OpenCV Error: $e');
-      return [];
-    }
-  }
-
-  /// Détecte les impacts en utilisant une image de référence
-  List<OpenCVDetectedImpact> detectFromReferences(
-    String imagePath,
-    List<({double x, double y})> referencePoints, {
-    double tolerance = 2.0,
-  }) {
-    // Basic implementation: use average color/brightness of reference points
-    // This is a placeholder for a more complex template matching or feature matching
-
-    // For now, we can just run the standard detection but filter results
-    // based on properties of the reference points (e.g. size/radius if we had it).
-
-    // Returning standard detection for now to enable the feature.
-    return detectImpacts(imagePath);
-  }
-}

lib/services/opencv_target_service.dart

@@ -26,23 +26,34 @@ class TargetDetectionResult {
 
 class OpenCVTargetService {
   /// Detect the main target (center and radius) from an image file
+  ///
+  /// IMPORTANT : les Mat OpenCV sont de la mémoire NATIVE, invisible pour le
+  /// garbage collector Dart. Cette méthode est appelée en boucle (~1 s)
+  /// pendant l'aperçu caméra : sans dispose() explicite dans le finally, la
+  /// mémoire native grimpe en continu tant que l'utilisateur vise.
   Future<TargetDetectionResult> detectTarget(String imagePath) async {
+    cv.Mat? img;
+    cv.Mat? gray;
+    cv.Mat? blurred;
+    cv.Mat? circles;
+    cv.Mat? looseCircles;
+
     try {
       // Read image
-      final img = cv.imread(imagePath, flags: cv.IMREAD_COLOR);
+      img = cv.imread(imagePath, flags: cv.IMREAD_COLOR);
       if (img.isEmpty) {
         return TargetDetectionResult.failure();
       }
 
       // Convert to grayscale
-      final gray = cv.cvtColor(img, cv.COLOR_BGR2GRAY);
+      gray = cv.cvtColor(img, cv.COLOR_BGR2GRAY);
 
       // Apply Gaussian blur to reduce noise
-      final blurred = cv.gaussianBlur(gray, (9, 9), 2, sigmaY: 2);
+      blurred = cv.gaussianBlur(gray, (9, 9), 2, sigmaY: 2);
 
-      // Detect circles using Hough Transform
+      // Detect circles using Hough Transform.
-      // Parameters need to be tuned for the specific target type
+      // HoughCircles returns a Mat of shape (1, N) of Vec3f (x, y, r).
-      final circles = cv.HoughCircles(
+      circles = cv.HoughCircles(
         blurred,
         cv.HOUGH_GRADIENT,
         1, // dp
@@ -55,26 +66,9 @@ class OpenCVTargetService {
         maxRadius: img.cols ~/ 2,
       );
 
-      // HoughCircles returns a Mat of shape (1, N, 3) where N is number of circles.
-      // In opencv_dart, we cannot iterate easily.
-      // However, we can access data via pointer if needed, or check if Vec3f is supported.
-      // Given the user report, `at<Vec3f>` likely failed compilation or runtime.
-      // Let's use a safer approach: assume standard memory layout (x, y, r, x, y, r...).
-      // Or use `at<double>` carefully.
-
-      // Better yet: try to use `circles.data` if available, but it returns a Pointer.
-      // Let's stick to `at` but use `double` and manual offset if Vec3f fails.
-      // actually, let's try to trust `at<double>` for flattened access OR `at<Vec3f>`.
-      // NOTE: `at<Vec3f>` was reported as "method at not defined for VecPoint2f" earlier, NOT for Mat.
-      // The user error was for `VecPoint2f`. `Mat` definitely has `at`.
-      // BUT `VecPoint2f` is a List-like structure in Dart wrapper.
-      // usage of `at` on `VecPoint2f` was the error.
-      // Here `circles` IS A MAT. So `at` IS defined.
-      // However, to be safe and robust, and to implement clustering...
-
       if (circles.isEmpty) {
         // Try with different parameters if first attempt fails (more lenient)
-        final looseCircles = cv.HoughCircles(
+        looseCircles = cv.HoughCircles(
           blurred,
           cv.HOUGH_GRADIENT,
           1,
@@ -93,8 +87,15 @@ class OpenCVTargetService {
 
       return _findBestConcentricCircles(circles, img.cols, img.rows);
     } catch (e) {
-      // print('Error detecting target with OpenCV: $e');
       return TargetDetectionResult.failure();
+    } finally {
+      // _findBestConcentricCircles a déjà extrait les données dans des listes
+      // Dart avant qu'on arrive ici : libérer les Mat est donc toujours sûr.
+      img?.dispose();
+      gray?.dispose();
+      blurred?.dispose();
+      circles?.dispose();
+      looseCircles?.dispose();
     }
   }
 

lib/services/parallelism_service.dart

@@ -0,0 +1,161 @@
+import 'dart:async';
+import 'dart:math' as math;
+import 'package:sensors_plus/sensors_plus.dart';
+
+/// Statut de parallélisme retourné en temps réel.
+enum ParallelismStatus {
+  /// Pas encore de données capteur disponibles.
+  unknown,
+
+  /// L'appareil est bien parallèle à la cible.
+  aligned,
+
+  /// L'appareil est trop incliné.
+  misaligned,
+}
+
+/// Données de parallélisme calculées à chaque frame capteur.
+class ParallelismData {
+  final ParallelismStatus status;
+
+  /// Inclinaison avant/arrière en degrés (0° = parfaitement vertical).
+  final double pitchDegrees;
+
+  /// Inclinaison gauche/droite en degrés (0° = parfaitement droit).
+  final double rollDegrees;
+
+  const ParallelismData({
+    required this.status,
+    required this.pitchDegrees,
+    required this.rollDegrees,
+  });
+
+  bool get isAligned => status == ParallelismStatus.aligned;
+
+  @override
+  String toString() =>
+      'ParallelismData(status: $status, pitch: ${pitchDegrees.toStringAsFixed(1)}°, roll: ${rollDegrees.toStringAsFixed(1)}°)';
+}
+
+/// Service de détection du parallélisme par accéléromètre.
+///
+/// Implémente une hystérésis à deux seuils pour éviter le clignotement :
+///
+///   État actuel = misaligned → passe à aligned si angle < [alignThreshold]
+///   État actuel = aligned    → passe à misaligned si angle > [misalignThreshold]
+///
+/// Cela crée une "zone de confort" entre les deux seuils où le statut
+/// ne change pas — le vert reste vert même si la main tremble légèrement.
+///
+/// Valeurs par défaut recommandées :
+///   alignThreshold    = 15°  (seuil d'entrée dans le vert — assez souple)
+///   misalignThreshold = 22°  (seuil de sortie du vert — tolérant au tremblement)
+class ParallelismService {
+  /// Angle max pour passer de misaligned → aligned.
+  final double alignThreshold;
+
+  /// Angle à dépasser pour passer de aligned → misaligned.
+  /// Doit être > alignThreshold pour créer la zone d'hystérésis.
+  final double misalignThreshold;
+
+  StreamSubscription<AccelerometerEvent>? _subscription;
+  final StreamController<ParallelismData> _controller =
+  StreamController<ParallelismData>.broadcast();
+
+  /// État interne mémorisé entre deux frames (cœur de l'hystérésis).
+  ParallelismStatus _currentStatus = ParallelismStatus.unknown;
+
+  ParallelismService({
+    this.alignThreshold = 25.0,
+    this.misalignThreshold = 32.0,
+  }) : assert(
+  misalignThreshold > alignThreshold,
+  'misalignThreshold doit être supérieur à alignThreshold',
+  );
+
+  Stream<ParallelismData> get stream => _controller.stream;
+
+  void start() {
+    if (_subscription != null) return;
+
+    _subscription = accelerometerEventStream(
+      samplingPeriod: SensorInterval.normalInterval, // ~50 ms
+    ).listen(
+      _onAccelerometerEvent,
+      onError: (_) {
+        // Simulateur ou capteur absent — on reste en "unknown" sans bloquer l'UI
+        if (!_controller.isClosed) {
+          _currentStatus = ParallelismStatus.unknown;
+          _controller.add(const ParallelismData(
+            status: ParallelismStatus.unknown,
+            pitchDegrees: 0,
+            rollDegrees: 0,
+          ));
+        }
+      },
+    );
+  }
+
+  void stop() {
+    _subscription?.cancel();
+    _subscription = null;
+    _currentStatus = ParallelismStatus.unknown;
+  }
+
+  void dispose() {
+    stop();
+    _controller.close();
+  }
+
+  void _onAccelerometerEvent(AccelerometerEvent event) {
+    if (_controller.isClosed) return;
+
+    final double gx = event.x;
+    final double gy = event.y;
+    final double gz = event.z;
+
+    final double magnitude = math.sqrt(gx * gx + gy * gy + gz * gz);
+    if (magnitude < 1.0) return; // Données aberrantes
+
+    // Normalisation par la magnitude réelle (indépendant de g exact)
+    final double nx = gx / magnitude;
+    final double nz = gz / magnitude;
+
+    // Pitch et Roll mesurent l'inclinaison autour de chaque axe.
+    final double pitchDeg = math.asin(nz.clamp(-1.0, 1.0)) * (180.0 / math.pi);
+    final double rollDeg = math.asin(nx.clamp(-1.0, 1.0)) * (180.0 / math.pi);
+
+    // Le critère de couleur = le PIRE des deux angles affichés à l'écran.
+    // Ainsi ce que voit l'utilisateur (Pitch / Roll) correspond exactement
+    // à la décision vert/orange : à 2° d'écart, on est largement dans le vert.
+    final double worstAngle = math.max(pitchDeg.abs(), rollDeg.abs());
+
+    // ── Hystérésis ──────────────────────────────────────────────────────────
+    // Premier appel : on décide selon alignThreshold uniquement
+    if (_currentStatus == ParallelismStatus.unknown) {
+      _currentStatus = worstAngle <= alignThreshold
+          ? ParallelismStatus.aligned
+          : ParallelismStatus.misaligned;
+    }
+    // Déjà misaligned → devient aligned seulement si on passe sous alignThreshold
+    else if (_currentStatus == ParallelismStatus.misaligned) {
+      if (worstAngle <= alignThreshold) {
+        _currentStatus = ParallelismStatus.aligned;
+      }
+    }
+    // Déjà aligned → devient misaligned seulement si on dépasse misalignThreshold
+    else if (_currentStatus == ParallelismStatus.aligned) {
+      if (worstAngle > misalignThreshold) {
+        _currentStatus = ParallelismStatus.misaligned;
+      }
+      // Entre alignThreshold et misalignThreshold → on garde le vert, on ne change rien
+    }
+    // ────────────────────────────────────────────────────────────────────────
+
+    _controller.add(ParallelismData(
+      status: _currentStatus,
+      pitchDegrees: pitchDeg,
+      rollDegrees: rollDeg,
+    ));
+  }
+}

lib/services/target_detection_service.dart

@@ -1,378 +0,0 @@
-import 'dart:math' as math;
-import 'package:flutter/foundation.dart';
-import '../data/models/target_type.dart';
-import 'image_processing_service.dart';
-import 'opencv_impact_detection_service.dart';
-export 'image_processing_service.dart'
-    show ImpactDetectionSettings, ReferenceImpact, ImpactCharacteristics;
-export 'opencv_impact_detection_service.dart'
-    show OpenCVDetectionSettings, OpenCVDetectedImpact;
-
-class TargetDetectionResult {
-  final double centerX; // Relative (0-1)
-  final double centerY; // Relative (0-1)
-  final double radius; // Relative (0-1)
-  final List<DetectedImpactResult> impacts;
-  final bool success;
-  final String? errorMessage;
-
-  TargetDetectionResult({
-    required this.centerX,
-    required this.centerY,
-    required this.radius,
-    required this.impacts,
-    this.success = true,
-    this.errorMessage,
-  });
-
-  factory TargetDetectionResult.error(String message) {
-    return TargetDetectionResult(
-      centerX: 0.5,
-      centerY: 0.5,
-      radius: 0.4,
-      impacts: [],
-      success: false,
-      errorMessage: message,
-    );
-  }
-}
-
-class DetectedImpactResult {
-  final double x; // Relative (0-1)
-  final double y; // Relative (0-1)
-  final double radius; // Absolute pixels
-  final int suggestedScore;
-
-  DetectedImpactResult({
-    required this.x,
-    required this.y,
-    required this.radius,
-    required this.suggestedScore,
-  });
-}
-
-class TargetDetectionService {
-  final ImageProcessingService _imageProcessingService;
-  final OpenCVImpactDetectionService _opencvService;
-
-  TargetDetectionService({
-    ImageProcessingService? imageProcessingService,
-    OpenCVImpactDetectionService? opencvService,
-  }) : _imageProcessingService =
-           imageProcessingService ?? ImageProcessingService(),
-       _opencvService = opencvService ?? OpenCVImpactDetectionService();
-
-  /// Detect target and impacts from an image file
-  TargetDetectionResult detectTarget(String imagePath, TargetType targetType) {
-    try {
-      // Detect main target
-      final mainTarget = _imageProcessingService.detectMainTarget(imagePath);
-
-      double centerX = 0.5;
-      double centerY = 0.5;
-      double radius = 0.4;
-
-      if (mainTarget != null) {
-        centerX = mainTarget.centerX;
-        centerY = mainTarget.centerY;
-        radius = mainTarget.radius;
-      }
-
-      // Detect impacts
-      final impacts = _imageProcessingService.detectImpacts(imagePath);
-
-      // Convert impacts to relative coordinates and calculate scores
-      final detectedImpacts = impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScore(
-                impact.x,
-                impact.y,
-                centerX,
-                centerY,
-                radius,
-              )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-
-      return TargetDetectionResult(
-        centerX: centerX,
-        centerY: centerY,
-        radius: radius,
-        impacts: detectedImpacts,
-      );
-    } catch (e) {
-      return TargetDetectionResult.error('Erreur de detection: $e');
-    }
-  }
-
-  int _calculateConcentricScore(
-    double impactX,
-    double impactY,
-    double centerX,
-    double centerY,
-    double targetRadius,
-  ) {
-    // Calculate distance from center (normalized to target radius)
-    final dx = impactX - centerX;
-    final dy = impactY - centerY;
-    final distance = math.sqrt(dx * dx + dy * dy) / targetRadius;
-
-    // Score zones (10 zones)
-    if (distance <= 0.1) return 10;
-    if (distance <= 0.2) return 9;
-    if (distance <= 0.3) return 8;
-    if (distance <= 0.4) return 7;
-    if (distance <= 0.5) return 6;
-    if (distance <= 0.6) return 5;
-    if (distance <= 0.7) return 4;
-    if (distance <= 0.8) return 3;
-    if (distance <= 0.9) return 2;
-    if (distance <= 1.0) return 1;
-    return 0; // Outside target
-  }
-
-  int _calculateSilhouetteScore(
-    double impactX,
-    double impactY,
-    double centerX,
-    double centerY,
-  ) {
-    // For silhouettes, scoring is typically based on zones
-    // Head and center mass = 5, body = 4, lower = 3
-
-    final dx = (impactX - centerX).abs();
-    final dy = impactY - centerY;
-
-    // Check if within silhouette bounds (approximate)
-    if (dx > 0.15) return 0; // Too far left/right
-
-    // Vertical zones
-    if (dy < -0.25) return 5; // Head zone (top)
-    if (dy < 0.0) return 5; // Center mass (upper body)
-    if (dy < 0.15) return 4; // Body
-    if (dy < 0.35) return 3; // Lower body
-
-    return 0; // Outside target
-  }
-
-  /// Detect only impacts with custom settings (doesn't affect target position)
-  List<DetectedImpactResult> detectImpactsOnly(
-    String imagePath,
-    TargetType targetType,
-    double centerX,
-    double centerY,
-    double radius,
-    int ringCount,
-    ImpactDetectionSettings settings,
-  ) {
-    try {
-      // Detect impacts with custom settings
-      final impacts = _imageProcessingService.detectImpactsWithSettings(
-        imagePath,
-        settings,
-      );
-
-      // Convert impacts to relative coordinates and calculate scores
-      return impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScoreWithRings(
-                impact.x,
-                impact.y,
-                centerX,
-                centerY,
-                radius,
-                ringCount,
-              )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-    } catch (e) {
-      return [];
-    }
-  }
-
-  int _calculateConcentricScoreWithRings(
-    double impactX,
-    double impactY,
-    double centerX,
-    double centerY,
-    double targetRadius,
-    int ringCount,
-  ) {
-    // Calculate distance from center (normalized to target radius)
-    final dx = impactX - centerX;
-    final dy = impactY - centerY;
-    final distance = math.sqrt(dx * dx + dy * dy) / targetRadius;
-
-    // Score zones based on ringCount
-    for (int i = 0; i < ringCount; i++) {
-      final zoneRadius = (i + 1) / ringCount;
-      if (distance <= zoneRadius) {
-        return 10 - i;
-      }
-    }
-
-    return 0; // Outside target
-  }
-
-  /// Analyze reference impacts to learn their characteristics
-  ImpactCharacteristics? analyzeReferenceImpacts(
-    String imagePath,
-    List<ReferenceImpact> references,
-  ) {
-    return _imageProcessingService.analyzeReferenceImpacts(
-      imagePath,
-      references,
-    );
-  }
-
-  /// Detect impacts based on reference characteristics (calibrated detection)
-  List<DetectedImpactResult> detectImpactsFromReferences(
-    String imagePath,
-    TargetType targetType,
-    double centerX,
-    double centerY,
-    double radius,
-    int ringCount,
-    ImpactCharacteristics characteristics, {
-    double tolerance = 2.0,
-  }) {
-    try {
-      final impacts = _imageProcessingService.detectImpactsFromReferences(
-        imagePath,
-        characteristics,
-        tolerance: tolerance,
-      );
-
-      return impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScoreWithRings(
-                impact.x,
-                impact.y,
-                centerX,
-                centerY,
-                radius,
-                ringCount,
-              )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-    } catch (e) {
-      return [];
-    }
-  }
-
-  /// Détecte les impacts en utilisant OpenCV (Hough Circles + Contours)
-  ///
-  /// Cette méthode utilise les algorithmes OpenCV pour une détection plus robuste:
-  /// - Transformation de Hough pour détecter les cercles
-  /// - Analyse de contours avec filtrage par circularité
-  List<DetectedImpactResult> detectImpactsWithOpenCV(
-    String imagePath,
-    TargetType targetType,
-    double centerX,
-    double centerY,
-    double radius,
-    int ringCount, {
-    OpenCVDetectionSettings? settings,
-  }) {
-    try {
-      final impacts = _opencvService.detectImpacts(
-        imagePath,
-        settings: settings ?? const OpenCVDetectionSettings(),
-      );
-
-      return impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScoreWithRings(
-                impact.x,
-                impact.y,
-                centerX,
-                centerY,
-                radius,
-                ringCount,
-              )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-    } catch (e) {
-      debugPrint('Erreur détection OpenCV: $e');
-      return [];
-    }
-  }
-
-  /// Détecte les impacts avec OpenCV en utilisant des références
-  ///
-  /// Analyse les impacts de référence pour apprendre leurs caractéristiques
-  /// puis détecte les impacts similaires dans l'image.
-  List<DetectedImpactResult> detectImpactsWithOpenCVFromReferences(
-    String imagePath,
-    TargetType targetType,
-    double centerX,
-    double centerY,
-    double radius,
-    int ringCount,
-    List<ReferenceImpact> references, {
-    double tolerance = 2.0,
-  }) {
-    try {
-      // Convertir les références au format OpenCV
-      final refPoints = references.map((r) => (x: r.x, y: r.y)).toList();
-
-      final impacts = _opencvService.detectFromReferences(
-        imagePath,
-        refPoints,
-        tolerance: tolerance,
-      );
-
-      return impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScoreWithRings(
-                impact.x,
-                impact.y,
-                centerX,
-                centerY,
-                radius,
-                ringCount,
-              )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-    } catch (e) {
-      debugPrint('Erreur détection OpenCV depuis références: $e');
-      return [];
-    }
-  }
-
-}

pubspec.lock

@@ -33,6 +33,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  camera:
+    dependency: "direct main"
+    description:
+      name: camera
+      sha256: "034c38cb8014d29698dcae6d20276688a1bf74e6487dfeb274d70ea05d5f7777"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.0+1"
+  camera_android_camerax:
+    dependency: transitive
+    description:
+      name: camera_android_camerax
+      sha256: b5064cf25a2787d122d0bf12e77c7b1033a2b983d0730e3091f770ee376efde5
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.2"
+  camera_avfoundation:
+    dependency: transitive
+    description:
+      name: camera_avfoundation
+      sha256: "90e4cc3fde331581a3b2d35d83be41dbb7393af0ab857eb27b732174289cb96d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.1"
+  camera_platform_interface:
+    dependency: transitive
+    description:
+      name: camera_platform_interface
+      sha256: "7ac852d77699acee79f0d438b793feee26721841e50973576419ff5c6d95e9b7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.13.0"
+  camera_web:
+    dependency: transitive
+    description:
+      name: camera_web
+      sha256: "57f49a635c8bf249d07fb95eb693d7e4dda6796dedb3777f9127fb54847beba7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.5+3"
   change_case:
     dependency: transitive
     description:
@@ -45,10 +85,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.0"
   clock:
     dependency: transitive
     description:
@@ -253,14 +293,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
-  google_mlkit_document_scanner:
-    dependency: "direct main"
-    description:
-      name: google_mlkit_document_scanner
-      sha256: "67428ddb853880c8185049a5834cd328e6420921a74786f6aadee0b76f8536bd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
   hooks:
     dependency: transitive
     description:
@@ -425,26 +457,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
   mime:
     dependency: transitive
     description:
@@ -661,6 +693,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.0"
+  sensors_plus:
+    dependency: "direct main"
+    description:
+      name: sensors_plus
+      sha256: "8e7fa79b4940442bb595bfc0ee9da4af5a22a0fe6ebacc74998245ee9496a82d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  sensors_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: sensors_plus_platform_interface
+      sha256: bc472d6cfd622acb4f020e726433ee31788b038056691ba433fec80e448a094f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -802,6 +850,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -814,10 +870,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5"
+      sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.0+1"
+    version: "3.4.0"
   term_glyph:
     dependency: transitive
     description:
@@ -830,10 +886,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.9"
+    version: "0.7.7"
   typed_data:
     dependency: transitive
     description:
@@ -915,5 +971,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.11.0 <4.0.0"
+  dart: ">=3.10.3 <4.0.0"
   flutter: ">=3.38.4"

pubspec.yaml

@@ -1,5 +1,5 @@
 name: bully
-description: "A new Flutter project."
+description: "Application d'analyse de cibles de tir : capture, centrage, plotting manuel des impacts, scores et statistiques."
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
@@ -36,12 +36,11 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
-
+  sensors_plus: ^4.0.2
   opencv_dart: ^2.1.0
 
   # Image capture from camera/gallery
   image_picker: ^1.2.1
-  google_mlkit_document_scanner: ^0.2.0
 
   # Local database for history
   sqflite: ^2.3.2
@@ -70,9 +69,7 @@ dependencies:
   device_info_plus: ^13.1.0
   shared_preferences: ^2.5.5
   crypto: ^3.0.7
-
+  camera: ^0.12.0+1
-  # Machine Learning for YOLOv8
-  # tflite_flutter: ^0.11.0
 
 dev_dependencies:
   flutter_test:
@@ -98,7 +95,6 @@ flutter:
 
   # To add assets to your application, add an assets section, like this:
   # assets:
-  #   - assets/models/yolov8n_32.tflite
   #   - images/a_dot_burr.jpeg
   #   - images/a_dot_ham.jpeg
 

test/services/grouping_analyzer_service_test.dart

@@ -0,0 +1,60 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:bully/data/models/shot.dart';
+import 'package:bully/services/grouping_analyzer_service.dart';
+
+Shot _shot(String id, double x, double y) =>
+    Shot(id: id, x: x, y: y, score: 0, analysisId: '');
+
+void main() {
+  final service = GroupingAnalyzerService();
+
+  group('analyzeGrouping', () {
+    test('liste vide → résultat vide', () {
+      final result = service.analyzeGrouping([]);
+      expect(result.shotCount, 0);
+      expect(result.diameter, 0);
+    });
+
+    test('un seul tir → diamètre nul, centre sur le tir', () {
+      final result = service.analyzeGrouping([_shot('a', 0.3, 0.7)]);
+      expect(result.shotCount, 1);
+      expect(result.centerX, 0.3);
+      expect(result.centerY, 0.7);
+      expect(result.diameter, 0);
+    });
+
+    test('deux tirs → centroïde au milieu et diamètre = écart', () {
+      final result = service.analyzeGrouping([
+        _shot('a', 0.4, 0.5),
+        _shot('b', 0.6, 0.5),
+      ]);
+
+      expect(result.centerX, closeTo(0.5, 1e-9));
+      expect(result.centerY, closeTo(0.5, 1e-9));
+      expect(result.diameter, closeTo(0.2, 1e-9));
+      expect(result.meanRadius, closeTo(0.1, 1e-9));
+      // Deux tirs équidistants du centroïde → dispersion nulle.
+      expect(result.standardDeviation, closeTo(0.0, 1e-9));
+    });
+
+    test('le diamètre est la plus grande distance entre deux tirs', () {
+      final result = service.analyzeGrouping([
+        _shot('a', 0.2, 0.5),
+        _shot('b', 0.5, 0.5),
+        _shot('c', 0.8, 0.5),
+      ]);
+      expect(result.diameter, closeTo(0.6, 1e-9));
+    });
+  });
+
+  group('getOffsetDescription', () {
+    test('décalage négligeable → Centre', () {
+      expect(service.getOffsetDescription(0.01, -0.01), 'Centre');
+    });
+
+    test('décalage combiné → direction composée', () {
+      expect(service.getOffsetDescription(0.1, -0.1), 'Haut-Droite');
+    });
+  });
+}

test/services/score_calculator_service_test.dart

@@ -0,0 +1,110 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:bully/data/models/shot.dart';
+import 'package:bully/data/models/target_type.dart';
+import 'package:bully/services/score_calculator_service.dart';
+
+void main() {
+  final service = ScoreCalculatorService();
+
+  group('calculateConcentricScore', () {
+    test('un tir au centre exact vaut 10', () {
+      final score = service.calculateConcentricScore(
+        shotX: 0.5,
+        shotY: 0.5,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+      expect(score, 10);
+    });
+
+    test('un tir hors de la cible vaut 0', () {
+      final score = service.calculateConcentricScore(
+        shotX: 0.95,
+        shotY: 0.5,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+      expect(score, 0);
+    });
+
+    test('un tir à mi-rayon tombe dans la zone attendue', () {
+      // Distance normalisée ≈ 0.475 → 5e anneau (zone 0.5) → score 6.
+      final score = service.calculateConcentricScore(
+        shotX: 0.5,
+        shotY: 0.69,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+      expect(score, 6);
+    });
+
+    test('le ratio d\'image est pris en compte (image paysage 2:1)', () {
+      // dx = 0.15 mais scaled ×2 → distance normalisée 0.75 → score 3.
+      final score = service.calculateConcentricScore(
+        shotX: 0.65,
+        shotY: 0.5,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+        imageAspectRatio: 2.0,
+      );
+      expect(score, 3);
+    });
+
+    test('les rayons d\'anneaux personnalisés sont respectés', () {
+      // Distance normalisée 0.3 avec anneaux [0.2, 0.5, 1.0] → 2e anneau → 9.
+      final score = service.calculateConcentricScore(
+        shotX: 0.5,
+        shotY: 0.62,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+        ringCount: 3,
+        ringRadii: [0.2, 0.5, 1.0],
+      );
+      expect(score, 9);
+    });
+  });
+
+  group('calculateScores', () {
+    test('agrège le total, le max possible et le pourcentage', () {
+      final shots = [
+        Shot(id: 'a', x: 0.5, y: 0.5, score: 0, analysisId: ''), // centre → 10
+        Shot(id: 'b', x: 0.95, y: 0.5, score: 0, analysisId: ''), // dehors → 0
+      ];
+
+      final result = service.calculateScores(
+        shots: shots,
+        targetType: TargetType.concentric,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+
+      expect(result.totalScore, 10);
+      expect(result.maxPossibleScore, 20);
+      expect(result.percentage, closeTo(50.0, 0.001));
+      expect(result.shotCount, 2);
+      expect(result.scoreDistribution[10], 1);
+      expect(result.scoreDistribution[0], 1);
+    });
+
+    test('une liste vide donne un résultat neutre', () {
+      final result = service.calculateScores(
+        shots: [],
+        targetType: TargetType.concentric,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+
+      expect(result.totalScore, 0);
+      expect(result.maxPossibleScore, 0);
+      expect(result.percentage, 0.0);
+    });
+  });
+}

test/widget_test.dart

@@ -1,20 +1,32 @@
-// This is a basic Flutter widget test.
+// Test de fumée sur un widget pur (sans providers ni base de données).
 //
-// To perform an interaction with a widget in your test, use the WidgetTester
+// Le montage complet de BullyApp exige les providers globaux et une base
-// utility in the flutter_test package. For example, you can send tap and scroll
+// SQLite initialisée ; pour un test widget rapide et stable, on valide ici
-// gestures. You can also use WidgetTester to find child widgets in the widget
+// le rendu d'un composant autonome.
-// tree, read text, and verify that the values of widget properties are correct.
 
+import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:bully/app.dart';
+import 'package:bully/features/home/widgets/stats_card.dart';
 
 void main() {
-  testWidgets('App loads correctly', (WidgetTester tester) async {
+  testWidgets('StatsCard affiche le titre, la valeur et l\'icône',
-    // Build our app and trigger a frame.
+      (WidgetTester tester) async {
-    await tester.pumpWidget(const BullyApp());
+    await tester.pumpWidget(
+      const MaterialApp(
+        home: Scaffold(
+          body: StatsCard(
+            icon: Icons.gps_fixed,
+            title: 'Tirs',
+            value: '42',
+            color: Colors.blue,
+          ),
+        ),
+      ),
+    );
 
-    // Verify that the app title is displayed.
+    expect(find.text('Tirs'), findsOneWidget);
-    expect(find.text('Bully'), findsOneWidget);
+    expect(find.text('42'), findsOneWidget);
+    expect(find.byIcon(Icons.gps_fixed), findsOneWidget);
   });
 }

tests/find_homography_test.dart

@@ -1,12 +0,0 @@
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-void main() {
-  var p1 = cv.VecPoint.fromList([cv.Point(0, 0), cv.Point(1, 1)]);
-  var p2 = cv.VecPoint2f.fromList([cv.Point2f(0, 0), cv.Point2f(1, 1)]);
-
-  // Is it p1.mat ?
-  // Or is it cv.findHomography(p1, p1) but actually needs specific types ?
-  cv.Mat mat1 = cv.Mat.fromVec(p1);
-  cv.Mat mat2 = cv.Mat.fromVec(p2);
-  cv.findHomography(mat1, mat2);
-}

tests/opencv_quad_test.dart

@@ -1,7 +0,0 @@
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-void main() {
-  print(cv.approxPolyDP);
-  print(cv.arcLength);
-  print(cv.contourArea);
-}

tests/test_homography.dart

@@ -1,5 +0,0 @@
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-void main() {
-  print(cv.findHomography);
-}