Merge pull request #1 from ipax77/dev

v0.6.6

Author: ipax77

README.md

@@ -24,7 +24,12 @@ Blazor Server Electron app for analyzing chess games with UCI chess engines on l
 
 # Release Notes
 
-<details open="open"><summary>v0.6.5</summary>
+<details open="open"><summary>v0.6.6</summary>
+
+>- pax.BlazorChartJs
+</details>
+
+<details><summary>v0.6.5</summary>
 
 >- Database bugfix
 >- SubVariation linebreaks fix

src/pax.BlazorChess/Models/Chart.cs

@@ -45,7 +45,7 @@
     </div>
     <div>
         <div class="btn-group mt-1">
-            <button type="button" class="btn btn-outline-light" @onclick="e => loadModal?.Show()">Import</button>
+            <button type="button" class="btn btn-outline-light" @onclick="ImportClick">Import</button>
             @if (Analyzes == null)
             {
                 <button type="button" class="btn btn-outline-info" @onclick="CreateNewAnalyzes">Start analyzing</button>
@@ -164,6 +164,11 @@
         AvailableAnalyzes = engineService.GetAnalyzes().ToList();
     }
 
+    private void ImportClick()
+    {
+        loadModal?.Show();
+    }
+
     private void InfoAvailable(object? sender, EngineInfoEventArgs infoEventArgs)
     {
         var _engineInfos = infoEventArgs.Infos.ToList();

src/pax.BlazorChess/Pages/AnalyzePage.razor

@@ -59,7 +59,7 @@
             </div>
         }
         <div>
-            <ChartComponent @ref="chart" Chart="_chart" OnChartClicked="ChartClicked"></ChartComponent>
+            <pax.BlazorChartJs.ChartComponent @ref="chartComponent" ChartJsConfig="chartConfig" OnLabelClicked="ChartClicked"></pax.BlazorChartJs.ChartComponent>
         </div>
     </div>
 </div>

src/pax.BlazorChess/Pages/EngineAnalyzesPage.razor

@@ -5,7 +5,7 @@
 using pax.chess;
 using pax.uciChessEngine;
 using Blazored.Toast.Services;
-using Microsoft.AspNetCore.Components.Routing;
+using pax.BlazorChartJs;
 
 namespace pax.BlazorChess.Pages;
 public partial class EngineAnalyzesPage : ComponentBase, IDisposable
@@ -31,15 +31,15 @@ public partial class EngineAnalyzesPage : ComponentBase, IDisposable
     List<GameAnalyzes> GameAnalyzis = new List<GameAnalyzes>();
     GameAnalyzes? Analysis;
     BoardContainer? boardContainer;
-    ChartComponent? chart;
+    ChartComponent? chartComponent;
     LoadModal? loadModal;
     SettingsModal? settingModal;
     EngineComponent? engineComponent;
     MoveStatsComponent? moveStatsComponent;
 
     CancellationTokenSource cts = new CancellationTokenSource();
 
-    private Chart _chart = ChartService.GetRatingChart();
+    private ChartJsConfig chartConfig = ChartService.GetRatingChart();
     private bool Analyzing = false;
     private bool Loading = false;
 
@@ -75,7 +75,7 @@ private async Task Init()
 
         if (Analysis != null)
         {
-            _chart.data.labels = Analysis.Game.State.Moves.Select(s => s.HalfMoveNumber.ToString()).ToList();
+            chartConfig.SetLabels(Analysis.Game.State.Moves.Select(s => s.HalfMoveNumber.ToString()).ToList());
             if (Analysis.Game.ReviewVariations.Any())
             {
                 ReviewVariations = new Dictionary<int, List<Variation>>(Analysis.Game.ReviewVariations);
@@ -131,8 +131,7 @@ private async Task GameImport(Game game)
                 _nav.NavigateTo(_nav.GetUriWithQueryParameter("GameId", GameId));
             }
         }
