resolving conflicts, testing and small tweaks

- merged dev into branch - added "type" parameter to group proxies for sections in order to distinguish between frame sections and shell sections
specklesystems · Jan 22, 2025 · c3a362e · c3a362e
1 parent 892954b
commit c3a362e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiDocumentModelStore.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiDocumentModelStore.cs
@@ -32,7 +32,7 @@ ICsiApplicationService csiApplicationService
     LoadState();
   }
 
-  private void SetPaths() // TODO: Event vent aggregator issues
+  private void SetPaths()
   {
     ModelPathHash = Crypt.Md5(_csiApplicationService.SapModel.GetModelFilepath(), length: 32);
     HostAppUserDataPath = Path.Combine(

diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/MaterialUnpacker.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/MaterialUnpacker.cs
@@ -42,7 +42,7 @@ public IEnumerable<IProxyCollection> UnpackMaterials()
           name = materialName,
           applicationId = materialName,
           objects = sectionIds,
-          ["Properties"] = properties
+          ["properties"] = properties
         };
 
       yield return materialProxy;

diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/ServiceRegistration.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/ServiceRegistration.cs
@@ -18,7 +18,7 @@
 
 namespace Speckle.Connectors.CSiShared;
 
-public static class ServiceRegistration // TODO: Fix in light of events
+public static class ServiceRegistration
 {
   public static IServiceCollection AddCsi(this IServiceCollection services)
   {

diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSectionUnpacker.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSectionUnpacker.cs
@@ -66,7 +66,8 @@ private IEnumerable<GroupProxy> UnpackFrameSections()
           name = sectionName,
           applicationId = sectionName,
           objects = frameIds,
-          ["Properties"] = properties // openings will just have an empty dict here
+          ["type"] = "Frame Section", // since sectionProxies are a flat list, need some way to distinguish from shell
+          ["properties"] = properties // openings will just have an empty dict here
         };
 
       yield return sectionProxy;
@@ -99,7 +100,8 @@ private IEnumerable<GroupProxy> UnpackShellSections()
           name = sectionName,
           applicationId = sectionName,
           objects = frameIds,
-          ["Properties"] = properties // openings will just have an empty dict here
+          ["type"] = "Shell Section", // since sectionProxies are a flat list, need some way to distinguish from frame
+          ["properties"] = properties // openings will just have an empty dict here
         };
 
       yield return sectionProxy;