zhusenlin/aistudio-wpf-diagram
1
0
Fork 0
mirror of https://gitee.com/akwkevin/aistudio.-wpf.-diagram synced 2026-03-02 15:50:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

这个线有点偏差

Browse Source
This commit is contained in:
艾竹
2023-02-27 23:18:31 +08:00
parent 6464cad46e
commit 73176a00d9
8 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AIStudio.Wpf.DiagramApp/ViewModels/MindViewModel.cs
View File

@@ -55,10 +55,10 @@ namespace AIStudio.Wpf.Flowchart
base.Init();
MindNode level1node = new MindNode(DiagramViewModel, Mind.NodeLevel.Level1, MindType) { Text = "思维导图" };
//level1node.Left = 220;
//level1node.Top = 15;
level1node.Left = 15;
level1node.Top = 200;
DiagramViewModel.DirectAddItemCommand.Execute(level1node);
DiagramViewModel.CenterMoveCommand.Execute(level1node);
//DiagramViewModel.CenterMoveCommand.Execute(level1node);
MindNode level2node1_1 = new MindNode(DiagramViewModel, Mind.NodeLevel.Level2, MindType) { Text = "分支主题1" };
level1node.AddChild(level2node1_1);

3
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
View File

@@ -1,12 +1,9 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Data.Common;
using System.Linq;
using System.Reactive.Linq;
using System.Reflection.Metadata;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;

5
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableViewModelBase.cs
View File

@@ -166,11 +166,6 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
bool IsEditing
{
get; set;
}
private bool _isEditing = true;
public bool IsEditing
{

2
AIStudio.Wpf.Mind/Helpers/DirectoryLayout.cs
View File

@@ -96,7 +96,7 @@ namespace AIStudio.Wpf.Mind.Helpers
var size = MeasureOverride(mindNode);
ArrangeOverride(mindNode);
mindNode.Root.BringToFrontCommand.Execute(new SelectableDesignerItemViewModelBase[] { mindNode });
mindNode.Root.BringToFrontCommand.Execute(mindNode.Root.Items.OfType<DesignerItemViewModelBase>());
mindNode.GetLevel1Node().LayoutUpdating = false;
}

20
AIStudio.Wpf.Mind/Helpers/FishBoneLayout.cs
View File

@@ -127,7 +127,7 @@ namespace AIStudio.Wpf.Mind.Helpers
var size = MeasureOverride(mindNode);
ArrangeOverride(mindNode);
mindNode.Root.BringToFrontCommand.Execute(new SelectableDesignerItemViewModelBase[] { mindNode });
mindNode.Root.BringToFrontCommand.Execute(mindNode.Root.Items.OfType<DesignerItemViewModelBase>());
mindNode.GetLevel1Node().LayoutUpdating = false;
}
@@ -151,7 +151,7 @@ namespace AIStudio.Wpf.Mind.Helpers
{
var childrensizes = mindNode.Children.Select(p => MeasureOverride(p, mindNode.IsExpanded && isExpanded)).ToArray();
var lastchildsize = childrensizes.LastOrDefault();
sizewithSpacing = new SizeBase(sizewithSpacing.Width + childrensizes.Sum(p => p.Height) - lastchildsize.Height / 2 + lastchildsize.Width, sizewithSpacing.Height + childrensizes.Sum(p => p.Height));
sizewithSpacing = new SizeBase(sizewithSpacing.Height + childrensizes.Sum(p => p.Height) - lastchildsize.Height / 2 + lastchildsize.Width, sizewithSpacing.Height + childrensizes.Sum(p => p.Height));
}
else if (mindNode.NodeLevel == NodeLevel.Level3 || mindNode.NodeLevel == NodeLevel.Level4)
{
@@ -200,7 +200,7 @@ namespace AIStudio.Wpf.Mind.Helpers
foreach (var child in bottoms)
{
child.Left = bottomleft + child.Spacing.Width + child.Offset.X;
child.Top = bottomtop + child.ItemHeight + child.Spacing.Height + child.Offset.Y;
child.Top = bottomtop + child.Spacing.Height + child.Offset.Y;
child.DesiredPosition = child.Position;
bottomleft += child.DesiredSize.Width;
@@ -217,11 +217,10 @@ namespace AIStudio.Wpf.Mind.Helpers
{
if (mindNode.ConnectorOrientation == ConnectorOrientation.BottomLeft)
{
double left = mindNode.Left - mindNode.Spacing.Width + mindNode.DesiredSize.Height;
double left = mindNode.Left + mindNode.ItemHeight + mindNode.Spacing.Height;
double top = mindNode.Top - mindNode.Spacing.Height;
if (mindNode.Children?.Count > 0)
{
foreach (var child in mindNode.Children)
{
child.Left = left + child.DesiredSize.Height - child.ItemHeight / 2 - child.Spacing.Height + child.Offset.X;
@@ -241,23 +240,22 @@ namespace AIStudio.Wpf.Mind.Helpers
}
else
{
double left = mindNode.Left - mindNode.Spacing.Width + mindNode.DesiredSize.Height;
double top = mindNode.Top - mindNode.Spacing.Height;
double left = mindNode.Left + mindNode.ItemHeight + mindNode.Spacing.Height;
double top = mindNode.Top + mindNode.ItemHeight + mindNode.Spacing.Height;
if (mindNode.Children?.Count > 0)
{
foreach (var child in mindNode.Children)
{
child.Left = left + child.DesiredSize.Height - child.ItemHeight / 2 - child.Spacing.Height + child.Offset.X;
child.Top = top - child.DesiredSize.Height + child.ItemHeight / 2 + child.Spacing.Height + child.Offset.Y;
child.Top = top + child.DesiredSize.Height - child.ItemHeight / 2 - child.Spacing.Height + child.Offset.Y;
child.DesiredPosition = child.Position;
top -= child.DesiredSize.Height;
top += child.DesiredSize.Height;
left += child.DesiredSize.Height;
ArrangeOverride(child);
var connect = mindNode.Root?.Items.OfType<ConnectionViewModel>().FirstOrDefault(p => p.SourceConnectorInfo?.DataItem == mindNode && p.SinkConnectorInfoFully?.DataItem == child);
connect?.SetSourcePort(mindNode.BottomLeftConnector);
connect?.SetSourcePort(mindNode.TopLeftConnector);
connect?.SetSinkPort(child.LeftConnector);
connect?.SetVisible(child.Visible);
}

2
AIStudio.Wpf.Mind/Helpers/LogicalLayout.cs
View File

@@ -95,7 +95,7 @@ namespace AIStudio.Wpf.Mind.Helpers
var size = MeasureOverride(mindNode);
ArrangeOverride(mindNode);
mindNode.Root.BringToFrontCommand.Execute(new SelectableDesignerItemViewModelBase[] { mindNode });
mindNode.Root.BringToFrontCommand.Execute(mindNode.Root.Items.OfType<DesignerItemViewModelBase>());
mindNode.GetLevel1Node().LayoutUpdating = false;
}

2
AIStudio.Wpf.Mind/Helpers/MindLayout.cs
View File

@@ -97,7 +97,7 @@ namespace AIStudio.Wpf.Mind.Helpers
var size = MeasureOverride(mindNode);
ArrangeOverride(mindNode);
mindNode.Root.BringToFrontCommand.Execute(new SelectableDesignerItemViewModelBase[] { mindNode });
mindNode.Root.BringToFrontCommand.Execute(mindNode.Root.Items.OfType<DesignerItemViewModelBase>());
mindNode.GetLevel1Node().LayoutUpdating = false;
}

2
Directory.Build.Props
View File

@@ -1,7 +1,7 @@
<Project>
<!-- Project properties -->
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp3.1;net5.0-windows</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">