diff --git a/XplorePlane.sln b/XplorePlane.sln index 2b40a4f..c43f265 100644 --- a/XplorePlane.sln +++ b/XplorePlane.sln @@ -3,19 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.14.36811.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XplorePlane", "XplorePlane\XplorePlane.csproj", "{07978DB9-4B88-4F42-9054-73992742BD6A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XplorePlane", "XplorePlane\XplorePlane.csproj", "{07978DB9-4B88-4F42-9054-73992742BD6A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XplorePlane.Tests", "XplorePlane.Tests\XplorePlane.Tests.csproj", "{6234B622-8DF2-4A8D-AF93-B17774019555}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Camera", "XP.Camera\XP.Camera.csproj", "{82762CDE-48CC-4E28-ABEC-1FC752BACEF4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Camera", "XP.Camera\XP.Camera.csproj", "{82762CDE-48CC-4E28-ABEC-1FC752BACEF4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.ImageProcessing.Core", "XP.ImageProcessing.Core\XP.ImageProcessing.Core.csproj", "{01EDC1D8-F6BC-2677-AE59-89BA3FC2C74F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.ImageProcessing.Core", "XP.ImageProcessing.Core\XP.ImageProcessing.Core.csproj", "{01EDC1D8-F6BC-2677-AE59-89BA3FC2C74F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.ImageProcessing.Processors", "XP.ImageProcessing.Processors\XP.ImageProcessing.Processors.csproj", "{2687E12E-3053-E1C6-5268-E4FF547EC212}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.ImageProcessing.Processors", "XP.ImageProcessing.Processors\XP.ImageProcessing.Processors.csproj", "{2687E12E-3053-E1C6-5268-E4FF547EC212}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.ImageProcessing.CfgControl", "XP.ImageProcessing.CfgControl\XP.ImageProcessing.CfgControl.csproj", "{9460CF45-8A25-9770-03AF-4602A2FFF016}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.ImageProcessing.CfgControl", "XP.ImageProcessing.CfgControl\XP.ImageProcessing.CfgControl.csproj", "{9460CF45-8A25-9770-03AF-4602A2FFF016}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.ImageProcessing.RoiControl", "XP.ImageProcessing.RoiControl\XP.ImageProcessing.RoiControl.csproj", "{57061533-EC58-1B1C-3862-9164BC73C806}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.ImageProcessing.RoiControl", "XP.ImageProcessing.RoiControl\XP.ImageProcessing.RoiControl.csproj", "{57061533-EC58-1B1C-3862-9164BC73C806}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExternalLibraries", "ExternalLibraries", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" ProjectSection(SolutionItems) = preProject @@ -40,31 +38,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExternalLibraries", "Extern ExternalLibraries\version_string.inc = ExternalLibraries\version_string.inc EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Common", "XP.Common\XP.Common.csproj", "{866A7353-C822-114E-48DE-26E8A3E17F9E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Common", "XP.Common\XP.Common.csproj", "{866A7353-C822-114E-48DE-26E8A3E17F9E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.Detector", "XP.Hardware.Detector\XP.Hardware.Detector.csproj", "{760D5EAC-795A-6666-1BE0-E30B1B2822C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Hardware.Detector", "XP.Hardware.Detector\XP.Hardware.Detector.csproj", "{760D5EAC-795A-6666-1BE0-E30B1B2822C3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.MotionControl", "XP.Hardware.MotionControl\XP.Hardware.MotionControl.csproj", "{9391C622-4552-8081-A1E8-B3447E0E7A4F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Hardware.MotionControl", "XP.Hardware.MotionControl\XP.Hardware.MotionControl.csproj", "{9391C622-4552-8081-A1E8-B3447E0E7A4F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.PLC", "XP.Hardware.PLC\XP.Hardware.PLC.csproj", "{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Hardware.PLC", "XP.Hardware.PLC\XP.Hardware.PLC.csproj", "{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.PLC.Sentry", "XP.Hardware.PLC.Sentry\XP.Hardware.PLC.Sentry.csproj", "{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Hardware.PLC.Sentry", "XP.Hardware.PLC.Sentry\XP.Hardware.PLC.Sentry.csproj", "{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.RaySource", "XP.Hardware.RaySource\XP.Hardware.RaySource.csproj", "{67D180E8-AB8F-FF62-ED46-270803B8F713}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Hardware.RaySource", "XP.Hardware.RaySource\XP.Hardware.RaySource.csproj", "{67D180E8-AB8F-FF62-ED46-270803B8F713}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.RaySource.Comet.Host", "XP.Hardware.RaySource.Comet.Host\XP.Hardware.RaySource.Comet.Host.csproj", "{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.RaySource.Comet.Messages", "XP.Hardware.RaySource.Comet.Messages\XP.Hardware.RaySource.Comet.Messages.csproj", "{6170AF9F-A792-6BDC-4E25-072EA87FAA15}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Hardware.RaySource.Comet.Messages", "XP.Hardware.RaySource.Comet.Messages\XP.Hardware.RaySource.Comet.Messages.csproj", "{6170AF9F-A792-6BDC-4E25-072EA87FAA15}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XP.Hardware", "XP.Hardware", "{29E2D405-341A-4445-B788-3E77A677C2BA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XP.ImageProcessing", "XP.ImageProcessing", "{C24535A4-6717-4149-AB81-1EF09A15F90F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Scan", "XP.Scan\XP.Scan.csproj", "{F40C71DC-7639-CD57-6183-2EAA78980EC5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Scan", "XP.Scan\XP.Scan.csproj", "{F40C71DC-7639-CD57-6183-2EAA78980EC5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XP.ScanMode", "XP.ScanMode", "{E208A5EA-7E3B-46B4-B045-A703F6274218}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Calibration", "XP.Calibration\XP.Calibration.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XP.Calibration", "XP.Calibration\XP.Calibration.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XP.Calibration", "XP.Calibration", "{D4E5F6A7-B8C9-0123-4567-89ABCDEF0123}" EndProject @@ -90,18 +88,6 @@ Global {07978DB9-4B88-4F42-9054-73992742BD6A}.Release|x64.Build.0 = Release|Any CPU {07978DB9-4B88-4F42-9054-73992742BD6A}.Release|x86.ActiveCfg = Release|Any CPU {07978DB9-4B88-4F42-9054-73992742BD6A}.Release|x86.Build.0 = Release|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Debug|x64.ActiveCfg = Debug|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Debug|x64.Build.0 = Debug|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Debug|x86.ActiveCfg = Debug|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Debug|x86.Build.0 = Debug|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Release|Any CPU.Build.0 = Release|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Release|x64.ActiveCfg = Release|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Release|x64.Build.0 = Release|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Release|x86.ActiveCfg = Release|Any CPU - {6234B622-8DF2-4A8D-AF93-B17774019555}.Release|x86.Build.0 = Release|Any CPU {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Debug|Any CPU.Build.0 = Debug|Any CPU {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Debug|x64.ActiveCfg = Debug|Any CPU diff --git a/XplorePlane/ViewModels/ImageProcessing/PipelineEditorViewModel.cs b/XplorePlane/ViewModels/ImageProcessing/PipelineEditorViewModel.cs index ca36fe9..20b817d 100644 --- a/XplorePlane/ViewModels/ImageProcessing/PipelineEditorViewModel.cs +++ b/XplorePlane/ViewModels/ImageProcessing/PipelineEditorViewModel.cs @@ -71,7 +71,6 @@ namespace XplorePlane.ViewModels DeletePipelineCommand = new DelegateCommand(async () => await DeletePipelineAsync()); LoadPipelineCommand = new DelegateCommand(async () => await LoadPipelineAsync()); LoadImageCommand = new DelegateCommand(LoadImage); - OpenToolboxCommand = new DelegateCommand(OpenToolbox); MoveNodeUpCommand = new DelegateCommand(MoveNodeUp); MoveNodeDownCommand = new DelegateCommand(MoveNodeDown); @@ -178,8 +177,6 @@ namespace XplorePlane.ViewModels public DelegateCommand LoadPipelineCommand { get; } public DelegateCommand LoadImageCommand { get; } - public DelegateCommand OpenToolboxCommand { get; } - public DelegateCommand MoveNodeUpCommand { get; } public DelegateCommand MoveNodeDownCommand { get; } @@ -689,25 +686,6 @@ namespace XplorePlane.ViewModels } } - private void OpenToolbox() //打开图像工具箱 - { - _logger.Info("OpenToolbox 被调用"); - try - { - var window = new Views.OperatorToolboxWindow - { - Owner = System.Windows.Application.Current.MainWindow - }; - _logger.Info("OperatorToolboxWindow 已创建，准备 Show()"); - window.Show(); - _logger.Info("OperatorToolboxWindow.Show() 完成"); - } - catch (Exception ex) - { - _logger.Error(ex, "OpenToolbox 打开窗口失败"); - } - } - private PipelineModel BuildPipelineModel() { return new PipelineModel