fix for name

RomanSoloweow · RomanSoloweow · commit 57f88d21eb89 · 2020-05-23T18:41:55.000+03:00
diff --git a/SimpleStateMachineNodeEditor/View/MainWindow.xaml b/SimpleStateMachineNodeEditor/View/MainWindow.xaml
@@ -186,7 +186,7 @@
                     <Label  Grid.Column="6" x:Name="LabelInformation" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{StaticResource IconInformation}" OpacityMask="{StaticResource ColorElementMouseOver}">Messages</Label>
                     <Separator Grid.Column="7" Visibility="{Binding ElementName=LabelDebug, Path=Visibility}" Style="{DynamicResource TemplateSeparator}" Height="Auto" BorderThickness="0,0,1,0" />
                     <Label  Grid.Column="8" x:Name="LabelDebug" Visibility="Hidden" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{StaticResource IconDebug}" OpacityMask="{StaticResource ColorElementMouseOver}">Debug</Label>
-                    <Label  Grid.Column="9" x:Name="LabelUpdate"  Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{StaticResource IconUpdate}" OpacityMask="{StaticResource ColorElementMouseOver}" HorizontalAlignment="Right" Margin="0,0,5,0">Update</Label>
+                    <Label  Grid.Column="9" x:Name="LabelErrorListUpdate"  Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{StaticResource IconUpdate}" OpacityMask="{StaticResource ColorElementMouseOver}" HorizontalAlignment="Right" Margin="0,0,5,0">Update/Clear</Label>
                 </Grid>
             </Expander.Header>
             <Expander.Content>
diff --git a/SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs b/SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs
@@ -26,6 +26,7 @@
 using System.Threading.Tasks;
 using System.Threading;
 using System.Reactive;
+using System.Collections.Generic;
 
 namespace SimpleStateMachineNodeEditor.View
 {
@@ -49,10 +50,26 @@ object IViewFor.ViewModel
             set { ViewModel = (ViewModelMainWindow)value; }
         }
         #endregion ViewModel
+        Dictionary<TypeMessage, System.Windows.Controls.Label> messagesLabels;
+        static Dictionary<TypeMessage, string> labelPostfix = new Dictionary<TypeMessage, string>()
+        {
+            {TypeMessage.Error, "Error" },
+            {TypeMessage.Information, "Information" },
+            {TypeMessage.Warning, "Warning" },
+            {TypeMessage.Debug, "Debug" },
+        };
 
         public MainWindow()
         {
             InitializeComponent();
+            messagesLabels = new Dictionary<TypeMessage, System.Windows.Controls.Label>()
+            {
+                {TypeMessage.Error, LabelError },
+                {TypeMessage.Information, LabelInformation },
+                {TypeMessage.Warning, LabelWarning },
+                {TypeMessage.Debug, LabelDebug },
+            };
+
             ViewModel = new ViewModelMainWindow(this.NodesCanvas.ViewModel);
             SetupCommands();
             SetupSubscriptions();
@@ -90,6 +107,19 @@ private void SetupBinding()
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandSelectAll,       x => x.ItemSelectAll).DisposeWith(disposable);
 
 
+                this.WhenAnyValue(x => x.NodesCanvas.ViewModel.Messages.Count).Subscribe(_=> UpdateLabels());
+                //var informationCount = this.ObservableForProperty(x => x.NodesCanvas.ViewModel.Messages).Select(x=>x.Value.Where(x=>x.TypeMessage==TypeMessage.Information).Count().ToString());
+                ////var SelectedItem = this.ObservableForProperty(x => x.NodesCanvas.ViewModel.Messages).Select(x=>x.);
+                //this.OneWayBind(this.ViewModel, x => informationCount, x => x.LabelError.Content).DisposeWith(disposable);
+
+                //informationCount.WhenAnyValue().Sub
+                //this.LabelError.Content.
+                //this.LabelError.Events().PreviewMouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Error)).DisposeWith(disposable);
+                //this.LabelInformation.Events().MouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Information)).DisposeWith(disposable);
+                //this.LabelWarning.Events().MouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Warning)).DisposeWith(disposable);
+                //this.LabelDebug.Events().MouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Debug)).DisposeWith(disposable);
+
+
                 //ItemSave.Command = CommandSave;
                 //this.OneWayBind(this, x => x.CommandSave, x => x.ItemSave.Command).DisposeWith(disposable);
 
