fix for Z-index

RomanSoloweow · RomanSoloweow · commit 9786a215bacc · 2020-04-05T23:42:17.000+03:00
diff --git a/SimpleStateMachineNodeEditor/Helpers/MyPoint.cs b/SimpleStateMachineNodeEditor/Helpers/MyPoint.cs
@@ -139,7 +139,7 @@ public MyPoint Set(MyPoint point)
         /// <returns>Точка Point</returns>
         public Point ToPoint()
         {
-            return MyPoint.MyPointToPoint(this);
+            return MyPoint.ToPoint(this);
         }
 
         /// <summary>
@@ -174,7 +174,7 @@ public override string ToString()
         /// </summary>
         /// <param name="point">Точка MyPoint</param>
         /// <returns>Точка Point</returns>
-        public static Point MyPointToPoint(MyPoint point)
+        public static Point ToPoint(MyPoint point)
         {
             return (point != null) ? new Point(point.X, point.Y) : new Point();
         }
@@ -184,7 +184,7 @@ public static Point MyPointToPoint(MyPoint point)
         /// </summary>
         /// <param name="point">ТОчка Point</param>
         /// <returns>Точка MyPoint</returns>
-        public static MyPoint MyPointFromPoint(Point point)
+        public static MyPoint CreateFromPoint(Point point)
         {
             return (point != null) ? new MyPoint(point.X, point.Y) : new MyPoint();
         }
