Skip to content

Commit 54498da

Browse files
committed
some fix and profiling
1 parent ff3a1df commit 54498da

File tree

5 files changed

+29
-27
lines changed

5 files changed

+29
-27
lines changed

SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444

4545
<ItemGroup>
4646
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
47-
<PackageReference Include="ReactiveUI" Version="11.3.8" />
48-
<PackageReference Include="ReactiveUI.Events.WPF" Version="11.3.8" />
49-
<PackageReference Include="ReactiveUI.Fody" Version="11.3.8" />
50-
<PackageReference Include="ReactiveUI.Validation" Version="1.4.13" />
51-
<PackageReference Include="ReactiveUI.WPF" Version="11.3.8" />
47+
<PackageReference Include="ReactiveUI" Version="11.4.1" />
48+
<PackageReference Include="ReactiveUI.Events.WPF" Version="11.4.1" />
49+
<PackageReference Include="ReactiveUI.Fody" Version="11.4.1" />
50+
<PackageReference Include="ReactiveUI.Validation" Version="1.4.15" />
51+
<PackageReference Include="ReactiveUI.WPF" Version="11.4.1" />
5252
<PackageReference Include="Splat" Version="9.4.5" />
5353
<PackageReference Include="Splat.Drawing" Version="9.4.5" />
5454
</ItemGroup>

SimpleStateMachineNodeEditor/View/ViewLeftConnector.xaml.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,17 @@ private void OnEventDrop(DragEventArgs e)
9696
}
9797
void UpdatePosition()
9898
{
99-
// Координата центра
100-
Point InputCenter = EllipseElement.TranslatePoint(new Point(EllipseElement.Width/2, EllipseElement.Height / 2), this);
99+
Point positionConnectPoint = EllipseElement.TranslatePoint(new Point(EllipseElement.Width/2, EllipseElement.Height / 2), this);
101100

102-
//Ищем Canvas
103101
ViewNodesCanvas NodesCanvas = MyUtils.FindParent<ViewNodesCanvas>(this);
104102
if (NodesCanvas == null)
105103
return;
106-
//Получаем позицию центру на канвасе
107-
MyPoint Position = MyPoint.CreateFromPoint(this.TransformToAncestor(NodesCanvas).Transform(InputCenter));
108104

109-
this.ViewModel.PositionConnectPoint.Set(Position/this.ViewModel.NodesCanvas.Scale.Value);
105+
positionConnectPoint = this.TransformToAncestor(NodesCanvas).Transform(positionConnectPoint);
106+
107+
MyPoint Position = MyPoint.CreateFromPoint(positionConnectPoint)/ this.ViewModel.NodesCanvas.Scale.Value;
108+
109+
this.ViewModel.PositionConnectPoint.Set(Position);
110110
}
111111
}
112112
}

SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
<local:ViewCutter x:Name="Cutter" Panel.ZIndex="999"/>
1616

1717
<ItemsControl Panel.ZIndex="0"
18-
VirtualizingStackPanel.IsVirtualizing="True"
19-
VirtualizingStackPanel.VirtualizationMode="Recycling"
20-
VirtualizingStackPanel.CacheLength="1"
21-
VirtualizingStackPanel.CacheLengthUnit="Page"
22-
23-
VirtualizingStackPanel.ScrollUnit="Pixel">
18+
VirtualizingPanel.IsVirtualizing="True"
19+
VirtualizingPanel.VirtualizationMode="Recycling"
20+
VirtualizingPanel.CacheLength="1"
21+
VirtualizingPanel.CacheLengthUnit="Page"
22+
VirtualizingPanel.ScrollUnit="Pixel">
2423

2524
<ItemsControl.RenderTransform>
2625
<TransformGroup x:Name="TransformGroup">

SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,34 +187,27 @@ private void ConnectorDrop(DragEventArgs e)
187187
/// </summary>
188188
void UpdatePositionConnectPoin()
189189
{
190-
191190
Point positionConnectPoint;
192191
MyPoint Position;
193-
//Если отображается
192+
194193
if (this.IsVisible)
195194
{
196-
// Координата центра
197195
positionConnectPoint = EllipseElement.TranslatePoint(new Point(EllipseElement.Width/2, EllipseElement.Height / 2), this);
198196

199-
//Ищем Canvas
200197
ViewNodesCanvas NodesCanvas = MyUtils.FindParent<ViewNodesCanvas>(this);
201198

202-
//Получаем позицию центру на канвасе
203199
positionConnectPoint = this.TransformToAncestor(NodesCanvas).Transform(positionConnectPoint);
204200

205201
Position = MyPoint.CreateFromPoint(positionConnectPoint) / this.ViewModel.NodesCanvas.Scale.Value;
206202

207203
}
208204
else
209205
{
210-
//Позиция выхода
211206
positionConnectPoint = this.ViewModel.Node.Output.PositionConnectPoint.Value;
212207

213208
Position = MyPoint.CreateFromPoint(positionConnectPoint);
214209
}
215-
216-
217-
210+
218211
this.ViewModel.PositionConnectPoint.Set(Position);
219212
}
220213

SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,17 @@ private DeleteMode DeleteSelectedElements(DeleteMode parameter, DeleteMode resul
395395
}
396396
private DeleteMode UnDeleteSelectedElements(DeleteMode parameter, DeleteMode result)
397397
{
398-
for (int i = 0;i<(int)result; i++)
398+
int count = 0;
399+
400+
if((result == DeleteMode.DeleteNodes)|| (result == DeleteMode.DeleteConnects))
401+
{
402+
count = 1;
403+
}else if (result == DeleteMode.DeleteAllSelected)
404+
{
405+
count = 2;
406+
}
407+
408+
for (int i = 0;i< count; i++)
399409
{
400410
CommandUndo.Execute();
401411
}

0 commit comments

Comments
 (0)