zhusenlin/aistudio-wpf-diagram
1
0
Fork 0
mirror of https://gitee.com/akwkevin/aistudio.-wpf.-diagram synced 2026-04-17 14:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

组合对象完成

Browse Source
This commit is contained in:
艾竹
2023-02-03 22:25:03 +08:00
parent 2fde666182
commit bd90d55ca8
7 changed files with 88 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
AIStudio.Wpf.DiagramApp/Models/PathToolBoxData.cs → AIStudio.Wpf.DiagramApp/Models/CustomToolBoxData.cs
View File

@@ -49,8 +49,14 @@ namespace AIStudio.Wpf.DiagramApp.Models
public class DesignerItemToolBoxData : ToolBoxData public class DesignerItemToolBoxData : ToolBoxData
{ {
public string FileName { get; set; } public string FileName
public DesignerItemViewModelBase DesignerItemViewModel { get; set; } {
get; set;
}
public DesignerItemViewModelBase DesignerItemViewModel
{
get; set;
}
public DesignerItemToolBoxData(DesignerItemBase designerItemBase, string filename, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, null, type, width, height, desiredSize, description) public DesignerItemToolBoxData(DesignerItemBase designerItemBase, string filename, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, null, type, width, height, desiredSize, description)
{ {
Addition = designerItemBase; Addition = designerItemBase;
@@ -66,58 +72,40 @@ namespace AIStudio.Wpf.DiagramApp.Models
{ {
get; set; get; set;
} }
public List<SelectableDesignerItemViewModelBase> SelectableDesignerItemViewModel public List<SelectableDesignerItemViewModelBase> SelectableDesignerItemViewModels
{ {
get; set; get; set;
} }
public MultipleDesignerItemToolBoxData(DiagramItem designerItemBase, string filename, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, null, typeof(List<SelectableDesignerItemViewModelBase>), width, height, desiredSize, description) public double CanvasWidth
{ {
List<DesignerItemViewModelBase> items = new List<DesignerItemViewModelBase>(); get; set;
foreach (var diagramItemData in designerItemBase.DesignerItems) }
{ public double CanvasHeight
Type itemtype = TypeHelper.GetType(diagramItemData.ModelTypeName); {
DesignerItemViewModelBase itemBase = Activator.CreateInstance(itemtype, null, diagramItemData, ".json") as DesignerItemViewModelBase; get; set;
items.Add(itemBase); }
} public MultipleDesignerItemToolBoxData(SerializableObject designerItemBase, string filename, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, null, typeof(List<SelectableDesignerItemViewModelBase>), width, height, desiredSize, description)
List<ConnectionViewModel> connects = new List<ConnectionViewModel>(); {
foreach (var connection in designerItemBase.Connections) SelectableDesignerItemViewModels = designerItemBase.ToObject();
{
Type itemtype = TypeHelper.GetType(connection.SerializableTypeName);
var connectionItem = SerializeHelper.DeserializeObject(itemtype, connection.SerializableString, ".json") as ConnectionItem;
connectionItem.SourceType = System.Type.GetType(connectionItem.SourceTypeName); var minleft = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Min(p => p.Left);
connectionItem.SinkType = System.Type.GetType(connectionItem.SinkTypeName); var mintop = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Min(p => p.Top);
DesignerItemViewModelBase sourceItem = DiagramViewModelHelper.GetConnectorDataItem(items, connectionItem.SourceId, connectionItem.SourceType); var maxright = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Max(p => p.Left + p.ItemWidth);
if (sourceItem == null) var maxbottom = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Max(p => p.Top + p.ItemHeight);
continue;
ConnectorOrientation sourceConnectorOrientation = connectionItem.SourceOrientation;
FullyCreatedConnectorInfo sourceConnectorInfo = sourceItem.GetFullConnectorInfo(connectionItem.Id, sourceConnectorOrientation, connectionItem.SourceXRatio, connectionItem.SourceYRatio, connectionItem.SourceInnerPoint, connectionItem.SourceInnerPoint);
DesignerItemViewModelBase sinkItem = DiagramViewModelHelper.GetConnectorDataItem(items, connectionItem.SinkId, connectionItem.SinkType); foreach (var item in SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>())
if (sinkItem == null)
continue;
ConnectorOrientation sinkConnectorOrientation = connectionItem.SinkOrientation;
FullyCreatedConnectorInfo sinkConnectorInfo = sinkItem.GetFullConnectorInfo(connectionItem.Id, sinkConnectorOrientation, connectionItem.SinkXRatio, connectionItem.SinkYRatio, connectionItem.SinkInnerPoint, connectionItem.SinkInnerPoint);
ConnectionViewModel connectionVM = new ConnectionViewModel(null, sourceConnectorInfo, sinkConnectorInfo, connectionItem);
connects.Add(connectionVM);
}
var minleft = items.OfType<DesignerItemViewModelBase>().Min(p => p.Left);
var mintop = items.OfType<DesignerItemViewModelBase>().Min(p => p.Top);
foreach (var item in items)
{ {
item.Left -= minleft; item.Left -= minleft;
item.Top -= mintop; item.Top -= mintop;
} }
CanvasWidth = maxright - minleft;
CanvasHeight = maxbottom - mintop;
SelectableDesignerItemViewModel = new List<SelectableDesignerItemViewModelBase>(); designerItemBase.DesignerItems = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Select(p => p.ToSerializableItem(".json")).Where(p => p != null).ToList();
SelectableDesignerItemViewModel.AddRange(items); designerItemBase.Connections = SelectableDesignerItemViewModels.OfType<ConnectionViewModel>().Select(p => p.ToSerializableItem(".json")).Where(p => p != null).ToList();
SelectableDesignerItemViewModel.AddRange(connects);
Addition = SelectableDesignerItemViewModel; Addition = designerItemBase;
FileName = filename; FileName = filename;
} }
} }
@@ -137,5 +125,5 @@ namespace AIStudio.Wpf.DiagramApp.Models
} }
} }
} }

