some try

Author: RomanSoloweow

SimpleStateMachineNodeEditor/View/MainWindow.xaml

@@ -178,6 +178,17 @@
                 <view:ViewNodesCanvas x:Name="NodesCanvas" />
             </TabItem>
             <!--<TabItem Header="Transitions table" ToolTip="" Style="{DynamicResource StyleTabItem}" Foreground="{DynamicResource ColorForeground}"/>-->
+            <TabItem  Header="Transitions table"  Style="{DynamicResource StyleTabItem}" Background="{DynamicResource ColorWindowHeader}" Foreground="{DynamicResource ColorWindowHeaderTabItemForeground}"  BorderBrush="{DynamicResource ColorElementMouseOver}" OpacityMask="{DynamicResource ColorElementMouseOver}">
+                <DataGrid x:Name="TableOfTransitions">
+                    <DataGridTemplateColumn Header="Address">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding Path=Name}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                </DataGrid>
+            </TabItem>
         </TabControl>
         <!--#endregion Tabs-->   
 

SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs

@@ -59,6 +59,8 @@ private void SetupBinding()
 
             this.WhenActivated(disposable =>
             {
+                this.OneWayBind(this.ViewModel, x => x.Tests, x => x.TableOfTransitions.ItemsSource).DisposeWith(disposable);
+
                 var SelectedItem = this.ObservableForProperty(x => x.MessageList.SelectedItem).Select(x=>(x.Value as ViewModelMessage)?.Text);
                 this.BindCommand(this.ViewModel, x => x.CommandCopyError, x => x.BindingCopyError, SelectedItem).DisposeWith(disposable);
                 this.BindCommand(this.ViewModel, x => x.CommandCopyError, x => x.ItemCopyError, SelectedItem).DisposeWith(disposable);

SimpleStateMachineNodeEditor/View/Test.xaml

@@ -0,0 +1,12 @@
+<UserControl x:Class="SimpleStateMachineNodeEditor.View.Test"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.View"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>

SimpleStateMachineNodeEditor/View/Test.xaml.cs

@@ -0,0 +1,53 @@
+using ReactiveUI;
+using SimpleStateMachineNodeEditor.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SimpleStateMachineNodeEditor.View
+{
+    /// <summary>
+    /// Логика взаимодействия для Test.xaml
+    /// </summary>
+    public partial class Test : UserControl, IViewFor<ViewModelConnector>
+    {
+        #region ViewModel
+        public static readonly DependencyProperty ViewModelProperty = DependencyProperty.Register(nameof(ViewModel), typeof(ViewModelConnector), typeof(Test), new PropertyMetadata(null));
+
+        public ViewModelConnector ViewModel
+        {
+            get { return (ViewModelConnector)GetValue(ViewModelProperty); }
+            set { SetValue(ViewModelProperty, value); }
+        }
+
+        object IViewFor.ViewModel
+        {
+            get { return ViewModel; }
+            set { ViewModel = (ViewModelConnector)value; }
+        }
+        #endregion ViewModel
+        public Test()
+        {
+            InitializeComponent();
+            SetupBinding();
+        }
+        #region SetupBinding
+        private void SetupBinding()
+        {
+            this.WhenActivated(disposable =>
+            {
+
+            });
+        }
+        #endregion SetupBinding
+    }
+}

SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml.cs

@@ -64,7 +64,7 @@ private void SetupBinding()
             this.WhenActivated(disposable =>
             {
 
-                this.OneWayBind(this.ViewModel, x => x.Nodes, x => x.Nodes.Collection).DisposeWith(disposable);
+                this.OneWayBind(this.ViewModel, x => x.Nodes2, x => x.Nodes.Collection).DisposeWith(disposable);
 
                 this.OneWayBind(this.ViewModel, x => x.Connects, x => x.Connects.Collection).DisposeWith(disposable);
 

SimpleStateMachineNodeEditor/ViewModel/Connector/ViewModelConnector.cs

@@ -31,6 +31,8 @@ public partial class ViewModelConnector : ReactiveObject
         [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
         [Reactive] public bool Selected { get; set; }
 
+        [Reactive] public SourceList<string> test { get; set; }
+
         public ViewModelConnector(ViewModelNodesCanvas nodesCanvas, ViewModelNode viewModelNode, string name, Point myPoint)
         {
             Node = viewModelNode;
@@ -51,7 +53,7 @@ private void SetupSubscriptions()
                 this.WhenAnyValue(x => x.Node.HeaderWidth).Buffer(2, 1).Subscribe(x => UpdatePositionOnWidthChange(x[1] - x[0]));
                 if (this.Name != "Output")
                 {
-                    this.WhenAnyValue(x => x.Node.Transitions.Count).Subscribe(x => UpdatePositionOnTransitionCountChange());                   
+                    this.WhenAnyValue(x => x.Node.Transitions2.Count).Subscribe(x => UpdatePositionOnTransitionCountChange());                   
                 }
 
             }
@@ -123,8 +125,8 @@ public static ViewModelConnect FromXElement(ViewModelNodesCanvas nodesCanvas,XEl
                 return viewModelConnect;
             }
 
-            ViewModelNode nodeFrom = nodesCanvas.Nodes.Single(x => x.Name == from);
-            ViewModelNode nodeTo = nodesCanvas.Nodes.Single(x => x.Name == to);
+            ViewModelNode nodeFrom = nodesCanvas.Nodes.Items.Single(x => x.Name == from);
+            ViewModelNode nodeTo = nodesCanvas.Nodes.Items.Single(x => x.Name == to);
 
             nodeFrom.CurrentConnector.Name = name;
 

SimpleStateMachineNodeEditor/ViewModel/MainWindow/ViewModelMainWindow.cs

@@ -6,9 +6,19 @@
 using SimpleStateMachineNodeEditor.Helpers.Enums;
 using System.Reactive.Linq;
 using System.Linq;
+using DynamicData.Alias;
 
 namespace SimpleStateMachineNodeEditor.ViewModel
 {
+    public class Test: ReactiveObject
+    {
+        [Reactive] public string Name { get; set; }
+
+        public Test(ViewModelNode viewModelNode)
+        {
+            Name = viewModelNode.Name;
+        }
+    }
     public partial class ViewModelMainWindow : ReactiveObject
     {
         public ObservableCollectionExtended<ViewModelMessage> Messages { get; set; } = new ObservableCollectionExtended<ViewModelMessage>();
@@ -22,14 +32,15 @@ public partial class ViewModelMainWindow : ReactiveObject
         [Reactive] public int CountInformation { get; set; }
         [Reactive] public int CountDebug { get; set; }
 
+
+        public ObservableCollectionExtended<ViewModelConnector> Tests = new ObservableCollectionExtended<ViewModelConnector>();
         private IDisposable ConnectToMessages;
         public double MaxHeightMessagePanel = 150;
 
-
-
         public ViewModelMainWindow(ViewModelNodesCanvas viewModelNodesCanvas)
         {
             NodesCanvas = viewModelNodesCanvas;
+            NodesCanvas.Nodes.Connect().SelectMany(x=>x.Transitions.Items).Bind(Tests).Subscribe();
             SetupCommands();
             SetupSubscriptions();
         }

SimpleStateMachineNodeEditor/ViewModel/Node/ViewModelNode.cs

@@ -38,18 +38,11 @@ public partial class ViewModelNode : ReactiveValidationObject<ViewModelNode>
         [Reactive] public double HeaderWidth { get; set; } = 80;
 
         public SourceList<ViewModelConnector> Transitions { get; set; } = new SourceList<ViewModelConnector>();
-
-        private readonly IObservableCollection<ViewModelConnector> _Transitions2 = new ObservableCollectionExtended<ViewModelConnector>();
-        public IObservableCollection<ViewModelConnector> Transitions2 => _Transitions2;
-
-        //public IObservableCollection<ViewModelConnector> Transitions2 { get; } = new ObservableCollectionExtended<ViewModelConnector>();
-
+        public ObservableCollectionExtended<ViewModelConnector> Transitions2  = new ObservableCollectionExtended<ViewModelConnector>();
         public int Zindex { get; private set; }
 
         private ViewModelNode()
         {
-            Transitions.Connect().ObserveOnDispatcher().Bind(_Transitions2).Subscribe();
-
             SetupCommands();
             SetupBinding();
         }
@@ -61,7 +54,9 @@ public ViewModelNode(ViewModelNodesCanvas nodesCanvas, string name, Point point)
             Name = name;
             Zindex = nodesCanvas.Nodes.Count;
             Point1 = point;
+            Transitions.Connect().ObserveOnDispatcher().Bind(Transitions2).Subscribe();
             SetupConnectors();
+        
             SetupCommands();
             SetupBinding();
             SetupSubscriptions();
@@ -78,9 +73,15 @@ private void SetupBinding()
         private void SetupSubscriptions()
         {
             this.WhenAnyValue(x => x.Selected).Subscribe(value => { this.BorderBrush = value ? Application.Current.Resources["ColorSelectedElement"] as SolidColorBrush : Brushes.LightGray; });
-            this.WhenAnyValue(x => x.Transitions.Count).Buffer(2, 1).Select(x => (Previous: x[0], Current: x[1])).Subscribe(x => UpdateCount(x.Previous, x.Current));
+            this.WhenAnyValue(x => x.Transitions2.Count).Buffer(2, 1).Select(x => (Previous: x[0], Current: x[1])).Subscribe(x => UpdateCount(x.Previous, x.Current));
             this.WhenAnyValue(x => x.Point1, x => x.Size).Subscribe(_ => UpdatePoint2());
-            this.WhenAnyValue(x => x.IsCollapse).Subscribe(value => Collapse(value));        
+            this.WhenAnyValue(x => x.IsCollapse).Subscribe(value => Collapse(value));
+
+            //this.WhenAnyValue(x => x.Transitions.Count).Subscribe(value => UpdateCount(value));
+        }
+        private void UpdateCount(int value)
+        {
+            NodesCanvas.TransitionsCount++;
         }
         #endregion Setup Subscriptions
         #region Connectors
@@ -100,7 +101,7 @@ private void UpdatePoint2()
         }
         private void UpdateCount(int oldValue, int newValue)
         {
-            if (newValue > oldValue)
+            if ((oldValue>0)&&(newValue > oldValue))
             {
                 NodesCanvas.TransitionsCount++;
             }

SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/ViewModelNodesCanvas.cs

@@ -14,14 +14,17 @@
 using System.Collections.Generic;
 using System.Windows.Controls;
 using System.Windows.Media;
+using DynamicData;
 
 namespace SimpleStateMachineNodeEditor.ViewModel
 {
     public partial class ViewModelNodesCanvas : ReactiveObject
     {
         public ObservableCollectionExtended<ViewModelConnect> Connects = new ObservableCollectionExtended<ViewModelConnect>();
 
-        public ObservableCollectionExtended<ViewModelNode> Nodes = new ObservableCollectionExtended<ViewModelNode>();
+        //public ObservableCollectionExtended<ViewModelNode> Nodes = new ObservableCollectionExtended<ViewModelNode>();
+        public SourceList<ViewModelNode> Nodes = new SourceList<ViewModelNode>();
+        public ObservableCollectionExtended<ViewModelNode> Nodes2 = new ObservableCollectionExtended<ViewModelNode>();
         public ObservableCollectionExtended<ViewModelMessage> Messages { get; set; } = new ObservableCollectionExtended<ViewModelMessage>();
 
         [Reactive] public Point PositionRight { get; set; }
@@ -46,14 +49,16 @@ public partial class ViewModelNodesCanvas : ReactiveObject
         [Reactive] public bool WithoutMessages { get; set; }
         [Reactive]  public Themes Theme { get; set; } = Themes.Dark;
 
+
+
         static Dictionary<Themes, string> themesPaths = new Dictionary<Themes, string>()
         {
             {Themes.Dark, @"Styles\Themes\Dark.xaml" },
             {Themes.Light, @"Styles\Themes\Light.xaml"},
         };
 
         public int NodesCount = 0;
-        public int TransitionsCount = 1;
+        public int TransitionsCount = 0;
         public double ScaleMax = 5;
         public double ScaleMin = 0.1;
         public double Scales { get; set; } = 0.05;
@@ -62,6 +67,7 @@ public partial class ViewModelNodesCanvas : ReactiveObject
         public ViewModelNodesCanvas()
         {
             Cutter = new ViewModelCutter(this);
+            Nodes.Connect().ObserveOnDispatcher().Bind(Nodes2).Subscribe();
             SetupCommands();
             SetupSubscriptions();
             SetupStartState();
@@ -80,7 +86,7 @@ private void SetupSubscriptions()
 
         private void SetupStartState()
         {
-            string name = Nodes.Any(x => x.Name == "Start") ? GetNameForNewNode() : "Start";
+            string name = Nodes.Items.Any(x => x.Name == "Start") ? GetNameForNewNode() : "Start";
             StartState = new ViewModelNode(this, name, new Point());
             SetAsStart(StartState);
             Nodes.Add(StartState);