DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Debugger - Replaced NavigationView in favor for something simpler

Browse Source
This commit is contained in:
Robert 2022-08-07 16:19:41 +02:00
parent faf5302975
commit 87e87ae15d
35 changed files with 452 additions and 3293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Artemis.Benchmarking/Artemis.Benchmarking.csproj
View File

@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
</ItemGroup>
</Project>

40
src/Artemis.Benchmarking/NumericConversion.cs
View File

@ -1,40 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Artemis.Core;
using BenchmarkDotNet.Attributes;
namespace Artemis.Benchmarking
{
public class NumericConversion
{
private readonly float _float;
private readonly Numeric _numeric;
public NumericConversion()
{
_float = 255235235f;
_numeric = new Numeric(_float);
}
[Benchmark]
public void FloatToIntCast()
{
var integer = (int) _float;
}
[Benchmark]
public void NumericToIntCast()
{
var integer = (int) _numeric;
}
[Benchmark]
public void NumericToIntConvertTo()
{
var integer = Convert.ChangeType(_numeric, typeof(int));
}
}
}

3
src/Artemis.Benchmarking/Program.cs
View File

@ -1,3 +0,0 @@
using BenchmarkDotNet.Running;
BenchmarkRunner.Run(typeof(Program).Assembly);

1524
src/Artemis.Benchmarking/packages.lock.json
View File

File diff suppressed because it is too large Load Diff

1151
src/Artemis.ConsoleUI/packages.lock.json
View File

File diff suppressed because it is too large Load Diff

5
src/Artemis.UI.Linux/packages.lock.json
View File

