use develop branch of ActiveLib

Set model card ID in projectCollection object at start of Send

.config/dotnet-tools.json

@@ -0,0 +1,11 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "gitversion.tool": {
+      "version": "6.0.2",
+      "commands": ["dotnet-gitversion"],
+      "rollForward": false
+    }
+  }
+}

.github/workflows/build.yml

@@ -0,0 +1,91 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: MSBuild
+
+on:
+  push:
+    branches: ["main", "develop", "release/*", "alan/*"] # Continuous delivery on every long-lived branch
+    tags: ["v3.*"] # Manual delivery on every 3.x tag
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+    outputs:
+      version: ${{ steps.set-version.outputs.version }}
+      file_version: ${{ steps.set-info-version.outputs.file_version }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: speckle-cpp-connectors
+          fetch-depth: 0
+      - uses: actions/checkout@v4
+        with:
+          repository: r-wessel/ActiveLib
+          path: ActiveLib
+          ref: develop
+
+      - name: Download zip file
+        run: |
+          New-Item -ItemType Directory -Path "Archicad 27" -Force
+          Invoke-WebRequest -Uri "https://github.com/GRAPHISOFT/archicad-api-devkit/releases/download/27.3001/API.Development.Kit.WIN.27.3001.zip" -OutFile "file.zip"
+
+      - name: Extract zip file to Archicad 27 folder
+        run: |
+          Add-Type -AssemblyName System.IO.Compression.FileSystem
+          [System.IO.Compression.ZipFile]::ExtractToDirectory("file.zip", "Archicad 27")
+
+      - name: Add MSBuild to PATH
+        uses: microsoft/setup-msbuild@v2
+
+      - name: ⚒️ Run GitVersion
+        working-directory: speckle-cpp-connectors
+        run: ./build.ps1 build-server-version
+
+      - name: Build
+        working-directory: speckle-cpp-connectors
+        run: ./build.ps1
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: output-${{ env.GitVersion_FullSemVer }}
+          path: speckle-cpp-connectors/output/*.zip
+          retention-days: 1
+
+      - id: set-version
+        name: Set version to output
+        run: echo "version=${{ env.GitVersion_FullSemVer }}" >> "$Env:GITHUB_OUTPUT"
+
+      - id: set-info-version
+        name: Set file version to output
+        run: echo "file_version=${{ env.GitVersion_AssemblySemVer}}" >> "$Env:GITHUB_OUTPUT" # version will be retrieved from tag?
+  deploy-installers:
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      IS_TAG_BUILD: ${{ github.ref_type == 'tag' }}
+      IS_RELEASE_BRANCH: true
+    steps:
+      - name: 🔫 Trigger Build Installers
+        uses: ALEEF02/workflow-dispatch@v3.0.0
+        continue-on-error: true
+        with:
+          workflow: build-cpp-installers
+          repo: specklesystems/connector-installers
+          token: ${{ secrets.CONNECTORS_GH_TOKEN }}
+          inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build.outputs.version }}", "file_version": "${{needs.build.outputs.file_version}}", "public_release": ${{ env.IS_TAG_BUILD }}, "store_artifacts": ${{ env.IS_RELEASE_BRANCH }} }'
+          ref: main
+          wait-for-completion: true
+          wait-for-completion-interval: 10s
+          wait-for-completion-timeout: 10m
+          display-workflow-run-url: true
+          display-workflow-run-url-interval: 10s
+
+      - uses: geekyeggo/delete-artifact@v5
+        with:
+          name: output-*

.gitignore

@@ -3,6 +3,7 @@ build/
 Documents/
 ResourceObjects/
 Install/
+enc_temp_folder/
 .vs/
 .vscode/
 xcuserdata/
@@ -25,4 +26,7 @@ XCBuildData/
 *.log
 .idea
 *.mui
-*.aps
+*.aps
+**/obj
+**/bin
+output/

GitVersion.yml

@@ -0,0 +1,6 @@
+workflow: GitFlow/v1
+next-version: 3.0.0
+branches:
+  release:
+    prevent-increment:
+      when-current-commit-tagged: true

SpeckleConnector/Connector.sln

@@ -13,6 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActiveLib17", "..\..\Active
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeckleLib17", "..\SpeckleLib\SpeckleLib17.vcxproj", "{942743B7-B3CB-4F91-BE46-28937F5E3FD1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build", "..\ci-build\Build.csproj", "{702DE13A-1CCF-485D-A50D-846F645F07D3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug16|x64 = Debug16|x64
@@ -143,6 +145,40 @@ Global
 		{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x64.Build.0 = ReleaseAC27|x64
 		{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x86.ActiveCfg = ReleaseAC27|Win32
 		{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x86.Build.0 = ReleaseAC27|Win32
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Debug16|x64.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Debug16|x64.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Debug16|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Debug16|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Debug17|x64.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Debug17|x64.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Debug17|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Debug17|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC27|x64.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC27|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC27|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugVS2022|x64.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugVS2022|x64.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugVS2022|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugVS2022|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Release16|x64.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Release16|x64.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Release16|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Release16|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Release17|x64.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Release17|x64.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Release17|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.Release17|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC27|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC27|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseVS2019|x64.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseVS2019|x64.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseVS2019|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseVS2019|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseVS2022|x64.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseVS2022|x64.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseVS2022|x86.ActiveCfg = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseVS2022|x86.Build.0 = Debug|Any CPU
+		{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC27|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

SpeckleConnector/Connector.vcxproj

@@ -94,6 +94,7 @@
   <ItemGroup>
     <ClCompile Include="Connector\Connector.cpp" />
     <ClCompile Include="Connector\Database\ModelCardDatabase.cpp" />
+    <ClCompile Include="Connector\Environment\ConnectorProject.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Account\AccountBridge.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Account\GetAccounts.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Base\AddModel.cpp" />
@@ -105,6 +106,8 @@
     <ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationName.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationVersion.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Base\HighlightModel.cpp" />
+    <ClCompile Include="Connector\Interface\Browser\Bridge\Base\HighlightObjects.cpp" />
+    <ClCompile Include="Connector\Interface\Browser\Bridge\Base\OpenUrl.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Base\RemoveModel.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Base\UpdateModel.cpp" />
     <ClCompile Include="Connector\Interface\Browser\Bridge\Config\Arg\ConnectorConfig.cpp" />
@@ -149,6 +152,7 @@
     <ClInclude Include="Connector\ConnectorResource.h" />
     <ClInclude Include="Connector\Database\Identity\RecordID.h" />
     <ClInclude Include="Connector\Database\ModelCardDatabase.h" />
+    <ClInclude Include="Connector\Environment\ConnectorProject.h" />
     <ClInclude Include="Connector\Event\ConnectorEventID.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Account\AccountBridge.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Account\GetAccounts.h" />
@@ -161,6 +165,8 @@
     <ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationName.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationVersion.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Base\HighlightModel.h" />
+    <ClInclude Include="Connector\Interface\Browser\Bridge\Base\HighlightObjects.h" />
+    <ClInclude Include="Connector\Interface\Browser\Bridge\Base\OpenUrl.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Base\RemoveModel.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Base\UpdateModel.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Config\Arg\ConnectorConfig.h" />
@@ -172,6 +178,7 @@
     <ClInclude Include="Connector\Interface\Browser\Bridge\Selection\GetSelection.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Selection\SelectionBridge.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\ConversionResult.h" />
+    <ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendConversionResult.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendError.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendObject.h" />
     <ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendViaBrowserArgs.h" />

SpeckleConnector/Connector.vcxproj.filters

@@ -71,6 +71,9 @@
     <Filter Include="Connector\Interface\Browser\Bridge\Selection\Arg">
       <UniqueIdentifier>{8bb3df60-affe-4b66-8d78-f1b98e6ba8df}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Connector\Environment">
+      <UniqueIdentifier>{1d9a10c3-cac6-4b15-afb9-f117b99b3a24}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="RFIX.win\Connector.rc2">
@@ -246,6 +249,15 @@
     <ClCompile Include="Connector\Interface\Browser\Bridge\Base\HighlightModel.cpp">
       <Filter>Connector\Interface\Browser\Bridge\Base</Filter>
     </ClCompile>
+    <ClCompile Include="Connector\Interface\Browser\Bridge\Base\OpenUrl.cpp">
+      <Filter>Connector\Interface\Browser\Bridge\Base</Filter>
+    </ClCompile>
+    <ClCompile Include="Connector\Environment\ConnectorProject.cpp">
+      <Filter>Connector\Environment</Filter>
+    </ClCompile>
+    <ClCompile Include="Connector\Interface\Browser\Bridge\Base\HighlightObjects.cpp">
+      <Filter>Connector\Interface\Browser\Bridge\Base</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Connector\ConnectorResource.h">
@@ -417,5 +429,17 @@
     <ClInclude Include="Connector\Interface\Browser\Bridge\Base\HighlightModel.h">
       <Filter>Connector\Interface\Browser\Bridge\Base</Filter>
     </ClInclude>
+    <ClInclude Include="Connector\Interface\Browser\Bridge\Base\OpenUrl.h">
+      <Filter>Connector\Interface\Browser\Bridge\Base</Filter>
+    </ClInclude>
+    <ClInclude Include="Connector\Environment\ConnectorProject.h">
+      <Filter>Connector\Environment</Filter>
+    </ClInclude>
+    <ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendConversionResult.h">
+      <Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
+    </ClInclude>
+    <ClInclude Include="Connector\Interface\Browser\Bridge\Base\HighlightObjects.h">
+      <Filter>Connector\Interface\Browser\Bridge\Base</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

SpeckleConnector/Connector.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 
 /* Begin PBXBuildFile section */
 		210CC8832C80E6A300610F58 /* TriggerEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 210CC8812C80E6A300610F58 /* TriggerEvent.cpp */; };
+		21384BCD2CD2EE7400D4602B /* OpenUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21384BC92CD2EE7400D4602B /* OpenUrl.cpp */; };
 		213CC39C2B1101F500088049 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2151077C2AEDB9070022CD24 /* Cocoa.framework */; };
 		214B7A372C764BCD00D586C1 /* UpdateConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21F69FBD2C7630B3008B6A06 /* UpdateConfig.cpp */; };
 		215F082A2C947F4400CD343B /* CardMover.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 215F08262C947F4400CD343B /* CardMover.cpp */; };
@@ -30,8 +31,11 @@
 		215F08372C95808B00CD343B /* ReceiverModelCard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 215F08362C95808B00CD343B /* ReceiverModelCard.cpp */; };
 		215F08462C9633A800CD343B /* EverythingSendFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 215F08452C9633A800CD343B /* EverythingSendFilter.cpp */; };
 		2192460D2CA3469D00CF5703 /* ProjectCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2192460B2CA3469D00CF5703 /* ProjectCollection.cpp */; };
+		2199BB552CDA4B1700A4BEEC /* ConnectorProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2199BB522CDA4B1700A4BEEC /* ConnectorProject.cpp */; };
+		2199BB7E2CDD3FA800A4BEEC /* HighlightObjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2199BB7C2CDD3FA800A4BEEC /* HighlightObjects.cpp */; };
 		219F30422C769283009834E9 /* ConfigTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 219F30402C769282009834E9 /* ConfigTests.cpp */; };
 		21A0FB982CB723240023F24E /* FinishProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A0FB942CB723240023F24E /* FinishProxy.cpp */; };
+		21A79EC92CCDA45C001754E4 /* HighlightModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A79EC52CCDA45C001754E4 /* HighlightModel.cpp */; };
 		21A890BC2CC15C540087E732 /* SelectionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A890B22CC15C540087E732 /* SelectionInfo.cpp */; };
 		21A890BD2CC15C540087E732 /* GetSelection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A890B52CC15C540087E732 /* GetSelection.cpp */; };
 		21A890BE2CC15C540087E732 /* SelectionBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A890B72CC15C540087E732 /* SelectionBridge.cpp */; };
@@ -295,6 +299,8 @@
 /* Begin PBXFileReference section */
 		210CC8812C80E6A300610F58 /* TriggerEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriggerEvent.cpp; sourceTree = "<group>"; };
 		210CC8822C80E6A300610F58 /* TriggerEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerEvent.h; sourceTree = "<group>"; };
+		21384BC92CD2EE7400D4602B /* OpenUrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpenUrl.cpp; sourceTree = "<group>"; };
+		21384BCC2CD2EE7400D4602B /* OpenUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenUrl.h; sourceTree = "<group>"; };
 		213CC3A52B1101F500088049 /* Speckle Connector.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Speckle Connector.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2151077C2AEDB9070022CD24 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		215F08262C947F4400CD343B /* CardMover.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CardMover.cpp; sourceTree = "<group>"; };
@@ -312,11 +318,20 @@
 		2192460B2CA3469D00CF5703 /* ProjectCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectCollection.cpp; sourceTree = "<group>"; };
 		2192460C2CA3469D00CF5703 /* ProjectCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectCollection.h; sourceTree = "<group>"; };
 		219388682C4E5DE2002A0180 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		2199BB512CDA481A00A4BEEC /* ConnectorFix.grc */ = {isa = PBXFileReference; lastKnownFileType = text; name = ConnectorFix.grc; path = RFIX/ConnectorFix.grc; sourceTree = "<group>"; };
+		2199BB522CDA4B1700A4BEEC /* ConnectorProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConnectorProject.cpp; sourceTree = "<group>"; };
+		2199BB532CDA4B1700A4BEEC /* ConnectorProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConnectorProject.h; sourceTree = "<group>"; };
+		2199BB5C2CDA93CE00A4BEEC /* ConnectorImagesFix.grc */ = {isa = PBXFileReference; lastKnownFileType = text; name = ConnectorImagesFix.grc; path = RFIX/ConnectorImagesFix.grc; sourceTree = "<group>"; };
+		2199BB792CDCEA3900A4BEEC /* SendConversionResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SendConversionResult.h; sourceTree = "<group>"; };
+		2199BB7C2CDD3FA800A4BEEC /* HighlightObjects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HighlightObjects.cpp; sourceTree = "<group>"; };
+		2199BB7D2CDD3FA800A4BEEC /* HighlightObjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HighlightObjects.h; sourceTree = "<group>"; };
 		219F30352C768F0A009834E9 /* Connector-AC27-Test.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Connector-AC27-Test.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
 		219F30402C769282009834E9 /* ConfigTests.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = ConfigTests.cpp; sourceTree = "<group>"; };
 		219F30432C7693B6009834E9 /* Connector-AC27-Debug.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Connector-AC27-Debug.xctestplan"; sourceTree = SOURCE_ROOT; };
 		21A0FB942CB723240023F24E /* FinishProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FinishProxy.cpp; sourceTree = "<group>"; };
 		21A0FB972CB723240023F24E /* FinishProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FinishProxy.h; sourceTree = "<group>"; };
+		21A79EC52CCDA45C001754E4 /* HighlightModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HighlightModel.cpp; sourceTree = "<group>"; };
+		21A79EC82CCDA45C001754E4 /* HighlightModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HighlightModel.h; sourceTree = "<group>"; };
 		21A890B22CC15C540087E732 /* SelectionInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectionInfo.cpp; sourceTree = "<group>"; };
 		21A890B32CC15C540087E732 /* SelectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionInfo.h; sourceTree = "<group>"; };
 		21A890B52CC15C540087E732 /* GetSelection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GetSelection.cpp; sourceTree = "<group>"; };
@@ -542,7 +557,6 @@
 		21D1E9AC2BF14AF200957EAA /* TeamworkProductVersion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TeamworkProductVersion.framework; path = "../Archicad 27/Support/Frameworks/TeamworkProductVersion.framework"; sourceTree = "<group>"; };
 		21D1EA452BF14B0700957EAA /* VWMM.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VWMM.framework; path = "../Vectorworks 2024/SDKLib/LibMac/Release/VWMM.framework"; sourceTree = "<group>"; };
 		21D1EA4A2BF14BBC00957EAA /* Connector.grc */ = {isa = PBXFileReference; lastKnownFileType = text; name = Connector.grc; path = RINT/Connector.grc; sourceTree = "<group>"; };
-		21D1EA4B2BF14BC700957EAA /* ConnectorFix.grc */ = {isa = PBXFileReference; lastKnownFileType = text; name = ConnectorFix.grc; path = RFIX/ConnectorFix.grc; sourceTree = "<group>"; };
 		21D1EA4C2BF14BF000957EAA /* Module-Info27.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Module-Info27.plist"; path = "RINT.Archicad/EN-GB/Module-Info27.plist"; sourceTree = "<group>"; };
 		21F69EC62C64C035008B6A06 /* SpeckleLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SpeckleLib.xcodeproj; path = ../SpeckleLib/SpeckleLib.xcodeproj; sourceTree = "<group>"; };
 		21F69EDB2C64ED10008B6A06 /* ConnectorMenu.grc */ = {isa = PBXFileReference; lastKnownFileType = text; name = ConnectorMenu.grc; path = RINT/ConnectorMenu.grc; sourceTree = "<group>"; };
@@ -962,6 +976,24 @@
 			path = Identity;
 			sourceTree = "<group>";
 		};
+		2199BB4E2CDA47F900A4BEEC /* Fixed */ = {
+			isa = PBXGroup;
+			children = (
+				2199BB512CDA481A00A4BEEC /* ConnectorFix.grc */,
+				2199BB5C2CDA93CE00A4BEEC /* ConnectorImagesFix.grc */,
+			);
+			name = Fixed;
+			sourceTree = "<group>";
+		};
+		2199BB542CDA4B1700A4BEEC /* Environment */ = {
+			isa = PBXGroup;
+			children = (
+				2199BB522CDA4B1700A4BEEC /* ConnectorProject.cpp */,
+				2199BB532CDA4B1700A4BEEC /* ConnectorProject.h */,
+			);
+			path = Environment;
+			sourceTree = "<group>";
+		};
 		219F30412C769282009834E9 /* ConnectorTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -998,6 +1030,7 @@
 			children = (
 				21AEF9F92CAC3897000B8681 /* ConversionResult.cpp */,
 				21AEF9F82CAC3897000B8681 /* ConversionResult.h */,
+				2199BB792CDCEA3900A4BEEC /* SendConversionResult.h */,
 				21AEF9E32CAB56E5000B8681 /* SendError.cpp */,
 				21AEF9E42CAB56E5000B8681 /* SendError.h */,
 				21AEF9EE2CAB5720000B8681 /* SendObject.cpp */,
@@ -1026,6 +1059,12 @@
 				21B67CA82C77329800FD64FC /* GetSourceApplicationName.h */,
 				21B67CA92C77329800FD64FC /* GetSourceApplicationVersion.cpp */,
 				21B67CAA2C77329800FD64FC /* GetSourceApplicationVersion.h */,
+				21A79EC52CCDA45C001754E4 /* HighlightModel.cpp */,
+				21A79EC82CCDA45C001754E4 /* HighlightModel.h */,
+				2199BB7C2CDD3FA800A4BEEC /* HighlightObjects.cpp */,
+				2199BB7D2CDD3FA800A4BEEC /* HighlightObjects.h */,
+				21384BC92CD2EE7400D4602B /* OpenUrl.cpp */,
+				21384BCC2CD2EE7400D4602B /* OpenUrl.h */,
 				21D0BDD52C935DAE0077E104 /* RemoveModel.cpp */,
 				21D0BDD62C935DAE0077E104 /* RemoveModel.h */,
 				21D0BDD22C935D1A0077E104 /* UpdateModel.cpp */,
