some fix for commands and start select for connectors

RomanSoloweow · RomanSoloweow · commit 378cbbcfb9d0 · 2020-05-08T04:05:37.000+03:00
diff --git a/SimpleStateMachineNodeEditor/Helpers/Commands/Command.cs b/SimpleStateMachineNodeEditor/Helpers/Commands/Command.cs
@@ -1,11 +1,12 @@
 ﻿
+using SimpleStateMachineNodeEditor.Helpers.Extensions;
 using System;
 using System.Windows.Input;
 
 namespace SimpleStateMachineNodeEditor.Helpers.Commands
 {
 
-    public class Command<TParameter, TResult> : CommandUndoRedo, ICommand, ICloneable where TParameter : class where TResult : class
+    public class Command<TParameter, TResult> : CommandUndoRedo, ICommand, ICloneable 
     {
 
         private readonly Func<TParameter, TResult, TResult> _execute;
@@ -74,12 +75,11 @@ public bool CanExecute(object parameter)
         /// <param name="parameter"> Параметр команды </param>
         public void Execute(object parameter)
         {
-
             //Запоминаем параметр ( чтобы можно было егоже передать в отмену)
-            Parameters = (parameter as TParameter);
+            Parameters = parameter.Cast<TParameter>();
 
             //Выполняем команду и запоминаем результат ( чтобы можно было выполнить отмену именно для этого результата)
-            Result = this._execute(Parameters, Result) as TResult;
+            Result = this._execute(Parameters, Result).Cast<TResult>();
 
             //Если команду можно отменить
             if (CanUnExecute)
@@ -92,10 +92,10 @@ public void Execute(object parameter)
             }
 
             //Очищаем результат ( чтобы не передавать его при повторном выполнении)
-            Result = null;
+            Result = default(TResult);
 
             //Очищаем параметр ( чтобы не передавать его при повторном выполнении)
-            Parameters = null;
+            Parameters = default(TParameter);
 
             OnExecute?.Invoke();
         }
diff --git a/SimpleStateMachineNodeEditor/Helpers/Commands/SimpleCommandWithParameter.cs b/SimpleStateMachineNodeEditor/Helpers/Commands/SimpleCommandWithParameter.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using SimpleStateMachineNodeEditor.Helpers.Extensions;
+using System;
 using System.Windows.Input;
 
 namespace SimpleStateMachineNodeEditor.Helpers.Commands
@@ -7,7 +8,7 @@ namespace SimpleStateMachineNodeEditor.Helpers.Commands
     /// Команда без Undo/Redo
     /// </summary>
     /// <typeparam name="TParameter"></typeparam>
-    public class SimpleCommandWithParameter<TParameter> : ICommand where TParameter : class
+    public class SimpleCommandWithParameter<TParameter> : ICommand
     {
         /// <summary>
         /// Функция с параметром, которая будет вызвана при выполнении команды
@@ -41,7 +42,9 @@ public bool CanExecute(object parameter)
         /// <param name="parameter"> Параметр команды </param>
         public void Execute(object parameter)
         {
-            this._execute(parameter as TParameter);
+
+            this._execute(parameter.Cast<TParameter>());
+
             OnExecute?.Invoke();
         }
 
diff --git a/SimpleStateMachineNodeEditor/Helpers/Enums/SelectMode.cs b/SimpleStateMachineNodeEditor/Helpers/Enums/SelectMode.cs
@@ -0,0 +1,14 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SimpleStateMachineNodeEditor.Helpers.Enums
+{
+    public enum SelectMode
+    {
+        noCorrect = 0,
+        Click,
+        ClickWithCtrl,
+        ClickWithShift       
+    }
+}
diff --git a/SimpleStateMachineNodeEditor/Helpers/Extensions/ObjectExtension.cs b/SimpleStateMachineNodeEditor/Helpers/Extensions/ObjectExtension.cs
@@ -0,0 +1,23 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SimpleStateMachineNodeEditor.Helpers.Extensions
+{
+    public static class ObjectExtension
+    {
+        public static T Cast<T>(this object obj)
+        {
+            return (obj is T) ? (T)obj : default(T);
+        }
+
+        public static bool TryCast<T>(this object obj, out T newValue)
+        {          
+            bool typeCorrect = obj is T;
+
+            newValue = typeCorrect?(T)obj:default(T);
+
+            return typeCorrect;
+        }
+    }
+}
diff --git a/SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj b/SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj
@@ -62,8 +62,4 @@
     </Page>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Images\" />
-  </ItemGroup>
-
 </Project>
diff --git a/SimpleStateMachineNodeEditor/Styles/Colors.xaml b/SimpleStateMachineNodeEditor/Styles/Colors.xaml
@@ -13,6 +13,9 @@
     <SolidColorBrush x:Key="ColorMenuBorder"  Color="#333337"/>
     <SolidColorBrush x:Key="ColorMenuBaground"  Color="#1b1b1c"/>
 
+    <SolidColorBrush x:Key="ColorForeground"  Color="White"/>
+
+    <SolidColorBrush x:Key="ColorSelectedElement"  Color="Red"/>
     <!--#endregion Theme-->
 
 
diff --git a/SimpleStateMachineNodeEditor/View/ViewNode.xaml b/SimpleStateMachineNodeEditor/View/ViewNode.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.View"
              xmlns:NodeStyles="clr-namespace:SimpleStateMachineNodeEditor.Styles.Node"
-             xmlns:View="clr-namespace:SimpleStateMachineNodeEditor.View"
+             xmlns:View="clr-namespace:SimpleStateMachineNodeEditor.View" xmlns:enums="clr-namespace:SimpleStateMachineNodeEditor.Helpers.Enums"
              mc:Ignorable="d" Focusable="True" AllowDrop="True" Visibility="Visible">
 
     <Border x:Name="BorderElement" CornerRadius="5,5,5,5" BorderThickness="1,1,1,1"   HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="80" Background="{StaticResource ColorNodeBody}" >
@@ -54,6 +54,6 @@
         </TransformGroup>
     </UserControl.RenderTransform>
     <UserControl.InputBindings>
-        <MouseBinding x:Name="BindingSelect" Gesture="Ctrl+LeftClick" />
+        <MouseBinding x:Name="BindingSelect" Gesture="Ctrl+LeftClick" CommandParameter="{x:Static enums:SelectMode.ClickWithCtrl}"/>
     </UserControl.InputBindings>
 </UserControl>
diff --git a/SimpleStateMachineNodeEditor/View/ViewNode.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewNode.xaml.cs
@@ -18,6 +18,7 @@
 using SimpleStateMachineNodeEditor.ViewModel;
 using SimpleStateMachineNodeEditor.Helpers;
 using SimpleStateMachineNodeEditor.Helpers.Transformations;
+using SimpleStateMachineNodeEditor.Helpers.Enums;
 
 namespace SimpleStateMachineNodeEditor.View
 {
@@ -40,7 +41,6 @@ object IViewFor.ViewModel
             set { ViewModel = (ViewModelNode)value; }
         }
         #endregion ViewModel
-
         public ViewNode()
         {
             InitializeComponent();
@@ -49,6 +49,7 @@ public ViewNode()
             SetupCommands();
          
         }
+
         #region Setup Binding
         private void SetupBinding()
         {
@@ -84,6 +85,15 @@ private void SetupBinding()
             });
         }
         #endregion Setup Binding
