From 3ec68b7b63f26040da03d5857741da24db150731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= Date: Wed, 28 Jun 2023 22:11:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ViewModels => Common}/BindableBase.cs | 0 .../{ViewModels => Common}/SimpleCommand.cs | 0 AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs | 8 ++++---- .../DiagramSelectionService.cs} | 4 ++-- .../ViewModels/BaseViewModel/DiagramViewModel.cs | 6 +++--- .../ViewModels/{ => Interface}/IAttachTo.cs | 0 .../ViewModels/{ => Interface}/IDiagramServiceProvider.cs | 0 .../ViewModels/{ => Interface}/IDiagramViewModel.cs | 2 +- .../ViewModels/{ => Interface}/IGroupable.cs | 0 .../ViewModels/{ => Interface}/ISelectable.cs | 0 10 files changed, 10 insertions(+), 10 deletions(-) rename AIStudio.Wpf.DiagramDesigner/{ViewModels => Common}/BindableBase.cs (100%) rename AIStudio.Wpf.DiagramDesigner/{ViewModels => Common}/SimpleCommand.cs (100%) rename AIStudio.Wpf.DiagramDesigner/ViewModels/{SelectionService.cs => BaseViewModel/DiagramSelectionService.cs} (96%) rename AIStudio.Wpf.DiagramDesigner/ViewModels/{ => Interface}/IAttachTo.cs (100%) rename AIStudio.Wpf.DiagramDesigner/ViewModels/{ => Interface}/IDiagramServiceProvider.cs (100%) rename AIStudio.Wpf.DiagramDesigner/ViewModels/{ => Interface}/IDiagramViewModel.cs (99%) rename AIStudio.Wpf.DiagramDesigner/ViewModels/{ => Interface}/IGroupable.cs (100%) rename AIStudio.Wpf.DiagramDesigner/ViewModels/{ => Interface}/ISelectable.cs (100%) diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BindableBase.cs b/AIStudio.Wpf.DiagramDesigner/Common/BindableBase.cs similarity index 100% rename from AIStudio.Wpf.DiagramDesigner/ViewModels/BindableBase.cs rename to AIStudio.Wpf.DiagramDesigner/Common/BindableBase.cs diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleCommand.cs b/AIStudio.Wpf.DiagramDesigner/Common/SimpleCommand.cs similarity index 100% rename from AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleCommand.cs rename to AIStudio.Wpf.DiagramDesigner/Common/SimpleCommand.cs diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs index 86d0158..c6cd60f 100644 --- a/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs +++ b/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs @@ -133,7 +133,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls #region Helper methods - private void DragLeft(double scale, DesignerItemViewModelBase item, SelectionService selectionService) + private void DragLeft(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService) { IEnumerable groupItems = selectionService.GetGroupMembers(item, false).Cast(); @@ -147,7 +147,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls } } - private void DragTop(double scale, DesignerItemViewModelBase item, SelectionService selectionService) + private void DragTop(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService) { IEnumerable groupItems = selectionService.GetGroupMembers(item, false).Cast(); double groupBottom = item.Top + item.GetItemHeight(); @@ -160,7 +160,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls } } - private void DragRight(double scale, DesignerItemViewModelBase item, SelectionService selectionService) + private void DragRight(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService) { IEnumerable groupItems = selectionService.GetGroupMembers(item, false).Cast(); @@ -175,7 +175,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls } } - private void DragBottom(double scale, DesignerItemViewModelBase item, SelectionService selectionService) + private void DragBottom(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService) { IEnumerable groupItems = selectionService.GetGroupMembers(item, false).Cast(); double groupTop = item.Top; diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramSelectionService.cs similarity index 96% rename from AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramSelectionService.cs index 7ddf190..bcaa364 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramSelectionService.cs @@ -5,11 +5,11 @@ using System.Text; namespace AIStudio.Wpf.DiagramDesigner { - public class SelectionService + public class DiagramSelectionService { private IDiagramViewModel DiagramViewModel; - public SelectionService(IDiagramViewModel diagramViewModel) + public DiagramSelectionService(IDiagramViewModel diagramViewModel) { this.DiagramViewModel = diagramViewModel; } diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs index ef3c9ea..1cc18f0 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs @@ -40,13 +40,13 @@ namespace AIStudio.Wpf.DiagramDesigner } } - private SelectionService selectionService; - public SelectionService SelectionService + private DiagramSelectionService selectionService; + public DiagramSelectionService SelectionService { get { if (selectionService == null) - selectionService = new SelectionService(this); + selectionService = new DiagramSelectionService(this); return selectionService; } diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IAttachTo.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IAttachTo.cs similarity index 100% rename from AIStudio.Wpf.DiagramDesigner/ViewModels/IAttachTo.cs rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IAttachTo.cs diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramServiceProvider.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramServiceProvider.cs similarity index 100% rename from AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramServiceProvider.cs rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramServiceProvider.cs diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramViewModel.cs similarity index 99% rename from AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramViewModel.cs index 2805bf7..97c56a4 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramViewModel.cs @@ -28,7 +28,7 @@ namespace AIStudio.Wpf.DiagramDesigner { get; } - SelectionService SelectionService + DiagramSelectionService SelectionService { get; } diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IGroupable.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IGroupable.cs similarity index 100% rename from AIStudio.Wpf.DiagramDesigner/ViewModels/IGroupable.cs rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IGroupable.cs diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/ISelectable.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/ISelectable.cs similarity index 100% rename from AIStudio.Wpf.DiagramDesigner/ViewModels/ISelectable.cs rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/ISelectable.cs