for delete nodes and connects

RomanSoloweow · RomanSoloweow · commit ff3a1df39379 · 2020-05-14T11:24:43.000+03:00
diff --git a/SimpleStateMachineNodeEditor/Helpers/Commands/Command.cs b/SimpleStateMachineNodeEditor/Helpers/Commands/Command.cs
@@ -25,9 +25,9 @@ public class Command<TParameter, TResult> : CommandUndoRedo, ICommand, ICloneabl
 
         /// <summary>
         /// Результат выполнения команды
-        /// </summary>
         /// Например здесь может храниться список объектов, которые были изменены
         public TResult Result { get; set; }
+        /// </summary>
 
         /// <summary>
         /// Флаг того, является ли команда отменяемой 
diff --git a/SimpleStateMachineNodeEditor/Helpers/Enums/DeleteMode.cs b/SimpleStateMachineNodeEditor/Helpers/Enums/DeleteMode.cs
@@ -0,0 +1,14 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SimpleStateMachineNodeEditor.Helpers.Enums
+{
+    public enum DeleteMode
+    {
+        noCorrect = 0,
+        DeleteNodes,
+        DeleteConnects,
+        DeleteAllSelected
+    }
+}
diff --git a/SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs b/SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs
@@ -178,7 +178,7 @@ void ExportToImage(ImageFormats format)
         }
         void New()
         {
-            this.NodesCanvas.ViewModel.CommandNew.Execute();
+            this.NodesCanvas.ViewModel.CommandNewScheme.Execute();
         }
         void WithoutSaving(Action action)
         {
diff --git a/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml b/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml
@@ -110,7 +110,7 @@
         <KeyBinding x:Name="BindingSave" Key="S" Modifiers="Control" />
         <KeyBinding x:Name="BindingSelectAll" Key="A" Modifiers="Control" />
         <KeyBinding x:Name="BindingAddNode" Key="N" Modifiers="Control" />
-        <KeyBinding x:Name="BindingDeleteNode" Key="Delete"  />
+        <KeyBinding x:Name="BindingDeleteSelectedElements" Key="Delete"  />
         <MouseBinding x:Name="BindingSelect" Gesture="Ctrl+LeftClick"/>
         <MouseBinding x:Name="BindingCut" Gesture="Alt+LeftClick" />
         <MouseBinding x:Name="BindingZoom" Gesture="WheelClick"/>
diff --git a/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml.cs
@@ -80,7 +80,6 @@ private void SetupBinding()
 
                 this.OneWayBind(this.ViewModel, x => x.Scale.Scales.Value.X, x => x.Scale.ScaleX).DisposeWith(disposable);
 
-                //Масштаб по оси Y
                 this.OneWayBind(this.ViewModel, x => x.Scale.Scales.Value.Y, x => x.Scale.ScaleY).DisposeWith(disposable);
 
                 this.OneWayBind(this.ViewModel, x => x.Selector, x => x.Selector.ViewModel).DisposeWith(disposable);
@@ -101,11 +100,17 @@ private void SetupCommands()
                 this.BindCommand(this.ViewModel, x => x.CommandRedo, x => x.BindingRedo).DisposeWith(disposable);
                 this.BindCommand(this.ViewModel, x => x.CommandUndo, x => x.BindingUndo).DisposeWith(disposable);
                 this.BindCommand(this.ViewModel, x => x.CommandSelectAll, x => x.BindingSelectAll).DisposeWith(disposable);
-                this.BindCommand(this.ViewModel, x => x.CommandDeleteSelectedNodes, x => x.BindingDeleteNode).DisposeWith(disposable);
+
+
+                this.BindCommand(this.ViewModel, x => x.CommandDeleteSelectedElements, x => x.BindingDeleteSelectedElements).DisposeWith(disposable);
+
+                //this.BindCommand(this.ViewModel, x => x.CommandDeleteSelectedNodes, x => x.BindingDeleteSelected).DisposeWith(disposable);
+                //this.BindCommand(this.ViewModel, x => x.CommandDeleteSelectedConnectors, x => x.BindingDeleteSelected).DisposeWith(disposable);
+
                 this.BindCommand(this.ViewModel, x => x.CommandSelect, x => x.BindingSelect, positionLeftClickObservable).DisposeWith(disposable);
                 this.BindCommand(this.ViewModel, x => x.CommandCut, x => x.BindingCut, positionLeftClickObservable).DisposeWith(disposable);
-                this.BindCommand(this.ViewModel, x => x.CommandAddNode, x => x.BindingAddNode, positionLeftClickObservable).DisposeWith(disposable);
-                this.BindCommand(this.ViewModel, x => x.CommandAddNode, x => x.ItemAddNode, positionRightClickObservable).DisposeWith(disposable);
+                this.BindCommand(this.ViewModel, x => x.CommandAddNodeWithUndoRedo, x => x.BindingAddNode, positionLeftClickObservable).DisposeWith(disposable);
+                this.BindCommand(this.ViewModel, x => x.CommandAddNodeWithUndoRedo, x => x.ItemAddNode, positionRightClickObservable).DisposeWith(disposable);
 
                 this.WhenAnyValue(x => x.ViewModel.Selector.Size).InvokeCommand(ViewModel.CommandSelectorIntersect).DisposeWith(disposable);
                 this.WhenAnyValue(x => x.ViewModel.Cutter.EndPoint.Value).InvokeCommand(ViewModel.CommandCutterIntersect).DisposeWith(disposable);
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelConnect.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelConnect.cs
@@ -11,6 +11,7 @@
 using SimpleStateMachineNodeEditor.Helpers.Enums;
 using System.Xml.Linq;
 using SimpleStateMachineNodeEditor.Helpers.Extensions;
+using SimpleStateMachineNodeEditor.Helpers.Commands;
 
 namespace SimpleStateMachineNodeEditor.ViewModel
 {
@@ -41,31 +42,23 @@ public class ViewModelConnect : ReactiveObject
         /// </summary>
         [Reactive] public Brush Stroke { get; set; } = Application.Current.Resources["ColorConnect"] as SolidColorBrush;
 
-        ///// <summary>
-        ///// Флаг того, что соединение выбрано
-        ///// </summary>
-        //[Reactive] public bool Selected { get; set; } = true;
-
-        /// <summary>
-        /// Элемент, из которого выходит линия
-        /// </summary>
         [Reactive] public ViewModelConnector FromConnector { get; set; }
 
-        /// <summary>
-        /// Элемент, в который приходит линия
-        /// </summary>
         [Reactive] public ViewModelConnector ToConnector { get; set; }
 
+        [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
+
         [Reactive] public DoubleCollection StrokeDashArray { get; set; }
 
         [Reactive] public double StrokeThickness { get; set; } = 1;
 
-        public ViewModelConnect(ViewModelConnector fromConnector)
+        public ViewModelConnect(ViewModelNodesCanvas viewModelNodesCanvas, ViewModelConnector fromConnector)
         {
 
             SetupSubscriptions();
             SetupCommands();
 
+            NodesCanvas = viewModelNodesCanvas;
             FromConnector = fromConnector;
             FromConnector.Connect = this;           
             //SetupCommands();
@@ -118,11 +111,37 @@ private void UpdateMedium()
 
         #region Setup Commands
 
+        //public SimpleCommand CommandDelete { get; set; }
+        //public SimpleCommand CommandAdd { get; set; }
+        //public SimpleCommand CommandDeleteWithConnector { get; set; }
+        //public SimpleCommand CommandAddWithConnector { get; set; }
         private void SetupCommands()
         {
-
+            //CommandAdd = new SimpleCommand(Add, NotSaved);
+            //CommandDelete = new SimpleCommand(Delete, NotSaved);
+            //CommandAddWithConnector = new SimpleCommand(AddWithConnect, NotSaved);
+            //CommandDeleteWithConnector = new SimpleCommand(DeleteWithConnects, NotSaved);
         }
-
+        private void NotSaved()
+        {
+            NodesCanvas.ItSaved = false;
+        }
+        //private void Add()
+        //{
+        //    NodesCanvas.CommandAddConnect.Execute(this);
+        //}
+        //private void Delete()
+        //{
+        //    NodesCanvas.CommandDeleteConnect.Execute(this);
+        //}
+        //private void AddWithConnect()
+        //{
+        //    this.FromConnector.CommandAddWithConnect.Execute();
+        //}
+        //private void DeleteWithConnects()
+        //{
+        //    this.FromConnector.CommandDeleteWithConnect.Execute();
+        //}
         #endregion Setup Commands
 
     }
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelConnector.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelConnector.cs
@@ -94,8 +94,10 @@ private void SetupBinding()
         public SimpleCommand CommandConnectorDragEnter { get; set; }
         public SimpleCommand CommandConnectorDrop { get; set; }
         public SimpleCommand CommandSetAsLoop { get; set; }
-        public SimpleCommand CommandAdd { get; set; }
-        public SimpleCommand CommandDelete { get; set; }
+        //public SimpleCommand CommandAdd { get; set; }
+        //public SimpleCommand CommandDelete { get; set; }
+        //public SimpleCommand CommandAddWithConnect { get; set; }
+        //public SimpleCommand CommandDeleteWithConnect { get; set; }
         public SimpleCommandWithParameter<SelectMode> CommandSelect { get; set; }
         public SimpleCommandWithParameter<string> CommandValidateName { get; set; }
 
@@ -111,8 +113,11 @@ private void SetupCommands()
             CommandConnectorDragEnter = new SimpleCommand(ConnectorDragEnter);
             CommandConnectorDrop = new SimpleCommand(ConnectorDrop);
 
-            CommandAdd = new SimpleCommand(Add);
-            CommandDelete = new SimpleCommand(Delete);
+            //CommandAdd = new SimpleCommand(Add);
+            //CommandDelete = new SimpleCommand(Delete);
+            //CommandAddWithConnect = new SimpleCommand(AddWithConnect);
+            //CommandDeleteWithConnect = new SimpleCommand(DeleteWithConnect);
+
             CommandValidateName = new SimpleCommandWithParameter<string>(ValidateName, NotSaved);
 
             CommandSelect = new SimpleCommandWithParameter<SelectMode>(Select);
@@ -170,59 +175,67 @@ private void SetAsLoop()
 
             Node.CommandAddEmptyConnector.Execute();
         }
-        private void Add()
-        {
-
-            Node.CommandAddConnector.Execute(this);
-        }
-        private void Delete()
-        {
-            Node.CommandDeleteConnector.Execute(this);
-        }
+        //private void Add()
+        //{
+        //    Node.CommandAddConnector.Execute((0, this));
+        //}
+        //private void Delete()
+        //{
+        //    Node.CommandDeleteConnector.Execute(this);
+        //}
+        //private void AddWithConnect()
+        //{
+        //    this.Add();
+        //    this.Connect?.CommandAdd.Execute();
+        //}
+        //private void DeleteWithConnect()
+        //{
+        //    this.Delete();
+        //    this.Connect?.CommandDelete.Execute();
+        //}
         private void ConnectPointDrag()
         {
-            Node.NodesCanvas.CommandAddFreeConnect.Execute(Node.CurrentConnector);
+            NodesCanvas.CommandAddDraggedConnect.Execute(Node.CurrentConnector);
         }
         private void DragConnector(ViewModelConnector draggedConnector)
         {
 
         }
 
         private void ConnectPointDrop()
-        {
-           
-            if (Node.NodesCanvas.DraggedConnect.FromConnector.Node != this.Node)
+        {           
+            if (NodesCanvas.DraggedConnect.FromConnector.Node != this.Node)
             {
-                var connect = Node.NodesCanvas.DraggedConnect;
+                var connect = NodesCanvas.DraggedConnect;
                 connect.ToConnector = this;
             }
 
         }
 
         private void CheckConnectPointDrop()
         {
-            if (Node.NodesCanvas.DraggedConnect.ToConnector == null)
+            if (NodesCanvas.DraggedConnect.ToConnector == null)
             {
-                Node.NodesCanvas.CommandDeleteFreeConnect.Execute();
+                NodesCanvas.CommandDeleteDraggedConnect.Execute();
             }
             else
             {
                 Node.CommandAddEmptyConnector.Execute();
-                Node.NodesCanvas.CommandAddConnect.Execute(Node.NodesCanvas.DraggedConnect);
-                Node.NodesCanvas.DraggedConnect = null;
+                NodesCanvas.CommandAddConnectWithUndoRedo.Execute(Node.NodesCanvas.DraggedConnect);
+                NodesCanvas.DraggedConnect = null;
             }
         }
 
         private void ConnectorDrag()
         {            
-            this.NodesCanvas.ConnectorPreviewForDrop = this;
+            NodesCanvas.ConnectorPreviewForDrop = this;
         }
         private void ConnectorDragEnter()
         {
-            if (this.Node != this.NodesCanvas.ConnectorPreviewForDrop.Node)
+            if (Node != NodesCanvas.ConnectorPreviewForDrop.Node)
                 return;
 
-            int indexTo = this.Node.Transitions.IndexOf(this);
+            int indexTo = Node.Transitions.IndexOf(this);
             if (indexTo == 0)
                 return;
 
@@ -317,7 +330,7 @@ public static ViewModelConnect FromXElement(ViewModelNodesCanvas nodesCanvas, XE
             }
             else
             {
-                viewModelConnect = new ViewModelConnect(nodeFrom.CurrentConnector);
+                viewModelConnect = new ViewModelConnect(nodeFrom.NodesCanvas, nodeFrom.CurrentConnector);
                 viewModelConnect.ToConnector = nodeTo.Input;
                 nodeFrom.CommandAddEmptyConnector.Execute();
             }     
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs
@@ -93,9 +93,10 @@ private void SetupConnectors()
         public SimpleCommandWithParameter<SelectMode> CommandSelect { get; set; }
         public SimpleCommandWithParameter<MyPoint> CommandMove { get; set; }
         public SimpleCommandWithParameter<bool> CommandCollapse { get; set; }
-        public SimpleCommandWithParameter<ViewModelConnector> CommandAddConnector { get; set; }
-        public SimpleCommandWithParameter<ViewModelConnector> CommandDeleteConnector { get; set; }
-
+        //public SimpleCommandWithParameter<(int index, ViewModelConnector connector)> CommandAddConnector { get; set; }
+        //public SimpleCommandWithParameter<ViewModelConnector> CommandDeleteConnector { get; set; }
+        public SimpleCommandWithParameter<(int index, ViewModelConnector connector)> CommandAddConnectorWithConnect { get; set; }
+        public SimpleCommandWithParameter<ViewModelConnector> CommandDeleteConnectorWithConnect { get; set; }
         public SimpleCommandWithParameter<string> CommandValidateName { get; set; }
 
         public SimpleCommandWithParameter<ViewModelConnector> CommandSelectWithShiftForConnectors { get; set; }
@@ -129,8 +130,13 @@ private void SetupCommands()
             //CommandTransitionsDragOver = new SimpleCommand(TransitionsDragOver);
             //CommandConnectorDrag = new SimpleCommandWithParameter<ViewModelConnector>(this, ConnectorDrag);
 
-            CommandAddConnector = new SimpleCommandWithParameter<ViewModelConnector>(AddConnector, NotSaved);
-            CommandDeleteConnector = new SimpleCommandWithParameter<ViewModelConnector>(DeleteConnector, NotSaved);
+            //CommandAddConnector = new SimpleCommandWithParameter<(int index, ViewModelConnector connector)>(AddConnector, NotSaved);
+            //CommandDeleteConnector = new SimpleCommandWithParameter<ViewModelConnector>(DeleteConnector, NotSaved);
+
+            CommandAddConnectorWithConnect = new SimpleCommandWithParameter<(int index, ViewModelConnector connector)>(AddConnectorWithConnect, NotSaved);
+            CommandDeleteConnectorWithConnect = new SimpleCommandWithParameter<ViewModelConnector>(DeleteConnectorWithConnec, NotSaved);
+
+
             CommandValidateName = new SimpleCommandWithParameter<string>(ValidateName, NotSaved);
 
 
@@ -156,12 +162,34 @@ private void Collapse(bool value)
                 UnSelectedAllConnectors();
             }
         }
-        private void AddConnector(ViewModelConnector connector)
+        public int GetConnectorIndex(ViewModelConnector connector)
         {
-            Transitions.Add(connector);
+            return Transitions.IndexOf(connector);
         }
-        private void DeleteConnector(ViewModelConnector connector)
+
+        //private void AddConnector((int index, ViewModelConnector connector) element)
+        //{
+        //    Transitions.Insert(element.index, element.connector);
+        //}
+        //private void DeleteConnector(ViewModelConnector connector)
+        //{
+        //    Transitions.Remove(connector);
+        //    //connector.Connect?.Comma
+        //}
+        private void AddConnectorWithConnect((int index, ViewModelConnector connector) element)
         {
+            Transitions.Insert(element.index, element.connector);
+            if(element.connector.Connect!=null)
+            {
+                NodesCanvas.CommandAddConnect.Execute(element.connector.Connect);
+            }
+        }
+        private void DeleteConnectorWithConnec(ViewModelConnector connector)
+        {
+            if (connector.Connect != null)
+            {
+                NodesCanvas.CommandDeleteConnect.Execute(connector.Connect);
+            }
             Transitions.Remove(connector);
         }
         private void Select(SelectMode selectMode)
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ void ExportToImage(ImageFormats format)`
`178`	`178`	`}`
`179`	`179`	`void New()`
`180`	`180`	`{`
`181`		`- this.NodesCanvas.ViewModel.CommandNew.Execute();`
	`181`	`+ this.NodesCanvas.ViewModel.CommandNewScheme.Execute();`
`182`	`182`	`}`
`183`	`183`	`void WithoutSaving(Action action)`
`184`	`184`	`{`