@@ -152,35 +182,40 @@ private void SetupEvents()
             {
                 this.ItemExportToJPEG.Events().Click.Subscribe(_ => ExportToImage(ImageFormats.JPEG)).DisposeWith(disposable);
                 this.ItemExportToPNG.Events().Click.Subscribe(_ => ExportToImage(ImageFormats.PNG)).DisposeWith(disposable);
-                //this.ButtonImportScheme
-
 
-
-                //this.ItemSave.InputBindings.Bin
                 this.Header.Events().PreviewMouseLeftButtonDown.Subscribe(e => HeaderClick(e)).DisposeWith(disposable);
                 this.ButtonClose.Events().Click.Subscribe(_ => WithoutSaving(ButtonCloseClick)).DisposeWith(disposable);
                 this.ButtonMin.Events().Click.Subscribe(e => ButtonMinClick(e)).DisposeWith(disposable);
                 this.ButtonMax.Events().Click.Subscribe(e => ButtonMaxClick(e)).DisposeWith(disposable);
-                
 
-                //this.ItemSave.Events().Click.Subscribe(_=> Save()).DisposeWith(disposable);
+                this.ItemSave.Events().Click.Subscribe(_ => Save()).DisposeWith(disposable);
                 this.ItemSaveAs.Events().Click.Subscribe(_ => SaveAs()).DisposeWith(disposable);
                 this.ItemOpen.Events().Click.Subscribe(async _ => await WithoutSavingAsync(OpenAsync)).DisposeWith(disposable);
                 this.ItemExit.Events().Click.Subscribe(_=> WithoutSaving(ButtonCloseClick)).DisposeWith(disposable);
                 this.ItemNew.Events().Click.Subscribe(_ => WithoutSaving(New)).DisposeWith(disposable);
                 this.ErrorListExpander.Events().Collapsed.Subscribe(_=> ErrorListCollapse()).DisposeWith(disposable);
                 this.ErrorListExpander.Events().Expanded.Subscribe(_ => ErrorListExpanded()).DisposeWith(disposable);
 
-                this.LabelErrorList.Events().PreviewMouseLeftButtonDown.Subscribe(e=> SetDisplayMessageType(e, TypeMessage.All)).DisposeWith(disposable);
-                this.LabelError.Events().PreviewMouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Error)).DisposeWith(disposable);
-                this.LabelInformation.Events().MouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Information)).DisposeWith(disposable);
-                this.LabelWarning.Events().MouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Warning)).DisposeWith(disposable);
-                this.LabelDebug.Events().MouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Debug)).DisposeWith(disposable);
+                foreach(var label in messagesLabels)
+                {
+                    label.Value.Events().PreviewMouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, label.Key)).DisposeWith(disposable);
+                }
 
-                //this.LabelUpdate.Events().PreviewMouseLeftButtonDown.Subscribe(_ => this.ViewModel.Messages.Cle).DisposeWith(disposable);
-                //this.ErrorListExpander.Events().Expanded.Subscribe(_ => ErrorListExpanded()).DisposeWith(disposable);
+                this.LabelErrorList.Events().PreviewMouseLeftButtonDown.Subscribe(e=> SetDisplayMessageType(e, TypeMessage.All)).DisposeWith(disposable);
+                this.LabelErrorListUpdate.Events().MouseLeftButtonDown.Subscribe(_ => NodesCanvas.ViewModel.CommandErrorListUpdate.ExecuteWithSubscribe()).DisposeWith(disposable);
             });
         }