+        #region Setup Commands
+        private void SetupCommands()
+        {
+            this.WhenActivated(disposable =>
+            {
+                this.BindCommand(this.ViewModel, x => x.CommandSelect, x => x.BindingSelect).DisposeWith(disposable);
+            });
+        }
+        #endregion Setup Commands
         #region Setup Events
         private void SetupEvents()
         {
@@ -107,7 +117,7 @@ private void SetupEvents()
         private void OnEventMouseLeftDowns(MouseButtonEventArgs e)
         {
             Keyboard.Focus(this);
-            this.ViewModel.CommandSelect.Execute(true);
+            this.ViewModel.CommandSelect.Execute(SelectMode.Click);
         }
         private void Validate(RoutedEventArgs e)
         {
@@ -162,14 +172,6 @@ private void OnEventCollapse()
             
         }
         #endregion Setup Events
-        #region Setup Commands
-        private void SetupCommands()
-        {
-            this.WhenActivated(disposable =>
-            {
-                this.BindCommand(this.ViewModel, x => x.CommandSelect, x => x.BindingSelect);
-            });
-        }
-        #endregion Setup Commands
+
     }
 }
diff --git a/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml b/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml
@@ -111,7 +111,7 @@
         <KeyBinding x:Name="BindingSelectAll" Key="A" Modifiers="Control" />
         <KeyBinding x:Name="BindingAddNode" Key="N" Modifiers="Control" />
         <KeyBinding x:Name="BindingDeleteNode" Key="Delete"  />