-        _chart.data.labels = Analysis.Game.State.Moves.Select(s => s.HalfMoveNumber.ToString()).ToList();
-        chart?.UpdateLabels(_chart.data.labels);
+        chartConfig.SetLabels(Analysis.Game.State.Moves.Select(s => s.HalfMoveNumber.ToString()).ToList());
         ReviewVariations.Clear();
         reviewVariations.Clear();
         UpdateChart();
@@ -149,8 +148,9 @@ private void SettingsChoosen()
         }
     }
 
-    private void ChartClicked(string label)
+    private void ChartClicked(KeyValuePair<Guid, string> report)
     {
+        string label = report.Value;
         if (Analysis != null)
         {
             int i;
@@ -167,22 +167,23 @@ private void UpdateChart(bool dry = false)
     {
         if (Analysis != null)
         {
-            _chart.data.datasets[0].data.Clear();
+            List<object> data = new();
+            
             for (int i = 0; i < Analysis.Game.State.Moves.Count; i++)
             {
                 if (ReviewVariations.ContainsKey(i) && ReviewVariations[i].Any())
                 {
                     var chartScore = ReviewVariations[i].OrderBy(o => o.Pv).First().Evaluation?.ChartScore();
-                    _chart.data.datasets[0].data.Add(chartScore == null ? 0 : (double)chartScore);
+                    data.Add(chartScore == null ? 0 : (double)chartScore);
                 }
                 else
                 {
-                    _chart.data.datasets[0].data.Add(0);
+                    data.Add(0);
                 }
             }
-            if (!dry)
+            if (!dry && chartConfig.Data.Datasets.Any())
             {
-                chart?.UpdateDataset(_chart.data.datasets[0]);
+                chartConfig.SetData(chartConfig.Data.Datasets.First(), data);
             }
         }
     }
@@ -191,14 +192,23 @@ private void ObserverMoveChanged()
     {
         if (Analysis != null && Analysis.Game.ObserverState.CurrentMove != null)
         {
+            var arConfig = chartConfig.Options?.Plugins?.ArbitraryLines?.FirstOrDefault();
             if (Analysis.Game.ObserverState.CurrentMove.Variation == null)
             {
-                chart?.DrawHorizontalLine(Analysis.Game.ObserverState.CurrentMove.HalfMoveNumber);
+                if (arConfig != null)
+                {
+                    arConfig.XPosition = Analysis.Game.ObserverState.CurrentMove.HalfMoveNumber;
+                    chartComponent?.UpdateChartOptions();
+                }
             }
             else
             {
                 var startMove = Analysis.Game.ObserverState.CurrentMove.Variation?.StartMove;
-                chart?.DrawHorizontalLine(startMove ?? 0);
+                if (arConfig != null)
+                {
+                    arConfig.XPosition = startMove ?? 0;
+                    chartComponent?.UpdateChartOptions();
+                }
             }
             boardContainer?.DrawReviewHints();
             reviewVariations = Analysis.Game.GetCurrentReviewVariations().ToList();
@@ -268,8 +278,7 @@ private async Task Analyse()
         int i = 0;
         if (Analysis != null)
         {
-            _chart.data.labels = Analysis.Game.State.Moves.Select(s => s.HalfMoveNumber.ToString()).ToList();
-            chart?.UpdateLabels(_chart.data.labels);
+            chartConfig.SetLabels(Analysis.Game.State.Moves.Select(s => s.HalfMoveNumber.ToString()).ToList());
             Analyzing = true;
             await InvokeAsync(() => StateHasChanged());
             cts = new CancellationTokenSource();

src/pax.BlazorChess/Pages/EngineAnalyzesPage.razor.cs

@@ -7,6 +7,7 @@
 using ElectronNET.API;
 using ElectronNET.API.Entities;
 using Blazored.Toast;
+using pax.BlazorChartJs;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -44,7 +45,7 @@
     });
 });
 
-
+builder.Services.AddChartJs();
 builder.Services.AddScoped<DbService>();
 builder.Services.AddSingleton<ConfigurationService>();
 builder.Services.AddSingleton<EngineService>();