+        
+        void UpdateLabels()
+        {
+           var counts =  this.NodesCanvas.ViewModel.Messages.GroupBy(x => x.TypeMessage).ToDictionary(x=>x.Key,x=>x.Count());
+          
+           foreach(var lable in messagesLabels)
+            {
+                lable.Value.Content = (counts.Keys.Contains(lable.Key) ? counts[lable.Key].ToString() : "0") +" "+ labelPostfix[lable.Key];
+            }
+
+        }
         void SetDisplayMessageType(MouseButtonEventArgs e, TypeMessage  typeMessage)
         {          
             if ((ErrorListExpander.IsExpanded)&&(this.ViewModel.NodesCanvas.DisplayMessageType != typeMessage))
diff --git a/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml b/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml
@@ -14,14 +14,13 @@
         <local:ViewSelector x:Name="Selector"  Panel.ZIndex="999"/>
         <local:ViewCutter x:Name="Cutter"  Panel.ZIndex="999"/>
 
-        <ItemsControl  x:Name="ElementItemControl"
-            Panel.ZIndex="0" 
+        <ItemsControl  x:Name="ElementItemControl" Panel.ZIndex="0" 
                        VirtualizingPanel.IsVirtualizing="True" 
                        VirtualizingPanel.VirtualizationMode="Recycling" 
                        VirtualizingPanel.CacheLength="1"
                        VirtualizingPanel.CacheLengthUnit="Page"                 
                        VirtualizingPanel.ScrollUnit="Pixel">
-            
+
             <ItemsControl.RenderTransform>
                 <TransformGroup x:Name="TransformGroup">
                     <ScaleTransform x:Name="Scale" ScaleX="1" ScaleY="1" />
@@ -51,46 +50,6 @@
                 </CompositeCollection>
             </ItemsControl.ItemsSource>
         </ItemsControl>
-        
-        
-        <!--<ItemsControl x:Name="Nodes" >
-            <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.ItemTemplate>
-                <DataTemplate>
-                    <View:ViewNode ViewModel="{Binding}" />
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
-
-        
-       
-        <ItemsControl x:Name="Connects" >
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <Grid Background="{x:Null}">
-                    </Grid>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-            <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                    <View:ViewConnect ViewModel="{Binding}"/>
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>-->
-
     </Canvas>
     <UserControl.ContextMenu >
         <ContextMenu Template="{StaticResource TemplateContextMenu}" Background="{StaticResource ColorMenuBackground}"  Foreground="{StaticResource ColorMenuForeground}" BorderBrush="{StaticResource ColorMenuBorder}" OpacityMask="{StaticResource ColorMenuBackgroundMouseOver}"  BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center" >
@@ -117,21 +76,13 @@
             </MenuItem>
         </ContextMenu>
     </UserControl.ContextMenu>
-
-    <UserControl.CommandBindings>
-        <!--<CommandBinding Command="Zoom" Executed="Zoom" />-->
-        <CommandBinding Command="Redo" x:Name="RedoCommand"/>
-
-    </UserControl.CommandBindings>
     <UserControl.InputBindings>
-        <KeyBinding x:Name="BindingUndo" Key="Z" Modifiers="Control" />
-        <KeyBinding x:Name="BindingRedo" Key="Y" Modifiers="Control" />
-        <!--<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="BindingUndo"        Key="Z" Modifiers="Control" />
+        <KeyBinding x:Name="BindingRedo"        Key="Y" Modifiers="Control" />
+        <KeyBinding x:Name="BindingSelectAll"   Key="A" Modifiers="Control" />
+        <KeyBinding x:Name="BindingAddNode"     Key="N" Modifiers="Control" />
         <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"/>-->
+        <MouseBinding x:Name="BindingSelect"    Gesture="Ctrl+LeftClick"/>
+        <MouseBinding x:Name="BindingCut"       Gesture="Alt+LeftClick" />
     </UserControl.InputBindings>
 </UserControl>
diff --git a/SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs b/SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs
@@ -121,8 +121,6 @@ private void ConnectDrag(MouseButtonEventArgs e)
             {
                 this.ViewModel.CommandSetAsLoop.ExecuteWithSubscribe();
                 this.ViewModel.NodesCanvas.CommandAddConnectorWithConnect.Execute(this.ViewModel);
-
-                this.ViewModel.NodesCanvas.LogDebug("Зашел 2 ");
             }          
             else 
             {
@@ -132,8 +130,6 @@ private void ConnectDrag(MouseButtonEventArgs e)
                 DragDrop.DoDragDrop(this, data, DragDropEffects.Link);
                 this.ViewModel.CommandCheckConnectPointDrop.ExecuteWithSubscribe();
                 e.Handled = true;
-
-                this.ViewModel.NodesCanvas.LogDebug("Зашел 1 ");
             }
         }
 
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs
@@ -38,11 +38,14 @@ public class ViewModelNode : ReactiveValidationObject<ViewModelNode>
         [Reactive] public ViewModelConnector Output { get; set; }
         [Reactive] public ViewModelConnector CurrentConnector { get; set; }
         [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
+        [Reactive] public int IndexStartSelectConnectors { get; set; } = 0;
 
+        public IObservableCollection<ViewModelConnector> Transitions { get; set; } = new ObservableCollectionExtended<ViewModelConnector>();
         public int Zindex { get; private set; }
 
-        [Reactive] public int IndexStartSelectConnectors { get; set; } = 0;
-        public IObservableCollection<ViewModelConnector> Transitions { get; set; } = new ObservableCollectionExtended<ViewModelConnector>();
+        public int TransitionsCount = -1;
+
+        
 
 
 
@@ -61,6 +64,8 @@ public ViewModelNode(ViewModelNodesCanvas nodesCanvas)
         private void SetupBinding()
         {
             this.WhenAnyValue(x => x.Selected).Subscribe(value => { this.BorderBrush = value ? Application.Current.Resources["ColorSelectedElement"] as SolidColorBrush : Brushes.LightGray; });
+            this.WhenAnyValue(x => x.Transitions.Count).Subscribe(value => UpdateCount(value));
+
             this.WhenAnyValue(x => x.Point1.Value, x => x.Size).Subscribe(_ => UpdatePoint2());
             this.WhenAnyValue(x => x.IsCollapse).Subscribe(value => Collapse(value));
         }
@@ -124,6 +129,11 @@ private void NotSaved()
         {
             NodesCanvas.ItSaved = false;
         }
+        private void UpdateCount(int count)
+        {
+            if (count > TransitionsCount)
+                TransitionsCount = count;
+        }
         #endregion Setup Commands
 
         private void Collapse(bool value)
@@ -195,7 +205,7 @@ private void AddEmptyConnector()
                 CurrentConnector.TextEnable = true;
                 CurrentConnector.FormEnable = false;
                 if (string.IsNullOrEmpty(CurrentConnector.Name))
-                    CurrentConnector.Name = "Transition " + NodesCanvas.Nodes.Sum(x => x.Transitions.Count - 1).ToString();
+                    CurrentConnector.Name = "Transition " + TransitionsCount.ToString();
             }
             CurrentConnector = new ViewModelConnector(NodesCanvas, this)
             {
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs b/SimpleStateMachineNodeEditor/ViewModel/ViewModelNodesCanvas.cs
@@ -39,16 +39,23 @@ public class ViewModelNodesCanvas : ReactiveObject
         [Reactive] public ViewModelNode StartState { get; set; }
         [Reactive] public bool ItSaved { get; set; } = true;
         [Reactive] public string Path { get; set; }
+
         [Reactive] public TypeMessage DisplayMessageType { get; set; }
-        
 
+
+        public int NodesCount = 0;
+        public double ScaleMax = 5;
+        public double ScaleMin = 0.1;
+        public double Scales { get; set; } = 0.05;
         [Reactive] public Scale Scale { get; set; } = new Scale();
 
         public ViewModelNodesCanvas()
         {
             SetupCommands();
             SetupStartState();
             Cutter = new ViewModelCutter(this);
+            this.WhenAnyValue(x => x.Nodes.Count).Subscribe(value => UpdateCount(value));
+
             for (int i = 1; i <= 5; i++)
             {
                 LogError("Error " + i.ToString());
@@ -114,7 +121,7 @@ private void SetAsStart(ViewModelNode node)
         public ReactiveCommand<Unit, Unit> CommandExpandDownAll { get; set; }
         public ReactiveCommand<Unit, Unit> CommandCollapseUpSelected { get; set; }
         public ReactiveCommand<Unit, Unit> CommandExpandDownSelected { get; set; }
-
+        public ReactiveCommand<Unit, Unit> CommandErrorListUpdate { get; set; }
 
 
 
@@ -154,13 +161,6 @@ private void SetAsStart(ViewModelNode node)
         public Command<List<(int index, ViewModelConnector element)>, List<(int index, ViewModelConnector element)>> CommandDeleteSelectedConnectors { get; set; }
         public Command<DeleteMode, DeleteMode> CommandDeleteSelectedElements { get; set; }
 
-
-
-
-        public double ScaleMax = 5;
-        public double ScaleMin = 0.1;
-        public double Scales { get; set; } = 0.05;
-
         private void SetupCommands()
         {
             CommandRedo = ReactiveCommand.Create(ICommandWithUndoRedo.Redo);
@@ -177,6 +177,8 @@ private void SetupCommands()
             CommandExpandDownAll = ReactiveCommand.Create(ExpandDownAll);
             CommandCollapseUpSelected = ReactiveCommand.Create(CollapseUpSelected);
             CommandExpandDownSelected = ReactiveCommand.Create(ExpandDownSelected);
+            CommandErrorListUpdate = ReactiveCommand.Create(ErrosUpdaate);
+
 
             CommandValidateNodeName = ReactiveCommand.Create<(ViewModelNode objectForValidate, string newValue)>(ValidateNodeName);
             CommandValidateConnectName = ReactiveCommand.Create<(ViewModelConnector objectForValidate, string newValue)>(ValidateConnectName);
@@ -249,6 +251,11 @@ public void LogWarning(string message)
 
         #endregion Logging
 
+        private void UpdateCount(int count)
+        {
+            if (count > NodesCount)
+                NodesCount = count;
+        }
         private void CollapseUpAll()
         {
             foreach(var node in Nodes)
@@ -263,6 +270,10 @@ private void ExpandDownAll()
                 node.IsCollapse = false;
             }
         }
+        private void ErrosUpdaate()
+        {
+            Messages.RemoveMany(Messages.Where(x => x.TypeMessage == DisplayMessageType || DisplayMessageType==TypeMessage.All));
+        }
         private void CollapseUpSelected()
         {
             foreach (var node in Nodes.Where(x=>x.Selected))
@@ -348,7 +359,7 @@ private void PartMoveAllSelectedNode(MyPoint delta)
         }
         private string GetNameForNewNode()
         {
-            return "State " + Nodes.Count.ToString();
+            return "State " + NodesCount.ToString();
         }
         private ViewModelNode AddNodeWithUndoRedo(MyPoint parameter, ViewModelNode result)
         {

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,6 @@ private void ConnectDrag(MouseButtonEventArgs e)`
`121`	`121`	`{`
`122`	`122`	`this.ViewModel.CommandSetAsLoop.ExecuteWithSubscribe();`
`123`	`123`	`this.ViewModel.NodesCanvas.CommandAddConnectorWithConnect.Execute(this.ViewModel);`
`124`		`-`
`125`		`- this.ViewModel.NodesCanvas.LogDebug("Зашел 2 ");`
`126`	`124`	`}`
`127`	`125`	`else`
`128`	`126`	`{`
`@@ -132,8 +130,6 @@ private void ConnectDrag(MouseButtonEventArgs e)`
`132`	`130`	`DragDrop.DoDragDrop(this, data, DragDropEffects.Link);`
`133`	`131`	`this.ViewModel.CommandCheckConnectPointDrop.ExecuteWithSubscribe();`
`134`	`132`	`e.Handled = true;`
`135`		`-`
`136`		`- this.ViewModel.NodesCanvas.LogDebug("Зашел 1 ");`
`137`	`133`	`}`
`138`	`134`	`}`
`139`	`135`