816 layouts for reflexion modeling

Assets/SEE/Controls/Actions/ContextMenuAction.cs

@@ -348,13 +348,16 @@ IEnumerable<PopupMenuEntry> options
                 _ => throw new ArgumentOutOfRangeException()
             });
 
+            // We want to empower the user to load the implementation and architecture, separately.
+            // This method loads only the implementation.
             void LoadImplementation()
             {
                 LoadReflexionDataProperty dialog = new();
                 dialog.Open();
                 WaitForInputAsync(dialog).Forget();
             }
 
+            // This method loads only the architecture.
             void LoadArchitecture()
             {
                 LoadReflexionDataProperty dialog = new();
@@ -366,17 +369,17 @@ async UniTask WaitForInputAsync(LoadReflexionDataProperty dialog)
             {
                 await UniTask.WaitWhile(dialog.WaitForInputOrCancel);
                 SEEReflexionCity city = graphElement.GameObject().ContainingCity<SEEReflexionCity>();
-                if (dialog.TryGetImplementationDataPaths(out DataPath implGXL, out DataPath projectFolder))
+                if (dialog.TryGetImplementationDataPaths(out DataPath implDataPath, out DataPath projectFolder))
                 {
-                    city.LoadAndDrawSubgraphAsync(implGXL, projectFolder).Forget();
-                    new LoadPartOfReflexionCityNetAction(city.transform.parent.name, false, implGXL, projectFolder).Execute();
+                    city.LoadAndDrawSubgraphAsync(implDataPath, projectFolder).Forget();
+                    new LoadPartOfReflexionCityNetAction(city.transform.parent.name, false, implDataPath, projectFolder).Execute();
 
                 }
 
-                if (dialog.TryGetArchitectureDataPath(out DataPath archGXL))
+                if (dialog.TryGetArchitectureDataPath(out DataPath archDataPath))
                 {
-                    city.LoadAndDrawSubgraphAsync(archGXL).Forget();
-                    new LoadPartOfReflexionCityNetAction(city.transform.parent.name, true, archGXL).Execute();
+                    city.LoadAndDrawSubgraphAsync(archDataPath).Forget();
+                    new LoadPartOfReflexionCityNetAction(city.transform.parent.name, true, archDataPath).Execute();
                 }
             }
         }

Assets/SEE/Controls/Actions/ShuffleAction.cs

@@ -116,7 +116,7 @@ private void Update()
                         // The node operator that is going to be used to move the city-root node
                         nodeOperator = cityRootNode.gameObject.NodeOperator();
 
