long candy ready to test
This commit is contained in:
@@ -1,8 +0,0 @@
|
||||
using Inspectron.Settings;
|
||||
|
||||
namespace VisionBuilder.UI.Windows.Test;
|
||||
|
||||
public class AppSettings
|
||||
{
|
||||
|
||||
}
|
||||
@@ -1,5 +1,10 @@
|
||||
using System.Runtime.InteropServices;
|
||||
using MaterialSkin;
|
||||
using MaterialSkin.Controls;
|
||||
using Microsoft.VisualBasic.Logging;
|
||||
using OpenCvSharp;
|
||||
using VisionBuilder.UI.Common;
|
||||
using VisionBuilder.UI.Common.Services;
|
||||
using VisionBuilder.UI.Common.ViewModel;
|
||||
|
||||
namespace VisionBuilder.UI.Windows.Test
|
||||
@@ -7,10 +12,14 @@ namespace VisionBuilder.UI.Windows.Test
|
||||
public partial class Form1 : MaterialForm
|
||||
{
|
||||
private readonly MainWindowVM _mainWindowVm;
|
||||
private readonly IPasswordInputService _passwordInputService;
|
||||
private readonly UIConfiguration _uiConfiguration;
|
||||
|
||||
public Form1(MainWindowVM mainWindowVm)
|
||||
public Form1(MainWindowVM mainWindowVm, IPasswordInputService passwordInputService, UIConfiguration uiConfiguration)
|
||||
{
|
||||
_mainWindowVm = mainWindowVm;
|
||||
_passwordInputService = passwordInputService;
|
||||
_uiConfiguration = uiConfiguration;
|
||||
MaterialSkin.MaterialSkinManager.ConfigureForInspectron();
|
||||
InitializeComponent();
|
||||
singleCameraControl1.SetViewModel(mainWindowVm.SingleCameraVms[0]);
|
||||
@@ -54,6 +63,12 @@ namespace VisionBuilder.UI.Windows.Test
|
||||
|
||||
private void btnSettings_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (_uiConfiguration.ProtectSettingsWithPassword)
|
||||
{
|
||||
var passwordOk = _passwordInputService.GetPassword() == _uiConfiguration.AdminPassword;
|
||||
if (!passwordOk)
|
||||
return;
|
||||
}
|
||||
_mainWindowVm.SettingsCommand.Execute(null);
|
||||
}
|
||||
|
||||
|
||||
BIN
VisionBuilder.UI.Windows.Test/Inspectron icon-512.ico
Normal file
BIN
VisionBuilder.UI.Windows.Test/Inspectron icon-512.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 103 KiB |
@@ -97,9 +97,11 @@ namespace VisionBuilder.UI.Windows.Test
|
||||
kernelCamera1.Get<SingleCameraVM>()
|
||||
];
|
||||
|
||||
var form = mainKernel.Get<Form1>();
|
||||
|
||||
settings.LoadSettings();
|
||||
Application.Run(new Form1(mainWindowVm));
|
||||
|
||||
Application.Run(form);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,8 +6,13 @@
|
||||
<Nullable>enable</Nullable>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<ApplicationIcon>Inspectron icon-512.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="Inspectron icon-512.ico" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
|
||||
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.6.0.20220608" />
|
||||
Reference in New Issue
Block a user