Skip to content

Commit d87c5d6

Browse files
josefprinzjosefprinz
committed
editor version 6.3.12 preview
1 parent 6f3ab28 commit d87c5d6

File tree

7 files changed

+108
-33
lines changed

7 files changed

+108
-33
lines changed

‎Aml.Toolkit.sln‎

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AmlToolkitTestUI", "AmlTool
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aml.Engine", "..\Aml.Engine\Aml.Engine\Aml.Engine.csproj", "{5A8A3EDE-41A7-4EB2-A079-9AE0E04BAA91}"
1111
EndProject
12-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FC3F1803-D46F-4C16-BBBB-9D16F6F71209}"
13-
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aml.Skins", "..\AMLEditorSkins\Aml.Skins.csproj", "{6672C0D6-319C-4E36-95EF-2609C40E891D}"
1513
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aml.Engine.Services", "..\Aml.Engine\Aml.Engine.Services\Aml.Engine.Services.csproj", "{26A6179F-BE26-4948-8876-0711C6C08FB7}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aml.Editor.Plugin.Contract", "..\Aml.Editor.API\Aml.Editor.Plugin\Aml.Editor.Plugin.Contract.csproj", "{EA939011-03F5-48D2-ADA9-D80AEACDA582}"
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aml.Engine.Resources", "..\Aml.Engine\Aml.Engine.Resources\Aml.Engine.Resources.csproj", "{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}"
19+
EndProject
1620
Global
1721
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1822
Debug|Any CPU = Debug|Any CPU
@@ -107,6 +111,66 @@ Global
107111
{6672C0D6-319C-4E36-95EF-2609C40E891D}.ReleaseTest|Any CPU.Build.0 = ReleaseTest|Any CPU
108112
{6672C0D6-319C-4E36-95EF-2609C40E891D}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64
109113
{6672C0D6-319C-4E36-95EF-2609C40E891D}.ReleaseTest|x64.Build.0 = ReleaseTest|x64
114+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
116+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Debug|x64.ActiveCfg = Debug|x64
117+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Debug|x64.Build.0 = Debug|x64
118+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
119+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release|Any CPU.Build.0 = Release|Any CPU
120+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release|x64.ActiveCfg = Release|x64
121+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release|x64.Build.0 = Release|x64
122+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release4.0|Any CPU.ActiveCfg = ReleaseTest|Any CPU
123+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release4.0|Any CPU.Build.0 = ReleaseTest|Any CPU
124+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release4.0|x64.ActiveCfg = ReleaseTest|x64
125+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release4.0|x64.Build.0 = ReleaseTest|x64
126+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release4.5|Any CPU.ActiveCfg = ReleaseTest|Any CPU
127+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release4.5|Any CPU.Build.0 = ReleaseTest|Any CPU
128+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release4.5|x64.ActiveCfg = ReleaseTest|x64
129+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.Release4.5|x64.Build.0 = ReleaseTest|x64
130+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.ReleaseTest|Any CPU.ActiveCfg = ReleaseTest|Any CPU
131+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.ReleaseTest|Any CPU.Build.0 = ReleaseTest|Any CPU
132+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64
133+
{26A6179F-BE26-4948-8876-0711C6C08FB7}.ReleaseTest|x64.Build.0 = ReleaseTest|x64
134+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Debug|Any CPU.Build.0 = Debug|Any CPU
136+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Debug|x64.ActiveCfg = Debug|x64
137+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Debug|x64.Build.0 = Debug|x64
138+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release|Any CPU.ActiveCfg = Release|Any CPU
139+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release|Any CPU.Build.0 = Release|Any CPU
140+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release|x64.ActiveCfg = Release|x64
141+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release|x64.Build.0 = Release|x64
142+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release4.0|Any CPU.ActiveCfg = ReleaseTest|Any CPU
143+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release4.0|Any CPU.Build.0 = ReleaseTest|Any CPU
144+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release4.0|x64.ActiveCfg = ReleaseTest|x64
145+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release4.0|x64.Build.0 = ReleaseTest|x64
146+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release4.5|Any CPU.ActiveCfg = ReleaseTest|Any CPU
147+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release4.5|Any CPU.Build.0 = ReleaseTest|Any CPU
148+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release4.5|x64.ActiveCfg = ReleaseTest|x64
149+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.Release4.5|x64.Build.0 = ReleaseTest|x64
150+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.ReleaseTest|Any CPU.ActiveCfg = ReleaseTest|Any CPU
151+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.ReleaseTest|Any CPU.Build.0 = ReleaseTest|Any CPU
152+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64
153+
{EA939011-03F5-48D2-ADA9-D80AEACDA582}.ReleaseTest|x64.Build.0 = ReleaseTest|x64
154+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
155+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Debug|Any CPU.Build.0 = Debug|Any CPU
156+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Debug|x64.ActiveCfg = Debug|x64
157+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Debug|x64.Build.0 = Debug|x64
158+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release|Any CPU.ActiveCfg = Release|Any CPU
159+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release|Any CPU.Build.0 = Release|Any CPU
160+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release|x64.ActiveCfg = Release|x64
161+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release|x64.Build.0 = Release|x64
162+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release4.0|Any CPU.ActiveCfg = ReleaseTest|Any CPU
163+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release4.0|Any CPU.Build.0 = ReleaseTest|Any CPU
164+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release4.0|x64.ActiveCfg = ReleaseTest|x64
165+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release4.0|x64.Build.0 = ReleaseTest|x64
166+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release4.5|Any CPU.ActiveCfg = ReleaseTest|Any CPU
167+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release4.5|Any CPU.Build.0 = ReleaseTest|Any CPU
168+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release4.5|x64.ActiveCfg = ReleaseTest|x64
169+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.Release4.5|x64.Build.0 = ReleaseTest|x64
170+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.ReleaseTest|Any CPU.ActiveCfg = ReleaseTest|Any CPU
171+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.ReleaseTest|Any CPU.Build.0 = ReleaseTest|Any CPU
172+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64
173+
{ECC00FFC-DFE6-4305-89E2-5E53EB3D4F63}.ReleaseTest|x64.Build.0 = ReleaseTest|x64
110174
EndGlobalSection
111175
GlobalSection(SolutionProperties) = preSolution
112176
HideSolutionNode = FALSE