diff --git a/SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs b/SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs
@@ -64,6 +64,7 @@ private void SetupEvents()
         {
             this.WhenActivated(disposable =>
             {
+
                 this.Header.Events().PreviewMouseLeftButtonDown.Subscribe(e => HeaderClick(e)).DisposeWith(disposable);
                 this.ButtonClose.Events().Click.Subscribe(e => ButtonCloseClick(e)).DisposeWith(disposable);
                 this.ButtonMin.Events().Click.Subscribe(e => ButtonMinClick(e)).DisposeWith(disposable);
diff --git a/SimpleStateMachineNodeEditor/View/ViewConnect.xaml b/SimpleStateMachineNodeEditor/View/ViewConnect.xaml
@@ -6,14 +6,6 @@
              xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.View"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" IsHitTestVisible="False">
-    <UserControl.RenderTransform>
-        <TransformGroup>
-            <ScaleTransform x:Name="Scale" ScaleX="1" ScaleY="1"/>
-            <SkewTransform/>
-            <RotateTransform/>
-            <TranslateTransform/>
-        </TransformGroup>
-    </UserControl.RenderTransform>
     <Grid>
         <Path x:Name="Path" StrokeDashCap="Round" StrokeLineJoin="Round" Stroke="{StaticResource ColorConnector}">
             <Path.Data>
diff --git a/SimpleStateMachineNodeEditor/View/ViewConnect.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewConnect.xaml.cs
@@ -49,6 +49,7 @@ private void SetupBinding()
         {
             this.WhenActivated(disposable =>
             {
+                Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.FromConnector.NodesCanvas.Nodes.Count);
                 // Цвет линии
                 this.OneWayBind(this.ViewModel, x => x.Stroke, x => x.Path.Stroke).DisposeWith(disposable);
 
diff --git a/SimpleStateMachineNodeEditor/View/ViewLeftConnector.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewLeftConnector.xaml.cs
@@ -108,9 +108,9 @@ void UpdatePosition()
             if (NodesCanvas == null)
                 return;
             //Получаем позицию центру на канвасе
-            Point Position = this.TransformToAncestor(NodesCanvas).Transform(InputCenter);
+            MyPoint Position = MyPoint.CreateFromPoint(this.TransformToAncestor(NodesCanvas).Transform(InputCenter));
 
-            this.ViewModel.PositionConnectPoint.Set(Position);
+            this.ViewModel.PositionConnectPoint.Set(Position/this.ViewModel.NodesCanvas.Scale.Value);
         }
     }
 }
diff --git a/SimpleStateMachineNodeEditor/View/ViewNode.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewNode.xaml.cs
@@ -47,12 +47,15 @@ public ViewNode()
             SetupBinding();
             SetupEvents();
             SetupCommands();
+         
         }
         #region Setup Binding
         private void SetupBinding()
         {
             this.WhenActivated(disposable =>
             {
+                Canvas.SetZIndex((UIElement)this.VisualParent,this.ViewModel.NodesCanvas.Nodes.Count);
+
                 //BorderBrush (Рамка вокруг узла)
                 this.OneWayBind(this.ViewModel, x => x.BorderBrush, x => x.Border.BorderBrush).DisposeWith(disposable);
 
diff --git a/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml b/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml
@@ -4,14 +4,49 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.View"
+             xmlns:View="clr-namespace:SimpleStateMachineNodeEditor.View"
+             xmlns:ViewModel="clr-namespace:SimpleStateMachineNodeEditor.ViewModel"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" Focusable="True" AllowDrop="True" ClipToBounds="True">
+
     <Canvas x:Name="Canvas" Background="{StaticResource ColorNodesCanvasBackground}" >
 
         <local:ViewSelector x:Name="Selector"  Panel.ZIndex="999"/>
         <local:ViewCutter x:Name="Cutter"  Panel.ZIndex="999"/>
-
-        <ItemsControl x:Name="Nodes" >
+        
+        <ItemsControl  Panel.ZIndex="0">
+            <ItemsControl.RenderTransform>
+                <TransformGroup x:Name="TransformGroup">
+                    <ScaleTransform x:Name="Scale" ScaleX="1" ScaleY="1" />
+                    <SkewTransform/>
+                    <RotateTransform Angle="0" />
+                    <TranslateTransform x:Name="Translate"/>
+                </TransformGroup>
+            </ItemsControl.RenderTransform>
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid Background="{x:Null}">
+                    </Grid>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.Resources >
+                <DataTemplate DataType="{x:Type ViewModel:ViewModelConnect}">
+                    <View:ViewConnect ViewModel="{Binding}"/>
+                </DataTemplate>
+                <DataTemplate   DataType="{x:Type ViewModel:ViewModelNode}">
+                    <View:ViewNode ViewModel="{Binding}" />
+                </DataTemplate>
+            </ItemsControl.Resources>
+            <ItemsControl.ItemsSource>
+                <CompositeCollection>
+                    <CollectionContainer  x:Name="Connects" />
+                    <CollectionContainer x:Name="Nodes"/>
+                </CompositeCollection>
+            </ItemsControl.ItemsSource>
+        </ItemsControl>
+        
+        
+        <!--<ItemsControl x:Name="Nodes" >
             <ItemsControl.RenderTransform>
                 <TransformGroup x:Name="TransformGroup">
                     <ScaleTransform x:Name="Scale" ScaleX="1" ScaleY="1" />
@@ -28,11 +63,13 @@
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <local:ViewNode ViewModel="{Binding}" />
+                    <View:ViewNode ViewModel="{Binding}" />
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
 
+        
+       
         <ItemsControl x:Name="Connects" >
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
@@ -42,10 +79,10 @@
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <local:ViewConnect ViewModel="{Binding}"/>
+                    <View:ViewConnect ViewModel="{Binding}"/>
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
-        </ItemsControl>
+        </ItemsControl>-->
 
     </Canvas>
     <UserControl.ContextMenu >
diff --git a/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml.cs
@@ -70,11 +70,14 @@ private void SetupBinding()
         {
             this.WhenActivated(disposable =>
             {
-                this.OneWayBind(this.ViewModel, x => x.Nodes, x => x.Nodes.ItemsSource).DisposeWith(disposable);
-                this.OneWayBind(this.ViewModel, x => x.Connects, x => x.Connects.ItemsSource).DisposeWith(disposable);
-                //this.OneWayBind(this.ViewModel, x => x.DraggedConnector, x => x.Connector.ViewModel).DisposeWith(disposable);
 
-                //Масштаб по оси X
+                this.OneWayBind(this.ViewModel, x => x.Nodes, x => x.Nodes.Collection).DisposeWith(disposable);
+                this.OneWayBind(this.ViewModel, x => x.Connects, x => x.Connects.Collection).DisposeWith(disposable);
+
+
+                //this.OneWayBind(this.ViewModel, x => x.Nodes, x => x.Nodes.ItemsSource).DisposeWith(disposable);
+                //this.OneWayBind(this.ViewModel, x => x.Connects, x => x.Connects.ItemsSource).DisposeWith(disposable);
+
                 this.OneWayBind(this.ViewModel, x => x.Scale.Scales.Value.X, x => x.Scale.ScaleX).DisposeWith(disposable);
 
                 //Масштаб по оси Y
@@ -223,7 +226,7 @@ private void OnEventDragOver(DragEventArgs e)
             if (this.ViewModel.DraggedConnect != null)
             {
                 point -= 2;
-                this.ViewModel.DraggedConnect.EndPoint.Set(point);
+                this.ViewModel.DraggedConnect.EndPoint.Set(point / this.ViewModel.Scale.Value);
             }
         }
         private void OnEventDragLeave(DragEventArgs e)
diff --git a/SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs
@@ -181,7 +181,9 @@ void UpdatePositionConnectPoin()
                 positionConnectPoint = this.ViewModel.Node.Output.PositionConnectPoint.Value;
             }
 
-            this.ViewModel.PositionConnectPoint.Set(positionConnectPoint);
+
+            MyPoint Position = MyPoint.CreateFromPoint(positionConnectPoint);
+            this.ViewModel.PositionConnectPoint.Set(Position / this.ViewModel.NodesCanvas.Scale.Value);
         }
 
         //void UpdatePosition()
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs
@@ -91,6 +91,8 @@ public class ViewModelNode : ReactiveValidationObject<ViewModelNode>
         /// </summary>
         [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
 
+        [Reactive] public int Zindex { get; set; }
+
         /// <summary>
         /// Список переходов
         /// </summary>
@@ -218,8 +220,7 @@ private void AddEmptyConnector()
                 CurrentConnector.TextEnable = true;
                 CurrentConnector.FormEnable = false;
 
-                //CurrentConnector.Name = "Transition_" + NodesCanvas.Connects.Count.ToString();
-                CurrentConnector.Name = "T" + NodesCanvas.Connects.Count.ToString();
+                CurrentConnector.Name = "Transition_" + NodesCanvas.Connects.Count.ToString();
             }
             CurrentConnector = new ViewModelConnector(NodesCanvas, this)
             {
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs
@@ -13,18 +13,20 @@
 using SimpleStateMachineNodeEditor.Helpers.Commands;
 using SimpleStateMachineNodeEditor.Helpers.Transformations;
 using System.IO;
+using System.Windows.Data;
 
 namespace SimpleStateMachineNodeEditor.ViewModel
 {
     public class ViewModelNodesCanvas : ReactiveObject
     {
         public IObservableCollection<ViewModelConnect> Connects = new ObservableCollectionExtended<ViewModelConnect>();
         public IObservableCollection<ViewModelNode> Nodes = new ObservableCollectionExtended<ViewModelNode>();
+        public IObservableCollection<Object> Elements = new ObservableCollectionExtended<Object>();
+        public CompositeCollection elements = new CompositeCollection();
         [Reactive] public ViewModelSelector Selector { get; set; } = new ViewModelSelector();
         [Reactive] public ViewModelCutter Cutter { get; set; }
         [Reactive] public ViewModelConnect DraggedConnect { get; set; }
         [Reactive] public ViewModelConnector ConnectorPreviewForDrop { get; set; }
-        [Reactive] public ViewModelNode CurrentNode { get; set; }
 
         /// <summary>
         /// Масштаб 
@@ -35,7 +37,6 @@ public ViewModelNodesCanvas()
         {
             SetupCommands();
             SetupNodes();
-
             Cutter = new ViewModelCutter(this);
         }
 
@@ -51,9 +52,8 @@ private void SetupNodes()
 
             };
             start.Input.Visible = null;
-
+            elements.Add(start);
             Nodes.Add(start);
-
             //ViewModelNode end = new ViewModelNode(this)
             //{
             //    Name = "End",
@@ -267,7 +267,10 @@ private void SelectNodes()
         private void AddFreeConnect(ViewModelConnector fromConnector)
         {
             DraggedConnect = new ViewModelConnect(fromConnector);
+           
             Connects.Add(DraggedConnect);
+
+            Elements.Add(DraggedConnect);
         }
         private ViewModelConnect AddConnect(ViewModelConnect parameter, ViewModelConnect result)
         {
@@ -299,6 +302,7 @@ private List<ViewModelNode> DeleteSelectedNode(List<ViewModelNode> parameter, Li
         private List<ViewModelNode> UnDeleteSelectedNode(List<ViewModelNode> parameter, List<ViewModelNode> result)
         {
             Nodes.Add(result);
+            Elements.Add(result);
             return result;
         }
         private void ValidateNodeName(ValidateObjectProperty<ViewModelNode, string> obj)

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public MyPoint Set(MyPoint point)`
`139`	`139`	`/// <returns>Точка Point</returns>`
`140`	`140`	`public Point ToPoint()`
`141`	`141`	`{`
`142`		`- return MyPoint.MyPointToPoint(this);`
	`142`	`+ return MyPoint.ToPoint(this);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`/// <summary>`
`@@ -174,7 +174,7 @@ public override string ToString()`
`174`	`174`	`/// </summary>`
`175`	`175`	`/// <param name="point">Точка MyPoint</param>`
`176`	`176`	`/// <returns>Точка Point</returns>`
`177`		`- public static Point MyPointToPoint(MyPoint point)`
	`177`	`+ public static Point ToPoint(MyPoint point)`
`178`	`178`	`{`
`179`	`179`	`return (point != null) ? new Point(point.X, point.Y) : new Point();`
`180`	`180`	`}`
`@@ -184,7 +184,7 @@ public static Point MyPointToPoint(MyPoint point)`
`184`	`184`	`/// </summary>`
`185`	`185`	`/// <param name="point">ТОчка Point</param>`
`186`	`186`	`/// <returns>Точка MyPoint</returns>`
`187`		`- public static MyPoint MyPointFromPoint(Point point)`
	`187`	`+ public static MyPoint CreateFromPoint(Point point)`
`188`	`188`	`{`
`189`	`189`	`return (point != null) ? new MyPoint(point.X, point.Y) : new MyPoint();`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ private void SetupEvents()`
`64`	`64`	`{`
`65`	`65`	`this.WhenActivated(disposable =>`
`66`	`66`	`{`
	`67`	`+`
`67`	`68`	`this.Header.Events().PreviewMouseLeftButtonDown.Subscribe(e => HeaderClick(e)).DisposeWith(disposable);`
`68`	`69`	`this.ButtonClose.Events().Click.Subscribe(e => ButtonCloseClick(e)).DisposeWith(disposable);`
`69`	`70`	`this.ButtonMin.Events().Click.Subscribe(e => ButtonMinClick(e)).DisposeWith(disposable);`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ private void SetupBinding()`
`49`	`49`	`{`
`50`	`50`	`this.WhenActivated(disposable =>`
`51`	`51`	`{`
	`52`	`+ Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.FromConnector.NodesCanvas.Nodes.Count);`
`52`	`53`	`// Цвет линии`
`53`	`54`	`this.OneWayBind(this.ViewModel, x => x.Stroke, x => x.Path.Stroke).DisposeWith(disposable);`
`54`	`55`
Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,9 @@ void UpdatePosition()`
`108`	`108`	`if (NodesCanvas == null)`
`109`	`109`	`return;`
`110`	`110`	`//Получаем позицию центру на канвасе`
`111`		`- Point Position = this.TransformToAncestor(NodesCanvas).Transform(InputCenter);`
	`111`	`+ MyPoint Position = MyPoint.CreateFromPoint(this.TransformToAncestor(NodesCanvas).Transform(InputCenter));`
`112`	`112`
`113`		`- this.ViewModel.PositionConnectPoint.Set(Position);`
	`113`	`+ this.ViewModel.PositionConnectPoint.Set(Position/this.ViewModel.NodesCanvas.Scale.Value);`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,15 @@ public ViewNode()`
`47`	`47`	`SetupBinding();`
`48`	`48`	`SetupEvents();`
`49`	`49`	`SetupCommands();`
	`50`	`+`
`50`	`51`	`}`
`51`	`52`	`#region Setup Binding`
`52`	`53`	`private void SetupBinding()`
`53`	`54`	`{`
`54`	`55`	`this.WhenActivated(disposable =>`
`55`	`56`	`{`
	`57`	`+ Canvas.SetZIndex((UIElement)this.VisualParent,this.ViewModel.NodesCanvas.Nodes.Count);`
	`58`	`+`
`56`	`59`	`//BorderBrush (Рамка вокруг узла)`
`57`	`60`	`this.OneWayBind(this.ViewModel, x => x.BorderBrush, x => x.Border.BorderBrush).DisposeWith(disposable);`
`58`	`61`
Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,14 @@ private void SetupBinding()`
`70`	`70`	`{`
`71`	`71`	`this.WhenActivated(disposable =>`
`72`	`72`	`{`
`73`		`- this.OneWayBind(this.ViewModel, x => x.Nodes, x => x.Nodes.ItemsSource).DisposeWith(disposable);`
`74`		`- this.OneWayBind(this.ViewModel, x => x.Connects, x => x.Connects.ItemsSource).DisposeWith(disposable);`
`75`		`- //this.OneWayBind(this.ViewModel, x => x.DraggedConnector, x => x.Connector.ViewModel).DisposeWith(disposable);`
`76`	`73`
`77`		`- //Масштаб по оси X`
	`74`	`+ this.OneWayBind(this.ViewModel, x => x.Nodes, x => x.Nodes.Collection).DisposeWith(disposable);`
	`75`	`+ this.OneWayBind(this.ViewModel, x => x.Connects, x => x.Connects.Collection).DisposeWith(disposable);`
	`76`	`+`
	`77`	`+`
	`78`	`+ //this.OneWayBind(this.ViewModel, x => x.Nodes, x => x.Nodes.ItemsSource).DisposeWith(disposable);`
	`79`	`+ //this.OneWayBind(this.ViewModel, x => x.Connects, x => x.Connects.ItemsSource).DisposeWith(disposable);`
	`80`	`+`
`78`	`81`	`this.OneWayBind(this.ViewModel, x => x.Scale.Scales.Value.X, x => x.Scale.ScaleX).DisposeWith(disposable);`
`79`	`82`
`80`	`83`	`//Масштаб по оси Y`
`@@ -223,7 +226,7 @@ private void OnEventDragOver(DragEventArgs e)`
`223`	`226`	`if (this.ViewModel.DraggedConnect != null)`
`224`	`227`	`{`
`225`	`228`	`point -= 2;`
`226`		`- this.ViewModel.DraggedConnect.EndPoint.Set(point);`
	`229`	`+ this.ViewModel.DraggedConnect.EndPoint.Set(point / this.ViewModel.Scale.Value);`
`227`	`230`	`}`
`228`	`231`	`}`
`229`	`232`	`private void OnEventDragLeave(DragEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,9 @@ void UpdatePositionConnectPoin()`
`181`	`181`	`positionConnectPoint = this.ViewModel.Node.Output.PositionConnectPoint.Value;`
`182`	`182`	`}`
`183`	`183`
`184`		`- this.ViewModel.PositionConnectPoint.Set(positionConnectPoint);`
	`184`	`+`
	`185`	`+ MyPoint Position = MyPoint.CreateFromPoint(positionConnectPoint);`
	`186`	`+ this.ViewModel.PositionConnectPoint.Set(Position / this.ViewModel.NodesCanvas.Scale.Value);`
`185`	`187`	`}`
`186`	`188`
`187`	`189`	`//void UpdatePosition()`