Add ScottPlot example

VincentH-Net · VincentH-Net · commit ee8e185ca8c2 · 2025-07-04T08:13:49.000+02:00
diff --git a/src/CSharpMarkup.WinUI.Examples/Directory.Packages.props b/src/CSharpMarkup.WinUI.Examples/Directory.Packages.props
@@ -9,6 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="CSharpMarkup.WinUI" Version="3.1.2" />
+    <PackageVersion Include="CSharpMarkup.WinUI.ScottPlot" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.Uno.Toolkit" Version="3.1.2" />
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Core/GlobalUsings.cs b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Core/GlobalUsings.cs
@@ -26,6 +26,7 @@
 global using static CSharpMarkup.WinUI.Uno.Extensions.Navigation.Helpers;
 global using static CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit.Helpers;
 global using static CSharpMarkup.WinUI.Uno.Toolkit.Helpers;
+global using static CSharpMarkup.WinUI.ScottPlot.Helpers;
 global using static WinUICsMarkupExamples.Presentation.Core.MarkupHelpers;
 
 // Aliases for WinUI namespaces and types
@@ -34,6 +35,9 @@
 global using UI = Microsoft.UI;
 global using UIBindable = Microsoft.UI.Xaml.Data.BindableAttribute;
 global using UIControls = Microsoft.UI.Xaml.Controls;
+global using SpLib = ScottPlot;
+global using SpUI = ScottPlot.WinUI;
+
 // - Non-view types, e.g. enums, don't need a UI prefix because they are not mirrored as types in the CSharpMarkup namespaces
 global using BindingMode = Microsoft.UI.Xaml.Data.BindingMode;
 global using Visibility = Microsoft.UI.Xaml.Visibility;
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/Routes.cs b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/Routes.cs
@@ -7,15 +7,17 @@ public static void Register(IViewRegistry views, IRouteRegistry routes)
         views.Register(
             new ViewMap(ViewModel: typeof(ShellViewModel)),
             new ViewMap<SearchPage, SearchViewModel>(),
-            new ViewMap<FlutterPage, FlutterViewModel>()
+            new ViewMap<FlutterPage, FlutterViewModel>(),
+            new ViewMap<ScottPlotPage, ScottPlotViewModel>()
         );
 
         routes.Register(
             new RouteMap("", View: views.FindByViewModel<ShellViewModel>(),
                 Nested: new RouteMap[]
                 {
                     new RouteMap("Search", View: views.FindByViewModel<SearchViewModel>(), IsDefault:true),
-                    new RouteMap("Flutter", View: views.FindByViewModel<FlutterViewModel>())
+                    new RouteMap("Flutter", View: views.FindByViewModel<FlutterViewModel>()),
+                    new RouteMap("ScottPlot", View: views.FindByViewModel<ScottPlotViewModel>())
                 }
             )
         );
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/ScottPlotPage.cs b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/ScottPlotPage.cs
@@ -0,0 +1,23 @@
+namespace WinUICsMarkupExamples.Presentation.Example;
+
+partial class ScottPlotPage
+{
+    enum Row { Header, Body }
+
+    public void BuildUI() => Content (
+        Grid (
+            Rows (
+                (Row.Header, Auto),
+                (Row.Body  , Star)
+            ),
+
+        NavigationBar(
+            TextBlock("ScottPlot"),
+            AppBarButton() .Icon("Images/forward") .Bind(vm?.ForwardCommand)
+        )  .Grid_Row(Row.Header),
+
+        WinUIPlot() .Invoke(ExampleGraph) 
+           .Grid_Row(Row.Body) .HVStretch()
+        )
+    );
+}
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/ScottPlotPage.logic.cs b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/ScottPlotPage.logic.cs
@@ -0,0 +1,17 @@
+using ScottPlot;
+
+namespace WinUICsMarkupExamples.Presentation.Example;
+
+[UIBindable]
+public sealed partial class ScottPlotPage : BasePage<ScottPlotViewModel>, IBuildUI
+{
+    public ScottPlotPage() => BuildUI();
+
+    void ExampleGraph(SpUI.WinUIPlot plot)
+    {
+        plot.Plot.Title("Example Graph");
+        plot.Plot.Add.Signal(Generate.Sin(51));
+        plot.Plot.Add.Signal(Generate.Cos(51));
+        plot.Refresh();
+    }
+}
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/ScottPlotViewModel.cs b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/ScottPlotViewModel.cs
@@ -0,0 +1,6 @@
+namespace WinUICsMarkupExamples.Presentation.Example;
+
+public partial class ScottPlotViewModel(INavigator navigator) : BaseViewModel
+{
+    [RelayCommand] public async Task Forward() => await navigator.NavigateViewModelAsync<FlutterViewModel>(this);
+}
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/SearchPage.cs b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/SearchPage.cs
@@ -16,8 +16,8 @@ Footer .Grid_Row(2)
 
     NavigationBar Header => NavigationBar(
         TextBox(PlaceholderText: "Search") .Style(ThemeResource.ComboBoxTextBoxStyle) .VerticalAlignment().Center() .Bind(vm?.SearchText, BindingMode.TwoWay),
-        AppBarButton() .Icon("Images/search" ) .OnClick(vm!.SearchCommand),
-        AppBarButton() .Icon("Images/forward") .OnClick(vm!.ForwardCommand)
+        AppBarButton() .Icon("Images/search" ) .Bind(vm?.SearchCommand),
+        AppBarButton() .Icon("Images/forward") .Bind(vm?.ForwardCommand)
     )  .HorizontalContentAlignment().Stretch()
        #if HAS_UNO
        .Style().AppResource("XamlDefaultNavigationBar")
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/SearchViewModel.cs b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/SearchViewModel.cs
@@ -113,7 +113,7 @@ public sealed partial class SearchViewModel(INavigator navigator) : BaseViewMode
 
     public static Uri LinkUri(string linkText) => new(linkText.StartsWith("#", StringComparison.Ordinal) ? TwitterSearchUri(linkText) : linkText);
 
