streaper2/impact
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix(calibration): préserver les rayons d'origine de l'IA lors du redimensionnement et corriger le reset

Browse Source
This commit is contained in:
qguillaume
2026-05-27 11:56:07 +02:00
parent 78c9fc96c9
commit 04c1204116
1 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/features/analysis/widgets/target_calibration.dart
View File

@@ -61,6 +61,9 @@ class TargetCalibrationState extends State<TargetCalibration> {
bool _showEspacement = false; bool _showEspacement = false;
double _baseRadiusBeforeScale = 1.0; double _baseRadiusBeforeScale = 1.0;
// SAUVEGARDE CRITIQUE : Pour mémoriser la structure d'origine de l'IA
List<double>? _originalRingRadii;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -70,14 +73,21 @@ class TargetCalibrationState extends State<TargetCalibration> {
_innerRadius = widget.initialInnerRadius; _innerRadius = widget.initialInnerRadius;
_ringCount = widget.initialRingCount; _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 // Initialisation du ratio par défaut
_currentEspacementRatio = (_radius > 0) ? (_innerRadius / _radius).clamp(0.01, 0.70) : 0.1; _currentEspacementRatio = (_radius > 0) ? (_innerRadius / _radius).clamp(0.01, 0.70) : 0.1;
_initRingRadii(); _initRingRadii();
} }
void _initRingRadii({bool forceRecalculate = false}) { 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!); _ringRadii = List.from(widget.initialRingRadii!);
} else { } else {
_ringRadii = List.generate(_ringCount, (i) { _ringRadii = List.generate(_ringCount, (i) {
@@ -112,6 +122,7 @@ class TargetCalibrationState extends State<TargetCalibration> {
shouldReinit = true; shouldReinit = true;
} }
if (widget.initialRingRadii != oldWidget.initialRingRadii && widget.initialRingRadii != null) { if (widget.initialRingRadii != oldWidget.initialRingRadii && widget.initialRingRadii != null) {
_originalRingRadii = List.from(widget.initialRingRadii!);
shouldReinit = true; shouldReinit = true;
} }
@@ -189,7 +200,12 @@ class TargetCalibrationState extends State<TargetCalibration> {
onChanged: (bool value) { onChanged: (bool value) {
setState(() { setState(() {
_showEspacement = value; _showEspacement = value;
// Quand on désactive l'espacement manuel, on restaure la configuration d'usine !
if (!value) {
_initRingRadii(forceRecalculate: false);
}
}); });
_notifyChange();
}, },
), ),
), ),
@@ -210,16 +226,17 @@ class TargetCalibrationState extends State<TargetCalibration> {
const Icon(Icons.zoom_out, color: Colors.white, size: 16), const Icon(Icons.zoom_out, color: Colors.white, size: 16),
Expanded( Expanded(
child: Slider( child: Slider(
// SÉCURITÉ : Valeur max bridée fermement à 0.82 pour éviter le débordement vertical // SÉCURITÉ : Ouverture mesurée des bornes pour plus de liberté sans débordement incontrôlé
value: _radius.clamp(0.5, 0.82), value: _radius.clamp(0.3, 0.95),
min: 0.5, min: 0.3,
max: 0.82, max: 0.95,
activeColor: AppTheme.primaryColor, activeColor: AppTheme.primaryColor,
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {
_radius = value; _radius = value;
_innerRadius = _radius * _currentEspacementRatio; _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(); _notifyChange();
}, },
@@ -267,19 +284,22 @@ class TargetCalibrationState extends State<TargetCalibration> {
], ],
), ),
), ),
// CORRECTION DU BOUTON RESET : Force le ratio d'usine (10%) en dur sans écrasement // CORRECTION DU BOUTON RESET : Restaure désormais le vrai profil d'usine de l'IA
IconButton( IconButton(
icon: const Icon(Icons.refresh, color: Colors.white70, size: 20), icon: const Icon(Icons.refresh, color: Colors.white70, size: 20),
onPressed: () { onPressed: () {
setState(() { setState(() {
// 1. On force la jauge orange à se remettre à 10% if (_originalRingRadii != null) {
_currentEspacementRatio = 0.1; _initRingRadii(forceRecalculate: false);
if (_ringRadii.isNotEmpty) {
// 2. On réaligne l'innerRadius sur la taille actuelle _currentEspacementRatio = _ringRadii.first;
_innerRadius = _radius * _currentEspacementRatio; _innerRadius = _radius * _currentEspacementRatio;
}
// 3. On force la reconstruction des cercles parfaits } else {
_initRingRadii(forceRecalculate: true); _currentEspacementRatio = 0.1;
_innerRadius = _radius * _currentEspacementRatio;
_initRingRadii(forceRecalculate: true);
}
}); });
_notifyChange(); _notifyChange();
}, },
@@ -361,9 +381,9 @@ class TargetCalibrationState extends State<TargetCalibration> {
void _onScaleUpdate(ScaleUpdateDetails details, Size size) { void _onScaleUpdate(ScaleUpdateDetails details, Size size) {
setState(() { setState(() {
if (details.pointerCount == 2) { if (details.pointerCount == 2) {
_radius = (_baseRadiusBeforeScale * details.scale).clamp(0.5, 0.82); _radius = (_baseRadiusBeforeScale * details.scale).clamp(0.3, 0.95);
_innerRadius = _radius * _currentEspacementRatio; _innerRadius = _radius * _currentEspacementRatio;
_initRingRadii(forceRecalculate: true); _initRingRadii(forceRecalculate: _showEspacement);
} else if (_isDraggingCenter) { } else if (_isDraggingCenter) {
final deltaX = details.focalPointDelta.dx / size.width; final deltaX = details.focalPointDelta.dx / size.width;
final deltaY = details.focalPointDelta.dy / size.height; final deltaY = details.focalPointDelta.dy / size.height;
@@ -472,8 +492,8 @@ class _CalibrationPainter extends CustomPainter {
for (int i = 0; i < ringCount; i++) { for (int i = 0; i < ringCount; i++) {
final ringRadius = ringRadii.length > i ? ringRadii[i] : (i + 1) / ringCount; final ringRadius = ringRadii.length > i ? ringRadii[i] : (i + 1) / ringCount;
final prevRingRadius = i > 0 ? (ringRadii.length > i - 1 ? ringRadii[i - 1] : i / ringCount) : 0.0; final textSpanRatio = i > 0 ? (ringRadii.length > i - 1 ? ringRadii[i - 1] : i / ringCount) : 0.0;
final zoneRadius = baseRadius * (ringRadius + prevRingRadius) / 2; final zoneRadius = baseRadius * (ringRadius + textSpanRatio) / 2;
final score = 10 - i; final score = 10 - i;
final labelX = center.dx + zoneRadius; final labelX = center.dx + zoneRadius;
@@ -517,7 +537,7 @@ class _CalibrationPainter extends CustomPainter {
canvas.drawLine(Offset(center.dx - 20, center.dy), Offset(center.dx - 8, center.dy), crossPaint); canvas.drawLine(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 + 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 - 20), Offset(center.dx, center.dy - 8), crossPaint);
canvas.drawLine(Offset(center.dx, center.dy + 8), Offset(center.dx, center.dy + 20), crossPaint); canvas.drawLine(Offset(center.dx, center.dy + 4), Offset(center.dx, center.dy + 20), crossPaint);
} }
void _drawInstructions(Canvas canvas, Size size) { void _drawInstructions(Canvas canvas, Size size) {