From 41e34e05e86dcfb3cfdfab63d2559d7c4662003a Mon Sep 17 00:00:00 2001 From: Alek-ban Date: Thu, 19 Feb 2026 08:22:55 +0300 Subject: [PATCH] feat: IlluminatorController --- GSS2.Test/DependencyInjectionHelper.cs | 4 +- GSS2.Test/ViewModels/MainViewModel.cs | 4 +- GSS2.Test/Views/MainView.axaml | 6 +- .../Converters/OrientationToBoolConverter.cs | 13 +++ .../IlluminatorControllerViewModel.cs | 72 +++++++++++++++++ .../Views/IlluminatorControllerView.axaml | 80 +++++++++++++++++++ .../Views/IlluminatorControllerView.axaml.cs | 11 +++ 7 files changed, 187 insertions(+), 3 deletions(-) create mode 100644 GSS2.UI.Core/Converters/OrientationToBoolConverter.cs create mode 100644 GSS2.UI.Core/ViewModels/IlluminatorControllerViewModel.cs create mode 100644 GSS2.UI.Core/Views/IlluminatorControllerView.axaml create mode 100644 GSS2.UI.Core/Views/IlluminatorControllerView.axaml.cs diff --git a/GSS2.Test/DependencyInjectionHelper.cs b/GSS2.Test/DependencyInjectionHelper.cs index ef8260d..085944e 100644 --- a/GSS2.Test/DependencyInjectionHelper.cs +++ b/GSS2.Test/DependencyInjectionHelper.cs @@ -15,5 +15,7 @@ public static class DependencyInjectionHelper .AddSingleton() .AddSingleton() .AddSingleton() - .AddSingleton(); + .AddSingleton() + .AddSingleton() + .AddSingleton(); } \ No newline at end of file diff --git a/GSS2.Test/ViewModels/MainViewModel.cs b/GSS2.Test/ViewModels/MainViewModel.cs index 0439c12..2f9d393 100644 --- a/GSS2.Test/ViewModels/MainViewModel.cs +++ b/GSS2.Test/ViewModels/MainViewModel.cs @@ -13,6 +13,7 @@ public partial class MainViewModel : ViewModelBase private readonly IlluminatorService _illuminatorService; [ObservableProperty] private CameraViewModel _cameraViewModel; [ObservableProperty] private ResourcesViewModel _resourcesViewModel; + [ObservableProperty] private IlluminatorControllerViewModel _illuminatorControllerViewModel; [ObservableProperty] private OpenCvSharp.Mat? _image1; [ObservableProperty] private OpenCvSharp.Mat? _image2; [ObservableProperty] private OpenCvSharp.Mat? _image3; @@ -24,13 +25,14 @@ public partial class MainViewModel : ViewModelBase [ObservableProperty] private bool _canScrollForward; [ObservableProperty] private bool _canScrollBackward; - public MainViewModel(ILogger logger, CameraViewModel cameraViewModel, ResourcesViewModel resourcesViewModel, CameraService cameraService, IlluminatorService illuminatorService) + public MainViewModel(ILogger logger, CameraViewModel cameraViewModel, ResourcesViewModel resourcesViewModel, IlluminatorControllerViewModel illuminatorControllerViewModel, CameraService cameraService, IlluminatorService illuminatorService) { _logger = logger; _cameraService = cameraService; _illuminatorService = illuminatorService; CameraViewModel = cameraViewModel; ResourcesViewModel = resourcesViewModel; + IlluminatorControllerViewModel = illuminatorControllerViewModel; ButtonCaptureClick = new RelayCommand(() => { Task.Run(async () => diff --git a/GSS2.Test/Views/MainView.axaml b/GSS2.Test/Views/MainView.axaml index 1e74a7a..09d5107 100644 --- a/GSS2.Test/Views/MainView.axaml +++ b/GSS2.Test/Views/MainView.axaml @@ -9,7 +9,12 @@