-        <MouseBinding x:Name="BindingSelect" Gesture="Ctrl+LeftClick" />
+        <MouseBinding x:Name="BindingSelect" Gesture="Ctrl+LeftClick"/>
         <MouseBinding x:Name="BindingCut" Gesture="Alt+LeftClick" />
         <MouseBinding x:Name="BindingZoom" Gesture="WheelClick"/>
     </UserControl.InputBindings>
diff --git a/SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs
@@ -16,6 +16,7 @@
 using SimpleStateMachineNodeEditor.Helpers;
 using SimpleStateMachineNodeEditor.ViewModel;
 using SimpleStateMachineNodeEditor.Helpers.Transformations;
+using SimpleStateMachineNodeEditor.Helpers.Enums;
 
 namespace SimpleStateMachineNodeEditor.View
 {
@@ -54,21 +55,22 @@ private void SetupBinding()
             {
                 Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.Node.Zindex+2);
 
+                this.OneWayBind(this.ViewModel, x => x.Visible, x => x.RightConnector.Visibility).DisposeWith(disposable);
+
                 this.OneWayBind(this.ViewModel, x => x.Name, x => x.TextBoxElement.Text).DisposeWith(disposable);
 
                 this.OneWayBind(this.ViewModel, x => x.TextEnable, x => x.TextBoxElement.IsEnabled).DisposeWith(disposable);
 
-                this.OneWayBind(this.ViewModel, x => x.FormEnable, x => x.EllipseElement.IsEnabled).DisposeWith(disposable);
+                this.OneWayBind(this.ViewModel, x => x.Foreground, x => x.TextBoxElement.Foreground).DisposeWith(disposable);
 
+                this.OneWayBind(this.ViewModel, x => x.FormEnable, x => x.EllipseElement.IsEnabled).DisposeWith(disposable);
 
                 this.OneWayBind(this.ViewModel, x => x.FormStroke, x => x.EllipseElement.Stroke).DisposeWith(disposable);
 
                 this.OneWayBind(this.ViewModel, x => x.FormStrokeThickness, x => x.EllipseElement.StrokeThickness).DisposeWith(disposable);
 
                 this.Bind(this.ViewModel, x => x.FormFill, x => x.EllipseElement.Fill).DisposeWith(disposable);
 
-                this.OneWayBind(this.ViewModel, x => x.Visible, x => x.RightConnector.Visibility).DisposeWith(disposable);
-
                 this.WhenAnyValue(x => x.ViewModel.Node.Size, x => x.ViewModel.Node.Point1.Value, x => x.ViewModel.Node.NodesCanvas.Scale.Scales.Value)
                 .Subscribe(_ => { UpdatePositionConnectPoin(); }).DisposeWith(disposable);
 
@@ -122,15 +124,24 @@ private void ConnectDrag(MouseButtonEventArgs e)
 
         private void ConnectorDrag(MouseButtonEventArgs e)
         {        
-                if (!this.ViewModel.TextEnable)
-                    return;
-                if (!Keyboard.IsKeyDown(Key.LeftShift))
-                    return;
+            if (!this.ViewModel.TextEnable)
+                return;
+            if (Keyboard.IsKeyDown(Key.LeftAlt))
+            {
                 this.ViewModel.CommandConnectorDrag.Execute();
                 DataObject data = new DataObject();
                 data.SetData("Connector", this.ViewModel);
                 DragDrop.DoDragDrop(this, data, DragDropEffects.Link);
                 e.Handled = true;
+            }
+            else if (Keyboard.IsKeyDown(Key.LeftAlt))
+            {
+
+            }
+            else
+            {
+                this.ViewModel.CommandSelect.Execute(SelectMode.Click);
+            }
            
         }
 
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelConnector.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelConnector.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Xml.Linq;
 using System.Linq;
+using SimpleStateMachineNodeEditor.Helpers.Enums;
 
 namespace SimpleStateMachineNodeEditor.ViewModel
 {
@@ -49,6 +50,8 @@ public class ViewModelConnector : ReactiveObject
         /// </summary>
         [Reactive] public Brush FormFill { get; set; } = Application.Current.Resources["ColorConnectorEllipseEnableBackground"] as SolidColorBrush;
 
+        [Reactive] public Brush Foreground { get; set; } = Application.Current.Resources["ColorForeground"] as SolidColorBrush;
+
         [Reactive] public double FormStrokeThickness { get; set; } = 1;
 
         /// <summary>
@@ -65,12 +68,23 @@ public class ViewModelConnector : ReactiveObject
 
         [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
 
+        [Reactive] public bool Selected { get; set; }
+
         public ViewModelConnector(ViewModelNodesCanvas nodesCanvas, ViewModelNode viewModelNode)
         {
             Node = viewModelNode;
             NodesCanvas = nodesCanvas;
             SetupCommands();
+            SetupBinding();
+        }
+
+        #region SetupBinding
+        private void SetupBinding()
+        {
+            this.WhenAnyValue(x => x.Selected).Subscribe(value => { this.Foreground = value ? Application.Current.Resources["ColorSelectedElement"] as SolidColorBrush : Application.Current.Resources["ColorForeground"] as SolidColorBrush; });
         }
+        #endregion SetupBinding
+
         #region Commands
 
         public SimpleCommand CommandConnectPointDrag { get; set; }
@@ -82,11 +96,12 @@ public ViewModelConnector(ViewModelNodesCanvas nodesCanvas, ViewModelNode viewMo
         public SimpleCommand CommandSetAsLoop { get; set; }
         public SimpleCommand CommandAdd { get; set; }
         public SimpleCommand CommandDelete { get; set; }
+        public SimpleCommandWithParameter<bool> CommandSelect { get; set; }
         public SimpleCommandWithParameter<string> CommandValidateName { get; set; }
 
         private void SetupCommands()
         {
-
+            
             CommandConnectPointDrag = new SimpleCommand(ConnectPointDrag);
             CommandConnectPointDrop = new SimpleCommand(ConnectPointDrop);
             CommandSetAsLoop = new SimpleCommand(SetAsLoop, NotSaved);
@@ -100,10 +115,39 @@ private void SetupCommands()
             CommandDelete = new SimpleCommand(Delete);
             CommandValidateName = new SimpleCommandWithParameter<string>(ValidateName, NotSaved);
 
+            CommandSelect = new SimpleCommandWithParameter<bool>(Select);
+
 
             //SimpleCommandWithResult<bool, Func<bool>> t = new SimpleCommandWithResult<bool, Func<bool>>()
         }
 
+        private void Select(bool obj)
+        {
+            //SelectMode selectMode = (SelectMode)obj;
+            //ViewModelConnect viewModelConnect;
+            ////if (obj?.GetType() == typeof(ViewModelConnect))\
+            //if (obj is SelectMode)
+            //{
+            //   viewModelConnect = (ViewModelConnect)obj;
+            //}
+            //else
+            //{
+            //    viewModelConnect = default(ViewModelConnect);
+            //}
+          
+
+            //if (selectMode==SelectMode.Click)
+            //{
+            //    this.Selected = !this.Selected;
+            //    return;
+            //}
+            //else
+            //{
+            //    this.Selected = (bool)obj;
+            //}
+            
+        }
+
         private void NotSaved()
         {
             NodesCanvas.ItSaved = false;
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`using SimpleStateMachineNodeEditor.ViewModel;`
`19`	`19`	`using SimpleStateMachineNodeEditor.Helpers;`
`20`	`20`	`using SimpleStateMachineNodeEditor.Helpers.Transformations;`
	`21`	`+using SimpleStateMachineNodeEditor.Helpers.Enums;`
`21`	`22`
`22`	`23`	`namespace SimpleStateMachineNodeEditor.View`
`23`	`24`	`{`
`@@ -40,7 +41,6 @@ object IViewFor.ViewModel`
`40`	`41`	`set { ViewModel = (ViewModelNode)value; }`
`41`	`42`	`}`
`42`	`43`	`#endregion ViewModel`
`43`		`-`
`44`	`44`	`public ViewNode()`
`45`	`45`	`{`
`46`	`46`	`InitializeComponent();`
`@@ -49,6 +49,7 @@ public ViewNode()`
`49`	`49`	`SetupCommands();`
`50`	`50`
`51`	`51`	`}`
	`52`	`+`
`52`	`53`	`#region Setup Binding`
`53`	`54`	`private void SetupBinding()`
`54`	`55`	`{`
`@@ -84,6 +85,15 @@ private void SetupBinding()`
`84`	`85`	`});`
`85`	`86`	`}`
`86`	`87`	`#endregion Setup Binding`
	`88`	`+ #region Setup Commands`
	`89`	`+ private void SetupCommands()`
	`90`	`+ {`
	`91`	`+ this.WhenActivated(disposable =>`
	`92`	`+ {`
	`93`	`+ this.BindCommand(this.ViewModel, x => x.CommandSelect, x => x.BindingSelect).DisposeWith(disposable);`
	`94`	`+ });`
	`95`	`+ }`
	`96`	`+ #endregion Setup Commands`
`87`	`97`	`#region Setup Events`
`88`	`98`	`private void SetupEvents()`
`89`	`99`	`{`
`@@ -107,7 +117,7 @@ private void SetupEvents()`
`107`	`117`	`private void OnEventMouseLeftDowns(MouseButtonEventArgs e)`
`108`	`118`	`{`
`109`	`119`	`Keyboard.Focus(this);`
`110`		`- this.ViewModel.CommandSelect.Execute(true);`
	`120`	`+ this.ViewModel.CommandSelect.Execute(SelectMode.Click);`
`111`	`121`	`}`
`112`	`122`	`private void Validate(RoutedEventArgs e)`
`113`	`123`	`{`
`@@ -162,14 +172,6 @@ private void OnEventCollapse()`
`162`	`172`
`163`	`173`	`}`
`164`	`174`	`#endregion Setup Events`
`165`		`- #region Setup Commands`
`166`		`- private void SetupCommands()`
`167`		`- {`
`168`		`- this.WhenActivated(disposable =>`
`169`		`- {`
`170`		`- this.BindCommand(this.ViewModel, x => x.CommandSelect, x => x.BindingSelect);`
`171`		`- });`
`172`		`- }`
`173`		`- #endregion Setup Commands`
	`175`	`+`
`174`	`176`	`}`
`175`	`177`	`}`