Collapse and expand of sub-graphs

Author: ATrefzer

CSharpCodeAnalyst/Configuration/ApplicationSettings.cs

@@ -2,7 +2,7 @@
 
 public class ApplicationSettings
 {
-    public int WarningCodeElementLimitForCycle { get; set; } = 50;
+    public int WarningCodeElementLimit { get; set; } = 50;
     public string DefaultProjectExcludeFilter { get; set; } = string.Empty;
     public bool DefaultShowQuickHelp { get; set; }
 }

CSharpCodeAnalyst/Exploration/CodeGraphExplorer.cs

@@ -130,7 +130,7 @@ public SearchResult FindSpecializations(CodeGraph codeGraph, CodeElement element
         ArgumentNullException.ThrowIfNull(codeGraph);
         ArgumentNullException.ThrowIfNull(element);
 
-        var dependencies = codeGraph.Nodes.Values.SelectMany(n => n.Dependencies)
+        var dependencies = codeGraph.GetAllDependencies()
             .Where(d => (d.Type == DependencyType.Overrides ||
                          d.Type == DependencyType.Implements) &&
                         d.TargetId == element.Id).ToList();

CSharpCodeAnalyst/GraphArea/DependencyGraphViewer.cs

@@ -11,6 +11,7 @@
 using Microsoft.Msagl.Drawing;
 using Microsoft.Msagl.WpfGraphControl;
 using Color = Microsoft.Msagl.Drawing.Color;
+using Node = Microsoft.Msagl.Drawing.Node;
 
 namespace CSharpCodeAnalyst.GraphArea;
 
@@ -20,12 +21,13 @@ namespace CSharpCodeAnalyst.GraphArea;
 ///     Dependencies of the same type (i.e a method Calls another multiple times) are handled
 ///     in the parser. In this case the dependency holds all source references.
 /// </summary>
-internal class DependencyGraphViewer : IDependencyGraphViewer, IDependencyGraphBinding, INotifyPropertyChanged
+internal partial class DependencyGraphViewer : IDependencyGraphViewer, IDependencyGraphBinding, INotifyPropertyChanged
 {
     private readonly List<IContextCommand> _contextCommands = [];
     private readonly MsaglBuilder _msaglBuilder;
     private readonly IPublisher _publisher;
-    private readonly LinkedList<CodeGraph> _undoStack = new();
+
+    private readonly LinkedList<UndoState> _undoStack = new();
 
     private readonly int _undoStackSize = 10;
 
@@ -45,6 +47,7 @@ internal class DependencyGraphViewer : IDependencyGraphViewer, IDependencyGraphB
     private IViewerEdge? _lastHighlightedEdge;
 
     private GraphViewer? _msaglViewer;
+    private PresentationState _presentationState = new();
 
     private RenderOption _renderOption = new DefaultRenderOptions();
     private bool _showFlatGraph;
@@ -77,20 +80,13 @@ public void ShowFlatGraph(bool value)
         RefreshGraph();
     }
 
-    /// <summary>
-    ///     Adding an existing element or dependency is prevented.
-    ///     Note from the originalCodeElement we don't add parent or children.
-    ///     We just use this information to integrate the node into the existing canvas.
-    /// </summary>
-    public void AddToGraph(IEnumerable<CodeElement> originalCodeElements, IEnumerable<Dependency> newDependencies)
+    private void AddToGraphInternal(IEnumerable<CodeElement> originalCodeElements, IEnumerable<Dependency> newDependencies)
     {
         if (_msaglViewer is null)
         {
             return;
         }
 
-        PushUndo();
-
         IntegrateNewFromOriginal(originalCodeElements);
 
         // Add dependencies we explicitly requested.
@@ -104,25 +100,56 @@ public void AddToGraph(IEnumerable<CodeElement> originalCodeElements, IEnumerabl
         RefreshGraph();
     }
 
+    /// <summary>
+    ///     Adding an existing element or dependency is prevented.
+    ///     Note from the originalCodeElement we don't add parent or children.
+    ///     We just use this information to integrate the node into the existing canvas.
+    /// </summary>
+    public void AddToGraph(IEnumerable<CodeElement> originalCodeElements, IEnumerable<Dependency> newDependencies)
+    {
+        if (_msaglViewer is null)
+        {
+            return;
+        }
+
+        PushUndo();
+        AddToGraphInternal(originalCodeElements, newDependencies);
+    }
+
     public void AddContextCommand(IContextCommand command)
     {
         _contextCommands.Add(command);
     }
 
-    public void Clear()
+    private void Clear(bool withUndoStack)
     {
         if (_msaglViewer is null)
         {
             return;
         }
 
         _clonedCodeGraph = new CodeGraph();
-        _undoStack.Clear();
+
+        if (withUndoStack)
+        {
+            ClearUndo();
+        }
+
+        // Nothing collapsed by default
+        _presentationState = new PresentationState();
         RefreshGraph();
     }
+    public void Clear()
+    {
+      Clear(true);
+    }
 
+    private void ClearUndo()
+    {
+        _undoStack.Clear();
+    }
 
-    public void Reset()
+    public void Layout()
     {
         //_msaglViewer?.SetInitialTransform();
         RefreshGraph();
@@ -187,19 +214,36 @@ public void ShowGlobalContextMenu()
         globalContextMenu.IsOpen = true;
     }
 
+
+  
     public bool Undo()
     {
         if (_undoStack.Any() is false)
         {
             return false;
         }
 
-        _clonedCodeGraph = _undoStack.First();
+        var state = _undoStack.First();       
         _undoStack.RemoveFirst();
+
+        _clonedCodeGraph = state.CodeGraph;
+        _presentationState = state.PresentationState;
+
         RefreshGraph();
         return true;
     }
 
+    public void ImportCycleGroup(List<CodeElement> codeElements, List<Dependency> dependencies)
+    {
+        PushUndo();
+        Clear(false);
+
+        // Everything is collapsed by default. This allows to import large graphs.
+        var defaultState = codeElements.Where(c => c.Children.Any()).ToDictionary(c => c.Id, c => true);
+        _presentationState = new PresentationState(defaultState);
+        AddToGraphInternal(codeElements, dependencies);
+    }
+
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
@@ -211,7 +255,8 @@ private void PushUndo()
             _undoStack.RemoveLast();
         }
 
-        _undoStack.AddFirst(_clonedCodeGraph.Clone(null, null));
+        var state = new UndoState(_clonedCodeGraph.Clone(null, null), _presentationState.Clone());
+        _undoStack.AddFirst(state);
     }
 
     private void ClearEdgeColoring()