-                        // Where exactly have we hit the plane containing cideRootNode (if at all)?
+                        // Where exactly have we hit the plane containing cityRootNode (if at all)?
                         if (Raycasting.RaycastPlane(new UnityEngine.Plane(Vector3.up, cityRootNode.position), out Vector3 cityPlaneHitPoint))
                         {
                             gizmo.gameObject.SetActive(true);

Assets/SEE/DataModel/DG/IO/GXLParser.cs

@@ -174,8 +174,11 @@ private void EnsureExpectedEndTag()
         /// </summary>
         /// <param name="gxl">Stream containing GXL data that shall be processed</param>
         /// <param name="name">Name of the GXL data stream. Only used for display purposes in log messages</param>
+        /// <param name="changePercentage">to report progress</param>
         /// <param name="token">token with which the loading can be cancelled</param>
-        public virtual async UniTask LoadAsync(Stream gxl, string name, CancellationToken token = default)
+        public virtual async UniTask LoadAsync(Stream gxl, string name,
+                                               Action<float> changePercentage = null,
+                                               CancellationToken token = default)
         {
             Name = name;
 
@@ -194,6 +197,8 @@ public virtual async UniTask LoadAsync(Stream gxl, string name, CancellationToke
             // Defined only at the EndElement, e.g. </string> here.
             string lastText = string.Empty;
 
+            bool firstEdgeRead = false;
+
             try
             {
                 await UniTask.SwitchToThreadPool();
@@ -237,6 +242,11 @@ public virtual async UniTask LoadAsync(Stream gxl, string name, CancellationToke
                                     StartNode();
                                     break;
                                 case State.InEdge:
+                                    if (!firstEdgeRead)
+                                    {
+                                       firstEdgeRead = true;
+                                       changePercentage?.Invoke(0.5f);
+                                    }
                                     StartEdge();
                                     break;
                                 case State.InType:
@@ -402,6 +412,7 @@ public virtual async UniTask LoadAsync(Stream gxl, string name, CancellationToke
             {
                 Reader.Close();
                 await UniTask.SwitchToMainThread();
+                changePercentage?.Invoke(1.0f);
             }
 
             if (Context.Count > 0)

Assets/SEE/DataModel/DG/IO/GraphReader.cs

@@ -47,13 +47,16 @@ public GraphReader(HashSet<string> hierarchicalEdgeTypes, string basePath, strin
         /// <param name="path">path of the GXL data</param>
         /// <param name="hierarchicalEdgeTypes">edge types forming the node hierarchy</param>
         /// <param name="basePath">the base path of the graph</param>
+        /// <param name="changePercentage">to report progress</param>
         /// <param name="token">token with which the loading can be cancelled</param>
         /// <param name="logger">logger to log the output</param>
         /// <returns>loaded graph</returns>
-        public static async UniTask<Graph> LoadAsync(DataPath path, HashSet<string> hierarchicalEdgeTypes, string basePath,                                                       CancellationToken token = default, Utils.ILogger logger = null)
+        public static async UniTask<Graph> LoadAsync(DataPath path, HashSet<string> hierarchicalEdgeTypes, string basePath,
+                                                     Action<float> changePercentage = null, CancellationToken token = default,
+                                                     Utils.ILogger logger = null)
         {
             GraphReader graphReader = new(hierarchicalEdgeTypes, basePath, logger: logger);
-            await graphReader.LoadAsync(await path.LoadAsync(), path.Path, token);
+            await graphReader.LoadAsync(await path.LoadAsync(), path.Path, changePercentage, token);
             return graphReader.GetGraph();
         }
 
@@ -75,10 +78,13 @@ public static async UniTask<Graph> LoadAsync(DataPath path, HashSet<string> hier
         /// </summary>
         /// <param name="gxl">Stream containing GXL data that shall be processed</param>
         /// <param name="name">Name of the GXL data stream. Only used for display purposes in log messages</param>
+        /// <param name="changePercentage">to report progress</param>
         /// <param name="token">token with which the loading can be cancelled</param>
-        public override async UniTask LoadAsync(Stream gxl, string name = "[unknown]", CancellationToken token = default)
+        public override async UniTask LoadAsync(Stream gxl, string name = "[unknown]",
+                                                Action<float> changePercentage = null,
+                                                CancellationToken token = default)
         {
-            await base.LoadAsync(gxl, name, token);
+            await base.LoadAsync(gxl, name, changePercentage, token);
             graph.BasePath = basePath;
             if (!string.IsNullOrWhiteSpace(rootName))
             {

Assets/SEE/DataModel/DG/Node.cs

@@ -1,7 +1,6 @@
 using SEE.Tools.ReflexionAnalysis;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 
 namespace SEE.DataModel.DG

Assets/SEE/Game/City/AbstractSEECity.cs

@@ -4,7 +4,6 @@
 using Sirenix.Serialization;
 using SEE.DataModel.DG;
 using SEE.GO;
-using SEE.Layout.NodeLayouts.Cose;
 using SEE.Utils;
 using Sirenix.OdinInspector;
 using UnityEngine;
@@ -264,13 +263,6 @@ public ColorRange GetColorForMetric(string metricName)
         [Tooltip("Settings for the selection of edges."), TabGroup(EdgeFoldoutGroup), RuntimeTab(EdgeFoldoutGroup)]
         public EdgeSelectionAttributes EdgeSelectionSettings = new();
 
-        /// <summary>
-        /// The cose graph settings.
-        /// </summary>
-        [HideInInspector]
-        [Obsolete]
-        public CoseGraphAttributes CoseGraphSettings = new(); // FIXME put into CitySettings.cs
-
         /// <summary>
         /// The metrics for the visualization of erosions.
         /// </summary>
@@ -697,50 +689,6 @@ protected static void DumpNodeMetrics(ICollection<Graph> graphs)
             }
         }
 
-        /// <summary>
-        /// Saves all data needed for the listing of the dirs in gui in cosegraphSettings
-        /// </summary>
-        /// <param name="graph"></param>
-        [Obsolete]
-        public void SetupCompoundSpringEmbedder(Graph graph)
-        {
-            if (NodeLayoutSettings.Kind == NodeLayoutKind.CompoundSpringEmbedder)
-            {
-                Dictionary<string, bool> dirs = CoseGraphSettings.ListInnerNodeToggle;
-                // the new directories
-                Dictionary<string, bool> dirsLocal = new();
-
-                Dictionary<string, NodeLayoutKind> dirsLayout = new();
-                Dictionary<string, NodeShapes> dirsShape = new();
-
-                foreach (Node node in graph.Nodes())
-                {
-                    if (!node.IsLeaf())
-                    {
-                        dirsShape.Add(node.ID, NodeTypes[node.Type].Shape);
-                        dirsLocal.Add(node.ID, false);
-                        dirsLayout.Add(node.ID, NodeLayoutSettings.Kind);
-                    }
-                }
-
-                // if the key isn't in the old dictionaries
-                //dirsLocal = dirsLocal.Where(i => !dirs.ContainsKey(i.Key)).ToDictionary(i => i.Key, i => i.Value);
-
-                bool diff1 = dirs.Keys.Except(dirsLocal.Keys).Any();
-                bool diff2 = dirsLocal.Keys.Except(dirs.Keys).Any();
-
-                if (dirs.Count != dirsLocal.Count || diff1 || diff2)
-                {
-                    CoseGraphSettings.InnerNodeShape = dirsShape;
-                    CoseGraphSettings.InnerNodeLayout = dirsLayout;
-                    CoseGraphSettings.ListInnerNodeToggle = dirsLocal;
-                }
-
-                CoseGraphSettings.LoadedForNodeTypes = NodeTypes.Where(type => type.Value.IsRelevant)
-                                                                .ToDictionary(kvp => kvp.Key, kvp => kvp.Value.IsRelevant);
-            }
-        }
-
         /// <summary>
         /// Adds the initial root node type to the <see cref="NodeTypes"/>.
         /// By default it is assigned the royal blue color and <see cref="ShowNames"/> is false.