Back merge dev -> main (#3611)

specklesystems · Aug 8, 2024 · 149d35e · 149d35e
2 parents b65c3fa + 0ec1f10
commit 149d35e
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 1 deletion.
diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateCommand.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateCommand.cpp
@@ -4,6 +4,7 @@
 #include "CreateCommand.hpp"
 #include "LibpartImportManager.hpp"
 #include "ClassificationImportManager.hpp"
+#include "APIHelper.hpp"
 #include "FieldNames.hpp"
 #include "OnExit.hpp"
 #include "ExchangeManager.hpp"
@@ -123,6 +124,8 @@ GS::ObjectState CreateCommand::Execute (const GS::ObjectState& parameters, GS::P
 	parameters.Get (GetFieldName (), objectStates);
 
 	ACAPI_CallUndoableCommand (GetUndoableCommandName (), [&] () -> GSErrCode {
+		LibraryHelper helper (false);
+
 		GS::Array<GS::ObjectState> applicationObjects;
 
 		AttributeManager* attributeManager = AttributeManager::GetInstance ();

diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateDoor.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateDoor.cpp
@@ -6,6 +6,7 @@
 #include "RealNumber.h"
 #include "DGModule.hpp"
 #include "LibpartImportManager.hpp"
+#include "APIHelper.hpp"
 #include "FieldNames.hpp"
 #include "OnExit.hpp"
 #include "ExchangeManager.hpp"

diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateGridElement.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateGridElement.cpp
@@ -1,6 +1,7 @@
 #include "CreateGridElement.hpp"
 #include "ResourceIds.hpp"
 #include "ObjectState.hpp"
+#include "APIHelper.hpp"
 #include "Utility.hpp"
 #include "Objects/Level.hpp"
 #include "Objects/Point.hpp"

diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateObject.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateObject.cpp
@@ -1,6 +1,7 @@
 #include "CreateObject.hpp"
 
 #include "APIMigrationHelper.hpp"
+#include "APIHelper.hpp"
 #include "LibpartImportManager.hpp"
 #include "ResourceIds.hpp"
 #include "Utility.hpp"
@@ -130,6 +131,8 @@ GS::ObjectState CreateObject::Execute (const GS::ObjectState& parameters, GS::Pr
 	parameters.Get (FieldNames::MeshModels, meshModels);
 
 	ACAPI_CallUndoableCommand (GetUndoableCommandName (), [&] () -> GSErrCode {
+		LibraryHelper helper (false);
+
 		AttributeManager* attributeManager = AttributeManager::GetInstance ();
 		LibpartImportManager* libpartImportManager = LibpartImportManager::GetInstance ();
 		for (ModelInfo meshModel : meshModels) {

diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateSkylight.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateSkylight.cpp
@@ -7,6 +7,7 @@
 #include "RealNumber.h"
 #include "DGModule.hpp"
 #include "LibpartImportManager.hpp"
+#include "APIHelper.hpp"
 #include "FieldNames.hpp"
 #include "OnExit.hpp"
 #include "ExchangeManager.hpp"

diff --git a/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWindow.cpp b/ConnectorArchicad/AddOn/Sources/AddOn/Commands/CreateWindow.cpp
@@ -7,6 +7,7 @@
 #include "RealNumber.h"
 #include "DGModule.hpp"
 #include "LibpartImportManager.hpp"
+#include "APIHelper.hpp"
 #include "FieldNames.hpp"
 #include "OnExit.hpp"
 #include "ExchangeManager.hpp"

diff --git a/ConnectorNavisworks/ConnectorNavisworks/Other/SelectionBuilder.cs b/ConnectorNavisworks/ConnectorNavisworks/Other/SelectionBuilder.cs
@@ -288,7 +288,12 @@ private HashSet<ModelItem> GetObjectsFromSavedSets()
 
     // Saved Sets filter stores Guids of the selection sets. This can be converted to ModelItem pseudoIds
     var selections = _filter.Selection.Select(guid => new Guid(guid)).ToList();
-    var savedItems = selections.Select(Application.ActiveDocument.SelectionSets.ResolveGuid).OfType<SelectionSet>();
+
+    // Resolve the saved items and extract the inner selection sets when folder items are encountered
+    var savedItems = selections
+      .Select(guid => Application.ActiveDocument.SelectionSets.ResolveGuid(guid))
+      .SelectMany(ExtractSelectionSets)
+      .ToList();
 
     foreach (var item in savedItems)
     {
@@ -308,6 +313,45 @@ private HashSet<ModelItem> GetObjectsFromSavedSets()
     return _uniqueModelItems;
   }
 
+  /// <summary>
+  /// Recursively extracts SelectionSet objects from the given item.
+  /// </summary>
+  /// <param name="selection">The object to extract SelectionSets from. Can be a SelectionSet, FolderItem, or any other object.</param>
+  /// <returns>An IEnumerable of SelectionSet objects extracted from the item and its children (if applicable).</returns>
+  /// <exception cref="ArgumentNullException">Thrown if the input item is null.</exception>
+  static IEnumerable<SelectionSet> ExtractSelectionSets(object selection)
+  {
+    if (selection == null)
+    {
+      throw new ArgumentNullException(nameof(selection), "Input item cannot be null.");
+    }
+
+    switch (selection)
+    {
+      case SelectionSet selectionSet:
+        yield return selectionSet;
+        break;
+      case FolderItem folderItem:
+        if (folderItem.Children == null)
+        {
+          yield break;
+        }
+        foreach (var childItem in folderItem.Children)
+        {
+          if (childItem == null)
+          {
+            continue;
+          }
+
+          foreach (var extractedSet in ExtractSelectionSets(childItem))
+          {
+            yield return extractedSet;
+          }
+        }
+        break;
+    }
+  }
+
   /// <summary>
   /// Populates the hierarchy by adding ancestor and descendant items to the unique model items.
   /// The unique model items have already been processed to validate that they are not hidden.