@@ -264,7 +309,8 @@ private void RefreshGraph()
     {
         if (_msaglViewer != null)
         {
-            var graph = _msaglBuilder.CreateGraphFromCodeStructure(_clonedCodeGraph, _showFlatGraph);
+            var graph = _msaglBuilder.CreateGraphFromCodeStructure(_clonedCodeGraph, _presentationState,
+                _showFlatGraph);
 
             _renderOption.Apply(graph);
             _msaglViewer.Graph = graph;
@@ -400,18 +446,38 @@ bool IsCtrlPressed()
             var node = clickedObject.Node;
             var contextMenu = new ContextMenu();
 
-            var addParentMenuItem = new MenuItem { Header = "Add parent" };
-            addParentMenuItem.Click += (_, _) => AddParentRequest(node);
+            MenuItem item = null;
+            if (node.UserData is CodeElement codeElement)
+            {
+                if (_presentationState.IsCollapsed(codeElement.Id) &&
+                    codeElement.Children.Any())
+                {
+                    item = new MenuItem { Header = "Expand" };
+                    item.Click += (_, _) => Expand(codeElement.Id);
+                    contextMenu.Items.Add(item);
+                }
 
-            var findInTreeMenuItem = new MenuItem { Header = "Find in Tree" };
-            findInTreeMenuItem.Click += (_, _) => FindInTree(node);
+                if (!_presentationState.IsCollapsed(codeElement.Id) &&
+                    codeElement.Children.Any())
+                {
+                    item = new MenuItem { Header = "Collapse" };
+                    item.Click += (_, _) => Collapse(codeElement.Id);
+                    contextMenu.Items.Add(item);
+                }
+            }
+
+            item = new MenuItem { Header = "Delete Node" };
+            item.Click += (_, _) => DeleteNode(node);
+            contextMenu.Items.Add(item);
+
+            item = new MenuItem { Header = "Find in Tree" };
+            item.Click += (_, _) => FindInTree(node);
+            contextMenu.Items.Add(item);
 
-            var deleteMenuItem = new MenuItem { Header = "Delete Node" };
-            deleteMenuItem.Click += (_, _) => DeleteNode(node);
+            item = new MenuItem { Header = "Add parent" };
+            item.Click += (_, _) => AddParentRequest(node);
+            contextMenu.Items.Add(item);
 
-            contextMenu.Items.Add(deleteMenuItem);
-            contextMenu.Items.Add(findInTreeMenuItem);
-            contextMenu.Items.Add(addParentMenuItem);
             contextMenu.Items.Add(new Separator());
             var lastItemIsSeparator = true;
 
@@ -451,6 +517,21 @@ bool IsCtrlPressed()
         }
     }
 
+    private void Collapse(string id)
+    {
+        PushUndo();
+        _presentationState.SetCollapsedState(id, true);
+        RefreshGraph();
+    }
+
+    private void Expand(string id)
+    {
+        PushUndo();
+        _presentationState.SetCollapsedState(id, false);
+
+        RefreshGraph();
+    }
+
     private void DeleteAllMarkedElements()
     {
         if (_msaglViewer is null)

CSharpCodeAnalyst/GraphArea/GraphViewModel.cs

@@ -238,9 +238,9 @@ internal void Clear()
         _viewer.Clear();
     }
 
-    internal void ResetZoom()
+    internal void Layout()
     {
-        _viewer.Reset();
+        _viewer.Layout();
     }
 
     internal void FindIncomingCalls(CodeElement method)
@@ -325,4 +325,9 @@ public void ShowGlobalContextMenu()
     {
         _viewer.ShowGlobalContextMenu();
     }
+
+    public void ImportCycleGroup(List<CodeElement> codeElements, List<Dependency> dependencies)
+    {
+        _viewer.ImportCycleGroup(codeElements, dependencies);
+    }
 }

CSharpCodeAnalyst/GraphArea/IDependencyGraphViewer.cs

@@ -19,7 +19,7 @@ internal interface IDependencyGraphViewer
     /// <summary>
     ///     Renders the graph and re-layouts it.
     /// </summary>
-    void Reset();
+    void Layout();
 
     /// <summary>
     ///     Note:
@@ -36,4 +36,5 @@ internal interface IDependencyGraphViewer
     void SetHighlightMode(HighlightMode valueMode);
     void ShowGlobalContextMenu();
     bool Undo();
+    void ImportCycleGroup(List<CodeElement> codeElements, List<Dependency> dependencies);
 }