@@ -1153,7 +1192,6 @@
 			isa = PBXGroup;
 			children = (
 				21D1EA4A2BF14BBC00957EAA /* Connector.grc */,
-				21D1EA4B2BF14BC700957EAA /* ConnectorFix.grc */,
 				21F69EDB2C64ED10008B6A06 /* ConnectorMenu.grc */,
 				21D1EA4C2BF14BF000957EAA /* Module-Info27.plist */,
 				21F69EFE2C66AD55008B6A06 /* SpecklePalette.grc */,
@@ -1206,6 +1244,7 @@
 				21B67CCD2C77694500FD64FC /* Connector.h */,
 				21F69F102C677BC0008B6A06 /* ConnectorResource.h */,
 				21B67CCB2C77670400FD64FC /* Database */,
+				2199BB542CDA4B1700A4BEEC /* Environment */,
 				21F69F092C677BC0008B6A06 /* Event */,
 				21F69F0E2C677BC0008B6A06 /* Interface */,
 				21D0BDD82C9387E60077E104 /* Record */,
@@ -1286,6 +1325,7 @@
 		81494D9D09DA5892006864FB /* Resource */ = {
 			isa = PBXGroup;
 			children = (
+				2199BB4E2CDA47F900A4BEEC /* Fixed */,
 				7EA5F91E157FA18400693CEA /* EN-GB */,
 			);
 			name = Resource;
@@ -1495,6 +1535,7 @@
 				21B67CAE2C77329800FD64FC /* GetSourceApplicationVersion.cpp in Sources */,
 				21A0FB982CB723240023F24E /* FinishProxy.cpp in Sources */,
 				21B67CC32C77649F00FD64FC /* GetDocumentState.cpp in Sources */,
+				2199BB7E2CDD3FA800A4BEEC /* HighlightObjects.cpp in Sources */,
 				21D0BD602C89BFEA0077E104 /* SendBridge.cpp in Sources */,
 				21D0BD972C8F13F30077E104 /* GetSendFilters.cpp in Sources */,
 				21B67CAC2C77329800FD64FC /* BaseBridge.cpp in Sources */,
@@ -1508,6 +1549,7 @@
 				214B7A372C764BCD00D586C1 /* UpdateConfig.cpp in Sources */,
 				21AEF9EC2CAB56E5000B8681 /* SendViaBrowserArgs.cpp in Sources */,
 				21FF70492CA1A7F400AAD99A /* RecordCollection.cpp in Sources */,
+				21A79EC92CCDA45C001754E4 /* HighlightModel.cpp in Sources */,
 				21B67CC02C775A0D00FD64FC /* GetDocumentInfo.cpp in Sources */,
 				21D0BDD42C935D1A0077E104 /* UpdateModel.cpp in Sources */,
 				21A890BD2CC15C540087E732 /* GetSelection.cpp in Sources */,
@@ -1519,7 +1561,9 @@
 				215F08372C95808B00CD343B /* ReceiverModelCard.cpp in Sources */,
 				21D0BDD72C935DAE0077E104 /* RemoveModel.cpp in Sources */,
 				21A890BC2CC15C540087E732 /* SelectionInfo.cpp in Sources */,
+				2199BB552CDA4B1700A4BEEC /* ConnectorProject.cpp in Sources */,
 				21AEF9EF2CAB5720000B8681 /* SendObject.cpp in Sources */,
+				21384BCD2CD2EE7400D4602B /* OpenUrl.cpp in Sources */,
 				21B67CDC2C78C88000FD64FC /* SayHi.cpp in Sources */,
 				215F082E2C94C5C000CD343B /* FilterMover.cpp in Sources */,
 				21F69F122C677BC0008B6A06 /* ConnectorMenu.cpp in Sources */,
@@ -2065,7 +2109,7 @@
 				);
 				LOCALISATION_SUFFIX = "EN-GB";
 				MACH_O_TYPE = mh_bundle;
-				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				NNA_WARNING_CPLUSPLUSFLAGS = "-Wno-deprecated";
 				OBJROOT = "";
 				ONLY_ACTIVE_ARCH = YES;
@@ -2172,7 +2216,7 @@
 				);
 				LOCALISATION_SUFFIX = "EN-GB";
 				MACH_O_TYPE = mh_bundle;
-				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				NNA_WARNING_CPLUSPLUSFLAGS = "-Wno-deprecated";
 				OBJROOT = "";
 				PLUGIN_FOLDER = "";

SpeckleConnector/Connector/Connector.cpp

@@ -1,7 +1,7 @@
 #include "Active/File/Directory.h"
 #include "ConnectorResource.h"
 #include "Connector/Connector.h"
-#include "Connector/Database/ModelCardDatabase.h"
+#include "Connector/Environment/ConnectorProject.h"
 #include "Connector/Interface/ConnectorMenu.h"
 #include "Connector/Interface/ConnectorPalette.h"
 #include "Speckle/Database/AccountDatabase.h"
@@ -11,7 +11,7 @@
 using namespace active::file;
 using namespace active::environment;
 using namespace connector;
-using namespace connector::database;
+using namespace connector::environment;
 using namespace speckle::database;
 using namespace speckle::environment;
 using namespace speckle::utility;
