DYN-5018 wires disappear when moving group (#12997)

filipeotero · web-flow · commit 0174e384352d · 2022-06-25T15:58:35.000-04:00
* Clear inports and outports.; report nodes position;

* Repositioning the collapsed groups of the wires based on the height of the ports

* Update the proxy ports if the Height or Width of the annotation is changed

* Remove from update proxy port on width and height property changed

* retrigger checks

* Removing modelBase property changed

* assigning comments
diff --git a/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs
@@ -245,9 +245,11 @@ public bool IsExpanded
             set
             {
                 annotationModel.IsExpanded = value;
+                InPorts.Clear();
+                OutPorts.Clear();
                 if (value)
                 {
-                    this.ShowGroupContents();
+                    this.ShowGroupContents();       
                 }
                 else
                 {
@@ -260,6 +262,15 @@ public bool IsExpanded
                 AddGroupToGroupCommand.RaiseCanExecuteChanged();
                 RaisePropertyChanged(nameof(IsExpanded));
                 RedrawConnectors();
+                ReportNodesPosition();
+            }
+        }
+
+        private void ReportNodesPosition()
+        {
+            foreach (var node in Nodes.OfType<AnnotationModel>())
+            {
+                node.ReportPosition();
             }
         }
 
@@ -536,11 +547,13 @@ private bool CanChangeFontSize(object obj)
         public AnnotationViewModel(WorkspaceViewModel workspaceViewModel, AnnotationModel model)
         {
             annotationModel = model;
+
             this.WorkspaceViewModel = workspaceViewModel;
             this.preferenceSettings = WorkspaceViewModel.DynamoViewModel.PreferenceSettings;
             model.PropertyChanged += model_PropertyChanged;
             model.RemovedFromGroup += OnModelRemovedFromGroup;
             model.AddedToGroup += OnModelAddedToGroup;
+
             DynamoSelection.Instance.Selection.CollectionChanged += SelectionOnCollectionChanged;
 
             //https://jira.autodesk.com/browse/QNTM-3770
@@ -581,14 +594,15 @@ public AnnotationViewModel(WorkspaceViewModel workspaceViewModel, AnnotationMode
             LoadGroupStylesFromPreferences(preferenceSettings.GroupStyleItemsList);
         }
 
+
         /// <summary>
         /// Creates input ports for the group based on its Nodes.
         /// Input ports that either is connected to a Node outside of the
         /// group, or has a port that is not connected will be used for the group.
+        /// This function appends to the inputs
         /// </summary>
-        internal void SetGroupInputPorts()
+        private void SetGroupInputPorts()
         {
-            InPorts.Clear();
             List<PortViewModel> newPortViewModels;
 
             // we need to store the original ports here
@@ -622,10 +636,10 @@ internal void SetGroupInputPorts()
         /// <summary>
         /// Creates output ports for the group based on its Nodes.
         /// Output ports that are not connected will be used for the group.
+        /// This function appends to the outports
         /// </summary>
-        internal void SetGroupOutPorts()
+        private void SetGroupOutPorts()
         {
-            OutPorts.Clear();
             List<PortViewModel> newPortViewModels;
 
             // we need to store the original ports here
@@ -716,13 +730,10 @@ private double GetPortVerticalOffset(PortModel portModel, int proxyPortIndex)
             return verticalOffset + (proxyPortIndex * portHeight) + portVerticalMidPoint;
         }
 
-        private Point2D CalculatePortPosition(PortModel portModel, int proxyPortIndex)
+        private Point2D CalculatePortPosition(PortModel portModel, double verticalPosition)
         {
             double groupHeaderHeight = Height - ModelAreaRect.Height;
-
-            double offset = GetPortVerticalOffset(portModel, proxyPortIndex);
-            double y = Top + groupHeaderHeight + offset;
-
+            double y = Top + groupHeaderHeight + verticalPosition + verticalOffset + portVerticalMidPoint;
             switch (portModel.PortType)
             {
                 case PortType.Input:
@@ -731,7 +742,7 @@ private Point2D CalculatePortPosition(PortModel portModel, int proxyPortIndex)
                     if (portModel.Owner is CodeBlockNodeModel)
                     {
                         // Special case because code block outputs are smaller than regular outputs.
-                        return new Point2D(Left + Width, y + 6);
+                        return new Point2D(Left + Width, y - 8);
                     }
                     return new Point2D(Left + Width, y);
             }
@@ -746,15 +757,19 @@ private List<PortViewModel> CreateProxyInPorts(IEnumerable<PortModel> groupPortM
                 .ToList();
 
             var newPortViewModels = new List<PortViewModel>();
-            for (int i = 0; i < groupPortModels.Count(); i++)
+            double verticalPosition = 0;
+            foreach (var groupPort in groupPortModels)
             {
-                var model = groupPortModels.ElementAt(i);
-                newPortViewModels.Add(originalPortViewModels[i].CreateProxyPortViewModel(model));
-
-                // calculate new position for the proxy inports.
-                model.Center = CalculatePortPosition(model, i);
+                var originalPort = originalPortViewModels.FirstOrDefault(x => x.PortModel.GUID == groupPort.GUID);
+                if (originalPort != null)
+                {
+                    var portViewModel = originalPort.CreateProxyPortViewModel(groupPort);
+                    newPortViewModels.Add(portViewModel);
+                    // calculate new position for the proxy outports
+                    groupPort.Center = CalculatePortPosition(groupPort, verticalPosition);
+                    verticalPosition += originalPort.Height;
+                }
             }
-
             return newPortViewModels;
         }
 
@@ -766,7 +781,7 @@ private List<PortViewModel> CreateProxyOutPorts(IEnumerable<PortModel> groupPort
                 .ToList();
 
             var newPortViewModels = new List<PortViewModel>();
-            int index = 0;
+            double verticalPosition = 0;
             foreach (var group in groupPortModels)
             {
                 var originalPort = originalPortViewModels.FirstOrDefault(x => x.PortModel.GUID == group.GUID);
@@ -775,9 +790,9 @@ private List<PortViewModel> CreateProxyOutPorts(IEnumerable<PortModel> groupPort
                     var portViewModel = originalPort.CreateProxyPortViewModel(group);
                     newPortViewModels.Add(portViewModel);
                     // calculate new position for the proxy outports
-                    group.Center = CalculatePortPosition(group, index);
+                    group.Center = CalculatePortPosition(group, verticalPosition);
+                    verticalPosition += originalPort.Height;
                 }
-                index++;
             }
 
             return newPortViewModels;
@@ -790,23 +805,28 @@ internal void UpdateProxyPortsPosition()
 
             if (parent != null && !parent.IsExpanded) return;
 
+            double verticalPosition = 0;
+
             for (int i = 0; i < inPorts.Count(); i++)
             {
                 var model = inPorts[i]?.PortModel;
                 if (model != null && model.IsProxyPort)
                 {
                     // calculate new position for the proxy inports.
-                    model.Center = CalculatePortPosition(model, i);
+                    model.Center = CalculatePortPosition(model, verticalPosition);
+                    verticalPosition += model.Height;
                 }
             }
 
+            verticalPosition = 0;
             for (int i = 0; i < outPorts.Count(); i++)
             {
                 var model = outPorts[i]?.PortModel;
                 if (model != null && model.IsProxyPort)
                 {
                     // calculate new position for the proxy outports.
-                    model.Center = CalculatePortPosition(model, i);
+                    model.Center = CalculatePortPosition(model, verticalPosition);
+                    verticalPosition += model.Height;
                 }
             }
         }
@@ -898,7 +918,6 @@ private void RedrawConnectors()
 
             foreach (var connector in allNodes.SelectMany(x=>x.AllConnectors))
             {
-
                 var connectorViewModel = WorkspaceViewModel
                     .Connectors
                     .Where(x => connector.GUID == x.ConnectorModel.GUID)
diff --git a/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml.cs b/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml.cs
@@ -254,6 +254,8 @@ private void GroupTextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
                 SetTextMaxWidth();
                 SetTextHeight();
             }
+
+            ViewModel.UpdateProxyPortsPosition();
         }
 
 

Original file line number	Diff line number	Diff line change
`@@ -245,9 +245,11 @@ public bool IsExpanded`
`245`	`245`	`set`
`246`	`246`	`{`
`247`	`247`	`annotationModel.IsExpanded = value;`
	`248`	`+ InPorts.Clear();`
	`249`	`+ OutPorts.Clear();`
`248`	`250`	`if (value)`
`249`	`251`	`{`
`250`		`- this.ShowGroupContents();`
	`252`	`+ this.ShowGroupContents();`
`251`	`253`	`}`
`252`	`254`	`else`
`253`	`255`	`{`
`@@ -260,6 +262,15 @@ public bool IsExpanded`
`260`	`262`	`AddGroupToGroupCommand.RaiseCanExecuteChanged();`
`261`	`263`	`RaisePropertyChanged(nameof(IsExpanded));`
`262`	`264`	`RedrawConnectors();`
	`265`	`+ ReportNodesPosition();`
	`266`	`+ }`
	`267`	`+ }`
	`268`	`+`
	`269`	`+ private void ReportNodesPosition()`
	`270`	`+ {`
	`271`	`+ foreach (var node in Nodes.OfType<AnnotationModel>())`
	`272`	`+ {`
	`273`	`+ node.ReportPosition();`
`263`	`274`	`}`
`264`	`275`	`}`
`265`	`276`
`@@ -536,11 +547,13 @@ private bool CanChangeFontSize(object obj)`
`536`	`547`	`public AnnotationViewModel(WorkspaceViewModel workspaceViewModel, AnnotationModel model)`
`537`	`548`	`{`
`538`	`549`	`annotationModel = model;`
	`550`	`+`
`539`	`551`	`this.WorkspaceViewModel = workspaceViewModel;`
`540`	`552`	`this.preferenceSettings = WorkspaceViewModel.DynamoViewModel.PreferenceSettings;`
`541`	`553`	`model.PropertyChanged += model_PropertyChanged;`
`542`	`554`	`model.RemovedFromGroup += OnModelRemovedFromGroup;`
`543`	`555`	`model.AddedToGroup += OnModelAddedToGroup;`
	`556`	`+`
`544`	`557`	`DynamoSelection.Instance.Selection.CollectionChanged += SelectionOnCollectionChanged;`
`545`	`558`
`546`	`559`	`//https://jira.autodesk.com/browse/QNTM-3770`
`@@ -581,14 +594,15 @@ public AnnotationViewModel(WorkspaceViewModel workspaceViewModel, AnnotationMode`
`581`	`594`	`LoadGroupStylesFromPreferences(preferenceSettings.GroupStyleItemsList);`
`582`	`595`	`}`
`583`	`596`
	`597`	`+`
`584`	`598`	`/// <summary>`
`585`	`599`	`/// Creates input ports for the group based on its Nodes.`
`586`	`600`	`/// Input ports that either is connected to a Node outside of the`
`587`	`601`	`/// group, or has a port that is not connected will be used for the group.`
	`602`	`+ /// This function appends to the inputs`
`588`	`603`	`/// </summary>`
`589`		`- internal void SetGroupInputPorts()`
	`604`	`+ private void SetGroupInputPorts()`
`590`	`605`	`{`
`591`		`- InPorts.Clear();`
`592`	`606`	`List<PortViewModel> newPortViewModels;`
`593`	`607`
`594`	`608`	`// we need to store the original ports here`
`@@ -622,10 +636,10 @@ internal void SetGroupInputPorts()`
`622`	`636`	`/// <summary>`
`623`	`637`	`/// Creates output ports for the group based on its Nodes.`
`624`	`638`	`/// Output ports that are not connected will be used for the group.`
	`639`	`+ /// This function appends to the outports`
`625`	`640`	`/// </summary>`
`626`		`- internal void SetGroupOutPorts()`
	`641`	`+ private void SetGroupOutPorts()`
`627`	`642`	`{`
`628`		`- OutPorts.Clear();`
`629`	`643`	`List<PortViewModel> newPortViewModels;`
`630`	`644`
`631`	`645`	`// we need to store the original ports here`
`@@ -716,13 +730,10 @@ private double GetPortVerticalOffset(PortModel portModel, int proxyPortIndex)`
`716`	`730`	`return verticalOffset + (proxyPortIndex * portHeight) + portVerticalMidPoint;`
`717`	`731`	`}`
`718`	`732`
`719`		`- private Point2D CalculatePortPosition(PortModel portModel, int proxyPortIndex)`
	`733`	`+ private Point2D CalculatePortPosition(PortModel portModel, double verticalPosition)`
`720`	`734`	`{`
`721`	`735`	`double groupHeaderHeight = Height - ModelAreaRect.Height;`
`722`		`-`
`723`		`- double offset = GetPortVerticalOffset(portModel, proxyPortIndex);`
`724`		`- double y = Top + groupHeaderHeight + offset;`
`725`		`-`
	`736`	`+ double y = Top + groupHeaderHeight + verticalPosition + verticalOffset + portVerticalMidPoint;`
`726`	`737`	`switch (portModel.PortType)`
`727`	`738`	`{`
`728`	`739`	`case PortType.Input:`
`@@ -731,7 +742,7 @@ private Point2D CalculatePortPosition(PortModel portModel, int proxyPortIndex)`
`731`	`742`	`if (portModel.Owner is CodeBlockNodeModel)`
`732`	`743`	`{`
`733`	`744`	`// Special case because code block outputs are smaller than regular outputs.`
`734`		`- return new Point2D(Left + Width, y + 6);`
	`745`	`+ return new Point2D(Left + Width, y - 8);`
`735`	`746`	`}`
`736`	`747`	`return new Point2D(Left + Width, y);`
`737`	`748`	`}`
`@@ -746,15 +757,19 @@ private List<PortViewModel> CreateProxyInPorts(IEnumerable<PortModel> groupPortM`
`746`	`757`	`.ToList();`
`747`	`758`
`748`	`759`	`var newPortViewModels = new List<PortViewModel>();`
`749`		`- for (int i = 0; i < groupPortModels.Count(); i++)`
	`760`	`+ double verticalPosition = 0;`
	`761`	`+ foreach (var groupPort in groupPortModels)`
`750`	`762`	`{`
`751`		`- var model = groupPortModels.ElementAt(i);`
`752`		`- newPortViewModels.Add(originalPortViewModels[i].CreateProxyPortViewModel(model));`
`753`		`-`
`754`		`- // calculate new position for the proxy inports.`
`755`		`- model.Center = CalculatePortPosition(model, i);`
	`763`	`+ var originalPort = originalPortViewModels.FirstOrDefault(x => x.PortModel.GUID == groupPort.GUID);`
	`764`	`+ if (originalPort != null)`
	`765`	`+ {`
	`766`	`+ var portViewModel = originalPort.CreateProxyPortViewModel(groupPort);`
	`767`	`+ newPortViewModels.Add(portViewModel);`
	`768`	`+ // calculate new position for the proxy outports`
	`769`	`+ groupPort.Center = CalculatePortPosition(groupPort, verticalPosition);`
	`770`	`+ verticalPosition += originalPort.Height;`
	`771`	`+ }`
`756`	`772`	`}`
`757`		`-`
`758`	`773`	`return newPortViewModels;`
`759`	`774`	`}`
`760`	`775`
`@@ -766,7 +781,7 @@ private List<PortViewModel> CreateProxyOutPorts(IEnumerable<PortModel> groupPort`
`766`	`781`	`.ToList();`
`767`	`782`
`768`	`783`	`var newPortViewModels = new List<PortViewModel>();`
`769`		`- int index = 0;`
	`784`	`+ double verticalPosition = 0;`
`770`	`785`	`foreach (var group in groupPortModels)`
`771`	`786`	`{`
`772`	`787`	`var originalPort = originalPortViewModels.FirstOrDefault(x => x.PortModel.GUID == group.GUID);`
`@@ -775,9 +790,9 @@ private List<PortViewModel> CreateProxyOutPorts(IEnumerable<PortModel> groupPort`
`775`	`790`	`var portViewModel = originalPort.CreateProxyPortViewModel(group);`
`776`	`791`	`newPortViewModels.Add(portViewModel);`
`777`	`792`	`// calculate new position for the proxy outports`
`778`		`- group.Center = CalculatePortPosition(group, index);`
	`793`	`+ group.Center = CalculatePortPosition(group, verticalPosition);`
	`794`	`+ verticalPosition += originalPort.Height;`
`779`	`795`	`}`
`780`		`- index++;`
`781`	`796`	`}`
`782`	`797`
`783`	`798`	`return newPortViewModels;`
`@@ -790,23 +805,28 @@ internal void UpdateProxyPortsPosition()`
`790`	`805`
`791`	`806`	`if (parent != null && !parent.IsExpanded) return;`
`792`	`807`
	`808`	`+ double verticalPosition = 0;`
	`809`	`+`
`793`	`810`	`for (int i = 0; i < inPorts.Count(); i++)`
`794`	`811`	`{`
`795`	`812`	`var model = inPorts[i]?.PortModel;`
`796`	`813`	`if (model != null && model.IsProxyPort)`
`797`	`814`	`{`
`798`	`815`	`// calculate new position for the proxy inports.`
`799`		`- model.Center = CalculatePortPosition(model, i);`
	`816`	`+ model.Center = CalculatePortPosition(model, verticalPosition);`
	`817`	`+ verticalPosition += model.Height;`
`800`	`818`	`}`
`801`	`819`	`}`
`802`	`820`
	`821`	`+ verticalPosition = 0;`
`803`	`822`	`for (int i = 0; i < outPorts.Count(); i++)`
`804`	`823`	`{`
`805`	`824`	`var model = outPorts[i]?.PortModel;`
`806`	`825`	`if (model != null && model.IsProxyPort)`
`807`	`826`	`{`
`808`	`827`	`// calculate new position for the proxy outports.`
`809`		`- model.Center = CalculatePortPosition(model, i);`
	`828`	`+ model.Center = CalculatePortPosition(model, verticalPosition);`
	`829`	`+ verticalPosition += model.Height;`
`810`	`830`	`}`
`811`	`831`	`}`
`812`	`832`	`}`
`@@ -898,7 +918,6 @@ private void RedrawConnectors()`
`898`	`918`
`899`	`919`	`foreach (var connector in allNodes.SelectMany(x=>x.AllConnectors))`
`900`	`920`	`{`
`901`		`-`
`902`	`921`	`var connectorViewModel = WorkspaceViewModel`
`903`	`922`	`.Connectors`
`904`	`923`	`.Where(x => connector.GUID == x.ConnectorModel.GUID)`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,8 @@ private void GroupTextBlock_SizeChanged(object sender, SizeChangedEventArgs e)`
`254`	`254`	`SetTextMaxWidth();`
`255`	`255`	`SetTextHeight();`
`256`	`256`	`}`
	`257`	`+`
	`258`	`+ ViewModel.UpdateProxyPortsPosition();`
`257`	`259`	`}`
`258`	`260`
`259`	`261`