@ -1668,10 +1668,7 @@
"Unosquare.Swan.Lite": { "Unosquare.Swan.Lite": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.0.0", "resolved": "3.0.0",
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw==", "contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw=="
"dependencies": {
"System.ValueTuple": "4.5.0"
}
}, },
"artemis.core": { "artemis.core": {
"type": "Project", "type": "Project",

5
src/Artemis.UI.MacOS/packages.lock.json
View File

@ -1668,10 +1668,7 @@
"Unosquare.Swan.Lite": { "Unosquare.Swan.Lite": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.0.0", "resolved": "3.0.0",
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw==", "contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw=="
"dependencies": {
"System.ValueTuple": "4.5.0"
}
}, },
"artemis.core": { "artemis.core": {
"type": "Project", "type": "Project",

8
src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Text.RegularExpressions;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Layout; using Avalonia.Layout;
@ -17,6 +18,7 @@ namespace Artemis.UI.Shared
/// </summary> /// </summary>
public class ArtemisIcon : UserControl public class ArtemisIcon : UserControl
{ {
private static Regex _imageRegex = new(@"[\/.](gif|jpg|jpeg|tiff|png)$", RegexOptions.Compiled);
/// <summary> /// <summary>
/// Creates a new instance of the <see cref="ArtemisIcon" /> class. /// Creates a new instance of the <see cref="ArtemisIcon" /> class.
/// </summary> /// </summary>
@ -39,9 +41,7 @@ namespace Artemis.UI.Shared
{ {
// First look for an enum value instead of a string // First look for an enum value instead of a string
if (Icon is MaterialIconKind materialIcon) if (Icon is MaterialIconKind materialIcon)
{
Content = new MaterialIcon {Kind = materialIcon, Width = Bounds.Width, Height = Bounds.Height}; Content = new MaterialIcon {Kind = materialIcon, Width = Bounds.Width, Height = Bounds.Height};
}
// If it's a string there are several options // If it's a string there are several options
else if (Icon is string iconString) else if (Icon is string iconString)
{ {
@ -49,7 +49,7 @@ namespace Artemis.UI.Shared
if (Enum.TryParse(iconString, true, out MaterialIconKind parsedIcon)) if (Enum.TryParse(iconString, true, out MaterialIconKind parsedIcon))
Content = new MaterialIcon {Kind = parsedIcon, Width = Bounds.Width, Height = Bounds.Height}; Content = new MaterialIcon {Kind = parsedIcon, Width = Bounds.Width, Height = Bounds.Height};
// An URI pointing to an image // An URI pointing to an image
else else if (_imageRegex.IsMatch(iconString))
{ {
if (!Fill) if (!Fill)
{ {
@ -71,6 +71,8 @@ namespace Artemis.UI.Shared
}; };
} }
} }
else
Content = new MaterialIcon {Kind = MaterialIconKind.QuestionMark, Width = Bounds.Width, Height = Bounds.Height};
} }
} }
catch catch

66
src/Artemis.UI/Screens/Debugger/DebugView.axaml
View File

@ -5,8 +5,11 @@
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:reactiveUi="http://reactiveui.net" xmlns:reactiveUi="http://reactiveui.net"
xmlns:debugger="clr-namespace:Artemis.UI.Screens.Debugger"
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800" mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800"
x:Class="Artemis.UI.Screens.Debugger.DebugView" x:Class="Artemis.UI.Screens.Debugger.DebugView"
x:DataType="debugger:DebugViewModel"
Icon="/Assets/Images/Logo/application.ico" Icon="/Assets/Images/Logo/application.ico"
Title="Artemis | Debugger" Title="Artemis | Debugger"
Width="1200" Width="1200"
@ -21,55 +24,18 @@
</Style> </Style>
</Window.Styles> </Window.Styles>
<Panel> <Grid ColumnDefinitions="240,*">
<controls:NavigationView x:Name="Navigation" <ListBox Items="{CompiledBinding Items}" SelectedItem="{CompiledBinding SelectedItem}" Grid.Column="0" Margin="10">
SelectedItem="{Binding SelectedItem}" <ListBox.ItemTemplate>
IsPaneToggleButtonVisible="False" <DataTemplate x:DataType="shared:ViewModelBase">
PaneDisplayMode="Left" <TextBlock Text="{CompiledBinding DisplayName}" VerticalAlignment="Center" />
Margin="0 10 0 0"> </DataTemplate>
<controls:NavigationView.MenuItems> </ListBox.ItemTemplate>
<controls:NavigationViewItem Tag="Rendering"> </ListBox>
<controls:NavigationViewItem.Content> <Border Classes="router-container" Grid.Column="1">
<StackPanel Orientation="Horizontal" Classes="sidebar-stackpanel"> <ContentControl Content="{CompiledBinding SelectedItem}" Margin="15"></ContentControl>
<avalonia:MaterialIcon Kind="Paint" /> </Border>
<TextBlock>Rendering</TextBlock>
</StackPanel>
</controls:NavigationViewItem.Content>
</controls:NavigationViewItem>
<controls:NavigationViewItem Tag="DataModel">
<controls:NavigationViewItem.Content>
<StackPanel Orientation="Horizontal" Classes="sidebar-stackpanel">
<avalonia:MaterialIcon Kind="FormatListBulletedType" />
<TextBlock>Data Model</TextBlock>
</StackPanel>
</controls:NavigationViewItem.Content>
</controls:NavigationViewItem>
<controls:NavigationViewItem Tag="Performance">
<controls:NavigationViewItem.Content>
<StackPanel Orientation="Horizontal" Classes="sidebar-stackpanel">
<avalonia:MaterialIcon Kind="Gauge" />
<TextBlock>Performance</TextBlock>
</StackPanel>
</controls:NavigationViewItem.Content>
</controls:NavigationViewItem>
<controls:NavigationViewItem Tag="Logging">
<controls:NavigationViewItem.Content>
<StackPanel Orientation="Horizontal" Classes="sidebar-stackpanel">
<avalonia:MaterialIcon Kind="Text" />
<TextBlock>Logging</TextBlock>
</StackPanel>
</controls:NavigationViewItem.Content>
</controls:NavigationViewItem>
</controls:NavigationView.MenuItems>
<reactiveUi:RoutedViewHost Router="{Binding Router}" Padding="12">
<reactiveUi:RoutedViewHost.PageTransition>
<CrossFade Duration="0.1" />
</reactiveUi:RoutedViewHost.PageTransition>
</reactiveUi:RoutedViewHost>
</controls:NavigationView>
<StackPanel Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
</Panel>
<StackPanel Grid.Column="0" Grid.ColumnSpan="2" Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
</Grid>
</controls:CoreWindow> </controls:CoreWindow>

4
src/Artemis.UI/Screens/Debugger/DebugView.axaml.cs
View File

@ -22,17 +22,13 @@ namespace Artemis.UI.Screens.Debugger
this.AttachDevTools(); this.AttachDevTools();
#endif #endif
NavigationView navigation = this.Get<NavigationView>("Navigation");
this.WhenActivated(d => this.WhenActivated(d =>
{ {
Observable.FromEventPattern(x => ViewModel!.ActivationRequested += x, x => ViewModel!.ActivationRequested -= x).Subscribe(_ => Observable.FromEventPattern(x => ViewModel!.ActivationRequested += x, x => ViewModel!.ActivationRequested -= x).Subscribe(_ =>
{ {
WindowState = WindowState.Normal; WindowState = WindowState.Normal;
Activate(); Activate();
}).DisposeWith(d); }).DisposeWith(d);
ViewModel!.SelectedItem = (NavigationViewItem) navigation.MenuItems.ElementAt(0);
}); });
} }

68
src/Artemis.UI/Screens/Debugger/DebugViewModel.cs
View File

@ -1,77 +1,40 @@
using System; using System;
using System.Collections.ObjectModel;
using System.Reactive.Disposables; using System.Reactive.Disposables;
using Artemis.UI.Screens.Debugger.DataModel; using Artemis.UI.Screens.Debugger.DataModel;
using Artemis.UI.Screens.Debugger.Logs; using Artemis.UI.Screens.Debugger.Logs;
using Artemis.UI.Screens.Debugger.Performance; using Artemis.UI.Screens.Debugger.Performance;
using Artemis.UI.Screens.Debugger.Render; using Artemis.UI.Screens.Debugger.Render;
using Artemis.UI.Screens.Debugger.Settings;
using Artemis.UI.Services.Interfaces; using Artemis.UI.Services.Interfaces;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using FluentAvalonia.UI.Controls;
using Ninject;
using Ninject.Parameters;
using ReactiveUI; using ReactiveUI;
namespace Artemis.UI.Screens.Debugger namespace Artemis.UI.Screens.Debugger;
{
public class DebugViewModel : ActivatableViewModelBase, IScreen public class DebugViewModel : ActivatableViewModelBase, IScreen
{ {
private readonly IKernel _kernel; private ViewModelBase _selectedItem;
private readonly IDebugService _debugService;
private NavigationViewItem? _selectedItem;
public DebugViewModel(IKernel kernel, IDebugService debugService) public DebugViewModel(IDebugService debugService,
RenderDebugViewModel render,
DataModelDebugViewModel dataModel,
PerformanceDebugViewModel performance,
LogsDebugViewModel logs)
{ {
_kernel = kernel; Items = new ObservableCollection<ViewModelBase> {render, dataModel, performance, logs};
_debugService = debugService; SelectedItem = render;
this.WhenAnyValue(x => x.SelectedItem).WhereNotNull().Subscribe(NavigateToSelectedItem); this.WhenActivated(d => Disposable.Create(debugService.ClearDebugger).DisposeWith(d));
this.WhenActivated(disposables =>
{
Disposable
.Create(HandleDeactivation)
.DisposeWith(disposables);
});
} }
public ObservableCollection<ViewModelBase> Items { get; }
public NavigationViewItem? SelectedItem public ViewModelBase SelectedItem
{ {
get => _selectedItem; get => _selectedItem;
set => RaiseAndSetIfChanged(ref _selectedItem, value); set => RaiseAndSetIfChanged(ref _selectedItem, value);
} }
private void NavigateToSelectedItem(NavigationViewItem item)
{
// Kind of a lame way to do this but it's so static idc
ConstructorArgument hostScreen = new("hostScreen", this);
switch (item.Tag as string)
{
case "Rendering":
Router.Navigate.Execute(_kernel.Get<RenderDebugViewModel>(hostScreen));
break;
case "DataModel":
Router.Navigate.Execute(_kernel.Get<DataModelDebugViewModel>(hostScreen));
break;
case "Performance":
Router.Navigate.Execute(_kernel.Get<PerformanceDebugViewModel>(hostScreen));
break;
case "Logging":
Router.Navigate.Execute(_kernel.Get<LogsDebugViewModel>(hostScreen));
break;
case "Settings":
Router.Navigate.Execute(_kernel.Get<DebugSettingsViewModel>(hostScreen));
break;
}
}
private void HandleDeactivation()
{
_debugService.ClearDebugger();
}
public RoutingState Router { get; } = new();
public void Activate() public void Activate()
{ {
OnActivationRequested(); OnActivationRequested();
@ -83,5 +46,6 @@ namespace Artemis.UI.Screens.Debugger
{ {
ActivationRequested?.Invoke(this, EventArgs.Empty); ActivationRequested?.Invoke(this, EventArgs.Empty);
} }
}
public RoutingState Router { get; } = new();
} }

5
src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugView.axaml.cs
View File

@ -1,8 +1,8 @@
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Debugger.DataModel namespace Artemis.UI.Screens.Debugger.DataModel;
{
public class DataModelDebugView : ReactiveUserControl<DataModelDebugViewModel> public class DataModelDebugView : ReactiveUserControl<DataModelDebugViewModel>
{ {
public DataModelDebugView() public DataModelDebugView()
@ -15,4 +15,3 @@ namespace Artemis.UI.Screens.Debugger.DataModel
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }
} }
}

11
src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugViewModel.cs
View File

@ -16,7 +16,7 @@ using ReactiveUI;
namespace Artemis.UI.Screens.Debugger.DataModel; namespace Artemis.UI.Screens.Debugger.DataModel;
public class DataModelDebugViewModel : ActivatableViewModelBase, IRoutableViewModel public class DataModelDebugViewModel : ActivatableViewModelBase
{ {
private readonly IDataModelUIService _dataModelUIService; private readonly IDataModelUIService _dataModelUIService;
private readonly IPluginManagementService _pluginManagementService; private readonly IPluginManagementService _pluginManagementService;
@ -28,13 +28,13 @@ public class DataModelDebugViewModel : ActivatableViewModelBase, IRoutableViewMo
private Module? _selectedModule; private Module? _selectedModule;
private bool _slowUpdates; private bool _slowUpdates;
public DataModelDebugViewModel(IScreen hostScreen, IDataModelUIService dataModelUIService, IPluginManagementService pluginManagementService) public DataModelDebugViewModel(IDataModelUIService dataModelUIService, IPluginManagementService pluginManagementService)
{ {
_dataModelUIService = dataModelUIService; _dataModelUIService = dataModelUIService;
_pluginManagementService = pluginManagementService; _pluginManagementService = pluginManagementService;
_updateTimer = new DispatcherTimer(TimeSpan.FromMilliseconds(25), DispatcherPriority.DataBind, (_, _) => Update()); _updateTimer = new DispatcherTimer(TimeSpan.FromMilliseconds(40), DispatcherPriority.Background, (_, _) => Update());
HostScreen = hostScreen; DisplayName = "Data Model";
Modules = new ObservableCollection<Module>(); Modules = new ObservableCollection<Module>();
this.WhenActivated(disposables => this.WhenActivated(disposables =>
@ -142,7 +142,4 @@ public class DataModelDebugViewModel : ActivatableViewModelBase, IRoutableViewMo
SelectedModule = null; SelectedModule = null;
} }
} }
public string UrlPathSegment => "data-model";
public IScreen HostScreen { get; }
} }

5
src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugView.axaml.cs
View File

@ -1,8 +1,8 @@
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Debugger.Logs namespace Artemis.UI.Screens.Debugger.Logs;
{
public class LogsDebugView : ReactiveUserControl<LogsDebugViewModel> public class LogsDebugView : ReactiveUserControl<LogsDebugViewModel>
{ {
public LogsDebugView() public LogsDebugView()
@ -15,4 +15,3 @@ namespace Artemis.UI.Screens.Debugger.Logs
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }
} }
}

17
src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs
View File

@ -1,16 +1,11 @@
using Artemis.UI.Shared; using Artemis.UI.Shared;
using ReactiveUI;
namespace Artemis.UI.Screens.Debugger.Logs namespace Artemis.UI.Screens.Debugger.Logs;
{
public class LogsDebugViewModel : ActivatableViewModelBase, IRoutableViewModel
{
public LogsDebugViewModel(IScreen hostScreen)
{
HostScreen = hostScreen;
}
public string UrlPathSegment => "logs"; public class LogsDebugViewModel : ActivatableViewModelBase
public IScreen HostScreen { get; } {
public LogsDebugViewModel()
{
DisplayName = "Logs";
} }
} }

6
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugMeasurementViewModel.cs
View File

@ -1,9 +1,8 @@
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using ReactiveUI;
namespace Artemis.UI.Screens.Debugger.Performance namespace Artemis.UI.Screens.Debugger.Performance;
{
public class PerformanceDebugMeasurementViewModel : ViewModelBase public class PerformanceDebugMeasurementViewModel : ViewModelBase
{ {
private string? _average; private string? _average;
@ -58,4 +57,3 @@ namespace Artemis.UI.Screens.Debugger.Performance
Percentile = Measurement.GetPercentile(0.95).TotalMilliseconds + " ms"; Percentile = Measurement.GetPercentile(0.95).TotalMilliseconds + " ms";
} }
} }
}

