feature(Navisworks): Enhance Selection Handling and Hierarchy Population

ConnectorNavisworks/ConnectorNavisworks/Bindings/ConnectorNavisworksBindings.Events.cs

@@ -3,7 +3,6 @@
 using Autodesk.Navisworks.Api;
 using DesktopUI2.Models;
 using DesktopUI2.ViewModels;
-using static Speckle.ConnectorNavisworks.Utilities;
 
 namespace Speckle.ConnectorNavisworks.Bindings;
 
@@ -29,30 +28,21 @@ private void SetsChangedEvent(object sender, EventArgs e)
   // This will happen automatically if a document is newly created or opened.
   private void DocumentChangedEvent(object sender, EventArgs e)
   {
-    var doc = sender as Document;
-
-    try
+    // As ConnectorNavisworks is Send only, There is little use for a new empty document.
+    if (sender is not Document doc || doc.IsClear)
     {
-      // As ConnectorNavisworks is Send only, There is little use for a new empty document.
-      if (doc == null || doc.IsClear)
-      {
-        UpdateSavedStreams?.Invoke(new List<StreamState>());
-        MainViewModel.GoHome();
-        return;
-      }
+      UpdateSavedStreams?.Invoke(new List<StreamState>());
+      MainViewModel.GoHome();
+      return;
+    }
 
-      var streams = GetStreamsInFile();
-      UpdateSavedStreams?.Invoke(streams);
+    var streams = GetStreamsInFile();
+    UpdateSavedStreams?.Invoke(streams);
 
-      UpdateSelectedStream?.Invoke();
+    UpdateSelectedStream?.Invoke();
 
-      MainViewModel.GoHome();
+    MainViewModel.GoHome();
 
-      _navisworksConverter.SetContextDocument(doc);
-    }
-    catch (Exception ex)
-    {
-      ErrorLog($"Something went wrong: {ex.Message}");
-    }
+    _navisworksConverter.SetContextDocument(doc);
   }
 }

ConnectorNavisworks/ConnectorNavisworks/Bindings/ConnectorNavisworksBindings.Filters.cs

@@ -128,7 +128,7 @@ private static TreeNode GetViews(SavedItem savedItem)
       // TODO: This is a defensive measure to prevent sending millions of objects that are hidden in the
       // current view but not hidden explicitly in the saved view. Optionally if this is not the case we could send visible items in the
       // current view with the viewpoint as it is saved.
-      case false when !((SavedViewpoint)savedItem).ContainsVisibilityOverrides:
+      case false when savedItem is SavedViewpoint { ContainsVisibilityOverrides: false }:
         return null;
       case false:
         return treeNode;

ConnectorNavisworks/ConnectorNavisworks/Bindings/ConnectorNavisworksBindings.Selections.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Autodesk.Navisworks.Api;
-using static Speckle.ConnectorNavisworks.Utilities;
+using Speckle.ConnectorNavisworks.Other;
 using Application = Autodesk.Navisworks.Api.Application;
 using Cursor = System.Windows.Forms.Cursor;
 
@@ -27,21 +27,14 @@ public override List<string> GetSelectedObjects()
     // Storing as a Set for consistency with the converter's handling of fragments and paths.
     var selectedObjects = new HashSet<string>();
 
-    var selectedItems = appSelectedItems;
-    var visible = selectedItems.Where(IsElementVisible);
-    //.SelectMany(x=>x.DescendantsAndSelf)
+    var visible = appSelectedItems.Where(IsElementVisible);
     var visibleItems = visible.ToList();
-    var ids = visibleItems.Select(GetPseudoId).Where(x => x != null);
+    var ids = visibleItems.Select(i => new Element().GetElement(i).PseudoId).Where(x => x != null);
 
     selectedObjects.UnionWith(ids);
 
     Cursor.Current = Cursors.Default;
 
-    if (visibleItems.Any() && selectedObjects.Count == 0)
-    {
-      // Handle Root Node Selection
-    }
-
     return selectedObjects.ToList();
   }