@@ -29,8 +29,6 @@ namespace {
 		ConnectorInstance(const String& name) : ConnectorAddon{name} {
 			add<ConnectorMenu>();
 			add<ConnectorPalette>();
-				//The connector 'owns' the model card database, so the publisher list should only hold a weak reference
-			addWeak(m_modelCards.getSubscription());
 		}
 		
 		// MARK: Functions (const)
@@ -40,15 +38,18 @@ namespace {
 		 @return The account database
 		 */
 		const AccountDatabase* getAccountDatabase() const override;
+		
+	protected:
 		/*!
-		 Get the model card database
-		 @return The model card database
+		 Make a new new project. Allows Addon subclasses to define a Project subclass with additional functions/databases
+		 @return A new project instance
 		 */
-		const ModelCardDatabase* getModelCardDatabase() const override { return &m_modelCards; }
+		virtual std::shared_ptr<Project> makeProject() const override {
+			return std::dynamic_pointer_cast<Project>(std::make_shared<ConnectorProject>());
+		}
 		
 	private:
 		mutable std::unique_ptr<AccountDatabase> m_account;
-		ModelCardDatabase m_modelCards;
 	};
 	
 		///The active addon instance

SpeckleConnector/Connector/Connector.h

@@ -3,10 +3,6 @@
 
 namespace speckle::database {
 	class AccountDatabase;
-	class BIMElementDatabase;
-}
-namespace connector::database {
-	class ModelCardDatabase;
 }
 
 namespace connector {
@@ -22,11 +18,6 @@ namespace connector {
 		 @return The account database
 		 */
 		const virtual speckle::database::AccountDatabase* getAccountDatabase() const = 0;
-		/*!
-		 Get the model card database
-		 @return The model card database
-		 */
-		const virtual database::ModelCardDatabase* getModelCardDatabase() const = 0;
 		
 	protected:
 		/*!

SpeckleConnector/Connector/ConnectorResource.h

@@ -58,6 +58,7 @@ enum ErrorString {
 	modelCardNotFoundID,
 	noProjectOpenID,
 	accountNotFoundID,
+	elementTypeNotConvertedID,
 };
 
 #endif	//CONNECTOR_RESOURCE

SpeckleConnector/Connector/Environment/ConnectorProject.cpp

@@ -0,0 +1,33 @@
+#include "Connector/Environment/ConnectorProject.h"
+
+#include "Connector/Connector.h"
+#include "Connector/Database/ModelCardDatabase.h"
+
+using namespace active::event;
+using namespace connector::database;
+using namespace connector::environment;
+using namespace speckle::utility;
+
+/*--------------------------------------------------------------------
+	Default constructor
+  --------------------------------------------------------------------*/
+ConnectorProject::ConnectorProject() {
+	m_modelCards = std::make_shared<ModelCardDatabase>();
+	connector()->addWeak(m_modelCards->getSubscription());
+}
+
+
+/*--------------------------------------------------------------------
+	Destructor
+  --------------------------------------------------------------------*/
+ConnectorProject::~ConnectorProject() {}
+
+
+/*--------------------------------------------------------------------
+	Get the model card database
+ 
+	return; The model card database
+  --------------------------------------------------------------------*/
+const ModelCardDatabase* ConnectorProject::getModelCardDatabase() const {
+	return m_modelCards.get();
+} //ConnectorProject::getModelCardDatabase

SpeckleConnector/Connector/Environment/ConnectorProject.h

@@ -0,0 +1,53 @@
+#ifndef CONNECTOR_ENVIRONMENT_CONNECTOR_PROJECT
+#define CONNECTOR_ENVIRONMENT_CONNECTOR_PROJECT
+
+#include "Speckle/Environment/Project.h"
+
+namespace connector::database {
+	class ModelCardDatabase;
+}
+
+namespace connector::environment {
+	
+	/*!
+	 A BIM project contained Speckle connector data, e.g. a model card database
+	*/
+	class ConnectorProject : public speckle::environment::Project {
+	public:
+
+		// MARK: - Types
+		
+			///Shared pointer
+		using Shared = std::shared_ptr<ConnectorProject>;
+			///Weak pointer
+		using Weak = std::weak_ptr<ConnectorProject>;
+
+		// MARK: - Constructors
+		
+		/*!
+		 Default constructor
+		 */
+		ConnectorProject();
+		
+		ConnectorProject(const ConnectorProject&) = delete;
+		/*!
+		 Destructor
+		 */
+		~ConnectorProject();
+		
+		// MARK: - Functions (const)
+		
+		/*!
+		 Get the model card database
+		 @return The model card database
+		 */
+		const connector::database::ModelCardDatabase* getModelCardDatabase() const;
+		
+	private:
+			///The model card database
+		std::shared_ptr<connector::database::ModelCardDatabase> m_modelCards;
+	};
+
+}
+
+#endif	//CONNECTOR_ENVIRONMENT_CONNECTOR_PROJECT

SpeckleConnector/Connector/Interface/Browser/Bridge/Account/GetAccounts.cpp

@@ -14,7 +14,7 @@ using namespace speckle::utility;
 
 namespace {
 	
-	using WrappedValue = active::serialise::CargoHold<ContainerWrap<Vector<Account>>, Vector<Account>>;
+	using WrappedValue = CargoHold<ContainerWrap<Vector<Account>>, Vector<Account>>;
 
 }
 

SpeckleConnector/Connector/Interface/Browser/Bridge/Account/GetAccounts.h

@@ -6,7 +6,7 @@
 namespace connector::interfac::browser::bridge {
 	
 	/*!
-	 JS Function class to retrieve the names of the methods supported by the bridge
+	 JS Function class to retrieve the user's account(s)
 	*/
 	class GetAccounts : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
 	public:

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/AddModel.cpp

@@ -1,11 +1,12 @@
 #include "Connector/Interface/Browser/Bridge/Base/AddModel.h"
 
 #include "Connector/Connector.h"
+#include "Connector/Environment/ConnectorProject.h"
 #include "Connector/Database/ModelCardDatabase.h"
-#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
 
 using namespace active::container;
 using namespace active::serialise;
+using namespace connector::environment;
 using namespace connector::record;
 using namespace connector::interfac::browser::bridge;
 using namespace speckle::utility;
@@ -24,6 +25,10 @@ AddModel::AddModel() : BridgeMethod{"AddModel", [&](const ModelCardEventWrapper&
 	card: The card to add
   --------------------------------------------------------------------*/
 void AddModel::run(const ModelCard& card) const {
-	if (auto modelCardDBase = connector()->getModelCardDatabase(); modelCardDBase != nullptr)
+	auto project = connector()->getActiveProject().lock();
+	auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+	if (!connectorProject)
+		return;
+	if (auto modelCardDBase = connectorProject->getModelCardDatabase(); modelCardDBase != nullptr)
 		modelCardDBase->write(card);
 } //AddModel::run

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/AddModel.h

@@ -8,7 +8,7 @@
 
 namespace connector::interfac::browser::bridge {
 	
-		///Argument parameter for a string
+		///Argument parameter for a model card
 	using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
 		///Argument type for this method
 	using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/BaseBridge.cpp

@@ -8,6 +8,19 @@
 #include "Connector/Interface/Browser/Bridge/Base/RemoveModel.h"
 #include "Connector/Interface/Browser/Bridge/Base/UpdateModel.h"
 #include "Connector/Interface/Browser/Bridge/Base/HighlightModel.h"
+#include "Connector/Interface/Browser/Bridge/Base/HighlightObjects.h"
+#include "Connector/Interface/Browser/Bridge/Base/OpenUrl.h"
+#include "Speckle/Event/Type/ProjectEvent.h"
+
+#include "Speckle/Environment/Project.h"
+#include "Speckle/Record/Element/Element.h"
+#include "Connector/Connector.h"
+#include "Connector/ConnectorResource.h"
+#include "Speckle/Database/Identity/RecordID.h"
+#include "Speckle/Database/BIMElementDatabase.h"
+#include "Connector/Record/Model/SenderModelCard.h"
+#include "Connector/Record/Model/Filter/SendFilter.h"
+#include "Connector/Database/ModelCardDatabase.h"
 
 using namespace connector::interfac::browser::bridge;
 
@@ -22,9 +35,11 @@ BaseBridge::BaseBridge() : BrowserBridge{"baseBinding"} {
 	addMethod<GetDocumentState>();
 	addMethod<GetSourceApplicationName>();
 	addMethod<GetSourceApplicationVersion>();
+	addMethod<HighlightModel>();
+	addMethod<HighlightObjects>();
+	addMethod<OpenUrl>();
 	addMethod<RemoveModel>();
 	addMethod<UpdateModel>();
-	addMethod<HighlightModel>();
 } //BaseBridge::BaseBridge
 
 /*--------------------------------------------------------------------
@@ -37,11 +52,11 @@ BaseBridge::BaseBridge() : BrowserBridge{"baseBinding"} {
 bool BaseBridge::handle(const speckle::event::ProjectEvent& event) {
 	using enum speckle::event::ProjectEvent::Type;
 	switch (event.getType()) {
-	case open:
-		sendEvent("documentChanged");
-		break;
-	default:
-		break;
+		case open:
+			sendEvent("documentChanged");
+			break;
+		default:
+			break;
 	}
 	return false;
 } //BaseBridge::handle

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/BaseBridge.h

@@ -3,12 +3,11 @@
 
 #include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
 #include "Speckle/Event/Subscriber/ProjectSubscriber.h"
-#include "Speckle/Event/Type/ProjectEvent.h"
 
 namespace connector::interfac::browser::bridge {
 	
 	/*!
-	 A browser bridge to provide configuration settings
+	 A browser bridge to manage document settings
 	*/
 	class BaseBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ProjectSubscriber {
 	public:

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.cpp

@@ -25,13 +25,13 @@ GetConnectorVersion::GetConnectorVersion() : BridgeMethod{"GetConnectorVersion",
 
 
 /*--------------------------------------------------------------------
-	Get the host application version
+	Get the connector software version
  
-	return: The application version
+	return: The connector software version
   --------------------------------------------------------------------*/
 std::unique_ptr<Cargo> GetConnectorVersion::run() const {
 		//Implement other platforms as required
-	String result{active::utility::String{connector::versionMajor} + "." + active::utility::String{connector::versionMinor} + "." +
-			active::utility::String{connector::versionPatch}};
+	String result{String{connector::versionMajor} + "." + String{connector::versionMinor} + "." +
+			String{connector::versionPatch}};
 	return std::make_unique<WrappedValue>(result);
 } //GetConnectorVersion::run

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.h

@@ -8,7 +8,7 @@ namespace connector::interfac::browser::bridge {
 	class ConnectorConfig;
 	
 	/*!
-	 JS Function class to retrieve the names of the methods supported by the bridge
+	 JS Function class to get the connector software version
 	*/
 	class GetConnectorVersion : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
 	public:
@@ -23,8 +23,8 @@ namespace connector::interfac::browser::bridge {
 		// MARK: - Functions (const)
 		
 		/*!
-		 Get the host application version
-		 @return The application version
+		 Get the connector software version
+		 @return The connector software version
 		 */
 		std::unique_ptr<active::serialise::Cargo> run() const;
 	};

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp

@@ -2,6 +2,7 @@
 
 #include "Active/Serialise/CargoHold.h"
 #include "Connector/Connector.h"
+#include "Connector/Environment/ConnectorProject.h"
 #include "Connector/Database/ModelCardDatabase.h"
 #include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
 #include "Speckle/Environment/Project.h"
@@ -9,6 +10,7 @@
 
 using namespace active::container;
 using namespace active::serialise;
+using namespace connector::environment;
 using namespace connector::interfac::browser::bridge;
 using namespace speckle::utility;
 
@@ -33,14 +35,17 @@ GetDocumentInfo::GetDocumentInfo() : BridgeMethod{"GetDocumentInfo", [&]() {
   --------------------------------------------------------------------*/
 std::unique_ptr<Cargo> GetDocumentInfo::run() const {
 	auto docInfo = std::make_unique<DocumentInfo>();
-	if (auto project = connector()->getActiveProject().lock(); project) {
-		auto info = project->getInfo();
-		docInfo->name = info.name;
-		if (info.path)
-			docInfo->location = *info.path;
-		if (auto cardDatabase = connector()->getModelCardDatabase(); cardDatabase != nullptr)
-			docInfo->ID = cardDatabase->getStoreID();
+	auto project = connector()->getActiveProject().lock();
+	auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+	if (!connectorProject)
+		return nullptr;
+	auto info = connectorProject->getInfo();
+	docInfo->name = info.name;
+	if (info.path)
+		docInfo->location = *info.path;
+	if (auto cardDatabase = connectorProject->getModelCardDatabase(); cardDatabase != nullptr)
+		docInfo->ID = cardDatabase->getStoreID();
+	else
 		docInfo->ID = Guid{true}.operator String();
-	}
 	return std::make_unique<WrappedValue>(std::move(docInfo));
 } //GetDocumentInfo::run

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.cpp

@@ -1,15 +1,13 @@
 #include "Connector/Interface/Browser/Bridge/Base/GetDocumentState.h"
 
-#include "Active/Serialise/CargoHold.h"
 #include "Connector/Connector.h"
-#include "Connector/Record/Model/ModelCard.h"
+#include "Connector/Environment/ConnectorProject.h"
 #include "Connector/Database/ModelCardDatabase.h"
 
 using namespace active::container;
 using namespace active::serialise;
+using namespace connector::environment;
 using namespace connector::interfac::browser::bridge;
-using namespace connector::database;
-using namespace connector::record;
 using namespace speckle::utility;
 
 /*--------------------------------------------------------------------
@@ -21,12 +19,16 @@ GetDocumentState::GetDocumentState() : BridgeMethod{"GetDocumentState", [&]() {
 
 
 /*--------------------------------------------------------------------
-	Get the document info
+	Get the document model cards
  
-	return: The document info
+	return: The document model cards
   --------------------------------------------------------------------*/
 std::unique_ptr<Cargo> GetDocumentState::run() const {
-	if (auto modelCardDBase = connector()->getModelCardDatabase(); modelCardDBase != nullptr) {
+	auto project = connector()->getActiveProject().lock();
+	auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+	if (!connectorProject)
+		return nullptr;
+	if (auto modelCardDBase = connectorProject->getModelCardDatabase(); modelCardDBase != nullptr) {
 		return modelCardDBase->wrapper();
 	}
 	return nullptr;

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.h

@@ -6,7 +6,7 @@
 namespace connector::interfac::browser::bridge {
 	
 	/*!
-	 JS Function class to retrieve the information about the active document
+	 JS Function class to retrieve model cards stored in the current document
 	*/
 	class GetDocumentState : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
 	public:
@@ -21,8 +21,8 @@ namespace connector::interfac::browser::bridge {
 		// MARK: - Functions (const)
 		
 		/*!
-		 Get the document info
-		 @return The document info
+		 Get the document model cards
+		 @return The document model cards
 		 */
 		std::unique_ptr<active::serialise::Cargo> run() const;
 	};

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/HighlightModel.cpp

@@ -1,6 +1,7 @@
 #include "Connector/Interface/Browser/Bridge/Base/HighlightModel.h"
 #include "Connector/Connector.h"
 #include "Connector/ConnectorResource.h"
+#include "Connector/Environment/ConnectorProject.h"
 #include "Connector/Database/ModelCardDatabase.h"
 #include "Connector/Interface/Browser/Bridge/Send/Arg/SendError.h"
 #include "Connector/Record/Model/SenderModelCard.h"
@@ -10,52 +11,45 @@
 #include "Speckle/Database/BIMElementDatabase.h"
 #include "Speckle/Environment/Project.h"
 
-#include <array>
-
 using namespace speckle::record::element;
+using namespace connector::environment;
 using namespace connector::interfac::browser::bridge;
 using namespace connector::record;
 using namespace speckle::utility;
 
-namespace {
-		
-}
-
 /*--------------------------------------------------------------------
 	Default constructor
   --------------------------------------------------------------------*/
-HighlightModel::HighlightModel() : BridgeMethod{"HighlightModel", [&](const SendArgs& args) {
+HighlightModel::HighlightModel() : BridgeMethod{"HighlightModel", [&](const HighlightModelArgs& args) {
 		run(args);
 }} {}
 
 
 /*--------------------------------------------------------------------
-	Higlight the model card selection
+	Highlight elements linked to the model card selection
  
-	modelCardID: The ID of the model to send
+	modelCardID: The ID of the target model card
   --------------------------------------------------------------------*/
 void HighlightModel::run(const String& modelCardID) const {
-	// Find the specified model card
-	auto modelCardDatabase = connector()->getModelCardDatabase();
+	auto project = connector()->getActiveProject().lock();
+	auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+	if (!connectorProject)
+		return;
+		//Find the specified model card
+	auto modelCardDatabase = connectorProject->getModelCardDatabase();
 	auto modelCard = modelCardDatabase->getCard(modelCardID);
 	if (!modelCard) {
 		getBridge()->sendEvent("setModelError",
 					std::make_unique<SendError>(connector()->getLocalString(errorString, modelCardNotFoundID), modelCardID));
 		return;
 	}
-	
 	if (auto senderCard = dynamic_cast<SenderModelCard*>(modelCard.get())) {
 		auto modelCardSelection = senderCard->getFilter().getElementIDs();
-
 		auto project = connector()->getActiveProject().lock();
-		if (!project) {
-			// TODO: is this OK? should this throw?
-			return;
-		}
-
+		if (!project)
+			return; // TODO: is this OK? should this throw?
 		auto elementDatabase = project->getElementDatabase();
 		elementDatabase->clearSelection();
 		elementDatabase->setSelection(modelCardSelection);
 	}
-
 } //HighlightModel::run

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/HighlightModel.h

@@ -3,22 +3,19 @@
 
 #include "Active/Serialise/CargoHold.h"
 #include "Active/Serialise/Item/Wrapper/ValueWrap.h"
-#include "Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h"
 #include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
 
 namespace connector::interfac::browser::bridge {
 	
-	class ConnectorConfig;
-	
 		///Argument parameter for a string
 	using StringHold = active::serialise::CargoHold<active::serialise::ValueWrap<speckle::utility::String>, speckle::utility::String>;
 		///Argument type for this method
-	using SendArgs = speckle::interfac::browser::bridge::JSArgType<StringHold>;
+	using HighlightModelArgs = speckle::interfac::browser::bridge::JSArgType<StringHold>;
 
 	/*!
-	 JS Function class to send a specified model
+	 JS Function class to highlight elements from the selected model card in the open document
 	*/
-	class HighlightModel : public speckle::interfac::browser::bridge::BridgeMethod<SendArgs, void> {
+	class HighlightModel : public speckle::interfac::browser::bridge::BridgeMethod<HighlightModelArgs, void> {
 	public:
 
 		// MARK: - Constructors
@@ -31,8 +28,8 @@ namespace connector::interfac::browser::bridge {
 		// MARK: - Functions (const)
 		
 		/*!
-		 Higlight the model card selection
-		 @param modelCardID The ID of the model to send
+		 Highlight elements linked to the model card selection
+		 @param modelCardID The ID of the target model card
 		 */
 		void run(const speckle::utility::String& modelCardID) const;
 	};

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/HighlightObjects.cpp

@@ -0,0 +1,40 @@
+#include "Connector/Interface/Browser/Bridge/Base/HighlightObjects.h"
+
+#include "Connector/Connector.h"
+#include "Connector/Environment/ConnectorProject.h"
+#include "Speckle/Database/BIMElementDatabase.h"
+#include "Speckle/Environment/Project.h"
+
+using namespace connector::environment;
+using namespace connector::interfac::browser::bridge;
+using namespace speckle::database;
+using namespace speckle::utility;
+
+/*--------------------------------------------------------------------
+	Default constructor
+  --------------------------------------------------------------------*/
+HighlightObjects::HighlightObjects() : BridgeMethod{"HighlightObjects", [&](const HighlightObjectArgs& args) {
+		run(args);
+}} {}
+
+
+/*--------------------------------------------------------------------
+	Highlight specified objects
+
+	objectIDs: List of object IDs to be highlighted
+  --------------------------------------------------------------------*/
+void HighlightObjects::run(const StringList& objectIDs) const {
+	BIMLinkList objectSelection;
+	for (const auto& text : objectIDs)
+		if (Guid guid{text}; !guid.empty())
+			objectSelection.emplace_back(guid);
+	if (objectSelection.empty())
+		return;
+	auto project = connector()->getActiveProject().lock();
+	auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+	if (!connectorProject)
+		return;
+	auto elementDatabase = project->getElementDatabase();
+	elementDatabase->clearSelection();
+	elementDatabase->setSelection(objectSelection);
+} //HighlightObjects::run

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/HighlightObjects.h

@@ -0,0 +1,42 @@
+#ifndef CONNECTOR_INTERFACE_BRIDGE_HIGHLIGHT_OBJECTS
+#define CONNECTOR_INTERFACE_BRIDGE_HIGHLIGHT_OBJECTS
+
+#include "Active/Serialise/CargoHold.h"
+#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
+#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
+#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
+
+namespace connector::interfac::browser::bridge {
+	
+		///List of strings
+	using StringList = std::vector<active::utility::String>;
+		///Argument parameter for a string
+	using StringListHold = active::serialise::CargoHold<active::serialise::ContainerWrap<StringList>, StringList>;
+		///Argument type for this method
+	using HighlightObjectArgs = speckle::interfac::browser::bridge::JSArgType<StringListHold>;
+
+	/*!
+	 JS Function class to highlight objects using passed application IDs
+	*/
+	class HighlightObjects : public speckle::interfac::browser::bridge::BridgeMethod<HighlightObjectArgs, void> {
+	public:
+
+		// MARK: - Constructors
+		
+		/*!
+		 Constructor
+		 */
+		HighlightObjects();
+
+		// MARK: - Functions (const)
+		
+		/*!
+		 Highlight specified objects
+		 @param objectIDs List of object IDs to be highlighted
+		 */
+		void run(const StringList& objectIDs) const;
+	};
+
+}
+
+#endif	//CONNECTOR_INTERFACE_BRIDGE_HIGHLIGHT_OBJECTS

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/OpenUrl.cpp

@@ -0,0 +1,24 @@
+#include "Connector/Interface/Browser/Bridge/Base/OpenUrl.h"
+
+#include "Speckle/Environment/Platform.h"
+
+using namespace connector::interfac::browser::bridge;
+using namespace speckle::environment;
+using namespace speckle::utility;
+
+/*--------------------------------------------------------------------
+	Default constructor
+  --------------------------------------------------------------------*/
+OpenUrl::OpenUrl() : BridgeMethod{"OpenUrl", [&](const SendArgs& args) {
+		run(args);
+}} {}
+
+
+/*--------------------------------------------------------------------
+	Opens an url
+ 
+	url: The URL to open
+  --------------------------------------------------------------------*/
+void OpenUrl::run(const String& url) const {
+	platform()->openURL(url);
+} //OpenUrl::run

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/OpenUrl.h

@@ -0,0 +1,41 @@
+#ifndef CONNECTOR_INTERFACE_BRIDGE_OPEN_URL
+#define CONNECTOR_INTERFACE_BRIDGE_OPEN_URL
+
+#include "Active/Serialise/CargoHold.h"
+#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
+#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
+
+namespace connector::interfac::browser::bridge {
+	
+	class ConnectorConfig;
+	
+		///Argument parameter for a string
+	using StringHold = active::serialise::CargoHold<active::serialise::ValueWrap<speckle::utility::String>, speckle::utility::String>;
+		///Argument type for this method
+	using SendArgs = speckle::interfac::browser::bridge::JSArgType<StringHold>;
+
+	/*!
+	 JS Function class to highlight elements from the selected model card in the open document
+	*/
+	class OpenUrl : public speckle::interfac::browser::bridge::BridgeMethod<SendArgs, void> {
+	public:
+
+		// MARK: - Constructors
+		
+		/*!
+		 Constructor
+		 */
+		OpenUrl();
+
+		// MARK: - Functions (const)
+		
+		/*!
+		 Opens an url
+		 @param url The URL to open
+		 */
+		void run(const speckle::utility::String& url) const;
+	};
+
+}
+
+#endif	//CONNECTOR_INTERFACE_BRIDGE_OPEN_URL

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/RemoveModel.cpp

@@ -1,22 +1,16 @@
 #include "Connector/Interface/Browser/Bridge/Base/RemoveModel.h"
 
 #include "Connector/Connector.h"
+#include "Connector/Environment/ConnectorProject.h"
 #include "Connector/Database/ModelCardDatabase.h"
-#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
 
 using namespace active::container;
 using namespace active::serialise;
-using namespace connector::database;
+using namespace connector::environment;
 using namespace connector::record;
 using namespace connector::interfac::browser::bridge;
 using namespace speckle::utility;
 
-namespace {
-	
-	using WrappedValue = active::serialise::CargoHold<PackageWrap, DocumentInfo>;
-
-}
-
 /*--------------------------------------------------------------------
 	Default constructor
   --------------------------------------------------------------------*/
@@ -31,6 +25,10 @@ RemoveModel::RemoveModel() : BridgeMethod{"RemoveModel", [&](const ModelCardEven
 	card: The card to add
   --------------------------------------------------------------------*/
 void RemoveModel::run(const ModelCard& card) const {
-	if (auto modelCardDBase = connector()->getModelCardDatabase(); modelCardDBase != nullptr)
+	auto project = connector()->getActiveProject().lock();
+	auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+	if (!connectorProject)
+		return;
+	if (auto modelCardDBase = connectorProject->getModelCardDatabase(); modelCardDBase != nullptr)
 		modelCardDBase->erase(card.getID());
 } //RemoveModel::run

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/RemoveModel.h

@@ -8,13 +8,13 @@
 
 namespace connector::interfac::browser::bridge {
 	
-		///Argument parameter for a string
+		///Argument parameter for a model card
 	using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
 		///Argument type for this method
 	using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;
 
 	/*!
-	 JS Function class to add a model card to the document storage
+	 JS Function class to remove a model card from the document storage
 	*/
 	class RemoveModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
 	public:
@@ -29,8 +29,8 @@ namespace connector::interfac::browser::bridge {
 		// MARK: - Functions (const)
 		
 		/*!
-		 Add a model card to document storage
-		 @param card The card to add
+		 Remove a model card from document storage
+		 @param card The card to remove
 		 */
 		void run(const connector::record::ModelCard& card) const;
 	};

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/UpdateModel.cpp

@@ -2,11 +2,12 @@
 
 #include "Connector/Connector.h"
 #include "Connector/Database/ModelCardDatabase.h"
+#include "Connector/Environment/ConnectorProject.h"
 #include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
 
 using namespace active::container;
 using namespace active::serialise;
-using namespace connector::database;
+using namespace connector::environment;
 using namespace connector::record;
 using namespace connector::interfac::browser::bridge;
 using namespace speckle::utility;
@@ -26,11 +27,15 @@ UpdateModel::UpdateModel() : BridgeMethod{"UpdateModel", [&](const ModelCardEven
 
 
 /*--------------------------------------------------------------------
-	Add a model card to document storage
+	Update a model card in document storage
  
-	card: The card to add
+	card: The card to update
   --------------------------------------------------------------------*/
 void UpdateModel::run(const ModelCard& card) const {
-	if (auto modelCardDBase = connector()->getModelCardDatabase(); modelCardDBase != nullptr)
+	auto project = connector()->getActiveProject().lock();
+	auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+	if (!connectorProject)
+		return;
+	if (auto modelCardDBase = connectorProject->getModelCardDatabase(); modelCardDBase != nullptr)
 		modelCardDBase->write(card);
 } //UpdateModel::run

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/UpdateModel.h

@@ -8,13 +8,13 @@
 
 namespace connector::interfac::browser::bridge {
 	
-		///Argument parameter for a string
+		///Argument parameter for a model card
 	using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
 		///Argument type for this method
 	using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;
 
 	/*!
-	 JS Function class to add a model card to the document storage
+	 JS Function class to update a model card in document storage
 	*/
 	class UpdateModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
 	public:
@@ -29,8 +29,8 @@ namespace connector::interfac::browser::bridge {
 		// MARK: - Functions (const)
 		
 		/*!
-		 Add a model card to document storage
-		 @param card The card to add
+		 Update a model card in document storage
+		 @param card The card to update
 		 */
 		void run(const connector::record::ModelCard& card) const;
 	};

SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.h

@@ -6,7 +6,7 @@
 namespace connector::interfac::browser::bridge {
 	
 	/*!
-	 JS Function class to retrieve the names of the methods supported by the bridge
+	 JS Function class to retrieve the current display configuration settings
 	*/
 	class GetConfig : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
 	public:

SpeckleConnector/Connector/Interface/Browser/Bridge/Config/UpdateConfig.h

@@ -9,11 +9,11 @@ namespace connector::interfac::browser::bridge {
 	
 	class ConnectorConfig;
 	
-		///Argument for a JS call to update the configuration
+		///Argument for a JS call to update the display configuration settings
 	using UpdateArgs = speckle::interfac::browser::bridge::JSArgType<ConnectorConfig>;
 
 	/*!
-	 JS Function class to retrieve the names of the methods supported by the bridge
+	 JS Function class to update the display configuration settings 
 	*/
 	class UpdateConfig : public speckle::interfac::browser::bridge::BridgeMethod<UpdateArgs, void> {
 	public:
@@ -22,7 +22,6 @@ namespace connector::interfac::browser::bridge {
 		
 		/*!
 		 Constructor
-		 @param bridge The parent bridge object (provides access to bridge methods)
 		 */
 		UpdateConfig();
 

SpeckleConnector/Connector/Interface/Browser/Bridge/Selection/GetSelection.h

@@ -12,7 +12,6 @@ namespace connector::interfac::browser::bridge {
 		
 		/*!
 		 Constructor
-		 @param bridge The parent bridge object (provides access to bridge methods)
 		 */
 		GetSelection();
 

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.cpp

@@ -1,5 +1,6 @@
 #include "Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h"
 
+#include "Active/Serialise/CargoHold.h"
 #include "Active/Serialise/Item/Wrapper/ValueWrap.h"
 
 #include <array>
@@ -12,14 +13,30 @@ namespace {
 	
 		///Serialisation fields
 	enum FieldIndex {
+		statusID,
+		srcID,
+		srcTypeID,
+		resID,
+		resTypeID,
 		errorID,
-		cardID,
 	};
 
 		///Serialisation field IDs
 	static std::array fieldID = {
+		Identity{"status"},
+		Identity{"sourceId"},
+		Identity{"sourceType"},
+		Identity{"resultId"},
+		Identity{"resultType"},
 		Identity{"error"},
-		Identity{"modelCardId"},
+	};
+
+		///Conversion status enumerator names
+	std::array statusName{
+		"success",
+		"warning",
+		"info",
+		"error",
 	};
 
 }
@@ -35,8 +52,12 @@ bool ConversionResult::fillInventory(active::serialise::Inventory& inventory) co
 	using enum Entry::Type;
 	inventory.merge(Inventory{
 		{
-			{ fieldID[errorID], errorID, element },
-			{ fieldID[cardID], cardID, element },
+			{ fieldID[statusID], statusID, element },
+			{ fieldID[srcID], srcID, element, !sourceID.empty() },
+			{ fieldID[srcTypeID], srcTypeID, element, !sourceType.empty() },
+			{ fieldID[resID], resID, element, !resultID.empty() },
+			{ fieldID[resTypeID], resTypeID, element, !resultType.empty() },
+			{ fieldID[errorID], errorID, element, error.operator bool() },
 		},
 	}.withType(&typeid(ConversionResult)));
 	return true;
@@ -55,11 +76,46 @@ Cargo::Unique ConversionResult::getCargo(const active::serialise::Inventory::Ite
 		return nullptr;
 	using namespace active::serialise;
 	switch (item.index) {
+		case statusID:
+			return Cargo::Unique{new CargoHold<ValueWrap<uint16_t>, uint16_t>(static_cast<uint16_t>(status))};
+		case srcID:
+			return std::make_unique<ValueWrap<String>>(sourceID);
+		case srcTypeID:
+			return std::make_unique<ValueWrap<String>>(sourceType);
+		case resID:
+			return std::make_unique<ValueWrap<String>>(resultID);
+		case resTypeID:
+			return std::make_unique<ValueWrap<String>>(resultType);
 		case errorID:
-			return std::make_unique<ValueWrap<String>>(message);
-		case cardID:
-			return std::make_unique<ValueWrap<String>>(modelCardID);
+			return std::make_unique<PackageWrap>(*error);
 		default:
 			return nullptr;	//Requested an unknown index
 	}
 } //ConversionResult::getCargo
+
+
+/*--------------------------------------------------------------------
+	Get a conversion status enumerator from text
+ 
+	text; The incoming text
+ 
+	return: The equivalent conversion status (nullopt on failure)
+  --------------------------------------------------------------------*/
+std::optional<ConversionResult::Status> connector::interfac::browser::bridge::toConversionStatus(const String& text) {
+	for (auto i = 0; i < statusName.size(); ++i)
+		if (text == statusName[i])
+			return static_cast<ConversionResult::Status>(i + 1);
+	return std::nullopt;
+} //active::geometry::toAnchor2D
+
+
+/*--------------------------------------------------------------------
+	Get the text for a conversion status value
+ 
+	status: The incoming status
+ 
+	return: The conversion status as text
+  --------------------------------------------------------------------*/
+String connector::interfac::browser::bridge::fromConversionStatus(ConversionResult::Status status) {
+	return statusName.at(static_cast<size_t>(status) - 1);
+} //active::geometry::fromAnchor2D

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h

@@ -1,47 +1,42 @@
-#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
-#define CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
+#ifndef CONNECTOR_INTERFACE_BRIDGE_CONVERSION_RESULT
+#define CONNECTOR_INTERFACE_BRIDGE_CONVERSION_RESULT
 
-#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
+#include "Active/Serialise/Package/Package.h"
+#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
 #include "Connector/Interface/Browser/Bridge/Send/Arg/SendError.h"
 #include "Speckle/Utility/String.h"
 
 namespace connector::interfac::browser::bridge {
 	
 	/*!
-	 A send error to return to the JS in the event of an error
+	 The result of a conversion process (BIM records to/from Speckle)
 	 */
-	class ConversionResult final : public active::serialise::Package {
+	class ConversionResult : public active::serialise::Package {
 	public:
-		enum class Status {
-			success = 1,
-			info,
-			warning,
-			error,
+		enum class Status : uint16_t {
+			success = 1, ///<The conversion was successful
+			info,	///<Not in use yet, maybe later as discussed
+			warning,	///<Not in use yet, maybe later as discussed
+			error,	///<An error occurred during conversion
 		};
 				
 		// MARK: - Constructors
 		
 		/*!
-			Constructor
-			@param errMess The error message
-			@param card The ID of the model card associated with the wrror
+			Default constructor
 		*/
-		ConversionResult(const speckle::utility::String& errMess, const speckle::utility::String& card) : message{errMess}, modelCardID{card} {}
+		ConversionResult() {}
 				
 		// MARK: - Public variables
 		
-			///The error message
-		speckle::utility::String message;
-			///The ID of the model card associated with the data
-		speckle::utility::String modelCardID;
 			///The element conversion status
 		Status status = Status::info;
 			///For receive conversion reports, this is the id of the speckle object. For send, it's the host app object id.
-		speckle::utility::String sourceId;
+		speckle::utility::String sourceID;
 			///For receive conversion reports, this is the type of the speckle object. For send, it's the host app object type.
 		speckle::utility::String sourceType;
 			///For receive conversion reports, this is the id of the host app object. For send, it's the speckle object id.
-		speckle::utility::String resultId;
+		speckle::utility::String resultID;
 			///For receive conversion reports, this is the type of the host app object. For send, it's the speckle object type.
 		speckle::utility::String resultType;
 			///The exception (nullopt = no exception)
@@ -63,6 +58,60 @@ namespace connector::interfac::browser::bridge {
 		Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
 	};
 
+	/*!
+	 Get a conversion status enumerator from text
+	 @param text The incoming text
+	 @return The equivalent conversion status (nullopt on failure)
+	 */
+	std::optional<ConversionResult::Status> toConversionStatus(const speckle::utility::String& text);
+	/*!
+	 Get the text for a conversion status value
+	 @param status The incoming status
+	 @return The conversion status as text
+	 */
+	speckle::utility::String fromConversionStatus(ConversionResult::Status status);
 }
 
-#endif	//CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
+namespace active::serialise {
+
+	/*!
+	 Import the object from the specified string (specialisation for bool)
+	 @param source The string to read
+	 @return True if the data was successfully read
+	 */
+	template<> inline
+	bool ValueWrap<connector::interfac::browser::bridge::ConversionResult::Status>::read(const utility::String& source) {
+		auto converted = connector::interfac::browser::bridge::toConversionStatus(source);
+		if (!converted)
+			return false;
+		base::get() = *converted;
+		return true;
+	} //ValueWrap<bool>::read
+	
+
+	/*!
+	 Import the object from the specified string (specialisation for bool)
+	 @param source The string to read
+	 @return True if the data was successfully read
+	 */
+	template<> inline
+	bool ValueWrap<std::optional<connector::interfac::browser::bridge::ConversionResult::Status>>::read(const utility::String& source) {
+		auto converted = connector::interfac::browser::bridge::toConversionStatus(source);
+		base::get() = converted;
+		return converted.operator bool();
+	} //ValueWrap<bool>::read
+
+	
+	/*!
+	 Export the object to the specified string (specialisation for bool)
+	 @param dest The string to write the data to
+	 @return True if the data was successfully written
+	 */
+	template<> inline
+	bool ValueWrap<connector::interfac::browser::bridge::ConversionResult::Status>::write(utility::String& dest) const {
+		dest = connector::interfac::browser::bridge::fromConversionStatus(get());
+		return true;
+	} //ValueWrap<bool>::write
+}
+
+#endif	//CONNECTOR_INTERFACE_BRIDGE_CONVERSION_RESULT

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendConversionResult.h

@@ -0,0 +1,49 @@
+#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
+#define CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
+
+#include "Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h"
+#include "Speckle/Serialise/Collection/ConversionReporter.h"
+
+namespace connector::interfac::browser::bridge {
+	
+	/*!
+	 A result from converting a record to Speckle
+	 */
+	class SendConversionResult : public ConversionResult {
+	public:
+				
+		// MARK: - Constructors
+		
+		/*!
+		 Constructor
+		 @param stat The send/conversion status of the target record
+		 @param srcID The record application ID
+		 @param srcType The record application type name
+		 @param err An optional error report
+		 */
+		SendConversionResult(Status stat, speckle::utility::String srcID, speckle::utility::String srcType, SendError::Option err = std::nullopt) {
+			status = stat;
+			sourceID = srcID;
+			sourceType = srcType;
+			error = err;
+		}
+		/*!
+		 Constructor
+		 @param stat The send/conversion status of the target record
+		 @param srcID The record application ID
+		 @param srcType The record application type name
+		 @param err An optional error report
+		 */
+		SendConversionResult(const speckle::database::BIMRecordID& srcID, const speckle::serialise::ConversionReporter::Data& data) {
+			status = data.status == speckle::serialise::ConversionReporter::Data::Status::success ?
+					ConversionResult::Status::success : ConversionResult::Status::error;
+			sourceID = srcID.operator speckle::utility::String();
+			sourceType = data.typeName;
+			if (!data.message.empty())
+				error = SendError{data.message};
+		}
+	};
+
+}
+
+#endif	//CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendError.cpp

@@ -12,14 +12,16 @@ namespace {
 	
 		///Serialisation fields
 	enum FieldIndex {
-		errorID,
+		messageID,
 		cardID,
+		stackID,
 	};
 
 		///Serialisation field IDs
 	static std::array fieldID = {
-		Identity{"error"},
+		Identity{"message"},
 		Identity{"modelCardId"},
+		Identity{"stackTrace"},
 	};
 
 }
@@ -35,8 +37,9 @@ bool SendError::fillInventory(active::serialise::Inventory& inventory) const {
 	using enum Entry::Type;
 	inventory.merge(Inventory{
 		{
-			{ fieldID[errorID], errorID, element },
-			{ fieldID[cardID], cardID, element },
+			{ fieldID[messageID], messageID, element },
+			{ fieldID[cardID], cardID, element, !modelCardID.empty() },
+			{ fieldID[stackID], stackID, element, modelCardID.empty() },	//Field not included when a model card is sent
 		},
 	}.withType(&typeid(SendError)));
 	return true;
@@ -55,10 +58,12 @@ Cargo::Unique SendError::getCargo(const active::serialise::Inventory::Item& item
 		return nullptr;
 	using namespace active::serialise;
 	switch (item.index) {
-		case errorID:
+		case messageID:
 			return std::make_unique<ValueWrap<String>>(message);
 		case cardID:
 			return std::make_unique<ValueWrap<String>>(modelCardID);
+		case stackID:
+			return std::make_unique<ValueWrap<String>>(stackTrace);
 		default:
 			return nullptr;	//Requested an unknown index
 	}

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendError.h

@@ -24,7 +24,7 @@ namespace connector::interfac::browser::bridge {
 			@param errMess The error message
 			@param card The ID of the model card associated with the wrror
 		*/
-		SendError(const speckle::utility::String& errMess, const speckle::utility::String& card) : message{errMess}, modelCardID{card} {}
+		SendError(const speckle::utility::String& errMess, const speckle::utility::String& card = {}) : message{errMess}, modelCardID{card} {}
 				
 		// MARK: - Public variables
 		
@@ -32,6 +32,8 @@ namespace connector::interfac::browser::bridge {
 		speckle::utility::String message;
 			///The ID of the model card associated with the data
 		speckle::utility::String modelCardID;
+			///The error stack trace
+		speckle::utility::String stackTrace;
 
 		// MARK: - Serialisation
 		

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendObject.cpp

@@ -1,12 +1,14 @@
 #include "Connector/Interface/Browser/Bridge/Send/Arg/SendObject.h"
 
-#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
 #include "Active/Serialise/Item/Wrapper/ValueWrap.h"
+#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
+#include "Connector/Record/Collection/ProjectCollection.h"
 
 #include <array>
 
 using namespace active::serialise;
 using namespace connector::interfac::browser::bridge;
+using namespace connector::record;
 using namespace speckle::serialise;
 using namespace speckle::utility;
 
@@ -67,3 +69,19 @@ Cargo::Unique SendObject::getCargo(const active::serialise::Inventory::Item& ite
 			return nullptr;	//Requested an unknown index
 	}
 } //SendObject::getCargo
+
+
+/*--------------------------------------------------------------------
+	Get the conversion results from the send object serialisation
+ 
+	return: The serialisation conversion results
+  --------------------------------------------------------------------*/
+std::vector<SendConversionResult> SendObject::getConversionResults() const {
+	std::vector<SendConversionResult> convertResults;
+	auto collection = dynamic_cast<const ProjectCollection*>(m_object.get());
+	if (collection == nullptr)
+		return convertResults;
+	for (const auto& item : collection->getLog())
+		convertResults.emplace_back(SendConversionResult{item.first, item.second});
+	return convertResults;
+} //SendObject::getConversionResults

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendObject.h

@@ -3,6 +3,7 @@
 
 #include "Active/Serialise/CargoHold.h"
 #include "Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h"
+#include "Connector/Interface/Browser/Bridge/Send/Arg/SendConversionResult.h"
 #include "Speckle/Database/Content/Record.h"
 #include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
 
@@ -44,15 +45,20 @@ namespace connector::interfac::browser::bridge {
 		 */
 		Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
 		/*!
-			Use a manager in (de)serialisation processes
-			@param management The management to use
-		*/
+		 Use a manager in (de)serialisation processes
+		 @param management The management to use
+		 */
 		void useManagement(active::serialise::Management* management) const override { m_object->useManagement(management); }
 		/*!
-			Get the cargo management
-			@return The active management
-		*/
+		 Get the cargo management
+		 @return The active management
+		 */
 		active::serialise::Management* management() const override { return m_object->management(); }
+		/*!
+		 Get the conversion results from the send object serialisation
+		 @return The serialisation conversion results
+		 */
+		std::vector<SendConversionResult> getConversionResults() const;
 		
 	private:
 			///The object to send

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.cpp

@@ -1,5 +1,6 @@
 #include "Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.h"
 
+#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
 #include "Connector/Record/Model/ModelCard.h"
 #include "Speckle/Record/Credentials/Account.h"
 
@@ -25,6 +26,7 @@ namespace {
 		accID,
 		messageID,
 		sendObjectID,
+		convResultID,
 	};
 
 		///Serialisation field IDs
@@ -37,6 +39,7 @@ namespace {
 		Identity{"accountId"},
 		Identity{"message"},
 		Identity{"sendObject"},
+		Identity{"sendConversionResults"},
 	};
 	
 }
@@ -47,11 +50,11 @@ namespace {
 	modelCard: The model card to populate into the send info for the browser
 	account: The account linked to the send
 	object: The object to be sent
+	results: The conversion results (reporting any conversion errors etc)
   --------------------------------------------------------------------*/
 SendViaBrowserArgs::SendViaBrowserArgs(const ModelCard& modelCard, const Account& account, SendObject&& object) :
 		modelCardID(modelCard.getID()), projectID(modelCard.getProjectID()), modelID(modelCard.getModelID()), token{account.getToken()},
 		serverURL{account.getServerURL()}, accountID{account.getID()}, sendObject{std::move(object)} {
-	
 } //SendViaBrowserArgs::SendViaBrowserArgs
 
 
@@ -74,6 +77,7 @@ bool SendViaBrowserArgs::fillInventory(active::serialise::Inventory& inventory)
 			{ fieldID[accID], accID, element },
 			{ fieldID[messageID], messageID, element },
 			{ fieldID[sendObjectID], sendObjectID, element },
+			{ fieldID[convResultID], convResultID, element },
 		},
 	}.withType(&typeid(SendViaBrowserArgs)));
 	return true;
@@ -108,6 +112,9 @@ Cargo::Unique SendViaBrowserArgs::getCargo(const active::serialise::Inventory::I
 			return std::make_unique<StringWrap>(message);
 		case sendObjectID:
 			return std::make_unique<PackageWrap>(sendObject);
+		case convResultID:
+			sendConversionResults = sendObject.getConversionResults();
+			return Cargo::Unique{new ContainerWrap{sendConversionResults}};
 		default:
 			return nullptr;	//Requested an unknown index
 	}

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.h

@@ -3,7 +3,7 @@
 
 #include "Active/Serialise/Package/Package.h"
 #include "Active/Utility/String.h"
-#include "Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h"
+#include "Connector/Interface/Browser/Bridge/Send/Arg/SendConversionResult.h"
 #include "Connector/Interface/Browser/Bridge/Send/Arg/SendObject.h"
 #include "Speckle/Database/Identity/RecordID.h"
 
@@ -54,7 +54,7 @@ namespace connector::interfac::browser::bridge {
 			///The send message
 		speckle::utility::String message;	//TODO: Clarify what this is used for
 			///The conversion report (summarising the conversion results on an element-by-element basis)
-		std::vector<ConversionResult> sendConversionResults;
+		mutable std::vector<SendConversionResult> sendConversionResults;
 			///The commit content
 		SendObject sendObject;
 

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.h

@@ -18,7 +18,6 @@ namespace connector::interfac::browser::bridge {
 		
 		/*!
 		 Constructor
-		 @param bridge The parent bridge object (provides access to bridge methods)
 		 */
 		GetSendFilters();
 

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendSettings.cpp

@@ -13,7 +13,7 @@ using namespace speckle::utility;
 
 namespace {
 	
-	using WrappedValue = active::serialise::CargoHold<ContainerWrap<Vector<CardSetting>, PackageWrap>, Vector<CardSetting>>;
+	using WrappedValue = CargoHold<ContainerWrap<Vector<CardSetting>, PackageWrap>, Vector<CardSetting>>;
 
 }
 
@@ -26,9 +26,9 @@ GetSendSettings::GetSendSettings() : BridgeMethod{"GetSendSettings", [&]() {
 
 
 /*--------------------------------------------------------------------
-	Get the send filters
+	Get send settings relevant to the host BIM application
  
-	return: The send filters
+	return: The send settings
   --------------------------------------------------------------------*/
 std::unique_ptr<Cargo> GetSendSettings::run() const {
 	auto filters = std::make_unique<Vector<CardSetting>>();

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendSettings.h

@@ -9,7 +9,7 @@ namespace connector::interfac::browser::bridge {
 	class ConnectorConfig;
 	
 	/*!
-	 JS Function class to retrieve the send filters
+	 JS Function class to retrieve the send settings relevant to the host BIM application
 	*/
 	class GetSendSettings : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
 	public:
@@ -18,15 +18,14 @@ namespace connector::interfac::browser::bridge {
 		
 		/*!
 		 Constructor
-		 @param bridge The parent bridge object (provides access to bridge methods)
 		 */
 		GetSendSettings();
 
 		// MARK: - Functions (const)
 		
 		/*!
-		 Get the send filters
-		 @return The send filters
+		 Get send settings relevant to the host BIM application
+		 @return The send settings
 		 */
 		std::unique_ptr<active::serialise::Cargo> run() const;
 	};

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp

@@ -5,34 +5,33 @@
 #include "Connector/Connector.h"
 #include "Connector/ConnectorResource.h"
 #include "Connector/Database/ModelCardDatabase.h"
-#include "Connector/Interface/Browser/Bridge/Send/Arg/SendError.h"
+#include "Connector/Environment/ConnectorProject.h"
+#include "Connector/Interface/Browser/Bridge/Send/Arg/SendConversionResult.h"
 #include "Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.h"
 #include "Connector/Record/Collection/ProjectCollection.h"
+#include "Connector/Record/Model/SenderModelCard.h"
+#include "Connector/Record/Model/Filter/SendFilter.h"
 #include "Speckle/Database/AccountDatabase.h"
+#include "Speckle/Database/BIMElementDatabase.h"
 #include "Speckle/Database/Content/BIMRecord.h"
+#include "Speckle/Environment/Project.h"
+#include "Speckle/Environment/Host.h"
 #include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
 #include "Speckle/Record/Credentials/Account.h"
+#include "Speckle/Record/Element/Element.h"
 #include "Speckle/Serialise/Detached/Storage/DetachedMemoryStore.h"
 #include "Speckle/Utility/Exception.h"
 
-#include "Speckle/Database/BIMElementDatabase.h"
-#include "Speckle/Environment/Project.h"
-#include "Speckle/Record/Element/Element.h"
-using namespace speckle::record::element;
-
-#include <array>
-
 using namespace active::serialise;
+using namespace connector::environment;
 using namespace connector::interfac::browser::bridge;
 using namespace connector::record;
 using namespace speckle::database;
+using namespace speckle::environment;
+using namespace speckle::record::element;
 using namespace speckle::serialise;
 using namespace speckle::utility;
 
-namespace {
-		
-}
-
 /*--------------------------------------------------------------------
 	Default constructor
   --------------------------------------------------------------------*/
@@ -44,11 +43,23 @@ Send::Send() : BridgeMethod{"Send", [&](const SendArgs& args) {
 /*--------------------------------------------------------------------
 	Send a specified model
  
-	modelCardID: The ID of the model to send
+	modelCardID: The ID of the model card identifying the objects to send
   --------------------------------------------------------------------*/
 void Send::run(const String& modelCardID) const {
+		//We can currently only send from the 3D model view
+	host()->makeModelViewActive(true);
+		//Get the active project
+	auto project = connector()->getActiveProject().lock();
+	if (!project) {
+		getBridge()->sendEvent("setModelError",
+					std::make_unique<SendError>(connector()->getLocalString(errorString, noProjectOpenID), modelCardID));
+		return;
+	}
+	auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+	if (!connectorProject)
+		return;
 		//Find the specified model card
-	auto modelCardDatabase = connector()->getModelCardDatabase();
+	auto modelCardDatabase = connectorProject->getModelCardDatabase();
 	auto modelCard = modelCardDatabase->getCard(modelCardID);
 	if (!modelCard) {
 		getBridge()->sendEvent("setModelError",
@@ -63,25 +74,23 @@ void Send::run(const String& modelCardID) const {
 					std::make_unique<SendError>(connector()->getLocalString(errorString, accountNotFoundID), modelCardID));
 		return;
 	}
-		//Get the active project
-	auto project = connector()->getActiveProject().lock();
-	if (!project) {
-		getBridge()->sendEvent("setModelError",
-					std::make_unique<SendError>(connector()->getLocalString(errorString, noProjectOpenID), modelCardID));
-		return;
+		//Get the selected elements from the modelcard
+	auto elementDatabase = project->getElementDatabase();
+	ElementIDList selected{};
+	if (auto senderCard = dynamic_cast<SenderModelCard*>(modelCard.get())) {
+		selected = senderCard->getFilter().getElementIDs();
 	}
 		//Build a collection from the selected elements
-	auto collection = std::make_unique<ProjectCollection>(project);
-	auto elementDatabase = project->getElementDatabase();
-	auto selected = elementDatabase->getSelection();
-	if (selected.empty()) {
-		getBridge()->sendEvent("setModelError",
-					std::make_unique<SendError>(connector()->getLocalString(errorString, noSelectedModelItemsID), modelCardID));
-		return;
-	}
+	auto collection = std::make_unique<ProjectCollection>(project, modelCard->getID());
 	for (const auto& link : selected) {
 		if (auto element = elementDatabase->getElement(link); element)
 			collection->addElement(*element);
+		else {
+				//Report failure to convert element
+			collection->logRecord(link, {ConversionReporter::Data::Status::failure, String{}, String{},
+					connector()->getLocalString(errorString, elementTypeNotConvertedID)}, false);
+			collection->incrementSkippedRecords();
+		}
 	}
 		//Send the collected information
 	auto result = std::make_unique<SendViaBrowserArgs>(*modelCard, *account, SendObject{std::move(collection)});

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h

@@ -25,7 +25,6 @@ namespace connector::interfac::browser::bridge {
 		
 		/*!
 		 Constructor
-		 @param bridge The parent bridge object (provides access to bridge methods)
 		 */
 		Send();
 
@@ -33,7 +32,7 @@ namespace connector::interfac::browser::bridge {
 		
 		/*!
 		 Send a specified model
-		 @param modelCardID The ID of the model to send
+		 @param modelCardID The ID of the model card identifying the objects to send
 		 */
 		void run(const speckle::utility::String& modelCardID) const;
 	};

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/SendBridge.cpp

@@ -1,10 +1,28 @@
 #include "Connector/Interface/Browser/Bridge/Send/SendBridge.h"
-
 #include "Connector/Interface/Browser/Bridge/Send/GetSendFilters.h"
 #include "Connector/Interface/Browser/Bridge/Send/GetSendSettings.h"
 #include "Connector/Interface/Browser/Bridge/Send/Send.h"
+#include "Connector/Connector.h"
+#include "Connector/ConnectorResource.h"
+#include "Connector/Database/ModelCardDatabase.h"
+#include "Connector/Environment/ConnectorProject.h"
+#include "Speckle/Event/Type/ElementEvent.h"
+#include "Speckle/Record/Element/Element.h"
+#include "Speckle/Database/BIMElementDatabase.h"
+#include "Speckle/Environment/Project.h"
+#include "Speckle/Database/Identity/RecordID.h"
+#include "Active/Serialise/CargoHold.h"
+#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
+#include "Connector/Record/Model/SenderModelCard.h"
+#include "Connector/Record/Model/Filter/SendFilter.h"
 
+using namespace speckle::database;
+using namespace connector::environment;
 using namespace connector::interfac::browser::bridge;
+using namespace speckle::utility;
+using namespace speckle::event;
+using namespace active::serialise;
+using namespace connector::record;
 
 /*--------------------------------------------------------------------
 	Default constructor
@@ -15,3 +33,55 @@ SendBridge::SendBridge() : BrowserBridge{"sendBinding"} {
 	addMethod<GetSendSettings>();
 	addMethod<Send>();
 } //SendBridge::SendBridge
+
+
+/*--------------------------------------------------------------------
+	Handle an element change
+
+	event: The selection event
+
+	return: True if the event should be closed
+  --------------------------------------------------------------------*/
+bool SendBridge::handle(const ElementEvent& event) {
+	using enum ElementEvent::Type;
+	auto eventType = event.getEventType();
+	switch (eventType) {
+		case begin:
+			m_changedElements.clear();
+			break;
+		case end: {
+			auto project = connector()->getActiveProject().lock();
+			auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
+			if (!connectorProject)
+				return false;
+			auto modelCardDatabase = connectorProject->getModelCardDatabase();
+			auto modelCards = modelCardDatabase->getCards();
+				// POC: this is probably not efficient, should test, review and refactor it
+			RecordIDList expiredModelCardIds;
+			for (const auto& modelCard : modelCards) {
+				if (auto senderCard = dynamic_cast<SenderModelCard*>(modelCard.get())) {
+					auto modelCardSelection = senderCard->getFilter().getElementIDs();
+					for (const auto& elemId : modelCardSelection) {
+						if (std::find(m_changedElements.begin(), m_changedElements.end(), elemId) != m_changedElements.end()) {
+							expiredModelCardIds.push_back(modelCard->getID());
+							break;
+						}
+					}
+				}
+			}
+			if (!expiredModelCardIds.empty()) {
+				auto wrapped = std::make_unique<CargoHold<ContainerWrap<RecordIDList>, RecordIDList>>(std::move(expiredModelCardIds));
+				sendEvent("setModelsExpired", std::move(wrapped));
+			}
+			break;
+		}
+		case changeElem: case editElem: case deleteElem: {
+			if (event.getElmentID())
+				m_changedElements.push_back(*event.getElmentID());
+			break;
+		}
+		default:
+		  break;
+	}
+	return false;
+} //SendBridge::handle

SpeckleConnector/Connector/Interface/Browser/Bridge/Send/SendBridge.h

@@ -2,13 +2,14 @@
 #define CONNECTOR_INTERFACE_BRIDGE_SEND_BRIDGE
 
 #include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
+#include "Speckle/Event/Subscriber/ElementSubscriber.h"
 
 namespace connector::interfac::browser::bridge {
 	
 	/*!
 	 A browser bridge to support sending model data to a Speckle server
 	*/
-	class SendBridge : public speckle::interfac::browser::bridge::BrowserBridge {
+	class SendBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ElementSubscriber {
 	public:
 		
 		// MARK: - Types
@@ -22,6 +23,14 @@ namespace connector::interfac::browser::bridge {
 		 Default constructor
 		 */
 		SendBridge();
+
+	protected:
+		/*!
+		 Handle an element change
+		 @param event The selection event
+		 @return True if the event should be closed
+		 */
+		bool handle(const speckle::event::ElementEvent& event) override;
 	};
 	
 }

SpeckleConnector/Connector/Interface/Browser/Bridge/Test/GetComplexType.h

@@ -1,5 +1,5 @@
-#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_CONFIG
-#define CONNECTOR_INTERFACE_BRIDGE_GET_CONFIG
+#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE
+#define CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE
 
 #include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
 
@@ -15,7 +15,6 @@ namespace connector::interfac::browser::bridge {
 		
 		/*!
 		 Constructor
-		 @param bridge The parent bridge object (provides access to bridge methods)
 		 */
 		GetComplexType();
 
@@ -30,4 +29,4 @@ namespace connector::interfac::browser::bridge {
 
 }
 
-#endif	//CONNECTOR_INTERFACE_BRIDGE_GET_CONFIG
+#endif	//CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE

SpeckleConnector/Connector/Interface/Browser/Bridge/Test/GoAway.cpp

@@ -1,8 +1,9 @@
 #include "Connector/Interface/Browser/Bridge/Test/GoAway.h"
 
-using namespace connector::interfac::browser::bridge;
+#include "Speckle/Environment/Platform.h"
 
-#include <iostream>
+using namespace connector::interfac::browser::bridge;
+using namespace speckle::environment;
 
 /*--------------------------------------------------------------------
 	Default constructor
@@ -16,5 +17,5 @@ GoAway::GoAway() : BridgeMethod{"GoAway", [&]() {
 	Write a message to the console
   --------------------------------------------------------------------*/
 void GoAway::run() const {
-	std::cout << "Okay, going away.";
+	platform()->writeToConsole("Okay, going away.");
 } //GoAway::run

SpeckleConnector/Connector/Interface/ConnectorPalette.cpp

@@ -17,6 +17,8 @@
 #include "Speckle/Event/Type/MenuEvent.h"
 #include "Speckle/Interface/Browser/JSPortal.h"
 
+#include "Speckle/Event/Type/ProjectEvent.h"
+
 #include <ACAPinc.h>
 #include <DGModule.hpp>
 #include <DGBrowser.hpp>
@@ -108,7 +110,9 @@ ConnectorPalette::ConnectorPalette() {
 	return: The subscription list (an empty list will put the subscriber into a suspended state)
   --------------------------------------------------------------------*/
 ConnectorPalette::Subscription ConnectorPalette::subscription() const {
-	return { {toggleConnectorPaletteID} };
+	auto result = ProjectSubscriber::subscription();
+	result.insert(toggleConnectorPaletteID);
+	return result;
 } //ConnectorPalette::subscription
 
 
@@ -130,16 +134,49 @@ bool ConnectorPalette::start() {
 	return: True if the event should be closed
   --------------------------------------------------------------------*/
 bool ConnectorPalette::receive(const active::event::Event& event) {
-	if (BrowserPalette::HasInstance() && BrowserPalette::GetInstance().IsVisible()) {
-		BrowserPalette::GetInstance().Hide ();
-	} else {
-		if (!BrowserPalette::HasInstance())
-			BrowserPalette::CreateInstance();
-		BrowserPalette::GetInstance().Show();
+	if (event == toggleConnectorPaletteID) {
+		if (BrowserPalette::HasInstance() && BrowserPalette::GetInstance().IsVisible()) {
+			BrowserPalette::GetInstance().Hide();
+		}
+		else {
+			if (!BrowserPalette::HasInstance())
+				BrowserPalette::CreateInstance();
+			BrowserPalette::GetInstance().Show();
+		}
+		return true;
 	}
-	return true;
+
+	return ProjectSubscriber::receive(event);
+	
 } //ConnectorPalette::receive
 
+/*--------------------------------------------------------------------
+	Handle a project event
+
+	event: The project event
+
+	return: True if the event should be closed
+ --------------------------------------------------------------------*/
+bool ConnectorPalette::handle(const speckle::event::ProjectEvent& event) {
+	using enum speckle::event::ProjectEvent::Type;
+	switch (event.getType()) {
+	case open: {
+		if (BrowserPalette::HasInstance() && !BrowserPalette::GetInstance().IsVisible()) {
+			BrowserPalette::GetInstance().Show();
+			BrowserPalette::GetInstance().EnableItems();
+		}
+	} break;
+	case close: {
+		if (BrowserPalette::HasInstance() && BrowserPalette::GetInstance().IsVisible()) {
+			BrowserPalette::GetInstance().Hide();
+		}
+	} break;
+	default:
+		break;
+	}
+	return false;
+} //ConnectorPalette::handle
+
 
 	//NB: Following is placeholder from GS example code - will be refactored to better suit our purposes
 
@@ -174,7 +211,13 @@ BrowserPalette::BrowserPalette() :
 	}
 
 	install<ConfigBridge>();
-	install<SendBridge>();
+
+	if (auto ref = install<SendBridge>(); ref) {
+		if (auto sendBridgeRef = std::dynamic_pointer_cast<SendBridge>(ref); sendBridgeRef) {
+			connector::connector()->addWeak(sendBridgeRef);
+			sendBridgeRef->start();
+		}
+	}
 
 	if (auto ref = install<SelectionBridge>(); ref) {
 		if (auto selectionBridgeRef = std::dynamic_pointer_cast<SelectionBridge>(ref); selectionBridgeRef) {
@@ -222,8 +265,8 @@ void BrowserPalette::Hide() {
 
 void BrowserPalette::InitBrowserControl() {
 #ifdef TESTING_MODE
-	browser->LoadURL("https://deploy-preview-3180--boisterous-douhua-e3cefb.netlify.app/");
 	//browser->LoadURL("https://boisterous-douhua-e3cefb.netlify.app/test");
+	browser->LoadURL("https://boisterous-douhua-e3cefb.netlify.app");
 #else
 	browser->LoadURL("https://boisterous-douhua-e3cefb.netlify.app/");
 #endif
@@ -276,18 +319,10 @@ GSErrCode __ACENV_CALL	BrowserPalette::PaletteControlCallBack(Int32, API_Palette
 			break;
 
 		case APIPalMsg_HidePalette_End:
-			if(HasInstance() && !GetInstance().IsVisible())
+			if (HasInstance() && !GetInstance().IsVisible())
+			{
 				GetInstance().Show();
-			break;
-
-		case APIPalMsg_DisableItems_Begin:
-			if(HasInstance() && GetInstance().IsVisible())
-				GetInstance().DisableItems();
-			break;
-
-		case APIPalMsg_DisableItems_End:
-			if(HasInstance() && GetInstance().IsVisible())
-				GetInstance().EnableItems();
+			}
 			break;
 
 		case APIPalMsg_IsPaletteVisible:

SpeckleConnector/Connector/Interface/ConnectorPalette.h

@@ -2,10 +2,11 @@
 #define CONNECTOR_CONNECTOR_PALETTE
 
 #include "Active/Event/Subscriber.h"
+#include "Speckle/Event/Subscriber/ProjectSubscriber.h"
 
 namespace connector {
 	
-	class ConnectorPalette : public active::event::Subscriber {
+	class ConnectorPalette : public speckle::event::ProjectSubscriber {
 	public:
 		/*!
 		 Default constructor
@@ -32,6 +33,13 @@ namespace connector {
 			@return True if the event should be closed
 		*/
 		bool receive(const active::event::Event& event) override;
+	protected:
+		/*!
+		 Handle the project events
+		 @param event The project event
+		 @return True if the event should be closed
+		 */
+		bool handle(const speckle::event::ProjectEvent& event) override;
 	};
 	
 }

SpeckleConnector/Connector/Record/Collection/ProjectCollection.cpp

@@ -9,8 +9,11 @@
 #include "Connector/Record/Collection/FinishProxy.h"
 #include "Speckle/Database/BIMAttributeDatabase.h"
 #include "Speckle/Database/BIMElementDatabase.h"
+#include "Speckle/Record/Attribute/Finish.h"
 #include "Speckle/Record/Element/Element.h"
 
+#include <limits>
+
 #ifdef ARCHICAD
 #include <ACAPinc.h>
 #include <ModelMaterial.hpp>
@@ -24,7 +27,7 @@ using namespace speckle::utility;
 
 #ifdef ARCHICAD
 namespace connector::record {
-	class ProjectCollection::FinishCache : public std::unordered_map<active::utility::Guid, Finish::Unique> {};
+	class ProjectCollection::FinishCache : public std::unordered_map<active::utility::Guid, Finish> {};
 }
 #endif
 
@@ -48,9 +51,12 @@ namespace {
 	Constructor
  
 	project: The source project
+	modelCardID: The model card ID for the send operation
   --------------------------------------------------------------------*/
-ProjectCollection::ProjectCollection(speckle::environment::Project::Shared project) : base{project->getInfo().name, project},
-		m_management{std::make_unique<Management>()} {
+ProjectCollection::ProjectCollection(speckle::environment::Project::Shared project, const RecordID& modelCardID) :
+	base{project->getInfo().name, project}, ConversionReporter{modelCardID}, m_management {
+	std::make_unique<Management>()
+} {
 	m_management->push_back(this);
 	m_finishes = std::make_unique<FinishCache>();
 	base::useManagement(m_management.get());
@@ -102,7 +108,10 @@ bool ProjectCollection::addElement(const speckle::record::element::Element& elem
 	RecordCollection* collection = this;
 	for (const auto& childName : collectionNames)
 		collection = collection->getChild(childName);
-	return collection->addIndex(BIMIndex{element.getBIMID(), element.getTableID()});
+	if (!collection->addIndex(BIMIndex{element.getBIMID(), element.getTableID()}))
+		return false;
+	incrementProjectedRecords();
+	return true;
 } //ProjectCollection::addElement
 
 
@@ -114,15 +123,14 @@ bool ProjectCollection::addElement(const speckle::record::element::Element& elem
  
 	return: True if the material proxy was added (false typically means the record already exists)
   --------------------------------------------------------------------*/
-bool ProjectCollection::addMaterialProxy(const speckle::database::BIMIndex& materialIndex, const speckle::database::BIMRecordID& objectID) {
+bool ProjectCollection::addFinishProxy(const speckle::database::BIMIndex& materialIndex, const speckle::database::BIMRecordID& objectID) {
 	auto iter = m_finishProxies.find(materialIndex);
 	if (iter == m_finishProxies.end())
 		iter = m_finishProxies.insert({materialIndex, {}}).first;
 	return iter->second.insert(objectID).second;
-} //ProjectCollection::addMaterialProxy
+} //ProjectCollection::addFinishProxy
 
 
-#ifdef ARCHICAD
 /*--------------------------------------------------------------------
 	Add a ModelerAPI material to the collection (NB: These are not persistent so need to be captured by this method)
  
@@ -131,16 +139,12 @@ bool ProjectCollection::addMaterialProxy(const speckle::database::BIMIndex& mate
  
 	return: True if the material proxy was added (false typically means the record already exists)
   --------------------------------------------------------------------*/
-bool ProjectCollection::addMaterialProxy(const ModelerAPI::Material& material, const speckle::database::BIMRecordID& objectID) {
-	auto finishID = Guid::fromInt(material.GenerateHashValue());
-	auto iter = m_finishes->find(finishID);
-	if (iter == m_finishes->end()) {
-		auto finish = std::make_unique<Finish>(material);
-		iter = m_finishes->insert({ finishID, std::move(finish) }).first;
-	}
-	return addMaterialProxy(finishID, objectID);
-} //ProjectCollection::addMaterialProxy
-#endif
+bool ProjectCollection::addFinishProxy(const Finish& finish, const speckle::database::BIMRecordID& objectID) {
+	auto iter = m_finishes->find(finish.getBIMID());
+	if (iter == m_finishes->end())
+		iter = m_finishes->insert({finish.getBIMID(), finish}).first;
+	return addFinishProxy(speckle::database::BIMIndex{finish.getBIMID()}, objectID);
+} //ProjectCollection::addFinishProxy
 
 
 /*--------------------------------------------------------------------
@@ -155,7 +159,7 @@ bool ProjectCollection::fillInventory(active::serialise::Inventory& inventory) c
 	base::fillInventory(inventory);
 	inventory.merge(Inventory{
 		{
-			{ Identity{fieldID[finishProxyID]}, finishProxyID, 100, std::nullopt },
+			{ Identity{fieldID[finishProxyID]}, finishProxyID, std::numeric_limits<size_t>::max(), std::nullopt },
 		},
 	}.withType(&typeid(ProjectCollection)));
 	return true;
@@ -181,7 +185,7 @@ Cargo::Unique ProjectCollection::getCargo(const Inventory::Item& item) const {
 				std::advance(iter, item.available);
 				const Finish* finish = nullptr;
 				if (auto fin = m_finishes->find(iter->first); fin != m_finishes->end())
-					finish = fin->second.get();
+					finish = &fin->second;
 				else if (auto attribute = m_project->getAttributeDatabase()->getAttribute(iter->first, iter->first.tableID); attribute)
 					finish = dynamic_cast<const Finish*>(attribute.get());
 				if (finish != nullptr) {

SpeckleConnector/Connector/Record/Collection/ProjectCollection.h

@@ -3,6 +3,7 @@
 
 #include "Connector/Record/Collection/RecordCollection.h"
 #include "Speckle/Serialise/Collection/FinishCollector.h"
+#include "Speckle/Serialise/Collection/ConversionReporter.h"
 
 #include <stack>
 
@@ -25,7 +26,7 @@ namespace connector::record {
 	 - Other attributes, e.g. materials
 	 Add all this supplementary data to the root container as required
 	 */
-	class ProjectCollection : public RecordCollection, public speckle::serialise::FinishCollector {
+	class ProjectCollection : public RecordCollection, public speckle::serialise::FinishCollector, public speckle::serialise::ConversionReporter {
 	public:
 		
 		// MARK: - Types
@@ -37,8 +38,9 @@ namespace connector::record {
 		/*!
 		 Constructor
 		 @param project The source project
+		 @param modelCardID The model card ID for the send operation
 		 */
-		ProjectCollection(speckle::environment::Project::Shared project);
+		ProjectCollection(speckle::environment::Project::Shared project, const speckle::database::RecordID& modelCardID);
 		ProjectCollection(const ProjectCollection&) = delete;
 		/*!
 		 Destructor
@@ -69,16 +71,14 @@ namespace connector::record {
 		 @param objectID The object the material is applied to
 		 @return True if the material proxy was added (false typically means the record already exists)
 		 */
-		bool addMaterialProxy(const speckle::database::BIMIndex& materialIndex, const speckle::database::BIMRecordID& objectID) override;
-#ifdef ARCHICAD
+		bool addFinishProxy(const speckle::database::BIMIndex& materialIndex, const speckle::database::BIMRecordID& objectID) override;
 		/*!
 		 Add a ModelerAPI material to the collection (NB: These are not persistent so need to be captured by this method)
-		 @param material A material
+		 @param finish A finish
 		 @param objectID The object the material is applied to
 		 @return True if the material proxy was added (false typically means the record already exists)
 		 */
-		bool addMaterialProxy(const ModelerAPI::Material& material, const speckle::database::BIMRecordID& objectID) override;
-#endif
+		bool addFinishProxy(const speckle::record::attribute::Finish& finish, const speckle::database::BIMRecordID& objectID) override;
 		
 		// MARK: - Serialisation
 		
@@ -101,11 +101,9 @@ namespace connector::record {
 		std::unique_ptr<active::serialise::Management> m_management;
 			///Finish proxies accumulated from meshes generated from the collection elements
 		FinishProxies m_finishProxies;
-#ifdef ARCHICAD
 		class FinishCache;
-			///Finishes cached from ModelerAPI materials
+			///Finishes cache
 		std::unique_ptr<FinishCache> m_finishes;
-#endif
 	};
 	
 }

SpeckleConnector/Connector/Record/Model/CardMover.cpp

@@ -3,6 +3,7 @@
 #include "Connector/Record/Model/ReceiverModelCard.h"
 #include "Connector/Record/Model/SenderModelCard.h"
 
+using namespace active::serialise;
 using namespace connector::record;
 
 namespace {
@@ -32,7 +33,7 @@ namespace {
 }
 
 	///The handler for model card packages
-std::shared_ptr<active::serialise::Handler> CardMover::m_handler = std::make_shared<active::serialise::Handler>(attributeTag);
+std::shared_ptr<Handler> CardMover::m_handler = std::make_shared<Handler>(attributeTag);
 
 
 /*--------------------------------------------------------------------

SpeckleConnector/Connector/Record/Model/CardMover.h

@@ -6,10 +6,10 @@
 namespace connector::record {
 	
 	/*!
-	 Wrapper to box/unbox objects during (de)serialisation, including reading/writing a specified attribute to determine object type
+	 Wrapper to box/unbox model cards during (de)serialisation
 	 
-	 Note that a derived class could also define the package handler, allowing the wrapper to be created via a default constructor that is
-	 automatically bound to a set of internally defined object types
+	 Model cards are polymorphic - this class ensures the type information is included when a card is serialised
+	 and the correct object type is constructed on deserialisation
 	 */
 	class CardMover : public active::serialise::Mover {
 	public:

SpeckleConnector/Connector/Record/Model/ModelCard.h

@@ -11,7 +11,10 @@
 namespace connector::record {
 	
 	/*!
-	 A connector send filter
+	 Base class for a Speckle model card
+
+	 A model card captures key information about a model submitted to a Speckle server, e.g. the model ID, the target server
+	 and account, and any settings or filters applicable to the host BIM application and open document
 	 */
 	class ModelCard : public speckle::database::Record {
 	public:
@@ -60,13 +63,13 @@ namespace connector::record {
 		 */
 		const speckle::utility::String& getModelID() const { return m_modelID; }
 		/*!
-		 Get the setting type
-		 @return The setting type
+		 Get the ID of the active BIM project
+		 @return The ID of the active BIM project
 		 */
 		const speckle::utility::String& getProjectID() const { return m_projectID; }
 		/*!
-		 Get the setting type
-		 @return The setting type
+		 Get the user account ID
+		 @return The user account ID
 		 */
 		const speckle::utility::String& getAccountID() const { return m_accountID; }
 		/*!
@@ -75,8 +78,8 @@ namespace connector::record {
 		 */
 		const speckle::utility::String& getMessage() const { return m_message; }
 		/*!
-		 Get the setting type
-		 @return The setting type
+		 Get the server URL
+		 @return The server URL
 		 */
 		const speckle::utility::String& getServerURL() const { return m_serverURL; }
 		/*!

SpeckleConnector/RFIX.WIN/Connector.rc

@@ -11,5 +11,6 @@
 #include "Speckle.grc.rc2"
 
 #include "ConnectorFix.grc.rc2"
+#include "ConnectorImagesFix.grc.rc2"
 
 1	ICON	LOADONCALL MOVEABLE IMPURE  ACAP.ico

SpeckleConnector/RFIX/ConnectorImagesFix.grc

@@ -0,0 +1,10 @@
+
+#ifdef macintosh
+'GICN' 32500  "Speckle menu icon" {
+	"32500Mac"
+}
+#else
+'GICN' 32500  "Speckle menu icon" {
+	"32500Win"
+}
+#endif

SpeckleConnector/RFIX/Images/32500Mac_18x18.svg

@@ -0,0 +1,5 @@
+<svg width="52" height="52" viewBox="0 0 52 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 10L2 4V44L9 50V10Z" stroke="black" stroke-width="3" stroke-linejoin="round"/>
+<path d="M43 2L2 4L9 10L50 8L43 2Z" stroke="black" stroke-width="3" stroke-linejoin="round"/>
+<path d="M50 8L9 10V50L50 48V8Z" stroke="black" stroke-width="3" stroke-linejoin="round"/>
+</svg>

SpeckleConnector/RFIX/Images/32500Win_18x18.svg

@@ -0,0 +1,5 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 8L0 2V42L7 48V8Z" fill="#313BCF"/>
+<path d="M41 0L0 2L7 8L48 6L41 0Z" fill="#7BBCFF"/>
+<path d="M48 6L7 8V48L48 46V6Z" fill="#047EFB"/>
+</svg>

SpeckleConnector/RINT/Connector.grc

@@ -9,4 +9,5 @@
 /* [  2] */		"The specified model card cannot be found. Try another card or create a new one"
 /* [  3] */		"Please open a project first"
 /* [  4] */		"The specified Speckle account cannot be found. Check that you have logged into your Speckle account with the Speckle Manager"
+/* [  5] */		"Unsupported conversion"
 }

SpeckleConnector/RINT/ConnectorMenu.grc

@@ -1,5 +1,5 @@
 'STR#' 32500  "Connector Menu" {
-	/*[ 1]*/	"Speckle Connector"
+	/*[ 1]*/	"Speckle Connector^E3^EL^ES^ED^EE^EI^EW^ET^32500"
 }
 
 

SpeckleConnector/RINT/SpecklePalette.grc

@@ -1,7 +1,7 @@
 /* --- Dockable browser palette ----------------------------------------------*/
 
-'GDLG'  32500    Palette | topCaption | close | grow   0   0  450  150  "Speckle Connector"  {
-/* [  1] */ Browser			0   0  450  150
+'GDLG'  32500    Palette | topCaption | close | grow   0   0  350  150  "Speckle Connector"  {
+/* [  1] */ Browser			0   0  350  150
 }
 
 'DLGH'  32500  DLG_32500_Browser_Palette {

SpeckleLib/RINT/Speckle.grc

@@ -1,4 +1,5 @@
 'STR#' 32700 "Speckle Title strings" {
 /* [  1] */		"Untitled"
 /* [  2] */		"Unknown"
+/* [  3] */		"Converting elements"
 }

SpeckleLib/Speckle/Database/BIMElementDatabase.cpp

@@ -33,8 +33,9 @@ namespace speckle::database {
 	};
 
 		///Element database storage declaration
-	class BIMElementDatabase::Store : public Storage<Element, UnboxedTransport, BIMRecordID, BIMRecordID, BIMRecordID, BIMRecordID> {
-		using base = Storage<Element, UnboxedTransport, BIMRecordID, BIMRecordID, BIMRecordID, BIMRecordID>;
+	class BIMElementDatabase::Store : public Storage<Element, UnboxedTransport, BIMRecordID, BIMRecordID,
+			BIMRecordID, BIMRecordID, ElementStorage::TableType> {
+		using base = Storage<Element, UnboxedTransport, BIMRecordID, BIMRecordID, BIMRecordID, BIMRecordID, ElementStorage::TableType>;
 		using base::base;
 	};
 	
@@ -75,6 +76,48 @@ BIMElementDatabase::BIMElementDatabase() {
 BIMElementDatabase::~BIMElementDatabase() {}
 
 
+/*--------------------------------------------------------------------
+	Get the available element tables
+ 
+	targetType: An optional filtr for table type to retrieve, e.g. get all sections (nullopt = all table types)
+ 
+	return: A list of available tables
+  --------------------------------------------------------------------*/
+BIMRecordIDList BIMElementDatabase::getTables(std::optional<TableType> targetType) const {
+	return m_engine->getTables(targetType);
+} //BIMElementDatabase::getTables
+
+
+/*--------------------------------------------------------------------
+	Get the default dbase table
+ 
+	return: The default dbase table (nullopt if no table is available)
+  --------------------------------------------------------------------*/
+std::optional<BIMRecordID> BIMElementDatabase::getDefaultTable() const {
+	return m_engine->getDefaultTable();
+} //BIMElementDatabase::getDefaultTable
+
+
+/*--------------------------------------------------------------------
+	Set the default dbase table
+ 
+	tableID: The new default dbase table
+  --------------------------------------------------------------------*/
+void BIMElementDatabase::setDefaultTable(const BIMRecordID& tableID) const {
+	m_engine->setDefaultTable(tableID);
+} //BIMElementDatabase::setDefaultTable
+
+
+/*--------------------------------------------------------------------
+	Bring the view of this database to the front (i.e. so the user sees it)
+ 
+	tableID: The ID of the table to bring to the front
+  --------------------------------------------------------------------*/
+void BIMElementDatabase::bringViewToFront(BIMRecordID tableID) const {
+	m_engine->bringViewToFront(tableID);
+} //BIMElementDatabase::bringViewToFront
+
+
 /*--------------------------------------------------------------------
 	Get the current user element selection
  
@@ -101,10 +144,27 @@ void BIMElementDatabase::clearSelection() const {
 } //BIMElementDatabase::clearSelection
 
 
+/*--------------------------------------------------------------------
+	Find a filtered list of objects
+ 
+	filter: The object filter (nullptr = find all objects)
+	tableID: Optional table ID (defaults to the first table)
+	documentID: Optional document ID (filter for this document only - nullopt = all objects)
+ 
+	return: A list containing IDs of found elements (empty if none found)
+  --------------------------------------------------------------------*/
+BIMRecordIDList BIMElementDatabase::findElements(const Filter& filter, std::optional<BIMRecordID> tableID,
+														  std::optional<BIMRecordID> documentID) const {
+	return m_engine->findObjects(filter, tableID, documentID);
+} //BIMElementDatabase::findElements
+
+
 /*--------------------------------------------------------------------
 	Get a specified element
  
 	elementID: The ID of the target element
+	tableID: Optional table ID (defaults to the first table)
+	documentID: Optional document ID (filter for this document only - nullopt = all objects)
  
 	return: The requested element (nullptr on failure)
   --------------------------------------------------------------------*/
@@ -117,10 +177,14 @@ Element::Unique BIMElementDatabase::getElement(const BIMRecordID& elementID, std
 /*--------------------------------------------------------------------
 	Get all elements
  
+	tableID: Optional table ID (defaults to the first table)
+	documentID: Optional document ID (filter for this document only - nullopt = all objects)
+ 
 	return: All the elements
   --------------------------------------------------------------------*/
-Vector<Element> BIMElementDatabase::getElements() const {
-	return m_store->getObjects();
+Vector<Element> BIMElementDatabase::getElements(std::optional<BIMRecordID> tableID,
+												std::optional<BIMRecordID> documentID) const {
+	return m_store->getObjects(tableID, documentID);
 } //BIMElementDatabase::getElements
 
 

SpeckleLib/Speckle/Database/BIMElementDatabase.h

@@ -2,6 +2,7 @@
 #define CONNECTOR_DATABASE_BIM_ELEMENT_DATABASE
 
 #include "Speckle/Database/Identity/BIMLink.h"
+#include "Speckle/Database/Storage/Element/ElementStorage.h"
 #include "Speckle/Record/Element/Element.h"
 #include "Speckle/Record/Element/Interface/Part.h"
 #include "Speckle/Utility/Guid.h"
@@ -19,7 +20,7 @@ namespace speckle::database {
 	/*!
 	 Database of model elements relating to a specific project
 	 */
-	class BIMElementDatabase {
+	class BIMElementDatabase : public ElementStorage {
 	public:
 
 		// MARK: - Constructors
@@ -36,6 +37,27 @@ namespace speckle::database {
 		
 		// MARK: - Functions (const)
 		
+		/*!
+		 Get the available element tables
+		 @param targetType An optional filtr for table type to retrieve, e.g. get all sections (nullopt = all table types)
+		 @return A set of available tables
+		 */
+		BIMRecordIDList getTables(std::optional<TableType> targetType) const;
+		/*!
+		 Get the default dbase table
+		 @return The default dbase table (nullopt if no table is available)
+		 */
+		std::optional<BIMRecordID> getDefaultTable() const;
+		/*!
+		 Set the default dbase table
+		 @param tableID The new default dbase table
+		 */
+		void setDefaultTable(const BIMRecordID& tableID) const;
+		/*!
+		 Bring the view of this database to the front (i.e. so the user sees it)
+		 @param tableID The ID of the table to bring to the front
+		 */
+		void bringViewToFront(BIMRecordID tableID) const;
 		/*!
 		 Get the current user element selection
 		 @return A list of selected element IDs
@@ -49,6 +71,15 @@ namespace speckle::database {
 		 Clear the element selection
 		 */
 		void clearSelection() const;
+		/*!
+		 Find a filtered list of objects
+		 @param filter The object filter (nullptr = find all objects)
+		 @param tableID Optional table ID (defaults to the first table)
+		 @param documentID Optional document ID (filter for this document only - nullopt = all objects)
+		 @return A list containing IDs of found elements (empty if none found)
+		 */
+		BIMRecordIDList findElements(const Filter& filter = nullptr, std::optional<BIMRecordID> tableID = std::nullopt,
+											  std::optional<BIMRecordID> documentID = std::nullopt) const;
 		/*!
 		 Get a specified element
 		 @param elementID The ID of the target element
@@ -66,9 +97,12 @@ namespace speckle::database {
 		std::unique_ptr<record::element::Element> getElement(const BIMLink& link) const { return getElement(link, link.tableID, link.docID); }
 		/*!
 		 Get all model elements
+		 @param tableID Optional table ID (defaults to the first table)
+		 @param documentID Optional document ID (filter for this document only - nullopt = all objects)
 		 @return All the elements
 		 */
-		active::container::Vector<record::element::Element> getElements() const;
+		active::container::Vector<record::element::Element> getElements(std::optional<BIMRecordID> tableID = std::nullopt,
+																		std::optional<BIMRecordID> documentID = std::nullopt) const;
 		/*!
 		 Get memo memo (supplementary) data for a specified element
 		 @param elementID The of the source element

SpeckleLib/Speckle/Database/Content/BIMRecord.h

@@ -62,7 +62,7 @@ namespace speckle::database {
 		 Get a link to the BIM record
 		 @return The BIM record link
 		 */
-		BIMLink getBIMLink() const { return BIMLink{ BIMLink::base	{m_applicationID, m_applicationTableID} }; }
+		virtual BIMLink getBIMLink() const { return BIMLink{BIMLink::base{m_applicationID, m_applicationTableID}}; }
 		/*!
 		 Get the record unit type
 		 @return The record unit type (nullopt if the record has no applicable unit type)

SpeckleLib/Speckle/Database/Identity/BIMLink.cpp

@@ -14,11 +14,8 @@ BIMLink::BIMLink(const API_Neig& selected, const BIMRecordID& tableID) : base{Gu
 	//More info should be extracted from API_Neig in future (as required) - extract into link settings, e.g. selection target etc
 } //Link::Link
 
-
 BIMLinkList::BIMLinkList(const ElementIDList& elementIDList) {
 	for (const auto& id : elementIDList)
 		push_back(id);
 }
 #endif
-
-

SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Attribute/ArchicadAttributeDBaseEngine.h

@@ -34,6 +34,7 @@ namespace speckle::database {
 		using Attribute = record::attribute::Attribute;
 		using Filter = base::Filter;
 		using Outline = base::Outline;
+		using ObjIDList = base::ObjIDList;
 		
 		// MARK: - Constructors
 		
@@ -51,6 +52,15 @@ namespace speckle::database {
 		
 		// MARK: - Functions (const)
 		
+		/*!
+		 Find a filtered list of objects
+		 @param filter The object filter (nullptr = find all objects)
+		 @param tableID Optional table ID (defaults to the first table)
+		 @param documentID Optional document ID (filter for this document only - nullopt = all objects)
+		 @return A list containing IDs of found elements (empty if none found)
+		 */
+		virtual ObjIDList findObjects(const Filter& filter = nullptr, std::optional<BIMRecordID> tableID = std::nullopt,
+									  std::optional<BIMRecordID> documentID = std::nullopt) const override { return {}; }	//Implement when required
 		/*!
 		 Get an object by ID
 		 @param objID The object ID
@@ -64,7 +74,7 @@ namespace speckle::database {
 		 @param objID The object ID
 		 @param tableID Optional table ID (defaults to the floor plan)
 		 @param documentID Optional document ID (when the object is bound to a specific document)
-		 @return: The requested wrapped cargo (nullptr on failure)
+		 @return The requested wrapped cargo (nullptr on failure)
 		 */
 		active::serialise::Cargo::Unique getObjectCargo(const BIMRecordID& objID, std::optional<BIMRecordID> tableID = std::nullopt, std::optional<BIMRecordID> documentID = std::nullopt) const override;
 		/*!

SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.cpp

@@ -16,6 +16,12 @@
 #include "Speckle/Record/Element/Beam.h"
 #include "Speckle/Record/Element/BeamSegment.h"
 #include "Speckle/Record/Element/Memo.h"
+#include "Speckle/Record/Element/MeshElem.h"
+#include "Speckle/Record/Element/Morph.h"
+#include "Speckle/Record/Element/Roof.h"
+#include "Speckle/Record/Element/Shell.h"
+#include "Speckle/Record/Element/Slab.h"
+#include "Speckle/Record/Element/Wall.h"
 #include "Speckle/Utility/Guid.h"
 #include "Speckle/Utility/String.h"
 
@@ -35,14 +41,24 @@ using enum ArchicadDBaseCore::Status;
 
 namespace {
 	
+		//ID for the floor plan view
+	static const Guid primary2DViewID{String{"ddad27c0-c17b-4ad3-b76b-53d1e176d5ef"}};
+		//ID for the 3D view
+	static const Guid primary3DViewID{String{"ec368939-fb7d-4d8c-bc88-6d29806d9212"}};
+
 	/*!
 	 Get information about a specified Archicad table
 	 @param tableID The ID of the target table
 	 @return The requested table info (nullopt on failure)
 	 */
 	std::optional<API_DatabaseInfo> getTableInfo(const BIMRecordID& tableID) {
-		API_DatabaseInfo dbaseInfo;
-		dbaseInfo.databaseUnId.elemSetId = tableID;
+		API_DatabaseInfo dbaseInfo{};
+		if (tableID == primary2DViewID)
+			dbaseInfo.typeID = APIWind_FloorPlanID;
+		else if (tableID == primary3DViewID)
+			dbaseInfo.typeID = APIWind_3DModelID;
+		else
+			dbaseInfo.databaseUnId.elemSetId = tableID;
 		if (auto err = ACAPI_Window_GetDatabaseInfo(&dbaseInfo); err == NoError)
 			return dbaseInfo;
 		return std::nullopt;
@@ -56,7 +72,7 @@ namespace {
 	 */
 	bool setActiveTable(const BIMRecordID& tableID) {
 		if (!tableID)
-			return false;	//Null guid doens't point to anything
+			return false;	//Null guid doesn't point to anything
 		if (auto activeTable = ArchicadElementDBaseEngine::getActiveTable(); activeTable && *activeTable == tableID)
 			return true;
 		auto dbaseInfo = getTableInfo(tableID);
@@ -82,6 +98,22 @@ namespace {
 				return std::make_unique<Beam>(elementData, tableID);
 			case API_BeamSegmentID:
 				return std::make_unique<BeamSegment>(elementData, tableID);
+			case API_MeshID:
+				return std::make_unique<Mesh>(elementData, tableID);
+			case API_MorphID:
+				return std::make_unique<Morph>(elementData, tableID);
+			case API_RoofID:
+				return std::make_unique<Roof>(elementData, tableID);
+			case API_ShellID:
+				return std::make_unique<Shell>(elementData, tableID);
+			case API_SlabID:
+				return std::make_unique<Slab>(elementData, tableID);
+			case API_WallID:
+				return std::make_unique<Wall>(elementData, tableID);
+			case API_ObjectID:
+				// POC: change this case once we are ready to convert Grid Elements
+				if (elementData.header.type.variationID == APIVarId_GridElement)
+					return nullptr;
 			default:
 				return std::make_unique<GenericModelElement>(elementData, tableID);
 		}
@@ -96,12 +128,34 @@ namespace {
 std::optional<BIMRecordID> ArchicadElementDBaseEngine::getActiveTable() {
 	API_WindowInfo dbaseInfo;
 	active::utility::Memory::erase(dbaseInfo);
-	if (auto err = ACAPI_Database_GetCurrentDatabase(&dbaseInfo); err == NoError)
+	if (auto err = ACAPI_Database_GetCurrentDatabase(&dbaseInfo); err == NoError) {
+		if (dbaseInfo.typeID == APIWind_FloorPlanID)
+			return primary2DViewID;
+		else if (dbaseInfo.typeID == APIWind_3DModelID)
+			return primary3DViewID;
 		return dbaseInfo.databaseUnId.elemSetId;
+	}
 	return std::nullopt;
 } //ArchicadElementDBaseEngine::getActiveTable
 
 
+/*--------------------------------------------------------------------
+	Bring the view of this database to the front (i.e. so the user sees it)
+ 
+	tableID: The ID of the table to bring to the front
+  --------------------------------------------------------------------*/
+void ArchicadElementDBaseEngine::bringViewToFront(BIMRecordID tableID) const {
+	auto dbaseInfo = getTableInfo(tableID);
+	if (!dbaseInfo)
+		return;
+	API_WindowInfo windowInfo{};
+	windowInfo.typeID = dbaseInfo->typeID;
+	if ((windowInfo.typeID != APIWind_FloorPlanID) && (windowInfo.typeID != APIWind_3DModelID))
+		windowInfo.databaseUnId = dbaseInfo->databaseUnId;
+	ACAPI_Window_ChangeWindow(&windowInfo);
+} //ArchicadElementDBaseEngine::bringViewToFront
+
+
 /*--------------------------------------------------------------------
 	Get the current user element selection
  
@@ -128,7 +182,7 @@ BIMLinkList ArchicadElementDBaseEngine::getSelection() const {
   --------------------------------------------------------------------*/
 void ArchicadElementDBaseEngine::setSelection(const BIMLinkList& elementIDs) const {
 	GS::Array<API_Neig> selNeigs;
-	for (const auto elemID : elementIDs) {
+	for (const auto& elemID : elementIDs) {
 		API_Neig neig(elemID);
 		selNeigs.Push(neig);
 	}
@@ -144,6 +198,73 @@ void ArchicadElementDBaseEngine::clearSelection() const {
 } //ArchicadElementDBaseEngine::clearSelection
 
 
+/*--------------------------------------------------------------------
+	Get the available dbase tables
+ 
+	targetType: An optional filtr for table type/group to retrieve
+ 
+	return: A list of available tables
+  --------------------------------------------------------------------*/
+ArchicadElementDBaseEngine::TableIDList ArchicadElementDBaseEngine::getTables(std::optional<TableType> targetType) const {
+	using enum ElementStorage::TableType;
+	TableIDList result;
+	if (!targetType || (targetType == primary2D))
+		result.insert(primary2DViewID);
+	if (!targetType || (targetType == primary3D))
+		result.insert(primary3DViewID);
+	return result;
+} //ArchicadElementDBaseEngine::getTables
+
+
+/*--------------------------------------------------------------------
+	Get the default dbase table
+ 
+	return: The default dbase table (nullopt if no table is available)
+  --------------------------------------------------------------------*/
+std::optional<BIMRecordID> ArchicadElementDBaseEngine::getDefaultTable() const {
+	return ArchicadElementDBaseEngine::getActiveTable();
+} //ArchicadElementDBaseEngine::getDefaultTable
+
+
+/*--------------------------------------------------------------------
+	Set the default dbase table
+ 
+	tableID: The new default dbase table
+  --------------------------------------------------------------------*/
+void ArchicadElementDBaseEngine::setDefaultTable(const BIMRecordID& tableID) const {
+	setActiveTable(tableID);
+} //ArchicadElementDBaseEngine::setDefaultTable
+
+
+/*--------------------------------------------------------------------
+	Find a filtered list of objects
+ 
+	filter: The object filter (nullptr = find all objects)
+	tableID: Optional table ID (defaults to the first table)
+	documentID: Optional document ID (filter for this document only - nullopt = all objects)
+ 
+	return: A list containing IDs of found elements (empty if none found)
+  --------------------------------------------------------------------*/
+BIMRecordIDList ArchicadElementDBaseEngine::findObjects(const Filter& filter, std::optional<BIMRecordID> tableID,
+																		 std::optional<BIMRecordID> documentID) const {
+		//Switch to the target table (when specified). Otherwise the currently active table will be used
+	if (tableID)
+		setActiveTable(*tableID);
+		//First check for no filter (in which case we return all objects)
+	if (filter == nullptr) {
+		GS::Array<API_Guid> found;
+		if ((ACAPI_Element_GetElemList({}, &found) != NoError) || found.IsEmpty())
+			return {};
+		BIMRecordIDList result;
+		for (const auto& item : found)
+			result.insert(item);
+		return result;
+	}
+		//Implement other filtering as required - ideally identify characteristics supported by API, e.g. filter by type/renovation etc
+	return {};
+} //ArchicadElementDBaseEngine::findObjects
+
+
 /*--------------------------------------------------------------------
 	Get an object by index
  
@@ -211,7 +332,19 @@ active::container::Vector<Element> ArchicadElementDBaseEngine::getObjects(std::o
 																					  std::optional<BIMRecordID> documentID) const {
 	if (tableID)
 		setActiveTable(*tableID);
-	return {}; //TODO: Implement
+	else {			
+			//Use the active table if none is specified
+		tableID = getActiveTable();
+		if (!tableID)
+			return {};
+	}
+		//Retrieve the element objects to build the result
+	active::container::Vector<Element> result;
+	auto objectIDs = findObjects();
+	for (const auto& ID : objectIDs)
+		if (auto element = getObject(ID, tableID); element)
+			result.emplace_back(std::move(element));
+	return result;
 } //ArchicadElementDBaseEngine::getObjects
 
 

SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.h

@@ -4,6 +4,7 @@
 #include "Active/Database/Storage/DBaseEngine.h"
 #include "Active/Serialise/UnboxedTransport.h"
 #include "Speckle/Database/Storage/ArchicadDBase/ArchicadDBaseCore.h"
+#include "Speckle/Database/Storage/Element/ElementStorage.h"
 #include "Speckle/Database/Identity/BIMLink.h"
 #include "Speckle/Record/Element/Element.h"
 #include "Speckle/Utility/Guid.h"
@@ -17,16 +18,17 @@ namespace speckle::database {
 	/*!
 	 A database engine to read/write elements in an Archicad project database (local file or cloud-based)
 	 */
-	class ArchicadElementDBaseEngine : public ArchicadDBaseCore,
-			public active::database::DBaseEngine<record::element::Element, BIMRecordID, BIMRecordID, BIMRecordID>  {
+	class ArchicadElementDBaseEngine : public ArchicadDBaseCore, public ElementStorage,
+			public active::database::DBaseEngine<record::element::Element, BIMRecordID, BIMRecordID, BIMRecordID, ElementStorage::TableType>  {
 	public:
 		
 		// MARK: - Types
 		
 		using base = active::database::DBaseEngine<record::element::Element, BIMRecordID, BIMRecordID, BIMRecordID>;
 		using Element = record::element::Element;
-		using Filter = base::Filter;
+		using Filter = ElementStorage::Filter;
 		using Outline = base::Outline;
+		using ObjIDList = base::ObjIDList;
 		
 		// MARK: - Constants
 		
@@ -53,6 +55,11 @@ namespace speckle::database {
 		
 		// MARK: - Functions (const)
 		
+		/*!
+		 Bring the view of this database to the front (i.e. so the user sees it)
+		 @param tableID The ID of the table to bring to the front
+		 */
+		void bringViewToFront(BIMRecordID tableID) const;
 		/*!
 		 Get the current user element selection
 		 @return A list of selected element IDs
@@ -66,6 +73,31 @@ namespace speckle::database {
 		 Clear the element selection
 		 */
 		void clearSelection() const;
+		/*!
+		 Get the available dbase tables
+		 @param targetType An optional filtr for table type/group to retrieve
+		 @return A list of available tables
+		 */
+		TableIDList getTables(std::optional<TableType> targetType) const override;
+		/*!
+		 Get the default dbase table
+		 @return The default dbase table (nullopt if no table is available)
+		 */
+		std::optional<BIMRecordID> getDefaultTable() const;
+		/*!
+		 Set the default dbase table
+		 @param tableID The new default dbase table
+		 */
+		void setDefaultTable(const BIMRecordID& tableID) const;
+		/*!
+		 Find a filtered list of objects
+		 @param filter The object filter (nullptr = find all objects)
+		 @param tableID Optional table ID (defaults to the first table)
+		 @param documentID Optional document ID (filter for this document only - nullopt = all objects)
+		 @return A list containing IDs of found elements (empty if none found)
+		 */
+		virtual BIMRecordIDList findObjects(const Filter& filter = nullptr, std::optional<BIMRecordID> tableID = std::nullopt,
+									  std::optional<BIMRecordID> documentID = std::nullopt) const override;
 		/*!
 		 Get an object by index
 		 @param objID The object ID
@@ -79,7 +111,7 @@ namespace speckle::database {
 		 @param objID The object ID
 		 @param tableID Optional table ID (defaults to the floor plan)
 		 @param documentID Optional document ID (when the object is bound to a specific document)
-		 @return: The requested wrapped cargo (nullptr on failure)
+		 @return The requested wrapped cargo (nullptr on failure)
 		 */
 		active::serialise::Cargo::Unique getObjectCargo(const BIMRecordID& objID, std::optional<BIMRecordID> tableID = std::nullopt, std::optional<BIMRecordID> documentID = std::nullopt) const override;
 		/*!

SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Property/ArchicadGroupDBaseEngine.h

@@ -29,6 +29,7 @@ namespace speckle::database {
 		using Group = record::property::Group;
 		using Filter = base::Filter;
 		using Outline = base::Outline;
+		using ObjIDList = base::ObjIDList;
 		
 		// MARK: - Constructors
 		
@@ -46,6 +47,15 @@ namespace speckle::database {
 		
 		// MARK: - Functions (const)
 		
+		/*!
+		 Find a filtered list of objects
+		 @param filter The object filter (nullptr = find all objects)
+		 @param tableID Optional table ID (defaults to the first table)
+		 @param documentID Optional document ID (filter for this document only - nullopt = all objects)
+		 @return A list containing IDs of found elements (empty if none found)
+		 */
+		virtual ObjIDList findObjects(const Filter& filter = nullptr, std::optional<BIMRecordID> tableID = std::nullopt,
+									  std::optional<BIMRecordID> documentID = std::nullopt) const override { return {}; }	//Implement when required
 		/*!
 		 Get an object by ID
 		 @param objID The object ID
@@ -59,7 +69,7 @@ namespace speckle::database {
 		 @param objID The object ID
 		 @param tableID Optional table ID (default selected based on record type)
 		 @param documentID Optional document ID (when the object is bound to a specific document)
-		 @return: The requested wrapped cargo (nullptr on failure)
+		 @return The requested wrapped cargo (nullptr on failure)
 		 */
 		active::serialise::Cargo::Unique getObjectCargo(const BIMRecordID& objID, std::optional<BIMRecordID> tableID = std::nullopt, std::optional<BIMRecordID> documentID = std::nullopt) const override;
 		/*!

SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Property/ArchicadPropertyDBaseEngine.h

@@ -30,6 +30,7 @@ namespace speckle::database {
 		using Template = record::property::Template;
 		using Filter = base::Filter;
 		using Outline = base::Outline;
+		using ObjIDList = base::ObjIDList;
 		
 		// MARK: - Constructors
 		
@@ -47,6 +48,15 @@ namespace speckle::database {
 		
 		// MARK: - Functions (const)
 		
+		/*!
+		 Find a filtered list of objects
+		 @param filter The object filter (nullptr = find all objects)
+		 @param tableID Optional table ID (defaults to the first table)
+		 @param documentID Optional document ID (filter for this document only - nullopt = all objects)
+		 @return A list containing IDs of found elements (empty if none found)
+		 */
+		virtual ObjIDList findObjects(const Filter& filter = nullptr, std::optional<BIMRecordID> tableID = std::nullopt,
+									  std::optional<BIMRecordID> documentID = std::nullopt) const override { return {}; }	//Implement when required
 		/*!
 		 Find all property templates linked to specified classifications
 		 @param classifications The classifications
@@ -66,7 +76,7 @@ namespace speckle::database {
 		 @param objID The object ID
 		 @param tableID Optional table ID (default selected based on record type)
 		 @param documentID Optional document ID (when the object is bound to a specific document)
-		 @return: The requested wrapped cargo (nullptr on failure)
+		 @return The requested wrapped cargo (nullptr on failure)
 		 */
 		active::serialise::Cargo::Unique getObjectCargo(const BIMRecordID& objID, std::optional<BIMRecordID> tableID = std::nullopt, std::optional<BIMRecordID> documentID = std::nullopt) const override;
 		/*!

SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp

@@ -239,7 +239,7 @@ void DocumentStoreCore::writeStore() {
 		GS::HashTable<API_Guid, short> conflicts;
 		if (auto statusCode = convertArchicadError(ACAPI_AddOnObject_ReserveObjects({Guid{m_id.id}}, &conflicts)); statusCode != nominal)
 			throw std::system_error(makeError(statusCode));
-			//TODO: Implamenent handling for conflicts
+			//TODO: Implement handling for conflicts
 	}
 	auto toWrite = buildStore();
 		//Write the new data

SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreEngine.h

@@ -46,6 +46,7 @@ namespace speckle::database {
 		using base = active::database::DBaseEngine<Obj, ObjID, RecordID, RecordID>;
 		using Filter = base::Filter;
 		using Outline = base::Outline;
+		using ObjIDList = base::ObjIDList;
 		using Cache = active::database::RecordCache<Obj, ObjWrapper, ObjID, RecordID, RecordID>;
 		
 		// MARK: - Constructors
@@ -59,6 +60,15 @@ namespace speckle::database {
 		
 		// MARK: - Functions (const)
 		
+		/*!
+		 Find a filtered list of objects
+		 @param filter The object filter (nullptr = find all objects)
+		 @param tableID Optional table ID (defaults to the first table)
+		 @param documentID Optional document ID (filter for this document only - nullopt = all objects)
+		 @return A list containing IDs of found elements (empty if none found)
+		 */
+		virtual ObjIDList findObjects(const Filter& filter = nullptr, std::optional<RecordID> tableID = std::nullopt,
+									  std::optional<RecordID> documentID = std::nullopt) const override { return {}; }	//Implement when required
 		/*!
 		 Get an object by index
 		 @param ID The object ID
@@ -72,7 +82,7 @@ namespace speckle::database {
 		 @param ID The object ID
 		 @param tableID Optional table ID (defaults to the first table)
 		 @param documentID Optional document ID (when the object is bound to a specific document)
-		 @return: The requested wrapped cargo (nullptr on failure)
+		 @return The requested wrapped cargo (nullptr on failure)
 		 */
 		active::serialise::Cargo::Unique getObjectCargo(const ObjID& objID, std::optional<RecordID> tableID = std::nullopt, std::optional<RecordID> documentID = std::nullopt) const override;
 		/*!
@@ -171,8 +181,10 @@ namespace speckle::database {
 			//Read the data stored in the document
 		auto storedData = readStore();
 		m_cache = std::make_unique<Cache>();
-		if (!storedData)
+		if (!storedData) {
+			m_cache->setID(speckle::utility::Guid{true}.operator speckle::utility::String()); //Needs an ID - substitute for the Speckle 'document ID'
 			return m_cache.get();	//Return an empty container if there's no data
+		}
 			//Import the document data into the record cache
 		if constexpr (std::is_same_v<ObjWrapper, Obj>)
 			Transport().receive(std::forward<active::serialise::Cargo&&>(*m_cache), active::serialise::Identity{}, storedData);

SpeckleLib/Speckle/Database/Storage/Element/ElementStorage.h

@@ -0,0 +1,29 @@
+#ifndef SPECKLE_DATABASE_ELEMENT_STORAGE
+#define SPECKLE_DATABASE_ELEMENT_STORAGE
+
+#include "Speckle/Record/Element/Element.h"
+
+namespace speckle::database {
+	
+	/*!
+	 Fundamental concepts for element storage
+	 */
+	class ElementStorage {
+	public:
+		
+		// MARK: - Types
+		
+			///Element storage table types
+		enum class TableType {
+			primary2D,
+			primary3D,
+			section,
+			elevation,
+		};
+			///Element filter
+		using Filter = std::function<bool(const record::element::Element&)>;
+	};
+	
+}
+
+#endif	//SPECKLE_DATABASE_ELEMENT_STORAGE

SpeckleLib/Speckle/Environment/Addon.cpp

@@ -2,6 +2,7 @@
 
 #include "Speckle/Environment/Project.h"
 #include "Speckle/Event/Type/ProjectEvent.h"
+#include "Speckle/Event/Subscriber/ProjectSubscriber.h"
 
 #include <limits>
 
@@ -18,6 +19,14 @@ namespace {
 		//An object representing the active addon
 	Addon* m_addonInstance = nullptr;
 
+		///An instance of this class is used to force project notifications to be issued from the moment the add-on is launched
+	class DummyProjectSubscriber : public ProjectSubscriber {
+	public:
+		bool start() override { return ProjectSubscriber::start(); }
+		bool handle(const ProjectEvent& event) override { return false; }
+	};
+
+	
 }
 
 /*--------------------------------------------------------------------
@@ -77,6 +86,7 @@ std::weak_ptr<Project> Addon::getActiveProject() const {
 void Addon::publishExternal(const active::event::Event& event) {
 	if (!logCallback())
 		return;
+	++m_sessionCount;
 	try {
 		preprocessEvent(event);
 		publish(event);
@@ -120,6 +130,8 @@ bool Addon::attach() {
 	return: True if the participant is able to continue
   --------------------------------------------------------------------*/
 bool Addon::start() {
+		//Force project notifications to be published
+	DummyProjectSubscriber().start();
 		//Add add-on functionality as required
 	return App::start();
 } //Addon::start
@@ -165,7 +177,7 @@ bool Addon::logCallback(bool initialise) {
 		return false;
 	}
 	return true;
-} //Addon::publishExternalEvent
+} //Addon::logCallback
 
 
 /*--------------------------------------------------------------------

SpeckleLib/Speckle/Environment/Addon.h

@@ -40,7 +40,12 @@ namespace speckle::environment {
 		 Get the active project
 		 @return The active project (nullptr = no open project)
 		 */
-		std::weak_ptr<Project> getActiveProject() const;
+		virtual std::weak_ptr<Project> getActiveProject() const;
+		/*!
+		 Get the session index
+		 @return The session index (non-recursive entries into the add-on)
+		 */
+		uint32_t getSession() const { return m_sessionCount; }
 		
 		// MARK: - Functions (mutating)
 		
@@ -103,6 +108,8 @@ namespace speckle::environment {
 		std::shared_ptr<Project> m_activeProject;
 			///The depth of nested callbacks - the root call starts at depth 0 (important for some entry-point initialisation)
 		uint32_t m_callDepth = 0;
+			///The index of the active session (non-recursive entries into the add-on)
+		uint32_t m_sessionCount = 0;
 	};
 	
 	

SpeckleLib/Speckle/Environment/Host.cpp

@@ -0,0 +1,64 @@
+#include "Speckle/Environment/Host.h"
+#include "Active/Utility/Memory.h"
+
+#ifdef ARCHICAD
+#include "DG.h"
+#endif
+
+using namespace speckle::utility;
+using namespace speckle::environment;
+
+namespace {
+	
+		//An object representing the active host
+	Host m_hostInstance;
+
+}
+
+/*--------------------------------------------------------------------
+	Default constructor
+  --------------------------------------------------------------------*/
+Host::Host() {
+} //Host::Host
+
+
+/*--------------------------------------------------------------------
+	Switch to the model view
+ 
+	isSelectionOnly: True to display just the selected elements
+ 
+ 	return: True if the model view is active
+ --------------------------------------------------------------------*/
+bool Host::makeModelViewActive(bool isSelectionOnly) const {
+#ifdef ARCHICAD
+	API_WindowInfo windowInfo;
+	active::utility::Memory::erase(windowInfo);
+	if ((ACAPI_Window_GetCurrentWindow(&windowInfo) == NoError) && (windowInfo.typeID == APIWind_3DModelID))
+		return true;
+	if (isSelectionOnly)
+		return (ACAPI_View_ShowSelectionIn3D() == NoError);
+	return (ACAPI_View_ShowAllIn3D() == NoError);
+#endif
+} //Host::makeModelViewActive
+
+
+/*--------------------------------------------------------------------
+	Display an alert dialog
+ 
+	message: The alert message
+ --------------------------------------------------------------------*/
+void Host::displayAlert(const String& message) const {
+#ifdef ARCHICAD
+	DGAlert(DG_INFORMATION, "Notification", message.data(), "", "OK");
+#endif
+} //Host::displayAlert
+
+
+/*--------------------------------------------------------------------
+	Get an object representing the parent process/application
+ 
+	return: The active application instance
+ --------------------------------------------------------------------*/
+speckle::environment::Host* speckle::environment::host() {
+	return &m_hostInstance;
+} //speckle::environment::host

SpeckleLib/Speckle/Environment/Host.h

@@ -0,0 +1,47 @@
+#ifndef SPECKLE_ENVIRONMENT_HOST
+#define SPECKLE_ENVIRONMENT_HOST
+
+#include "Speckle/Utility/String.h"
+
+namespace speckle::environment {
+	
+	/*!
+		Class to represent a host application (for plugin contexts)
+	*/
+	class Host {
+	public:
+
+		// MARK: Constructors
+
+		/*!
+		 Default constructor
+		 */
+		Host();
+
+		// MARK: Functions (const)
+		
+		/*!
+		 Switch to the model view
+		 @param isSelectionOnly True to display just the selected elements
+ 		 @return True if the model view is active
+		*/
+		bool makeModelViewActive(bool isSelectionOnly = false) const;
+		/*!
+		 Display an alert dialog
+		 @param message The alert message
+		*/
+		void displayAlert(const speckle::utility::String& message) const;
+		
+		// MARK: Functions (mutating)
+		
+	};
+
+	/*!
+	 Get an object representing the host instance
+	 @return The active host instance (nullptr if the host is not running)
+	 */
+	speckle::environment::Host* host();
+
+}
+
+#endif //SPECKLE_ENVIRONMENT_HOST

SpeckleLib/Speckle/Environment/Platform.cpp

@@ -27,6 +27,22 @@ void Platform::writeToConsole(const active::utility::String& message) {
 } //Platform::writeToConsole
 
 
+/*--------------------------------------------------------------------
+	Open a URL
+ 
+	URL: The URL to open
+ --------------------------------------------------------------------*/
+void Platform::openURL(const active::utility::String& URL) {
+#if WINDOWS
+	std::system((String{"start "} + URL).data());
+#elif __APPLE__
+	std::system((String{"open "} + URL).data());
+#elif __linux__
+	std::system((String{"xdg-open"} + url).data());
+#endif
+} //Platform::openURL
+
+
 /*--------------------------------------------------------------------
 	Get an object representing the parent process/application
  

SpeckleLib/Speckle/Environment/Platform.h

@@ -18,6 +18,11 @@ namespace speckle::environment {
 		 @param message The message to write
 		 */
 		void writeToConsole(const active::utility::String& message);
+		/*!
+		 Open a URL
+		 @param URL The URL to open
+		 */
+		void openURL(const active::utility::String& URL);
 	};
 	
 	

SpeckleLib/Speckle/Environment/Project.h

@@ -48,7 +48,7 @@ namespace speckle::environment {
 		/*!
 		 Destructor
 		 */
-		~Project();
+		virtual ~Project();
 		
 		// MARK: - Functions (const)
 		

SpeckleLib/Speckle/Event/Subscriber/ElementSubscriber.cpp

@@ -0,0 +1,113 @@
+#include "Speckle/Event/Subscriber/ElementSubscriber.h"
+#include "Speckle/Environment/Addon.h"
+#include "Speckle/Database/Identity/BIMLink.h"
+#include "Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.h"
+#include "Speckle/Event/Type/ElementEvent.h"
+
+#ifdef ARCHICAD
+#include <ACAPinc.h>
+#endif
+
+using namespace active::environment;
+using namespace active::event;
+using namespace speckle::database;
+using namespace speckle::environment;
+using namespace speckle::event;
+
+namespace {
+	
+	using enum ElementEvent::Type;
+	
+#ifdef ARCHICAD
+	/*!
+	 Callback for an Archicad element change
+	 @param elemType Info about the last changed element
+	 */
+	GSErrCode __ACENV_CALL elementChangedCallback(const API_NotifyElementType* elemType) {
+		if (addon() == nullptr)
+			return NoError;
+
+		// POC: can we do this switch smater?
+		switch (elemType->notifID)
+		{
+			case APINotifyElement_New: {
+				// POC: Put this back once we decide to use Object Tracking
+				// ACAPI_Element_AttachObserver(elemType->elemHead.guid);
+				addon()->publishExternal(ElementEvent{newElem, ElementID{elemType->elemHead.guid}});
+			} break;
+			case APINotifyElement_Change: {
+				addon()->publishExternal(ElementEvent{changeElem, ElementID{elemType->elemHead.guid}});
+			} break;
+			case APINotifyElement_Edit: {
+				addon()->publishExternal(ElementEvent{editElem, ElementID{elemType->elemHead.guid}});
+			} break;
+			case APINotifyElement_Delete: {
+				addon()->publishExternal(ElementEvent{deleteElem, ElementID{ elemType->elemHead.guid}});
+			} break;
+			case APINotifyElement_BeginEvents:
+				addon()->publishExternal(ElementEvent{begin});
+				break;
+			case APINotifyElement_EndEvents: {
+				addon()->publishExternal(ElementEvent{end});
+			} break;
+			default:
+				break;
+		}
+
+		return NoError;
+	}
+#endif
+
+}
+
+/*--------------------------------------------------------------------
+	Get the event subscription list
+ 
+	return: The subscription list (an empty list will put the subscriber into a suspended state)
+  --------------------------------------------------------------------*/
+Subscriber::Subscription ElementSubscriber::subscription() const {
+	return { {ElementEvent::ID} };
+} //ElementSubscriber::subscription
+
+
+/*--------------------------------------------------------------------
+	Receive a subscribed event
+ 
+	event: The incoming event
+ 
+	return: True if the event should be closed
+  --------------------------------------------------------------------*/
+bool ElementSubscriber::receive(const Event& event) {
+		//Pass a menu event to the specified handler function
+	if (auto changeEvent = dynamic_cast<const ElementEvent*>(&event); changeEvent != nullptr)
+		return handle(*changeEvent);
+	return false;
+} //ElementSubscriber::receive
+
+
+/*--------------------------------------------------------------------
+	Start the participant operation
+ 
+	return: True if the participant is able to continue
+  --------------------------------------------------------------------*/
+bool ElementSubscriber::start() {
+#ifdef ARCHICAD
+	GSErrCode err = ACAPI_Element_InstallElementObserver(elementChangedCallback);
+	if (err != NoError)
+		return false;
+	
+	return (ACAPI_Element_CatchNewElement(nullptr, elementChangedCallback) == NoError);
+#else
+	return false;
+#endif
+} //ElementSubscriber::start
+
+
+/*--------------------------------------------------------------------
+	Stop participation (release resources etc)
+  --------------------------------------------------------------------*/
+void ElementSubscriber::stop() {
+#ifdef ARCHICAD
+	ACAPI_Notification_CatchSelectionChange(nullptr);
+#endif
+} //ElementSubscriber::stop

SpeckleLib/Speckle/Event/Subscriber/ElementSubscriber.h

@@ -0,0 +1,73 @@
+#ifndef SPECKLE_EVENT_ELEMENT_CHANGED_SUBSCRIBER
+#define SPECKLE_EVENT_ELEMENT_CHANGED_SUBSCRIBER
+
+#include "Active/Event/Subscriber.h"
+#include "Speckle/Database/Identity/RecordID.h"
+
+namespace speckle::event {
+	
+	class ElementEvent;
+	
+	/*!
+	 Base class for subscribers responding to element changes
+	*/
+	class ElementSubscriber : public virtual active::event::Subscriber {
+	public:
+
+		// MARK: - Constructors
+		
+		/*!
+		 Default constructor
+		 */
+		ElementSubscriber() = default;
+		/*!
+		 Copy constructor
+		 @param source The object to copy
+		 */
+		ElementSubscriber(const ElementSubscriber& source) = default;
+		/*!
+		 Destructor
+		 */
+		~ElementSubscriber() = default;
+
+		// MARK: - Functions (const)
+		
+		/*!
+		 Get the event subscription list
+		 @return The subscription list (an empty list will put the subscriber into a suspended state)
+		*/
+		Subscription subscription() const override;
+		
+		// MARK: - Functions (mutating)
+		
+		/*!
+		 Receive a subscribed event
+		 @param event The incoming event
+		 @return True if the event should be closed
+		 */
+		bool receive(const active::event::Event& event) override;
+		/*!
+		 Start the participant operation
+		 @return True if the participant is able to continue
+		 */
+		virtual bool start() override;
+		/*!
+		 Stop participation (release resources etc)
+		 */
+		void stop() override;
+		
+	protected:
+
+		/*!
+		 Handle an element change
+		 @param event The element change event
+		 @return True if the event should be closed
+		 */
+		virtual bool handle(const ElementEvent& event) = 0;
+
+		speckle::database::ElementIDList m_changedElements;
+	};
+	
+}
+
+#endif	//SPECKLE_EVENT_ELEMENT_CHANGED_SUBSCRIBER

SpeckleLib/Speckle/Event/Subscriber/SelectionSubscriber.cpp

@@ -81,4 +81,4 @@ void SelectionSubscriber::stop() {
 #ifdef ARCHICAD
 	ACAPI_Notification_CatchSelectionChange(nullptr);
 #endif
-}
+} //SelectionSubscriber::stop

SpeckleLib/Speckle/Event/Type/ElementEvent.h

@@ -0,0 +1,65 @@
+#ifndef SPECKLE_EVENT_ELEMENT_EVENT
+#define SPECKLE_EVENT_ELEMENT_EVENT
+
+#include "Active/Event/Event.h"
+
+#include "Active/Utility/Guid.h"
+#include "Active/Utility/String.h"
+
+namespace speckle::event {
+	
+	/*!
+	 Class representing an event signaling a database transaction operating on a BIM element, e.g. adding, editing, deleting etc
+	*/
+	class ElementEvent : public active::event::Event {
+	public:
+
+		enum Type {
+			newElem,	///<A new element has been created
+			begin,	///<An element database transaction has started - subsequent events will detail specific actions
+			end,	///<The current element database transaction has ended - any handling based on the transaction events should be fone now
+			changeElem,	///<An element has been changed
+			editElem,	///<An element has been edited
+			deleteElem	///<An element has been deleted
+		};
+		
+		static const inline active::utility::NameID ID{active::utility::String{"element transaction"},
+				active::utility::Guid{active::utility::String{"ac9366d5-90fd-497e-b7f7-a7b4c8d97c91"}}};
+
+		// MARK: - Constructors
+		
+		/*!
+		 Constructor
+		 @param eventType An event type identifier
+		 @param targetID The ID of the element targeted by the database transaction (nullopt = undefined, e.g. for a begin/end event)
+		 */
+		ElementEvent(Type eventType, database::ElementID::Option targetID = std::nullopt) : Event{ID}, m_elementID{targetID}, m_eventType{eventType} {}
+		/*!
+		 Copy constructor
+		 @param source The object to copy
+		 */
+		ElementEvent(const ElementEvent& source) = default;
+		/*!
+		 Destructor
+		 */
+		~ElementEvent() = default;
+
+		// MARK: - Functions (const)
+		
+		/*!
+		 Get the ID of the database transaction target element
+		 @return The target element ID (nullopt = no target, e.g. a begin/end event)
+		 */
+		database::ElementID::Option getElmentID() const { return m_elementID; }
+		Type getEventType() const { return m_eventType; }
+
+	private:
+			///The ID of the target element (nullopt = undefined)
+		database::ElementID::Option m_elementID;
+			///The specific database operation performed
+		Type m_eventType;
+	};
+	
+}
+
+#endif	//SPECKLE_EVENT_ELEMENT_EVENT

SpeckleLib/Speckle/Interface/Browser/Bridge/BridgeArgument.h

@@ -62,12 +62,17 @@ namespace speckle::interfac::browser::bridge {
 		 @return The number of parameters
 		 */  
 		virtual uint32_t parameterCount() const { return 1;  }
-
 		/*!
 		 Get any error message relating to the arguments
 		 @return The error message (nullopt if no errors occurred)
 		 */
 		speckle::utility::String::Option errorMessage() const { return m_errorMessage; }
+		/*!
+			Write the item data to a string
+			@param dest The string to write the data to
+			@return True if the data was successfully written
+		*/
+		bool write(active::utility::String& dest) const override { return true; }
 		/*!
 		 Fill an inventory with the cargo items
 		 @param inventory The inventory to receive the cargo items
@@ -83,6 +88,12 @@ namespace speckle::interfac::browser::bridge {
 		
 		// MARK: - Functions (mutating)
 		
+		/*!
+			Read the cargo data from the specified string
+			@param source The string to read
+			@return True if the data was successfully read
+		*/
+		bool read(const active::utility::String& source) override { return true; }
 		/*!
 		 Set to the default package content
 		 */
@@ -121,12 +132,24 @@ namespace speckle::interfac::browser::bridge {
 		 */
 		JSArgType(const JSArgType& source) : BridgeArgument{source}, T{source} {}
 
-        /*!
+		/*!
+			Write the item data to a string
+			@param dest The string to write the data to
+			@return True if the data was successfully written
+		*/
+		bool write(active::utility::String& dest) const override { return true; }
+       /*!
                     Get the number of parameters in the argument
                     @return The number of parameters
                     */
         uint32_t parameterCount() const override { return Params; }
 
+ 		/*!
+			Read the cargo data from the specified string
+			@param source The string to read
+			@return True if the data was successfully read
+		*/
+		bool read(const active::utility::String& source) override { return true; }
 		/*!
 		 Set to the default package content
 		 */

SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetCallResult.cpp

@@ -4,6 +4,8 @@
 #include "Active/Serialise/JSON/JSONTransport.h"
 #include "Active/Utility/BufferOut.h"
 #include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
+#include "Speckle/Record/Element/ModelElement.h"
+#include "Speckle/Utility/UserCancel.h"
 
 #include <utility>
 
@@ -44,6 +46,15 @@ std::unique_ptr<WrappedResultArg> GetCallResult::getResult(const WrappedResultAr
 	if (!item)
 		return nullptr;
 	String jsonOutput;
-	JSONTransport().send(std::forward<Cargo&&>(*item), Identity{}, jsonOutput);
+	try {
+		JSONTransport().send(std::forward<Cargo&&>(*item), Identity{}, jsonOutput);
+	} catch(const UserCancel& userCancel) {
+			//If the user cancels and we have a model card ID, notify the JS UI that the operation is cancelled
+		if (userCancel.getModelCardID())
+			getBridge()->sendEvent("triggerCancelSend",
+								   std::make_unique<CargoHold<ValueWrap<String>, String>>(String{*userCancel.getModelCardID()}));
+		jsonOutput = "null";
+	}
+	record::element::ModelElement::resetCache();
 	return std::make_unique<WrappedResultArg>(jsonOutput);
 } //GetCallResult::getResult

SpeckleLib/Speckle/Interface/Component/Progress.cpp

@@ -0,0 +1,101 @@
+#include "Speckle/Interface/Component/Progress.h"
+
+#include <mutex>
+
+#ifdef ARCHICAD
+#include "ACAPI_Interface.h"
+#endif
+
+using namespace speckle::interfac;
+using namespace speckle::utility;
+
+namespace {
+	
+		///The progress class instance - a weak reference is held so the object is released when active users complete
+	std::weak_ptr<Progress> m_instance;
+		///Mutex controlling management of the progress instance
+	std::mutex m_mutex;
+	
+}
+
+/*--------------------------------------------------------------------
+	Destructor
+  --------------------------------------------------------------------*/
+Progress::~Progress() {
+#ifdef ARCHICAD
+	ACAPI_ProcessWindow_CloseProcessWindow();
+#endif
+} //Progress::~Progress
+
+
+/*--------------------------------------------------------------------
+	Get a progress component instance
+ 
+	title: The process title, i.e. for the overall operation. Ignored if an instance is already in operation
+	stages: The number of stages for completing the overall operation. Ignored if an instance is already in operation
+ 
+	return: The progress instance - can be an active progress component if it has already been started (nullptr on failure)
+  --------------------------------------------------------------------*/
+Progress::Shared Progress::getInstance(const String& title, size_t stages) {
+	const std::lock_guard<std::mutex> lock(m_mutex);
+	if (auto instance = m_instance.lock(); instance)
+		return instance;
+#ifdef ARCHICAD
+	GS::UniString gsTitle{title};
+	auto phases = static_cast<Int32>(stages);
+	if (ACAPI_ProcessWindow_InitProcessWindow(&gsTitle, &phases) != NoError)
+		return nullptr;
+#endif
+	auto result = Progress::Shared{new Progress};
+	m_instance = result;
+	return result;
+} //Progress::getInstance
+
+
+/*--------------------------------------------------------------------
+	Addition with assignment
+ 
+	toAdd: The number of steps to add to the progress of the current stage
+  --------------------------------------------------------------------*/
+void Progress::operator+= (size_t toAdd) {
+#ifdef ARCHICAD
+	auto incVal = static_cast<Int32>(toAdd);
+	ACAPI_ProcessWindow_IncProcessValue(&incVal);
+#endif
+} //Progress::operator+=
+
+
+/*--------------------------------------------------------------------
+	Increment operator (increment the the progress of the current stage)
+  --------------------------------------------------------------------*/
+void Progress::operator++ () {
+	operator+=(1);
+} //Progress::operator++
+
+
+/*--------------------------------------------------------------------
+	Start the next stage
+ 
+	title: The stage title
+	stepCount: The number of steps in this stage
+	showPercentage: True to estimate/display the process completion percentage
+  --------------------------------------------------------------------*/
+void Progress::startStage(const String& title, size_t stepCount, bool showPercentage) {
+#ifdef ARCHICAD
+	GS::UniString gsTitle{title};
+	auto maxVal = static_cast<Int32>(stepCount);
+	ACAPI_ProcessWindow_SetNextProcessPhase(&gsTitle, &maxVal, &showPercentage);
+#endif
+} //Progress::startStage
+
+
+/*--------------------------------------------------------------------
+	Determine if the process has been cancelled, e.g. the user cancelling
+ 
+	return: True if the process has been cancelled
+  --------------------------------------------------------------------*/
+bool Progress::isCancelled() {
+#ifdef ARCHICAD
+	return (ACAPI_ProcessWindow_IsProcessCanceled() != NoError);
+#endif
+} //Progress::isCancelled

SpeckleLib/Speckle/Interface/Component/Progress.h

@@ -0,0 +1,80 @@
+#ifndef SPECKLE_INTERFACE_PROGRESS
+#define SPECKLE_INTERFACE_PROGRESS
+
+#include "Speckle/Utility/String.h"
+
+#include <memory>
+
+namespace speckle::interfac {
+	
+	/*!
+	 Interface component to provide progress feedback during some long process to the user, e.g. a progress meter
+	 
+	 The structure of this component is intended for a host-wide singleton, i.e. a modal process that locks out other processes, rather than
+	 simply (say) a progress bar as a component in a dialog/palette. This reflects the behaviour of Archicad but may be adapted to other
+	 hosts
+	 */
+	class Progress {
+	public:
+
+		// MARK: - Types
+		
+			///Shared pointer
+		using Shared = std::shared_ptr<Progress>;
+
+		// MARK: - Constructors
+		
+		Progress(const Progress&) = delete;
+		/*!
+		 Destructor
+		 */
+		~Progress();
+
+		/*!
+		 Get a progress component instance
+		 @param title The process title, i.e. for the overall operation. Ignored if an instance is already in operation
+		 @param stages The number of stages for completing the overall operation. Ignored if an instance is already in operation
+		 @return The progress instance - can be an active progress component if it has already been started (nullptr on failure)
+		 */
+		static Shared getInstance(const utility::String& title = {}, size_t stages = 1);
+		
+		// MARK: - Operators
+		
+		/*!
+		 Addition with assignment
+		 @param toAdd The number of steps to add to the progress of the current stage
+		 */
+		void operator+= (size_t toAdd);
+		/*!
+		 Increment operator (increment the the progress of the current stage)
+		 */
+		void operator++ ();
+		
+		// MARK: - Functions (const)
+
+		/*!
+		 Determine if the process has been cancelled, e.g. the user cancelling
+		 @return True if the process has been cancelled
+		 */
+		bool isCancelled();
+		
+		// MARK: - Functions (mutating)
+
+		/*!
+		 Start the next stage
+		 @param title The stage title
+		 @param stepCount The number of steps in this stage
+		 @param showPercentage True to estimate/display the process completion percentage
+		 */
+		void startStage(const utility::String& title, size_t stepCount, bool showPercentage = true);
+		
+	private:
+		/*!
+		 Default constructor
+		 */
+		Progress() {}
+	};
+	
+}
+
+#endif	//SPECKLE_INTERFACE_PROGRESS

SpeckleLib/Speckle/Primitive/Mesh/Mesh.cpp

@@ -1,6 +1,7 @@
 #include "Speckle/Primitive/Mesh/Mesh.h"
 
 #include "Active/Serialise/Item/Wrapper/ValueWrap.h"
+#include "Active/Serialise/Item/Wrapper/FastDoubleWrap.h"
 #include "Active/Serialise/Package/Wrapper/PackageWrap.h"
 #include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
 #include "Active/Serialise/Inventory/Identity.h"
@@ -78,7 +79,7 @@ Cargo::Unique Mesh::getCargo(const Inventory::Item& item) const {
 	using namespace active::serialise;
 	switch (item.index) {
 	case vertexID:
-			return std::make_unique<ContainerWrap<std::vector<double>>>(m_vertices);
+			return std::make_unique<ContainerWrap<std::vector<double>, FastDoubleWrap>>(m_vertices);
 		case faceID:
 			return std::make_unique<ContainerWrap<std::vector<int>>>(m_faces);
 		case colorID:
@@ -98,6 +99,6 @@ void Mesh::useManagement(Management* management) const {
 		//NB: This object only exists to populate the finish collection - it doesn't carry any serialisable content
 	if (management != nullptr) {
 		if (auto collector = management->get<FinishCollector>(); collector != nullptr)
-			collector->addMaterialProxy(m_material, getBIMID());
+			collector->addFinishProxy(m_finish, getBIMID());
 	}
 } //Mesh::useManagement

SpeckleLib/Speckle/Primitive/Mesh/Mesh.h

@@ -3,10 +3,7 @@
 
 #include "Speckle/Database/Content/BIMRecord.h"
 #include "Speckle/Utility/String.h"
-
-#ifdef ARCHICAD
-#include "ModelMaterial.hpp"
-#endif
+#include "Speckle/Record/Attribute/Finish.h"
 
 namespace speckle::primitive {
 	
@@ -30,23 +27,23 @@ namespace speckle::primitive {
 		/*!
 		 Constructor
 		 @param unit The mesh unit type
-		 @param material The mesh material
+		 @param finish The mesh finish
 		 */
-		Mesh(const ModelerAPI::Material& material,
+		Mesh(const record::attribute::Finish& finish,
 			active::measure::LengthType unit = active::measure::LengthType::metre) :
-			base{ utility::Guid{true}, utility::Guid{}, unit }, m_material{ material } {}
+			base{ utility::Guid{true}, utility::Guid{}, unit }, m_finish{ finish } {}
 		/*!
 		 Constructor
-		 @param unit The mesh unit type
 		 @param vertices The mesh vertices
 		 @param faces The mesh faces (the number of indices in the face followed by the vertex indices)
 		 @param colors The mesh face colours
-		 @param material The mesh material
+		 @param finish The mesh material
+		 @param unit The mesh unit type
 		 */
-		Mesh(std::vector<double>&& vertices, std::vector<int>&& faces, std::vector<int>&& colors, const ModelerAPI::Material& material,
+		Mesh(std::vector<double>&& vertices, std::vector<int>&& faces, std::vector<int>&& colors, const record::attribute::Finish& finish,
 				active::measure::LengthType unit = active::measure::LengthType::metre) :
-				base{utility::Guid{true}, utility::Guid{}, unit}, m_vertices{std::move(vertices)}, m_faces{std::move(faces)}, m_colors{std::move(colors)}, m_material{material} {}
-
+				base{utility::Guid{true}, utility::Guid{}, unit}, m_vertices{std::move(vertices)}, m_faces{std::move(faces)}, m_colors{std::move(colors)}, m_finish{finish} {}
+		
 		// MARK: - Functions (const)
 		
 		/*!
@@ -85,9 +82,7 @@ namespace speckle::primitive {
 		std::vector<double> m_vertices;
 		std::vector<int> m_faces;
 		std::vector<int> m_colors;
-#ifdef ARCHICAD
-		ModelerAPI::Material m_material;
-#endif
+		record::attribute::Finish m_finish;
 	};
 	
 }

SpeckleLib/Speckle/Record/Attribute/Finish.cpp

@@ -156,6 +156,22 @@ Finish::Finish(const Finish& source) : base{source} {
 Finish::~Finish() {}
 
 
+/*--------------------------------------------------------------------
+	Assignment operator
+ 
+	source: The object to assign
+ 
+	return: A reference to this
+  --------------------------------------------------------------------*/
+Finish& Finish::operator=(const Finish& source) {
+	if (this != &source) {
+		base::operator=(source);
+		m_data = source.m_data ? std::make_unique<Data>(*source.m_data) : nullptr;
+	}
+	return *this;
+} //Finish::operator=
+
+
 #ifdef ARCHICAD
 /*--------------------------------------------------------------------
 	Get the (immutable) API attribute header data