7
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugPluginView.axaml.cs
View File

@ -1,9 +1,9 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.Debugger.Performance namespace Artemis.UI.Screens.Debugger.Performance;
{
public partial class PerformanceDebugPluginView : UserControl public class PerformanceDebugPluginView : UserControl
{ {
public PerformanceDebugPluginView() public PerformanceDebugPluginView()
{ {
@ -15,4 +15,3 @@ namespace Artemis.UI.Screens.Debugger.Performance
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }
} }
}

5
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugPluginViewModel.cs
View File

@ -3,8 +3,8 @@ using System.Linq;
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Shared; using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Debugger.Performance namespace Artemis.UI.Screens.Debugger.Performance;
{
public class PerformanceDebugPluginViewModel : ViewModelBase public class PerformanceDebugPluginViewModel : ViewModelBase
{ {
public PerformanceDebugPluginViewModel(Plugin plugin) public PerformanceDebugPluginViewModel(Plugin plugin)
@ -28,4 +28,3 @@ namespace Artemis.UI.Screens.Debugger.Performance
profilerViewModel.Update(); profilerViewModel.Update();
} }
} }
}

7
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml.cs
View File

@ -1,9 +1,9 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.Debugger.Performance namespace Artemis.UI.Screens.Debugger.Performance;
{
public partial class PerformanceDebugProfilerView : UserControl public class PerformanceDebugProfilerView : UserControl
{ {
public PerformanceDebugProfilerView() public PerformanceDebugProfilerView()
{ {
@ -15,4 +15,3 @@ namespace Artemis.UI.Screens.Debugger.Performance
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }
} }
}

5
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerViewModel.cs
View File

@ -3,8 +3,8 @@ using System.Linq;
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Shared; using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Debugger.Performance namespace Artemis.UI.Screens.Debugger.Performance;
{
public class PerformanceDebugProfilerViewModel : ViewModelBase public class PerformanceDebugProfilerViewModel : ViewModelBase
{ {
public PerformanceDebugProfilerViewModel(Profiler profiler) public PerformanceDebugProfilerViewModel(Profiler profiler)
@ -28,4 +28,3 @@ namespace Artemis.UI.Screens.Debugger.Performance
profilingMeasurementViewModel.Update(); profilingMeasurementViewModel.Update();
} }
} }
}

