Design: Remplacement du point rouge par une mire vert fluo interne dans le viseur
This commit is contained in:
@@ -106,7 +106,8 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
Row(
|
Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
const Icon(Icons.center_focus_strong, color: Colors.redAccent, size: 20),
|
// CORRECTION : Icône passée en vert fluo (0xFF00FF00)
|
||||||
|
const Icon(Icons.center_focus_strong, color: Color(0xFF00FF00), size: 20),
|
||||||
const SizedBox(width: 8),
|
const SizedBox(width: 8),
|
||||||
Text(
|
Text(
|
||||||
'Alignez le centre de la cible sur la croix',
|
'Alignez le centre de la cible sur la croix',
|
||||||
@@ -149,7 +150,8 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
padding: const EdgeInsets.symmetric(vertical: 15),
|
padding: const EdgeInsets.symmetric(vertical: 15),
|
||||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
|
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
|
||||||
),
|
),
|
||||||
child: const Text('Analyser', style: TextStyle(fontWeight: FontWeight.bold)),
|
// CORRECTION : Texte modifié pour correspondre au nouveau flux
|
||||||
|
child: const Text('Suivant', style: TextStyle(fontWeight: FontWeight.bold)),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -253,6 +255,10 @@ class _CropScreenState extends State<CropScreen> {
|
|||||||
final targetCenterY = cropRect.y + cropRect.height / 2;
|
final targetCenterY = cropRect.y + cropRect.height / 2;
|
||||||
|
|
||||||
if (!mounted) return;
|
if (!mounted) return;
|
||||||
|
|
||||||
|
// Note : On laisse temporairement AnalysisScreen ici.
|
||||||
|
// Dès qu'on s'attaque au fichier de calibration, on modifiera cette ligne
|
||||||
|
// pour basculer directement sur le bon écran !
|
||||||
Navigator.pushReplacement(
|
Navigator.pushReplacement(
|
||||||
context,
|
context,
|
||||||
MaterialPageRoute(
|
MaterialPageRoute(
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ class _CropOverlayPainter extends CustomPainter {
|
|||||||
_drawGrid(canvas, cropRect);
|
_drawGrid(canvas, cropRect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dessiner le point central (croix)
|
// Dessiner le point central (croix interne vert fluo)
|
||||||
_drawCenterPoint(canvas, cropRect);
|
_drawCenterPoint(canvas, cropRect);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -165,35 +165,40 @@ class _CropOverlayPainter extends CustomPainter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _drawCenterPoint(Canvas canvas, Rect rect) {
|
void _drawCenterPoint(Canvas canvas, Rect rect) {
|
||||||
|
// Peinture de la croix interne (Vert Fluo)
|
||||||
final centerPaint = Paint()
|
final centerPaint = Paint()
|
||||||
..color = Colors.white.withValues(alpha: 0.8)
|
..color = const Color(0xFF00FF00)
|
||||||
..style = PaintingStyle.stroke
|
..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 centerX = rect.center.dx;
|
||||||
final centerY = rect.center.dy;
|
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(
|
canvas.drawLine(
|
||||||
Offset(centerX - size, centerY),
|
Offset(centerX - circleRadius, centerY),
|
||||||
Offset(centerX + size, centerY),
|
Offset(centerX + circleRadius, centerY),
|
||||||
centerPaint,
|
centerPaint,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Ligne verticale
|
// Ligne verticale (de haut en bas, reste à l'intérieur)
|
||||||
canvas.drawLine(
|
canvas.drawLine(
|
||||||
Offset(centerX, centerY - size),
|
Offset(centerX, centerY - circleRadius),
|
||||||
Offset(centerX, centerY + size),
|
Offset(centerX, centerY + circleRadius),
|
||||||
centerPaint,
|
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
|
@override
|
||||||
|
|||||||
Reference in New Issue
Block a user