3
AIStudio.Wpf.DiagramApp/Models/DiagramItem.cs
View File

@@ -18,6 +18,7 @@ using AIStudio.Wpf.SFC.ViewModels;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using AIStudio.Wpf.DiagramDesigner.Models; using AIStudio.Wpf.DiagramDesigner.Models;
using AIStudio.Wpf.DiagramDesigner.Helpers;
namespace AIStudio.Wpf.DiagramApp.Models namespace AIStudio.Wpf.DiagramApp.Models
{ {
@@ -123,5 +124,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
[XmlArray] [XmlArray]
public List<SerializableItem> Connections { get; set; } = new List<SerializableItem>(); public List<SerializableItem> Connections { get; set; } = new List<SerializableItem>();
} }
} }

3
AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs
View File

@@ -20,6 +20,7 @@ using AIStudio.Wpf.Flowchart.Models;
using AIStudio.Wpf.SFC.Models; using AIStudio.Wpf.SFC.Models;
using System.Windows; using System.Windows;
using System; using System;
using AIStudio.Wpf.DiagramDesigner.Models;
namespace AIStudio.Wpf.DiagramApp.ViewModels namespace AIStudio.Wpf.DiagramApp.ViewModels
{ {
@@ -272,7 +273,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
if (xmlobject.DiagramItems[0].DesignerItems.Count > 1) if (xmlobject.DiagramItems[0].DesignerItems.Count > 1)
{ {
var itemBase = new MultipleDesignerItemToolBoxData(xmlobject.DiagramItems[0], filename); var itemBase = new MultipleDesignerItemToolBoxData(new SerializableObject() { DesignerItems = xmlobject.DiagramItems[0].DesignerItems, Connections = xmlobject.DiagramItems[0].Connections }, filename);
return itemBase; return itemBase;
} }

8
AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml
View File

@@ -162,7 +162,7 @@
</DataTemplate.Triggers> </DataTemplate.Triggers>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="{x:Type model:MultipleDesignerItemToolBoxData}"> <DataTemplate DataType="{x:Type model:MultipleDesignerItemToolBoxData}">
<Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}"> <Grid ToolTip="{Binding Description}">
<Grid.ContextMenu> <Grid.ContextMenu>
<ContextMenu> <ContextMenu>
<MenuItem Header="删除" Command="{StaticResource DeleteItemCommandReference}" CommandParameter="{Binding .}"/> <MenuItem Header="删除" Command="{StaticResource DeleteItemCommandReference}" CommandParameter="{Binding .}"/>
@@ -173,8 +173,10 @@
StrokeDashArray="2" StrokeDashArray="2"
Fill="Transparent" Fill="Transparent"
SnapsToDevicePixels="true"/> SnapsToDevicePixels="true"/>
<Viewbox Stretch="Uniform"> <Viewbox Stretch="Uniform" Width="{Binding Width}" Height="{Binding Height}">
<ItemsControl ItemsSource="{Binding SelectableDesignerItemViewModel}"> <ItemsControl ItemsSource="{Binding SelectableDesignerItemViewModels}"
Width="{Binding CanvasWidth}"
Height="{Binding CanvasHeight}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<Canvas x:Name="rootCanvas"/> <Canvas x:Name="rootCanvas"/>

5
AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
View File

@@ -12,6 +12,8 @@ using System.Linq;
using System.Windows.Shapes; using System.Windows.Shapes;
using System.Windows.Resources; using System.Windows.Resources;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Newtonsoft.Json;
using AIStudio.Wpf.DiagramDesigner.Models;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
@@ -567,8 +569,9 @@ namespace AIStudio.Wpf.DiagramDesigner
{ {
_viewModel.ClearSelectedItemsCommand.Execute(null); _viewModel.ClearSelectedItemsCommand.Execute(null);
Point position = e.GetPosition(this); Point position = e.GetPosition(this);
if (dragObject.DesignerItem is List<SelectableDesignerItemViewModelBase> designerItems) if (dragObject.DesignerItem is SerializableObject serializableObject)
{ {
var designerItems = serializableObject.ToObject();
foreach (var item in designerItems.OfType<DesignerItemViewModelBase>()) foreach (var item in designerItems.OfType<DesignerItemViewModelBase>())
{ {
item.Left += position.X; item.Left += position.X;

41
AIStudio.Wpf.DiagramDesigner/Models/Serializables/SerializableObject.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml.Serialization; using System.Xml.Serialization;
using AIStudio.Wpf.DiagramDesigner.Helpers;
namespace AIStudio.Wpf.DiagramDesigner.Models namespace AIStudio.Wpf.DiagramDesigner.Models
{ {
@@ -49,5 +50,45 @@ namespace AIStudio.Wpf.DiagramDesigner.Models
[XmlArray] [XmlArray]
public List<SerializableItem> Connections { get; set; } = new List<SerializableItem>(); public List<SerializableItem> Connections { get; set; } = new List<SerializableItem>();
public List<SelectableDesignerItemViewModelBase> ToObject()
{
List<DesignerItemViewModelBase> items = new List<DesignerItemViewModelBase>();
foreach (var diagramItemData in this.DesignerItems)
{
Type itemtype = TypeHelper.GetType(diagramItemData.ModelTypeName);
DesignerItemViewModelBase itemBase = Activator.CreateInstance(itemtype, null, diagramItemData, ".json") as DesignerItemViewModelBase;
items.Add(itemBase);
}
List<ConnectionViewModel> connects = new List<ConnectionViewModel>();
foreach (var connection in this.Connections)
{
Type itemtype = TypeHelper.GetType(connection.SerializableTypeName);
var connectionItem = SerializeHelper.DeserializeObject(itemtype, connection.SerializableString, ".json") as ConnectionItem;
connectionItem.SourceType = System.Type.GetType(connectionItem.SourceTypeName);
connectionItem.SinkType = System.Type.GetType(connectionItem.SinkTypeName);
DesignerItemViewModelBase sourceItem = DiagramViewModelHelper.GetConnectorDataItem(items, connectionItem.SourceId, connectionItem.SourceType);
if (sourceItem == null)
continue;
ConnectorOrientation sourceConnectorOrientation = connectionItem.SourceOrientation;
FullyCreatedConnectorInfo sourceConnectorInfo = sourceItem.GetFullConnectorInfo(connectionItem.Id, sourceConnectorOrientation, connectionItem.SourceXRatio, connectionItem.SourceYRatio, connectionItem.SourceInnerPoint, connectionItem.SourceInnerPoint);
DesignerItemViewModelBase sinkItem = DiagramViewModelHelper.GetConnectorDataItem(items, connectionItem.SinkId, connectionItem.SinkType);
if (sinkItem == null)
continue;
ConnectorOrientation sinkConnectorOrientation = connectionItem.SinkOrientation;
FullyCreatedConnectorInfo sinkConnectorInfo = sinkItem.GetFullConnectorInfo(connectionItem.Id, sinkConnectorOrientation, connectionItem.SinkXRatio, connectionItem.SinkYRatio, connectionItem.SinkInnerPoint, connectionItem.SinkInnerPoint);
ConnectionViewModel connectionVM = new ConnectionViewModel(null, sourceConnectorInfo, sinkConnectorInfo, connectionItem);
connects.Add(connectionVM);
}
var viewmodels = new List<SelectableDesignerItemViewModelBase>();
viewmodels.AddRange(items);
viewmodels.AddRange(connects);
return viewmodels;
}
} }
} }

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
View File

@@ -159,5 +159,7 @@ namespace AIStudio.Wpf.DiagramDesigner
ShowText = true; ShowText = true;
} }
} }
} }