‎Aml.Toolkit/Aml.Toolkit.csproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3030
<PackageLicenseExpression>MIT</PackageLicenseExpression>
3131
<RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
32-
<Version>5.1.0</Version>
32+
<Version>5.2.0</Version>
3333
<Platforms>AnyCPU;x64</Platforms>
3434
<NeutralLanguage>en-US</NeutralLanguage>
3535
<Configurations>Debug;Release;ReleaseTest</Configurations>
@@ -131,18 +131,15 @@
131131
</None>
132132
</ItemGroup>
133133

134-
135134
<ItemGroup>
136-
<PackageReference Include="MahApps.Metro" Version="3.0.0-alpha0492" />
137-
<PackageReference Include="MahApps.Metro.IconPacks" Version="5.0.0" />
135+
<PackageReference Include="MahApps.Metro.IconPacks" Version="5.1.0" />
138136
</ItemGroup>
139137

140-
141138
<ItemGroup>
142-
<ProjectReference Include="..\..\Aml.Editor.API\Aml.Editor.Plugin\Aml.Editor.Plugin.Contract.csproj" />
143-
<ProjectReference Include="..\..\AMLEditorSkins\Aml.Skins.csproj" />
144-
<ProjectReference Include="..\..\Aml.Engine\Aml.Engine.Services\Aml.Engine.Services.csproj" />
145-
<ProjectReference Include="..\..\Aml.Engine\Aml.Engine\Aml.Engine.csproj" />
139+
<ProjectReference Include="..\..\Aml.Editor.API\Aml.Editor.Plugin\Aml.Editor.Plugin.Contract.csproj" />
140+
<ProjectReference Include="..\..\Aml.Engine\Aml.Engine.Services\Aml.Engine.Services.csproj" />
141+
<ProjectReference Include="..\..\Aml.Engine\Aml.Engine\Aml.Engine.csproj" />
142+
<ProjectReference Include="..\..\AMLEditorSkins\Aml.Skins.csproj" />
146143
</ItemGroup>
147144

148145
<ItemGroup>

‎Aml.Toolkit/ViewModel/AMLNodeViewModel.cs‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using System.Linq;
1414
using System.Windows.Controls;
1515
using System.Windows.Data;
16+
using System.Windows.Forms.Integration;
1617
using System.Windows.Input;
1718
using System.Windows.Media;
1819
using System.Xml.Linq;
@@ -1299,7 +1300,7 @@ public void RefreshTree(bool expand, bool refreshChild = false)
12991300

13001301
foreach (var obsoleteChild in obsoletes)
13011302
{
1302-
RemoveNode(obsoleteChild);
1303+
obsoleteChild.RemoveNode();
13031304
treeChanged = true;
13041305
}
13051306

@@ -1451,33 +1452,42 @@ public void RefreshTree(bool expand, bool refreshChild = false)
14511452
_isUpdating = false;
14521453
}
14531454