4
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml
View File

@ -28,8 +28,8 @@
<TextBlock Text="{Binding RenderWidth}" /> <TextBlock Text="{Binding RenderWidth}" />
<TextBlock Text="x" /> <TextBlock Text="x" />
<TextBlock Text="{Binding RenderHeight}" /> <TextBlock Text="{Binding RenderHeight}" />
<TextBlock Text=" - Renderer: "></TextBlock> <TextBlock Text=" - Renderer: " />
<TextBlock Text="{Binding Renderer}"></TextBlock> <TextBlock Text="{Binding Renderer}" />
</StackPanel> </StackPanel>

5
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml.cs
View File

@ -1,8 +1,8 @@
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Debugger.Performance namespace Artemis.UI.Screens.Debugger.Performance;
{
public class PerformanceDebugView : ReactiveUserControl<PerformanceDebugViewModel> public class PerformanceDebugView : ReactiveUserControl<PerformanceDebugViewModel>
{ {
public PerformanceDebugView() public PerformanceDebugView()
@ -15,4 +15,3 @@ namespace Artemis.UI.Screens.Debugger.Performance
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }
} }
}

11
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs
View File

@ -12,7 +12,7 @@ using SkiaSharp;
namespace Artemis.UI.Screens.Debugger.Performance; namespace Artemis.UI.Screens.Debugger.Performance;
public class PerformanceDebugViewModel : ActivatableViewModelBase, IRoutableViewModel public class PerformanceDebugViewModel : ActivatableViewModelBase
{ {
private readonly ICoreService _coreService; private readonly ICoreService _coreService;
private readonly IPluginManagementService _pluginManagementService; private readonly IPluginManagementService _pluginManagementService;
@ -22,13 +22,14 @@ public class PerformanceDebugViewModel : ActivatableViewModelBase, IRoutableView
private int _renderHeight; private int _renderHeight;
private int _renderWidth; private int _renderWidth;
public PerformanceDebugViewModel(IScreen hostScreen, ICoreService coreService, IPluginManagementService pluginManagementService) public PerformanceDebugViewModel(ICoreService coreService, IPluginManagementService pluginManagementService)
{ {
HostScreen = hostScreen;
_coreService = coreService; _coreService = coreService;
_pluginManagementService = pluginManagementService; _pluginManagementService = pluginManagementService;
_updateTimer = new DispatcherTimer(TimeSpan.FromMilliseconds(500), DispatcherPriority.Normal, (_, _) => Update()); _updateTimer = new DispatcherTimer(TimeSpan.FromMilliseconds(500), DispatcherPriority.Normal, (_, _) => Update());
DisplayName = "Performance";
this.WhenActivated(disposables => this.WhenActivated(disposables =>
{ {
Observable.FromEventPattern<PluginFeatureEventArgs>(x => pluginManagementService.PluginFeatureEnabled += x, x => pluginManagementService.PluginFeatureEnabled -= x) Observable.FromEventPattern<PluginFeatureEventArgs>(x => pluginManagementService.PluginFeatureEnabled += x, x => pluginManagementService.PluginFeatureEnabled -= x)
@ -123,8 +124,4 @@ public class PerformanceDebugViewModel : ActivatableViewModelBase, IRoutableView
RenderHeight = bitmapInfo.Height; RenderHeight = bitmapInfo.Height;
RenderWidth = bitmapInfo.Width; RenderWidth = bitmapInfo.Width;
} }
public string UrlPathSegment => "performance";
public IScreen HostScreen { get; }
} }

4
src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml
View File

@ -20,8 +20,8 @@
<TextBlock Text="{Binding RenderWidth}" /> <TextBlock Text="{Binding RenderWidth}" />
<TextBlock Text="x" /> <TextBlock Text="x" />
<TextBlock Text="{Binding RenderHeight}" /> <TextBlock Text="{Binding RenderHeight}" />
<TextBlock Text=" - Renderer: "></TextBlock> <TextBlock Text=" - Renderer: " />
<TextBlock Text="{Binding Renderer}"></TextBlock> <TextBlock Text="{Binding Renderer}" />
</StackPanel> </StackPanel>
<Border Classes="card" Padding="10"> <Border Classes="card" Padding="10">

5
src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml.cs
View File

@ -1,8 +1,8 @@
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Debugger.Render namespace Artemis.UI.Screens.Debugger.Render;
{
public class RenderDebugView : ReactiveUserControl<RenderDebugViewModel> public class RenderDebugView : ReactiveUserControl<RenderDebugViewModel>
{ {
public RenderDebugView() public RenderDebugView()
@ -15,4 +15,3 @@ namespace Artemis.UI.Screens.Debugger.Render
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }
} }
}

15
src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs
View File

@ -7,9 +7,9 @@ using Avalonia.Media.Imaging;
using ReactiveUI; using ReactiveUI;
using SkiaSharp; using SkiaSharp;
namespace Artemis.UI.Screens.Debugger.Render namespace Artemis.UI.Screens.Debugger.Render;
{
public class RenderDebugViewModel : ActivatableViewModelBase, IRoutableViewModel public class RenderDebugViewModel : ActivatableViewModelBase
{ {
private readonly ICoreService _coreService; private readonly ICoreService _coreService;
private double _currentFps; private double _currentFps;
@ -20,11 +20,12 @@ namespace Artemis.UI.Screens.Debugger.Render
private int _renderHeight; private int _renderHeight;
private int _renderWidth; private int _renderWidth;
public RenderDebugViewModel(DebugViewModel hostScreen, ICoreService coreService) public RenderDebugViewModel(ICoreService coreService)
{ {
HostScreen = hostScreen;
_coreService = coreService; _coreService = coreService;
DisplayName = "Rendering";
this.WhenActivated(disposables => this.WhenActivated(disposables =>
{ {
HandleActivation(); HandleActivation();
@ -101,8 +102,4 @@ namespace Artemis.UI.Screens.Debugger.Render
CurrentFrame = new Bitmap(data.AsStream()); CurrentFrame = new Bitmap(data.AsStream());
} }
} }
public string UrlPathSegment => "render";
public IScreen HostScreen { get; }
}
} }

5
src/Artemis.UI/Screens/Debugger/Tabs/Settings/DebugSettingsView.axaml.cs
View File

@ -1,8 +1,8 @@
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Debugger.Settings namespace Artemis.UI.Screens.Debugger.Settings;
{
public class DebugSettingsView : ReactiveUserControl<DebugSettingsViewModel> public class DebugSettingsView : ReactiveUserControl<DebugSettingsViewModel>
{ {
public DebugSettingsView() public DebugSettingsView()
@ -15,4 +15,3 @@ namespace Artemis.UI.Screens.Debugger.Settings
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }
} }
}

17
src/Artemis.UI/Screens/Debugger/Tabs/Settings/DebugSettingsViewModel.cs
View File

@ -1,16 +1,11 @@
using Artemis.UI.Shared; using Artemis.UI.Shared;
using ReactiveUI;
namespace Artemis.UI.Screens.Debugger.Settings namespace Artemis.UI.Screens.Debugger.Settings;
{
public class DebugSettingsViewModel : ActivatableViewModelBase, IRoutableViewModel
{
public DebugSettingsViewModel(IScreen hostScreen)
{
HostScreen = hostScreen;
}
public string UrlPathSegment => "logs"; public class DebugSettingsViewModel : ActivatableViewModelBase
public IScreen HostScreen { get; } {
public DebugSettingsViewModel()
{
DisplayName = "Settings";
} }
} }

8
src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
View File

@ -17,22 +17,18 @@
<TextBox Classes="clearButton" Text="{CompiledBinding SearchPluginInput}" Watermark="Search plugins" Margin="0 0 10 0" /> <TextBox Classes="clearButton" Text="{CompiledBinding SearchPluginInput}" Watermark="Search plugins" Margin="0 0 10 0" />
<StackPanel Spacing="5" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal"> <StackPanel Spacing="5" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
<controls:HyperlinkButton Grid.Row="0" <controls:HyperlinkButton VerticalAlignment="Top" NavigateUri="https://wiki.artemis-rgb.com/en/guides/user/plugins">
Grid.Column="1"
VerticalAlignment="Top"
NavigateUri="https://wiki.artemis-rgb.com/en/guides/user/plugins">
Get more plugins Get more plugins
</controls:HyperlinkButton> </controls:HyperlinkButton>
<Button Classes="accent" Command="{CompiledBinding ImportPlugin}">Import plugin</Button> <Button Classes="accent" Command="{CompiledBinding ImportPlugin}">Import plugin</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
<ScrollViewer Grid.Row="1" Grid.Column="0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" VerticalAlignment="Top"> <ScrollViewer Grid.Row="1" Grid.Column="0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" VerticalAlignment="Top">
<ItemsRepeater Items="{CompiledBinding Plugins}" MaxWidth="900" VerticalAlignment="Center"> <ItemsRepeater Items="{CompiledBinding Plugins}" MaxWidth="900" VerticalAlignment="Center">
<ItemsRepeater.ItemTemplate> <ItemsRepeater.ItemTemplate>
<DataTemplate x:DataType="plugins:PluginSettingsViewModel"> <DataTemplate x:DataType="plugins:PluginSettingsViewModel">
<ContentControl Content="{CompiledBinding}"/> <ContentControl Content="{CompiledBinding}" Height="200"/>
</DataTemplate> </DataTemplate>
</ItemsRepeater.ItemTemplate> </ItemsRepeater.ItemTemplate>
</ItemsRepeater> </ItemsRepeater>

3
src/Artemis.UI/Screens/Settings/Tabs/PluginsTabViewModel.cs
View File

@ -36,12 +36,13 @@ namespace Artemis.UI.Screens.Settings
DisplayName = "Plugins"; DisplayName = "Plugins";
SourceList<Plugin> plugins = new(); SourceList<Plugin> plugins = new();
IObservable<Func<Plugin, bool>> pluginFilter = this.WhenAnyValue(vm => vm.SearchPluginInput).Throttle(TimeSpan.FromMilliseconds(100), AvaloniaScheduler.Instance).Select(CreatePredicate); IObservable<Func<Plugin, bool>> pluginFilter = this.WhenAnyValue(vm => vm.SearchPluginInput).Throttle(TimeSpan.FromMilliseconds(100)).Select(CreatePredicate);
plugins.Connect() plugins.Connect()
.Filter(pluginFilter) .Filter(pluginFilter)
.Sort(SortExpressionComparer<Plugin>.Ascending(p => p.Info.Name)) .Sort(SortExpressionComparer<Plugin>.Ascending(p => p.Info.Name))
.Transform(settingsVmFactory.PluginSettingsViewModel) .Transform(settingsVmFactory.PluginSettingsViewModel)
.ObserveOn(AvaloniaScheduler.Instance)
.Bind(out ReadOnlyObservableCollection<PluginSettingsViewModel> pluginViewModels) .Bind(out ReadOnlyObservableCollection<PluginSettingsViewModel> pluginViewModels)
.Subscribe(); .Subscribe();
Plugins = pluginViewModels; Plugins = pluginViewModels;

6
src/Artemis.sln
View File

@ -47,36 +47,42 @@ Global
{035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Release|Any CPU.ActiveCfg = Release|x64 {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Release|Any CPU.ActiveCfg = Release|x64
{035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Release|x64.ActiveCfg = Release|x64 {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Release|x64.ActiveCfg = Release|x64
{035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Debug|Any CPU.Build.0 = Debug|x64 {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Debug|Any CPU.Build.0 = Debug|x64
{035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Release|x64.Build.0 = Release|x64
{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|Any CPU.ActiveCfg = Debug|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|Any CPU.ActiveCfg = Debug|x64
{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|x64.ActiveCfg = Debug|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|x64.ActiveCfg = Debug|x64
{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|x64.Build.0 = Debug|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|x64.Build.0 = Debug|x64
{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|Any CPU.ActiveCfg = Release|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|Any CPU.ActiveCfg = Release|x64
{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|x64.ActiveCfg = Release|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|x64.ActiveCfg = Release|x64
{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|Any CPU.Build.0 = Debug|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|Any CPU.Build.0 = Debug|x64
{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|x64.Build.0 = Release|x64
{DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|Any CPU.ActiveCfg = Debug|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|Any CPU.ActiveCfg = Debug|x64
{DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|x64.ActiveCfg = Debug|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|x64.ActiveCfg = Debug|x64
{DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|x64.Build.0 = Debug|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|x64.Build.0 = Debug|x64
{DE45A288-9320-461F-BE2A-26DFE3817216}.Release|Any CPU.ActiveCfg = Release|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Release|Any CPU.ActiveCfg = Release|x64
{DE45A288-9320-461F-BE2A-26DFE3817216}.Release|x64.ActiveCfg = Release|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Release|x64.ActiveCfg = Release|x64
{DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|Any CPU.Build.0 = Debug|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|Any CPU.Build.0 = Debug|x64
{DE45A288-9320-461F-BE2A-26DFE3817216}.Release|x64.Build.0 = Release|x64
{9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|Any CPU.ActiveCfg = Debug|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|Any CPU.ActiveCfg = Debug|x64
{9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|x64.ActiveCfg = Debug|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|x64.ActiveCfg = Debug|x64
{9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|x64.Build.0 = Debug|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|x64.Build.0 = Debug|x64
{9012C8E2-3BEC-42F5-8270-7352A5922B04}.Release|Any CPU.ActiveCfg = Release|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Release|Any CPU.ActiveCfg = Release|x64
{9012C8E2-3BEC-42F5-8270-7352A5922B04}.Release|x64.ActiveCfg = Release|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Release|x64.ActiveCfg = Release|x64
{9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|Any CPU.Build.0 = Debug|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|Any CPU.Build.0 = Debug|x64
{9012C8E2-3BEC-42F5-8270-7352A5922B04}.Release|x64.Build.0 = Release|x64
{2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|Any CPU.ActiveCfg = Debug|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|Any CPU.ActiveCfg = Debug|x64
{2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|x64.ActiveCfg = Debug|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|x64.ActiveCfg = Debug|x64
{2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|x64.Build.0 = Debug|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|x64.Build.0 = Debug|x64
{2F5F16DC-FACF-4559-9882-37C2949814C7}.Release|Any CPU.ActiveCfg = Release|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Release|Any CPU.ActiveCfg = Release|x64
{2F5F16DC-FACF-4559-9882-37C2949814C7}.Release|x64.ActiveCfg = Release|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Release|x64.ActiveCfg = Release|x64
{2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|Any CPU.Build.0 = Debug|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|Any CPU.Build.0 = Debug|x64
{2F5F16DC-FACF-4559-9882-37C2949814C7}.Release|x64.Build.0 = Release|x64
{412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|Any CPU.ActiveCfg = Debug|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|Any CPU.ActiveCfg = Debug|x64
{412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|x64.ActiveCfg = Debug|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|x64.ActiveCfg = Debug|x64
{412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|x64.Build.0 = Debug|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|x64.Build.0 = Debug|x64
{412B921A-26F5-4AE6-8B32-0C19BE54F421}.Release|Any CPU.ActiveCfg = Release|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Release|Any CPU.ActiveCfg = Release|x64
{412B921A-26F5-4AE6-8B32-0C19BE54F421}.Release|x64.ActiveCfg = Release|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Release|x64.ActiveCfg = Release|x64
{412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|Any CPU.Build.0 = Debug|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|Any CPU.Build.0 = Debug|x64
{412B921A-26F5-4AE6-8B32-0C19BE54F421}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE