Merge pull request #673 from julien4215/fix/analysis-screen-index

Change index for analysis that doesn't start from chess initial position
lichess-org · May 12, 2024 · 7d92683 · 7d92683
2 parents 9ddf27d + c258da4
commit 7d92683
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/src/model/analysis/analysis_controller.dart b/lib/src/model/analysis/analysis_controller.dart
@@ -109,7 +109,8 @@ class AnalysisController extends _$AnalysisController {
       onVisitNode: (root, branch, isMainline) {
         if (isMainline &&
             options.initialMoveCursor != null &&
-            branch.position.ply <= options.initialMoveCursor!) {
+            branch.position.ply <=
+                root.position.ply + options.initialMoveCursor!) {
           path = path + branch.id;
           lastMove = branch.sanMove.move;
         }

diff --git a/lib/src/view/analysis/analysis_screen.dart b/lib/src/view/analysis/analysis_screen.dart
@@ -1248,6 +1248,11 @@ class AcplChart extends ConsumerWidget {
           .select((value) => value.acplChartData),
     );
 
+    final rootPly = ref.watch(
+      analysisControllerProvider(pgn, options)
+          .select((value) => value.root.position.ply),
+    );
+
     final currentNode = ref.watch(
       analysisControllerProvider(pgn, options)
           .select((value) => value.currentNode),
@@ -1329,7 +1334,7 @@ class AcplChart extends ConsumerWidget {
                 verticalLines: [
                   if (isOnMainline)
                     VerticalLine(
-                      x: (currentNode.position.ply - 1).toDouble(),
+                      x: (currentNode.position.ply - 1 - rootPly).toDouble(),
                       color: mainLineColor,
                       strokeWidth: 1.0,
                     ),