1455+
private void RemoveVertex ()
1456+
{
1457+
Tree.AmlTreeView?.InternalLinksAdorner?.RemoveVertex(this);
1458+
foreach (var child in Children)
1459+
{
1460+
child.RemoveVertex();
1461+
}
1462+
}
1463+
14541464
/// <summary>
14551465
/// Removes the node.
14561466
/// </summary>
1457-
/// <param name="node">The node.</param>
1458-
public void RemoveNode(AMLNodeViewModel node)
1467+
public void RemoveNode()
14591468
{
1460-
if (node.IsSelected)
1469+
if (IsSelected)
14611470
{
1462-
_ = Tree.SelectedElements.Remove(node);
1463-
node.IsSelected = false;
1471+
_ = Tree.SelectedElements.Remove(this);
14641472
}
14651473

1466-
_ = node.Parent.Children.Remove(node);
1467-
if (node.Parent is AMLNodeGroupViewModel && node.Parent.Children.Count == 0)
1474+
1475+
RemoveVertex();
1476+
_ = Parent?.Children.Remove(this);
1477+
Tree.AmlTreeView?.InternalLinksAdorner?.InvalidateMeasure();
1478+
if (Parent is AMLNodeGroupViewModel && Parent.Children.Count == 0)
14681479
{
1469-
node.Parent.IsVisible = false;
1480+
Parent.IsVisible = false;
14701481
}
14711482

1472-
Tree.AmlTreeView?.InternalLinksAdorner?.RemoveVertex(node);
14731483

1474-
if (!node.Parent.HasChilds)
1484+
if (Parent?.HasChilds == false)
14751485
{
14761486
//node.Parent._childrenCollection.Source = _emptyChildren;
1477-
Children.Clear();
1487+
Parent?.Children.Clear();
14781488
}
14791489

1480-
RaisePropertyChanged(nameof(HasDummyChild));
1490+
Parent?.RaisePropertyChanged(nameof(HasDummyChild));
14811491
}
14821492

14831493
#endregion Public Methods

‎Aml.Toolkit/ViewModel/AMLNodeWithClassReference.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ public void CloseLink(AMLNodeViewModel partner)
306306
}
307307

308308
_showLinks = false;
309+
//UpdateLinks(false, true);
309310
RaisePropertyChanged(nameof(ShowLinks));
310311
// }
311312
//).OnUIThread();

‎Aml.Toolkit/ViewModel/AMLTreeViewModel.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,12 @@ CAEX_CLASSModel_TagNames.REVISION_NEWVERSION_STRING or
10361036
return;
10371037
}
10381038

1039+
if (e.CAEXAttributeName is CAEX_CLASSModel_TagNames.ATTRIBUTE_NAME_REF_PARTNER_SIDE_A or
1040+
CAEX_CLASSModel_TagNames.ATTRIBUTE_NAME_REF_PARTNER_SIDE_B)
1041+
{
1042+
;
1043+
}
1044+
10391045

10401046
foreach (var treeNode in treeNodes.ToList())
10411047
{

‎AmlToolkitTestUI/AmlToolkitTestUI.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
55
<Authors>Josef Prinz</Authors>
66
<ImplicitUsings>disable</ImplicitUsings>
77
<Nullable>disable</Nullable>
@@ -35,15 +35,14 @@
3535
<ItemGroup>
3636
<None Remove="Resources\appbar.flag.png" />
3737
</ItemGroup>
38-
38+
3939
<ItemGroup>
40-
<ProjectReference Include="..\Aml.Toolkit\Aml.Toolkit.csproj" />
41-
<ProjectReference Include="..\..\AMLEditorSkins\Aml.Skins.csproj" />
42-
<ProjectReference Include="..\..\Aml.Engine\Aml.Engine\Aml.Engine.csproj" />
40+
<PackageReference Include="MahApps.Metro" Version="3.0.0-alpha0513" />
41+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
4342
</ItemGroup>
4443

4544
<ItemGroup>
46-
<PackageReference Include="MahApps.Metro" Version="3.0.0-alpha0492" />
45+
<ProjectReference Include="..\Aml.Toolkit\Aml.Toolkit.csproj" />
4746
</ItemGroup>
4847

4948
<ItemGroup>

‎AmlToolkitTestUI/MainWindow.xaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
<Grid.RowDefinitions>
1010
<RowDefinition Height="Auto" />
1111
<RowDefinition Height="Auto" />
12-
</Grid.RowDefinitions>
13-
14-
12+
</Grid.RowDefinitions>
1513

1614
<ToolBar >
1715
<Button Click="Undo_Click" IsEnabled="{Binding CanUndo}">Undo</Button>

0 commit comments

Comments
 (0)