-    [RelayCommand] public async Task Forward() => await navigator.NavigateViewModelAsync<FlutterViewModel>(this);
+    [RelayCommand] public async Task Forward() => await navigator.NavigateViewModelAsync<ScottPlotViewModel>(this);
     [RelayCommand] public async Task Search() => await LaunchUri(TwitterSearchUri(SearchText));
     [RelayCommand] public static void Like(Tweet tweet) => tweet.IsLikedByMe = !tweet.IsLikedByMe;
 
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/WinUICsMarkupExamples.Presentation.csproj b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/WinUICsMarkupExamples.Presentation.csproj
@@ -25,5 +25,6 @@
     <PackageReference Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" />
     <PackageReference Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" />
     <PackageReference Include="CSharpMarkup.WinUI.Uno.Toolkit" />
+    <PackageReference Include="CSharpMarkup.WinUI.ScottPlot" />
   </ItemGroup>
 </Project>
diff --git a/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples/WinUICsMarkupExamples.csproj b/src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples/WinUICsMarkupExamples.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Uno.Sdk">
+﻿<Project Sdk="Uno.Sdk">
   <ItemGroup>
     <ProjectReference Include="..\WinUICsMarkupExamples.Presentation\WinUICsMarkupExamples.Presentation.csproj" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,17 @@ public static void Register(IViewRegistry views, IRouteRegistry routes)`
`7`	`7`	`views.Register(`
`8`	`8`	`new ViewMap(ViewModel: typeof(ShellViewModel)),`
`9`	`9`	`new ViewMap<SearchPage, SearchViewModel>(),`
`10`		`- new ViewMap<FlutterPage, FlutterViewModel>()`
	`10`	`+ new ViewMap<FlutterPage, FlutterViewModel>(),`
	`11`	`+ new ViewMap<ScottPlotPage, ScottPlotViewModel>()`
`11`	`12`	`);`
`12`	`13`
`13`	`14`	`routes.Register(`
`14`	`15`	`new RouteMap("", View: views.FindByViewModel<ShellViewModel>(),`
`15`	`16`	`Nested: new RouteMap[]`
`16`	`17`	`{`
`17`	`18`	`new RouteMap("Search", View: views.FindByViewModel<SearchViewModel>(), IsDefault:true),`
`18`		`- new RouteMap("Flutter", View: views.FindByViewModel<FlutterViewModel>())`
	`19`	`+ new RouteMap("Flutter", View: views.FindByViewModel<FlutterViewModel>()),`
	`20`	`+ new RouteMap("ScottPlot", View: views.FindByViewModel<ScottPlotViewModel>())`
`19`	`21`	`}`
`20`	`22`	`)`
`21`	`23`	`);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Uno.Sdk">`
	`1`	`+<Project Sdk="Uno.Sdk">`
`2`	`2`	`<ItemGroup>`
`3`	`3`	`<ProjectReference Include="..\WinUICsMarkupExamples.Presentation\WinUICsMarkupExamples.Presentation.csproj" />`
`4`	`4`	`</ItemGroup>`