Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Jedd Morgan
|
f7ed725a0d |
@@ -1,11 +0,0 @@
|
||||
{
|
||||
"version": 1,
|
||||
"isRoot": true,
|
||||
"tools": {
|
||||
"gitversion.tool": {
|
||||
"version": "6.0.2",
|
||||
"commands": ["dotnet-gitversion"],
|
||||
"rollForward": false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
# 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-*
|
||||
+3
-11
@@ -3,17 +3,14 @@ build/
|
||||
Documents/
|
||||
ResourceObjects/
|
||||
Install/
|
||||
enc_temp_folder/
|
||||
.vs/
|
||||
.vscode/
|
||||
xcuserdata/
|
||||
x64/
|
||||
.DS_Store
|
||||
.cache/
|
||||
SpeckleConnector/Documentation/*
|
||||
!SpeckleConnector/Documentation/Doxyfile
|
||||
SpeckleLib/Documentation/*
|
||||
!SpeckleLib/Documentation/Doxyfile
|
||||
Documentation/*
|
||||
!Documentation/Doxyfile
|
||||
CMakeCache.txt
|
||||
_deps/
|
||||
CMakeFiles/
|
||||
@@ -24,9 +21,4 @@ CMakeFiles/
|
||||
XCBuildData/
|
||||
**/*.xcsettings
|
||||
*.log
|
||||
.idea
|
||||
*.mui
|
||||
*.aps
|
||||
**/obj
|
||||
**/bin
|
||||
output/
|
||||
.idea
|
||||
@@ -1,6 +0,0 @@
|
||||
workflow: GitFlow/v1
|
||||
next-version: 3.0.0
|
||||
branches:
|
||||
release:
|
||||
prevent-increment:
|
||||
when-current-commit-tagged: true
|
||||
@@ -13,36 +13,22 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "..\ci-build\Build.csproj", "{702DE13A-1CCF-485D-A50D-846F645F07D3}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug16|x64 = Debug16|x64
|
||||
Debug16|x86 = Debug16|x86
|
||||
Debug17|x64 = Debug17|x64
|
||||
Debug17|x86 = Debug17|x86
|
||||
DebugAC25|x64 = DebugAC25|x64
|
||||
DebugAC25|x86 = DebugAC25|x86
|
||||
DebugAC26|x64 = DebugAC26|x64
|
||||
DebugAC26|x86 = DebugAC26|x86
|
||||
DebugAC27|x64 = DebugAC27|x64
|
||||
DebugAC27|x86 = DebugAC27|x86
|
||||
DebugAC28|x64 = DebugAC28|x64
|
||||
DebugAC28|x86 = DebugAC28|x86
|
||||
DebugVS2022|x64 = DebugVS2022|x64
|
||||
DebugVS2022|x86 = DebugVS2022|x86
|
||||
Release16|x64 = Release16|x64
|
||||
Release16|x86 = Release16|x86
|
||||
Release17|x64 = Release17|x64
|
||||
Release17|x86 = Release17|x86
|
||||
ReleaseAC25|x64 = ReleaseAC25|x64
|
||||
ReleaseAC25|x86 = ReleaseAC25|x86
|
||||
ReleaseAC26|x64 = ReleaseAC26|x64
|
||||
ReleaseAC26|x86 = ReleaseAC26|x86
|
||||
ReleaseAC27|x64 = ReleaseAC27|x64
|
||||
ReleaseAC27|x86 = ReleaseAC27|x86
|
||||
ReleaseAC28|x64 = ReleaseAC28|x64
|
||||
ReleaseAC28|x86 = ReleaseAC28|x86
|
||||
ReleaseVS2019|x64 = ReleaseVS2019|x64
|
||||
ReleaseVS2019|x86 = ReleaseVS2019|x86
|
||||
ReleaseVS2022|x64 = ReleaseVS2022|x64
|
||||
@@ -57,22 +43,10 @@ Global
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Debug17|x64.Build.0 = DebugVW2024|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Debug17|x86.ActiveCfg = DebugAC27|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Debug17|x86.Build.0 = DebugAC27|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC25|x64.ActiveCfg = DebugAC25|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC25|x64.Build.0 = DebugAC25|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC25|x86.ActiveCfg = DebugVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC25|x86.Build.0 = DebugVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC26|x64.ActiveCfg = DebugAC26|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC26|x64.Build.0 = DebugAC26|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC26|x86.ActiveCfg = DebugVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC26|x86.Build.0 = DebugVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x64.ActiveCfg = DebugAC27|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x64.Build.0 = DebugAC27|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x86.ActiveCfg = DebugVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x86.Build.0 = DebugVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC28|x64.ActiveCfg = DebugAC28|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC28|x64.Build.0 = DebugAC28|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC28|x86.ActiveCfg = DebugVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC28|x86.Build.0 = DebugVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x64.ActiveCfg = DebugVW2024|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x64.Build.0 = DebugVW2024|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x86.ActiveCfg = DebugRV2024|Win32
|
||||
@@ -85,22 +59,10 @@ Global
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Release17|x64.Build.0 = ReleaseVW2024|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Release17|x86.ActiveCfg = ReleaseAC27|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Release17|x86.Build.0 = ReleaseAC27|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC25|x64.ActiveCfg = ReleaseAC25|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC25|x64.Build.0 = ReleaseAC25|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC25|x86.ActiveCfg = ReleaseVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC25|x86.Build.0 = ReleaseVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC26|x64.ActiveCfg = ReleaseAC26|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC26|x64.Build.0 = ReleaseAC26|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC26|x86.ActiveCfg = ReleaseVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC26|x86.Build.0 = ReleaseVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x64.ActiveCfg = ReleaseAC27|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x64.Build.0 = ReleaseAC27|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x86.ActiveCfg = ReleaseVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x86.Build.0 = ReleaseVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC28|x64.ActiveCfg = ReleaseAC28|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC28|x64.Build.0 = ReleaseAC28|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC28|x86.ActiveCfg = ReleaseVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC28|x86.Build.0 = ReleaseVW2024|Win32
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x64.ActiveCfg = ReleaseVW2024|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x64.Build.0 = ReleaseVW2024|x64
|
||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x86.ActiveCfg = ReleaseRV2024|Win32
|
||||
@@ -117,22 +79,10 @@ Global
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Debug17|x64.Build.0 = Debug17|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Debug17|x86.ActiveCfg = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Debug17|x86.Build.0 = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC25|x64.ActiveCfg = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC25|x64.Build.0 = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC25|x86.ActiveCfg = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC25|x86.Build.0 = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC26|x64.ActiveCfg = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC26|x64.Build.0 = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC26|x86.ActiveCfg = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC26|x86.Build.0 = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x64.ActiveCfg = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x64.Build.0 = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x86.ActiveCfg = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x86.Build.0 = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC28|x64.ActiveCfg = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC28|x64.Build.0 = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC28|x86.ActiveCfg = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC28|x86.Build.0 = Debug17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x64.ActiveCfg = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x64.Build.0 = Debug16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x86.ActiveCfg = Debug17|Win32
|
||||
@@ -145,22 +95,10 @@ Global
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Release17|x64.Build.0 = Release17|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Release17|x86.ActiveCfg = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Release17|x86.Build.0 = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC25|x64.ActiveCfg = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC25|x64.Build.0 = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC25|x86.ActiveCfg = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC25|x86.Build.0 = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC26|x64.ActiveCfg = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC26|x64.Build.0 = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC26|x86.ActiveCfg = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC26|x86.Build.0 = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x64.ActiveCfg = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x64.Build.0 = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x86.ActiveCfg = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x86.Build.0 = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC28|x64.ActiveCfg = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC28|x64.Build.0 = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC28|x86.ActiveCfg = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC28|x86.Build.0 = Release17|Win32
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x64.ActiveCfg = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x64.Build.0 = Release16|x64
|
||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x86.ActiveCfg = Release17|Win32
|
||||
@@ -177,22 +115,10 @@ Global
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x64.Build.0 = DebugAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x86.ActiveCfg = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x86.Build.0 = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC25|x64.ActiveCfg = DebugAC25|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC25|x64.Build.0 = DebugAC25|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC25|x86.ActiveCfg = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC25|x86.Build.0 = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC26|x64.ActiveCfg = DebugAC26|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC26|x64.Build.0 = DebugAC26|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC26|x86.ActiveCfg = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC26|x86.Build.0 = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x64.ActiveCfg = DebugAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x64.Build.0 = DebugAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x86.ActiveCfg = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x86.Build.0 = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC28|x64.ActiveCfg = DebugAC28|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC28|x64.Build.0 = DebugAC28|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC28|x86.ActiveCfg = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC28|x86.Build.0 = DebugAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x64.ActiveCfg = DebugAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x64.Build.0 = DebugAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x86.ActiveCfg = DebugAC27|Win32
|
||||
@@ -205,22 +131,10 @@ Global
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x64.Build.0 = ReleaseAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x86.ActiveCfg = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x86.Build.0 = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC25|x64.ActiveCfg = ReleaseAC25|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC25|x64.Build.0 = ReleaseAC25|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC25|x86.ActiveCfg = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC25|x86.Build.0 = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC26|x64.ActiveCfg = ReleaseAC26|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC26|x64.Build.0 = ReleaseAC26|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC26|x86.ActiveCfg = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC26|x86.Build.0 = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x64.ActiveCfg = ReleaseAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x64.Build.0 = ReleaseAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x86.ActiveCfg = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x86.Build.0 = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC28|x64.ActiveCfg = ReleaseAC28|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC28|x64.Build.0 = ReleaseAC28|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC28|x86.ActiveCfg = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC28|x86.Build.0 = ReleaseAC27|Win32
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x64.ActiveCfg = ReleaseAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x64.Build.0 = ReleaseAC27|x64
|
||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x86.ActiveCfg = ReleaseAC27|Win32
|
||||
@@ -229,58 +143,6 @@ 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}.DebugAC25|x64.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC25|x86.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC25|x86.Build.0 = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC26|x64.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC26|x86.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC26|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}.DebugAC28|x64.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC28|x86.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.DebugAC28|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}.ReleaseAC25|x64.ActiveCfg = Release|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC25|x86.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC25|x86.Build.0 = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC26|x64.ActiveCfg = Release|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC26|x86.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC26|x86.Build.0 = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC27|x64.ActiveCfg = Release|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}.ReleaseAC28|x64.ActiveCfg = Release|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC28|x86.ActiveCfg = Debug|Any CPU
|
||||
{702DE13A-1CCF-485D-A50D-846F645F07D3}.ReleaseAC28|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
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -32,53 +32,11 @@
|
||||
<Filter Include="Connector\Database">
|
||||
<UniqueIdentifier>{2f459f56-86f0-4794-b4b7-1bd7b8ee5617}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Interface\Browser\Bridge\Config\Arg">
|
||||
<UniqueIdentifier>{6a2f1f18-a554-4546-bba3-314d5f2ec9f9}</UniqueIdentifier>
|
||||
<Filter Include="Connector\Database\Model">
|
||||
<UniqueIdentifier>{2820ad4f-60d9-436e-a7a2-d019d7e0ce0c}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Interface\Browser\Bridge\Base\Arg">
|
||||
<UniqueIdentifier>{d74446ad-e141-48ac-9fa0-8b82279bbdbf}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Interface\Browser\Bridge\Test">
|
||||
<UniqueIdentifier>{9976ca16-8f99-44a2-b596-b81df82d847a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Interface\Browser\Bridge\Test\Arg">
|
||||
<UniqueIdentifier>{1656a0df-aa39-4f41-860f-7b278b31784a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Interface\Browser\Bridge\Send">
|
||||
<UniqueIdentifier>{2b87cf11-87cd-435f-ab24-42170c2e657e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Database\Identity">
|
||||
<UniqueIdentifier>{41395ee2-50f3-49c0-8859-23a3ad19a2fa}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Record">
|
||||
<UniqueIdentifier>{a915e7ee-849f-48a9-aa7b-0ef6e358bee7}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Record\Model">
|
||||
<UniqueIdentifier>{2b16c188-1d80-4d4d-830e-5c1e56ecf46e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Record\Model\Filter">
|
||||
<UniqueIdentifier>{b6d6326c-77f4-414a-bda6-e3e587c7ded2}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Record\Collection">
|
||||
<UniqueIdentifier>{0ac4b0a4-6a2a-4a48-9757-1172effc20e7}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Interface\Browser\Bridge\Send\Arg">
|
||||
<UniqueIdentifier>{6693f9a9-5ece-4853-b008-4064d1c551ab}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Interface\Browser\Bridge\Selection">
|
||||
<UniqueIdentifier>{806f4af5-fa02-49b8-ac01-297991fe90ea}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<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>
|
||||
<Filter Include="Connector\Interface\Browser\Bridge\Receive">
|
||||
<UniqueIdentifier>{896b7b9b-61d8-46e7-8432-cfbdab4918fb}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Connector\Tool">
|
||||
<UniqueIdentifier>{f9330e8f-8242-4605-b25c-b1ba24451825}</UniqueIdentifier>
|
||||
<Filter Include="Connector\Database\Model\Card">
|
||||
<UniqueIdentifier>{85935d00-16ac-466a-a614-ad9ea802bffa}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@@ -104,6 +62,9 @@
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="Connector\Connector.cpp">
|
||||
<Filter>Connector</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\ConnectorMenu.cpp">
|
||||
<Filter>Connector\Interface</Filter>
|
||||
</ClCompile>
|
||||
@@ -119,6 +80,9 @@
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\ConfigBridge.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\ConnectorConfig.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\GetConfig.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config</Filter>
|
||||
</ClCompile>
|
||||
@@ -128,6 +92,9 @@
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\BaseBridge.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\DocumentInfo.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetConnectorVersion.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClCompile>
|
||||
@@ -143,137 +110,8 @@
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationVersion.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\Arg\ConnectorConfig.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config\Arg</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\Arg\DocumentInfo.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base\Arg</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Test\GetComplexType.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Test\GoAway.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Test\SayHi.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Test\TestBridge.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Test\Arg\SayHiArg.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test\Arg</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Test\TriggerEvent.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\SendBridge.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\Send.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\GetSendFilters.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Database\ModelCardDatabase.cpp">
|
||||
<Filter>Connector\Database</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\CardMover.cpp">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\CardSetting.cpp">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\ModelCard.cpp">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\ReceiverModelCard.cpp">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\SenderModelCard.cpp">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\Filter\DirectSelectionSendFilter.cpp">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\Filter\EverythingSendFilter.cpp">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\Filter\FilterMover.cpp">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Model\Filter\SendFilter.cpp">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\AddModel.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\RemoveModel.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\UpdateModel.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Collection\RecordCollection.cpp">
|
||||
<Filter>Connector\Record\Collection</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\Arg\ConversionResult.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\Arg\SendError.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\Arg\SendViaBrowserArgs.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\Arg\SendObject.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\GetSendSettings.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Collection\FinishProxy.cpp">
|
||||
<Filter>Connector\Record\Collection</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Record\Collection\ProjectCollection.cpp">
|
||||
<Filter>Connector\Record\Collection</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\GetSelection.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Selection</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\SelectionBridge.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Selection</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Selection\Arg</Filter>
|
||||
</ClCompile>
|
||||
<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>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\GetIsDevMode.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Receive\Receive.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Receive</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Receive\ReceiveBridge.cpp">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Receive</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Tool\ElementHighlighter.cpp">
|
||||
<Filter>Connector\Tool</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Connector\Connector.cpp">
|
||||
<Filter>Connector</Filter>
|
||||
<ClCompile Include="Connector\Database\Model\Card\ModelCardDatabase.cpp">
|
||||
<Filter>Connector\Database\Model\Card</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@@ -298,6 +136,9 @@
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\ConfigBridge.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\ConnectorConfig.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\GetConfig.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config</Filter>
|
||||
</ClInclude>
|
||||
@@ -307,6 +148,9 @@
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\BaseBridge.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\DocumentInfo.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetConnectorVersion.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClInclude>
|
||||
@@ -328,146 +172,8 @@
|
||||
<ClInclude Include="Connector\Version.h">
|
||||
<Filter>Connector</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\Arg\ConnectorConfig.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config\Arg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\Arg\DocumentInfo.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base\Arg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Test\GetComplexType.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Test\GoAway.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Test\SayHi.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Test\TestBridge.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Test\Arg\SayHiArg.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test\Arg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Test\TriggerEvent.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Test</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\SendBridge.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Send.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\GetSendFilters.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Database\ModelCardDatabase.h">
|
||||
<Filter>Connector\Database</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Database\Identity\RecordID.h">
|
||||
<Filter>Connector\Database\Identity</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\CardMover.h">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\CardSetting.h">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\ModelCard.h">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\ReceiverModelCard.h">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\SenderModelCard.h">
|
||||
<Filter>Connector\Record\Model</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\Filter\ArchicadEverythingFilter.h">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\Filter\ArchicadSelectionFilter.h">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\Filter\DirectSelectionSendFilter.h">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\Filter\EverythingSendFilter.h">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\Filter\FilterMover.h">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Model\Filter\SendFilter.h">
|
||||
<Filter>Connector\Record\Model\Filter</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\AddModel.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\RemoveModel.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\UpdateModel.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Base</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Collection\RecordCollection.h">
|
||||
<Filter>Connector\Record\Collection</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\ConversionResult.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendError.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendObject.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendViaBrowserArgs.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send\Arg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\GetSendSettings.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Collection\FinishProxy.h">
|
||||
<Filter>Connector\Record\Collection</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Record\Collection\ProjectCollection.h">
|
||||
<Filter>Connector\Record\Collection</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\GetSelection.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Selection</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\SelectionBridge.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Selection</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Selection\Arg</Filter>
|
||||
</ClInclude>
|
||||
<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>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\GetIsDevMode.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Config</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Receive\Receive.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Receive</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Receive\ReceiveBridge.h">
|
||||
<Filter>Connector\Interface\Browser\Bridge\Receive</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Connector\Tool\ElementHighlighter.h">
|
||||
<Filter>Connector\Tool</Filter>
|
||||
<ClInclude Include="Connector\Database\Model\Card\ModelCardDatabase.h">
|
||||
<Filter>Connector\Database\Model\Card</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -15,21 +15,6 @@
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|x64'">
|
||||
<LocalDebuggerCommand>C:\Program Files\Graphisoft\Archicad 28\Archicad.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|x64'">
|
||||
<LocalDebuggerCommand>C:\Program Files\Graphisoft\Archicad 26\Archicad.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|x64'">
|
||||
<LocalDebuggerCommand>C:\Program Files\Graphisoft\ARCHICAD 25\Archicad.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|x64'">
|
||||
<LocalDebuggerCommand>C:\Program Files\Vectorworks 2024\Vectorworks2024.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
@@ -45,19 +30,4 @@
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|x64'">
|
||||
<LocalDebuggerCommand>C:\Program Files\Graphisoft\Archicad 28\Archicad.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|x64'">
|
||||
<LocalDebuggerCommand>C:\Program Files\Graphisoft\Archicad 26\Archicad.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|x64'">
|
||||
<LocalDebuggerCommand>C:\Program Files\Graphisoft\ARCHICAD 25\Archicad.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
File diff suppressed because it is too large
Load Diff
-71
@@ -1,71 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES"
|
||||
buildArchitectures = "Automatic">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21BD79802CE23E4D00526AD1"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC25-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
shouldAutocreateTestPlan = "YES">
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<PathRunnable
|
||||
runnableDebuggingMode = "0"
|
||||
FilePath = "/Applications/Graphisoft/ARCHICAD 25/ARCHICAD 25.app">
|
||||
</PathRunnable>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21BD79802CE23E4D00526AD1"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC25-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
-71
@@ -1,71 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES"
|
||||
buildArchitectures = "Automatic">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21BD79802CE23E4D00526AD1"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC25-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Release"
|
||||
selectedDebuggerIdentifier = ""
|
||||
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
shouldAutocreateTestPlan = "YES">
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Release"
|
||||
selectedDebuggerIdentifier = ""
|
||||
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<PathRunnable
|
||||
runnableDebuggingMode = "0"
|
||||
FilePath = "/Applications/Graphisoft/ARCHICAD 25/ARCHICAD 25.app">
|
||||
</PathRunnable>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21BD79802CE23E4D00526AD1"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC25-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Release">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
-72
@@ -1,72 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES"
|
||||
buildArchitectures = "Automatic">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21CE8A922CE4F3370076522F"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC26-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
shouldAutocreateTestPlan = "YES">
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<PathRunnable
|
||||
runnableDebuggingMode = "0"
|
||||
BundleIdentifier = "com.graphisoft.archicad26"
|
||||
FilePath = "/Applications/Graphisoft/Archicad 26/Archicad 26.app">
|
||||
</PathRunnable>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21CE8A922CE4F3370076522F"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC26-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
-71
@@ -1,71 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES"
|
||||
buildArchitectures = "Automatic">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21CE8A922CE4F3370076522F"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC26-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Release"
|
||||
selectedDebuggerIdentifier = ""
|
||||
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
shouldAutocreateTestPlan = "YES">
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Release"
|
||||
selectedDebuggerIdentifier = ""
|
||||
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<PathRunnable
|
||||
runnableDebuggingMode = "0"
|
||||
FilePath = "/Applications/Graphisoft/Archicad 26/Archicad 26.app">
|
||||
</PathRunnable>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21CE8A922CE4F3370076522F"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC26-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Release">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
LastUpgradeVersion = "1530"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
@@ -29,7 +29,7 @@
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "219F30342C768F0A009834E9"
|
||||
BuildableName = "Connector-AC27-Test.bundle"
|
||||
BuildableName = "Connector-AC27-Test.vwlibrary"
|
||||
BlueprintName = "Connector-AC27-Test"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
LastUpgradeVersion = "1530"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
+1
-5
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
LastUpgradeVersion = "1530"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
@@ -39,10 +39,6 @@
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<PathRunnable
|
||||
runnableDebuggingMode = "0"
|
||||
FilePath = "/Applications/Graphisoft/Archicad 27/Archicad 27.app">
|
||||
</PathRunnable>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
LastUpgradeVersion = "1530"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
@@ -20,7 +20,7 @@
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "219F30342C768F0A009834E9"
|
||||
BuildableName = "Connector-AC27-Test.bundle"
|
||||
BuildableName = "Connector-AC27-Test.vwlibrary"
|
||||
BlueprintName = "Connector-AC27-Test"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
||||
-71
@@ -1,71 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES"
|
||||
buildArchitectures = "Automatic">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21CE8DD22CE5137C0076522F"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC28-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
shouldAutocreateTestPlan = "YES">
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<PathRunnable
|
||||
runnableDebuggingMode = "0"
|
||||
FilePath = "/Applications/Graphisoft/Archicad 28/Archicad 28.app">
|
||||
</PathRunnable>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21CE8DD22CE5137C0076522F"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC28-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
-71
@@ -1,71 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1610"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES"
|
||||
buildArchitectures = "Automatic">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21CE8DD22CE5137C0076522F"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC28-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Release"
|
||||
selectedDebuggerIdentifier = ""
|
||||
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
shouldAutocreateTestPlan = "YES">
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Release"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<PathRunnable
|
||||
runnableDebuggingMode = "0"
|
||||
FilePath = "/Applications/Graphisoft/Archicad 28/Archicad 28.app">
|
||||
</PathRunnable>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "21CE8DD22CE5137C0076522F"
|
||||
BuildableName = "Speckle Connector.bundle"
|
||||
BlueprintName = "Connector-AC28-EN-GB"
|
||||
ReferencedContainer = "container:Connector.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Release">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
Regular → Executable
+13
-113
@@ -1,112 +1,42 @@
|
||||
#include "Active/File/Directory.h"
|
||||
#include "ConnectorResource.h"
|
||||
#include "Connector/Connector.h"
|
||||
#include "Connector/Environment/ConnectorProject.h"
|
||||
#include "Connector/Interface/ConnectorMenu.h"
|
||||
#include "Connector/Interface/ConnectorPalette.h"
|
||||
#include "Connector/Tool/ElementHighlighter.h"
|
||||
#include "Speckle/Database/AccountDatabase.h"
|
||||
#include "Connector/Database/Model/Card/ModelCardDatabase.h"
|
||||
#include "Interface/ConnectorMenu.h"
|
||||
#include "Interface/ConnectorPalette.h"
|
||||
#include "Speckle/Environment/Addon.h"
|
||||
#include "Speckle/Utility/String.h"
|
||||
|
||||
#include <mutex>
|
||||
|
||||
#ifdef WINDOWS
|
||||
//NB: VS is ignoring template specialisations unless they are explicitly used in the top-level project
|
||||
#include "Active/Setting/Values/GuidValue.h"
|
||||
#include "Active/Setting/Values/TimeValue.h"
|
||||
#include "Active/Setting/Values/StringValue.h"
|
||||
using namespace active::setting;
|
||||
#endif
|
||||
|
||||
using namespace active::file;
|
||||
using namespace active::environment;
|
||||
using namespace connector;
|
||||
using namespace connector::environment;
|
||||
using namespace speckle::database;
|
||||
using namespace connector::database;
|
||||
using namespace speckle::environment;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
//The Speckle application data/support directory name
|
||||
const char* speckleDataDirName = "Speckle";
|
||||
//The account database name
|
||||
const char* accountDBaseName = "Accounts.db";
|
||||
|
||||
|
||||
/*!
|
||||
Class for a concrete instance of an add-on
|
||||
|
||||
This class is private to prevent ad-hoc construction of instances while fulfilling the requirements of the public interface. Essentially
|
||||
this should behave as a singleton, representing the sole instance of the running add-on
|
||||
*/
|
||||
///The Connector addon class
|
||||
class ConnectorInstance : public ConnectorAddon {
|
||||
public:
|
||||
/*!
|
||||
Constructor
|
||||
@param name The connector add-on name
|
||||
*/
|
||||
ConnectorInstance(const String& name) : ConnectorAddon{name} {
|
||||
//Define the connector UI components
|
||||
add<ConnectorMenu>();
|
||||
add<ConnectorPalette>();
|
||||
add<ElementHighlighter>();
|
||||
add(std::make_shared<ConnectorMenu>());
|
||||
add(std::make_shared<ConnectorPalette>());
|
||||
}
|
||||
|
||||
// MARK: Functions (const)
|
||||
|
||||
/*!
|
||||
Get the account database
|
||||
@return The account database
|
||||
Get the model card database
|
||||
@return The model card database
|
||||
*/
|
||||
const AccountDatabase* getAccountDatabase() const override;
|
||||
|
||||
protected:
|
||||
/*!
|
||||
Make a new new project. Allows Addon subclasses to define a Project subclass with additional functions/databases
|
||||
@return A new project instance
|
||||
*/
|
||||
virtual std::shared_ptr<Project> makeProject() const override {
|
||||
return std::dynamic_pointer_cast<Project>(std::make_shared<ConnectorProject>());
|
||||
}
|
||||
const ModelCardDatabase* getModelCards() const override { return &m_modelCards; }
|
||||
|
||||
private:
|
||||
///The accounts database - always a single instance for the active user
|
||||
mutable std::unique_ptr<AccountDatabase> m_account;
|
||||
///Mutex to control access to the accounts database
|
||||
mutable std::mutex m_accountMutex;
|
||||
ModelCardDatabase m_modelCards;
|
||||
};
|
||||
|
||||
|
||||
///The active addon instance
|
||||
std::unique_ptr<ConnectorAddon> m_addonInstance;
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the speckle application data directory (creating if missing)
|
||||
|
||||
return: The application data directory (nullopt = missing and unable to create)
|
||||
--------------------------------------------------------------------*/
|
||||
Directory::Option getAppDataDirectory() {
|
||||
auto appData = Directory::appData();
|
||||
if (!appData)
|
||||
return std::nullopt;
|
||||
return Directory{*appData, speckleDataDirName, true};
|
||||
} //getAppDataDirectory
|
||||
|
||||
#ifdef WINDOWS
|
||||
//NB: VS is ignoring template specialisations unless they are explicitly used in the top-level project
|
||||
void invokeSpecialisation() {
|
||||
StringValue stringValue;
|
||||
active::utility::String unusedString = stringValue;
|
||||
GuidValue guidValue;
|
||||
active::utility::Guid unusedGuid = guidValue;
|
||||
TimeValue timeValue;
|
||||
active::utility::Time unusedTime = timeValue;
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
@@ -115,46 +45,16 @@ namespace {
|
||||
name: The add-on name
|
||||
--------------------------------------------------------------------*/
|
||||
ConnectorAddon::ConnectorAddon(const speckle::utility::String& name) : Addon{name} {
|
||||
#ifdef WINDOWS
|
||||
invokeSpecialisation();
|
||||
#endif
|
||||
} //ConnectorAddon::ConnectorAddon
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the account database
|
||||
|
||||
return: The account database
|
||||
--------------------------------------------------------------------*/
|
||||
const AccountDatabase* ConnectorInstance::getAccountDatabase() const {
|
||||
const std::lock_guard<std::mutex> lock{m_accountMutex};
|
||||
if (!m_account) {
|
||||
auto speckleDirectory = getAppDataDirectory();
|
||||
if (!speckleDirectory)
|
||||
return nullptr;
|
||||
m_account = std::make_unique<AccountDatabase>(speckleDirectory->getPath() / accountDBaseName);
|
||||
}
|
||||
return m_account.get();
|
||||
} //ConnectorInstance::getAccounts
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get an object representing the connector instance
|
||||
@return The active connector instance (nullptr if no connector is running)
|
||||
--------------------------------------------------------------------*/
|
||||
ConnectorAddon* connector::connector() {
|
||||
return m_addonInstance.get();
|
||||
} //connector::connector
|
||||
|
||||
|
||||
|
||||
#ifdef ARCHICAD
|
||||
/*!
|
||||
The following is the C interface for the plugin to Archicad as specified by the API
|
||||
*/
|
||||
|
||||
#include <ACAPinc.h>
|
||||
#include <APIdefs_Registration.h>
|
||||
#include "ACAPinc.h"
|
||||
#include "APIdefs_Registration.h"
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Confirm that the plugin is able to run in the current environment
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
#include "Speckle/Environment/Addon.h"
|
||||
#include "Speckle/Utility/String.h"
|
||||
|
||||
namespace speckle::database {
|
||||
class AccountDatabase;
|
||||
namespace connector::database {
|
||||
|
||||
class ModelCardDatabase;
|
||||
|
||||
}
|
||||
|
||||
namespace connector {
|
||||
@@ -13,10 +16,10 @@ namespace connector {
|
||||
// MARK: Functions (const)
|
||||
|
||||
/*!
|
||||
Get the account database
|
||||
@return The account database
|
||||
Get the model card database
|
||||
@return The model card database
|
||||
*/
|
||||
const virtual speckle::database::AccountDatabase* getAccountDatabase() const = 0;
|
||||
const virtual database::ModelCardDatabase* getModelCards() const = 0;
|
||||
|
||||
protected:
|
||||
/*!
|
||||
|
||||
@@ -28,8 +28,6 @@ enum StringResource {
|
||||
enum TitleString {
|
||||
addonNameID = 1,
|
||||
addonDescriptionID,
|
||||
noStoreyID,
|
||||
showLayersID,
|
||||
};
|
||||
|
||||
|
||||
@@ -39,13 +37,12 @@ enum PromptString {
|
||||
|
||||
|
||||
//Information strings (in UI content, logging, reports)
|
||||
enum GeneralString {
|
||||
enum InfoString {
|
||||
};
|
||||
|
||||
|
||||
//Notification strings (advice displayed in alerts)
|
||||
enum NotifyString {
|
||||
showHiddenLayersID = 1,
|
||||
};
|
||||
|
||||
|
||||
@@ -56,11 +53,6 @@ enum WarningString {
|
||||
|
||||
//Error strings (errors displayed in alerts)
|
||||
enum ErrorString {
|
||||
noSelectedModelItemsID = 1,
|
||||
modelCardNotFoundID,
|
||||
noProjectOpenID,
|
||||
accountNotFoundID,
|
||||
elementTypeNotConvertedID,
|
||||
};
|
||||
|
||||
#endif //CONNECTOR_RESOURCE
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#ifndef CONNECTOR_DATABASE_ID
|
||||
#define CONNECTOR_DATABASE_ID
|
||||
|
||||
namespace connector::database {
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_DATABASE_ID
|
||||
+19
-28
@@ -1,27 +1,27 @@
|
||||
#include "Speckle/Interface/Browser/Bridge/Functions/ErrorReport.h"
|
||||
#include "Connector/Database/Model/Card/ModelCardDatabase.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
#include "Active/Serialise/Package/Wrapper/ValueSettingWrap.h"
|
||||
#include "Active/Setting/ValueSetting.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace speckle::interfac::browser::bridge;
|
||||
using namespace active::setting;
|
||||
using namespace connector::database;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
///Serialisation fields
|
||||
enum FieldIndex {
|
||||
errMessage,
|
||||
errInfo,
|
||||
errTrace,
|
||||
model,
|
||||
};
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"message"},
|
||||
Identity{"error"},
|
||||
Identity{"stackTrace"},
|
||||
Identity{"model"},
|
||||
};
|
||||
|
||||
}
|
||||
@@ -33,17 +33,15 @@ namespace {
|
||||
|
||||
return: True if the package has added items to the inventory
|
||||
--------------------------------------------------------------------*/
|
||||
bool ErrorReport::fillInventory(Inventory& inventory) const {
|
||||
bool ModelCardDatabase::fillInventory(Inventory& inventory) const {
|
||||
using enum Entry::Type;
|
||||
inventory.merge(Inventory{
|
||||
{
|
||||
{ fieldID[errMessage], errMessage, element },
|
||||
{ fieldID[errInfo], errInfo, element },
|
||||
{ fieldID[errTrace], errTrace, element },
|
||||
{ fieldID[model], model, element },
|
||||
},
|
||||
}.withType(&typeid(ErrorReport)));
|
||||
}.withType(&typeid(ModelCardDatabase)));
|
||||
return true;
|
||||
} //ErrorReport::fillInventory
|
||||
} //ModelCardDatabase::fillInventory
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
@@ -53,28 +51,21 @@ bool ErrorReport::fillInventory(Inventory& inventory) const {
|
||||
|
||||
return: The requested cargo (nullptr on failure)
|
||||
--------------------------------------------------------------------*/
|
||||
Cargo::Unique ErrorReport::getCargo(const Inventory::Item& item) const {
|
||||
if (item.ownerType != &typeid(ErrorReport))
|
||||
Cargo::Unique ModelCardDatabase::getCargo(const Inventory::Item& item) const {
|
||||
if (item.ownerType != &typeid(ModelCardDatabase))
|
||||
return nullptr;
|
||||
using namespace active::serialise;
|
||||
switch (item.index) {
|
||||
case errMessage:
|
||||
return std::make_unique<ValueWrap<String>>(message);
|
||||
case errInfo:
|
||||
return std::make_unique<ValueWrap<String>>(error);
|
||||
case errTrace:
|
||||
return std::make_unique<ValueWrap<String>>(stackTrace);
|
||||
case model:
|
||||
return std::make_unique<CargoHold<ValueSettingWrap, ValueSetting>>(); //NB: This is a placeholder until we define the content
|
||||
default:
|
||||
return nullptr; //Requested an unknown index
|
||||
}
|
||||
} //ErrorReport::getCargo
|
||||
} //ModelCardDatabase::getCargo
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Set to the default package content
|
||||
--------------------------------------------------------------------*/
|
||||
void ErrorReport::setDefault() {
|
||||
message.clear();
|
||||
error.clear();
|
||||
stackTrace.clear();
|
||||
} //ErrorReport::setDefault
|
||||
void ModelCardDatabase::setDefault() {
|
||||
} //ModelCardDatabase::setDefault
|
||||
+13
-11
@@ -1,15 +1,15 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SAYHI_ARG
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_SAYHI_ARG
|
||||
#ifndef CONNECTOR_DATABASE_MODEL_CARD_DATABASE
|
||||
#define CONNECTOR_DATABASE_MODEL_CARD_DATABASE
|
||||
|
||||
#include "Active/Serialise/Package/Package.h"
|
||||
#include "Speckle/Utility/String.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
namespace connector::database {
|
||||
|
||||
/*!
|
||||
Object for testing JS comms (with TestBridge binding)
|
||||
Database of model cards relating to a specific project
|
||||
*/
|
||||
class SayHiArg : public active::serialise::Package {
|
||||
class ModelCardDatabase : public active::serialise::Package {
|
||||
public:
|
||||
|
||||
// MARK: - Types
|
||||
@@ -21,14 +21,14 @@ namespace connector::interfac::browser::bridge {
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
SayHiArg() = default;
|
||||
ModelCardDatabase() {}
|
||||
|
||||
// MARK: - Public variables (NB: Assuming to class invariants or overrides for this data, so making public for simplicity)
|
||||
|
||||
///Sample parameters for testing only
|
||||
speckle::utility::String name;
|
||||
int32_t count = 0;
|
||||
bool isHello = false;
|
||||
|
||||
// MARK: Functions (const)
|
||||
|
||||
//Implement card access when necessary
|
||||
|
||||
// MARK: - Serialisation
|
||||
|
||||
@@ -48,8 +48,10 @@ namespace connector::interfac::browser::bridge {
|
||||
Set to the default package content
|
||||
*/
|
||||
void setDefault() override;
|
||||
private:
|
||||
//TODO: Model card array here - implement when necessary
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SAYHI_ARG
|
||||
#endif //CONNECTOR_DATABASE_MODEL_CARD_DATABASE
|
||||
@@ -1,141 +0,0 @@
|
||||
#include "Connector/Database/ModelCardDatabase.h"
|
||||
|
||||
#include "Active/Database/Storage/Storage.h"
|
||||
#include "Active/Serialise/JSON/JSONTransport.h"
|
||||
#include "Connector/Record/Model/CardMover.h"
|
||||
#include "Speckle/Database/Identity/RecordID.h"
|
||||
#include "Speckle/Database/Storage/DocumentStore/DocumentStoreEngine.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
using namespace active::container;
|
||||
using namespace active::database;
|
||||
using namespace active::event;
|
||||
using namespace active::serialise;
|
||||
using namespace active::serialise::json;
|
||||
using namespace connector::database;
|
||||
using namespace connector::record;
|
||||
using namespace speckle::database;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace connector::database {
|
||||
|
||||
///ModelCard database engine declaration
|
||||
class ModelCardDatabase::Engine : public DocumentStoreEngine<ModelCard, CardMover, JSONTransport, RecordID> {
|
||||
using base = DocumentStoreEngine<ModelCard, CardMover, JSONTransport, RecordID>;
|
||||
using base::base;
|
||||
};
|
||||
|
||||
///ModelCard database storage declaration
|
||||
class ModelCardDatabase::Store : public Storage<ModelCard, JSONTransport,
|
||||
RecordID, RecordID, RecordID, RecordID> {
|
||||
using base = Storage<ModelCard, JSONTransport,
|
||||
RecordID, RecordID, RecordID, RecordID>;
|
||||
using base::base;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
///The document storage identifier for model cards
|
||||
const char* modelCardDBaseName = "connector::database::ModelModelCardDatabase";
|
||||
///The document storage identifier for model cards
|
||||
const char* modelCardTableName = "models";
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Constructor
|
||||
--------------------------------------------------------------------*/
|
||||
ModelCardDatabase::ModelCardDatabase() {
|
||||
m_engine = std::make_shared<Engine>(modelCardDBaseName,
|
||||
//Schema
|
||||
DBaseSchema{active::utility::String{modelCardDBaseName},
|
||||
//Tables
|
||||
{
|
||||
//Model card table
|
||||
{
|
||||
modelCardTableName, 0, 0, {} //The table specifics aren't relevant in this context
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
m_store = std::make_shared<Store>(m_engine);
|
||||
} //ModelCardDatabase::ModelCardDatabase
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Destructor
|
||||
--------------------------------------------------------------------*/
|
||||
ModelCardDatabase::~ModelCardDatabase() {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get a specified card from the database
|
||||
|
||||
return: The requested card (nullptr on failure)
|
||||
--------------------------------------------------------------------*/
|
||||
ModelCard::Unique ModelCardDatabase::getCard(const speckle::utility::String& cardID) const {
|
||||
return m_store->getObject(cardID);
|
||||
} //ModelCardDatabase::getCard
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get all model cards
|
||||
|
||||
return: All the cards
|
||||
--------------------------------------------------------------------*/
|
||||
Vector<ModelCard> ModelCardDatabase::getCards() const {
|
||||
return m_store->getObjects();
|
||||
} //ModelCardDatabase::getCards
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Write a card to storage
|
||||
|
||||
card: The card to write
|
||||
--------------------------------------------------------------------*/
|
||||
void ModelCardDatabase::write(ModelCard& card) const {
|
||||
m_store->write(card);
|
||||
} //ModelCardDatabase::write
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Erase a card
|
||||
|
||||
cardID: The ID of the card to erase
|
||||
--------------------------------------------------------------------*/
|
||||
void ModelCardDatabase::erase(const String& cardID) const {
|
||||
m_store->erase(cardID);
|
||||
} //ModelCardDatabase::erase
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the unique ID of the engine storage
|
||||
|
||||
return: The databas unique ID
|
||||
--------------------------------------------------------------------*/
|
||||
RecordID ModelCardDatabase::getStoreID() const {
|
||||
return m_engine->getUniqueID();
|
||||
} //ModelCardDatabase::getStoreID
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get a serialisation wrapper for the database
|
||||
|
||||
return: A database wrapper
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> ModelCardDatabase::wrapper() const {
|
||||
return m_store->wrapper();
|
||||
} //ModelCardDatabase::wrapper
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the database subscription (the content is document-based, and must react to document operations)
|
||||
|
||||
return: The database subscription (add weakly to publisher)
|
||||
--------------------------------------------------------------------*/
|
||||
std::shared_ptr<active::event::Subscriber> ModelCardDatabase::getSubscription() {
|
||||
return std::dynamic_pointer_cast<Subscriber>(m_engine);
|
||||
} //ModelCardDatabase::getSubscription
|
||||
@@ -1,81 +0,0 @@
|
||||
#ifndef CONNECTOR_DATABASE_MODEL_CARD_DATABASE
|
||||
#define CONNECTOR_DATABASE_MODEL_CARD_DATABASE
|
||||
|
||||
#include "Connector/Record/Model/ModelCard.h"
|
||||
|
||||
namespace active::event {
|
||||
class Subscriber;
|
||||
}
|
||||
|
||||
namespace connector::database {
|
||||
|
||||
/*!
|
||||
Database of model cards relating to a specific project
|
||||
*/
|
||||
class ModelCardDatabase {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
ModelCardDatabase();
|
||||
ModelCardDatabase(const ModelCardDatabase&) = delete;
|
||||
/*!
|
||||
Destructor
|
||||
*/
|
||||
~ModelCardDatabase();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Get a specified card from the database
|
||||
@return The requested card (nullptr on failure)
|
||||
*/
|
||||
record::ModelCard::Unique getCard(const speckle::utility::String& cardID) const;
|
||||
/*!
|
||||
Get all model cards
|
||||
@return All the cards
|
||||
*/
|
||||
active::container::Vector<record::ModelCard> getCards() const;
|
||||
/*!
|
||||
Write a card to storage
|
||||
@param card The card to write
|
||||
*/
|
||||
void write(record::ModelCard& card) const;
|
||||
/*!
|
||||
Erase a card
|
||||
@param cardID The ID of the card to erase
|
||||
*/
|
||||
void erase(const speckle::utility::String& cardID) const;
|
||||
/*!
|
||||
Get a serialisation wrapper for the database
|
||||
@return A database wrapper
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> wrapper() const;
|
||||
/*!
|
||||
Get the unique ID of the engine storage
|
||||
@return The database unique ID
|
||||
*/
|
||||
speckle::database::RecordID getStoreID() const;
|
||||
|
||||
// MARK: - Functions (mutating)
|
||||
|
||||
/*!
|
||||
Get the database subscription (the content is document-based, and must react to document operations)
|
||||
@return The database subscription (add weakly to publisher)
|
||||
*/
|
||||
std::shared_ptr<active::event::Subscriber> getSubscription();
|
||||
|
||||
private:
|
||||
class Engine;
|
||||
class Store;
|
||||
///Model card database storage
|
||||
std::shared_ptr<Engine> m_engine;
|
||||
std::shared_ptr<Store> m_store;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_DATABASE_MODEL_CARD_DATABASE
|
||||
@@ -1,33 +0,0 @@
|
||||
#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
|
||||
@@ -1,53 +0,0 @@
|
||||
#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
|
||||
@@ -3,20 +3,6 @@
|
||||
|
||||
#include "Active/Utility/NameID.h"
|
||||
|
||||
// MARK: - Event identities
|
||||
|
||||
//Identifier for event signalling the connector palette visibility should be toggled
|
||||
inline const active::utility::NameID toggleConnectorPaletteID{"toggleConnectorPalette"};
|
||||
//Identifier for event signalling the connector palette has changed (state carried with event)
|
||||
inline const active::utility::NameID reflectPaletteVisibilityID{"setConnectorMenuCheck"};
|
||||
//Identifier for event signalling the that an attached list of elements should be highlighted
|
||||
inline const active::utility::NameID setElementHighlight{"setElementHighlight"};
|
||||
|
||||
// MARK: - Event setting identities
|
||||
|
||||
//Identifier for setting carrying a menu state
|
||||
inline const active::utility::NameID paletteVisibilityStateID{"menuCheckState"};
|
||||
//Identifier for setting carrying a list of element links
|
||||
inline const active::utility::NameID recordLinks{"recordLinks"};
|
||||
|
||||
#endif //CONNECTOR_EVENT_ID
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||
#include "Connector/Connector.h"
|
||||
#include "Speckle/Database/AccountDatabase.h"
|
||||
#include "Speckle/Record/Credentials/Account.h"
|
||||
|
||||
using namespace active::container;
|
||||
@@ -14,14 +12,14 @@ using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
using WrappedValue = CargoHold<ContainerWrap<Vector<Account>>, Vector<Account>>;
|
||||
using WrappedValue = active::serialise::CargoHold<ContainerWrap<Vector, Account>, Vector<Account>>;
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetAccounts::GetAccounts() : BridgeMethod{"GetAccounts", [&]() {
|
||||
GetAccounts::GetAccounts() : JSBridgeMethod{"GetAccounts", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
@@ -31,11 +29,8 @@ GetAccounts::GetAccounts() : BridgeMethod{"GetAccounts", [&]() {
|
||||
|
||||
return: The accounts (empty array when none defined)
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetAccounts::run() const {
|
||||
std::unique_ptr<Vector<Account>> result;
|
||||
if (auto accountDBase = connector()->getAccountDatabase(); accountDBase != nullptr)
|
||||
result = std::make_unique<Vector<Account>>(accountDBase->getAccounts());
|
||||
else
|
||||
result = std::make_unique<Vector<Account>>();
|
||||
return std::make_unique<WrappedValue>(std::move(result));
|
||||
std::unique_ptr<Cargo> GetAccounts::run(void) const {
|
||||
Vector<Account> accounts;
|
||||
///TODO: Get the accounts here - returning an empty array for testing only
|
||||
return std::make_unique<WrappedValue>(accounts);
|
||||
} //GetAccounts::run
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_ACCOUNTS
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_ACCOUNTS
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
JS Function class to retrieve the user's account(s)
|
||||
JS Function class to retrieve the names of the methods supported by the bridge
|
||||
*/
|
||||
class GetAccounts : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
class GetAccounts : public speckle::interfac::browser::bridge::JSBridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
@@ -24,7 +24,7 @@ namespace connector::interfac::browser::bridge {
|
||||
Get the accounts
|
||||
@return The accounts (empty array when none defined)
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
std::unique_ptr<active::serialise::Cargo> run(void) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Base/AddModel.h"
|
||||
|
||||
#include "Connector/Connector.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::record;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
AddModel::AddModel() : BridgeMethod{"AddModel", [&](const ModelCardEventWrapper& card) {
|
||||
return run(card.get());
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Add a model card to document storage
|
||||
|
||||
card: The card to add
|
||||
--------------------------------------------------------------------*/
|
||||
void AddModel::run(const ModelCard& card) const {
|
||||
auto project = connector()->getActiveProject().lock();
|
||||
auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
|
||||
if (!connectorProject)
|
||||
return;
|
||||
if (auto modelCardDBase = connectorProject->getModelCardDatabase(); modelCardDBase != nullptr) {
|
||||
auto newCard = clone(card);
|
||||
modelCardDBase->write(*newCard);
|
||||
}
|
||||
} //AddModel::run
|
||||
@@ -1,40 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_ADD_MODEL
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_ADD_MODEL
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Connector/Record/Model/CardMover.h"
|
||||
#include "Connector/Record/Model/ModelCard.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
///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
|
||||
*/
|
||||
class AddModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
AddModel();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Add a model card to document storage
|
||||
@param card The card to add
|
||||
*/
|
||||
void run(const connector::record::ModelCard& card) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_ADD_MODEL
|
||||
@@ -1,26 +1,10 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Base/BaseBridge.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/AddModel.h"
|
||||
|
||||
#include "Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/GetDocumentState.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/GetSourceApplicationName.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/GetSourceApplicationVersion.h"
|
||||
#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;
|
||||
|
||||
@@ -29,34 +13,9 @@ using namespace connector::interfac::browser::bridge;
|
||||
--------------------------------------------------------------------*/
|
||||
BaseBridge::BaseBridge() : BrowserBridge{"baseBinding"} {
|
||||
//Add bridge methods
|
||||
addMethod<AddModel>();
|
||||
addMethod<GetConnectorVersion>();
|
||||
addMethod<GetDocumentInfo>();
|
||||
addMethod<GetDocumentState>();
|
||||
addMethod<GetSourceApplicationName>();
|
||||
addMethod<GetSourceApplicationVersion>();
|
||||
addMethod<HighlightModel>();
|
||||
addMethod<HighlightObjects>();
|
||||
addMethod<OpenUrl>();
|
||||
addMethod<RemoveModel>();
|
||||
addMethod<UpdateModel>();
|
||||
} //BaseBridge::BaseBridge
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Handle a project event
|
||||
|
||||
event: The project event
|
||||
|
||||
return: True if the event should be closed
|
||||
--------------------------------------------------------------------*/
|
||||
bool BaseBridge::handle(const speckle::event::ProjectEvent& event) {
|
||||
using enum speckle::event::ProjectEvent::Type;
|
||||
switch (event.getType()) {
|
||||
case open:
|
||||
sendEvent("documentChanged");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
} //BaseBridge::handle
|
||||
|
||||
@@ -2,14 +2,13 @@
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_BASE_BRIDGE
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
||||
#include "Speckle/Event/Subscriber/ProjectSubscriber.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
A browser bridge to manage document settings
|
||||
A browser bridge to provide configuration settings
|
||||
*/
|
||||
class BaseBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ProjectSubscriber {
|
||||
class BaseBridge : public speckle::interfac::browser::bridge::BrowserBridge {
|
||||
public:
|
||||
|
||||
// MARK: - Types
|
||||
@@ -23,14 +22,6 @@ namespace connector::interfac::browser::bridge {
|
||||
Default constructor
|
||||
*/
|
||||
BaseBridge();
|
||||
|
||||
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;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/DocumentInfo.h"
|
||||
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
|
||||
@@ -19,9 +19,9 @@ namespace {
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"location"},
|
||||
Identity{"name"},
|
||||
Identity{"id"},
|
||||
Identity{"Location"},
|
||||
Identity{"Name"},
|
||||
Identity{"Id"},
|
||||
};
|
||||
|
||||
}
|
||||
+17
-17
@@ -1,5 +1,5 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_DOCUMENT_INFO
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_DOCUMENT_INFO
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_CONNECTOR_CONFIG
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_CONNECTOR_CONFIG
|
||||
|
||||
#include "Active/Serialise/Package/Package.h"
|
||||
#include "Speckle/Utility/String.h"
|
||||
@@ -29,33 +29,33 @@ namespace connector::interfac::browser::bridge {
|
||||
|
||||
// MARK: - Public variables (NB: Assuming to class invariants or overrides for this data, so making public for simplicity)
|
||||
|
||||
///The URL of the project file (non-teamwork) or server (teamwork)
|
||||
speckle::utility::String location;
|
||||
///The project location
|
||||
speckle::utility::String location; //TODO: Confirm this is an address
|
||||
///The project name
|
||||
speckle::utility::String name;
|
||||
speckle::utility::String name; //TODO: Assume project name rather than document (file) name - need to confirm
|
||||
///A unique, persistent ID for the project document
|
||||
speckle::utility::String ID;
|
||||
speckle::utility::String ID; //TODO: should possibly be a guid - need to check
|
||||
|
||||
// MARK: - Serialisation
|
||||
|
||||
/*!
|
||||
Fill an inventory with the package items
|
||||
@param inventory The inventory to receive the package items
|
||||
@return True if the package has added items to the inventory
|
||||
*/
|
||||
Fill an inventory with the package items
|
||||
@param inventory The inventory to receive the package items
|
||||
@return True if the package has added items to the inventory
|
||||
*/
|
||||
bool fillInventory(active::serialise::Inventory& inventory) const override;
|
||||
/*!
|
||||
Get the specified cargo
|
||||
@param item The inventory item to retrieve
|
||||
@return The requested cargo (nullptr on failure)
|
||||
*/
|
||||
Get the specified cargo
|
||||
@param item The inventory item to retrieve
|
||||
@return The requested cargo (nullptr on failure)
|
||||
*/
|
||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
||||
/*!
|
||||
Set to the default package content
|
||||
*/
|
||||
Set to the default package content
|
||||
*/
|
||||
void setDefault() override;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_DOCUMENT_INFO
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_CONNECTOR_CONFIG
|
||||
@@ -19,19 +19,19 @@ namespace {
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetConnectorVersion::GetConnectorVersion() : BridgeMethod{"GetConnectorVersion", [&]() {
|
||||
GetConnectorVersion::GetConnectorVersion() : JSBridgeMethod{"GetConnectorVersion", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the connector software version
|
||||
Get the host application version
|
||||
|
||||
return: The connector software version
|
||||
return: The application version
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetConnectorVersion::run() const {
|
||||
//Implement other platforms as required
|
||||
String result{String{connector::versionMajor} + "." + String{connector::versionMinor} + "." +
|
||||
String{connector::versionPatch}};
|
||||
String result{active::utility::String{connector::versionMajor} + "." + active::utility::String{connector::versionMinor} + "." +
|
||||
active::utility::String{connector::versionPatch}};
|
||||
return std::make_unique<WrappedValue>(result);
|
||||
} //GetConnectorVersion::run
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_CONNECTOR_VERSION
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_CONNECTOR_VERSION
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
class ConnectorConfig;
|
||||
|
||||
/*!
|
||||
JS Function class to get the connector software version
|
||||
JS Function class to retrieve the names of the methods supported by the bridge
|
||||
*/
|
||||
class GetConnectorVersion : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
class GetConnectorVersion : public speckle::interfac::browser::bridge::JSBridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
@@ -23,8 +23,8 @@ namespace connector::interfac::browser::bridge {
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Get the connector software version
|
||||
@return The connector software version
|
||||
Get the host application version
|
||||
@return The application version
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
};
|
||||
|
||||
@@ -1,16 +1,11 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.h"
|
||||
|
||||
#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"
|
||||
#include "Speckle/Utility/Guid.h"
|
||||
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/DocumentInfo.h"
|
||||
|
||||
using namespace active::container;
|
||||
using namespace active::serialise;
|
||||
using namespace connector::environment;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
@@ -23,7 +18,7 @@ namespace {
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetDocumentInfo::GetDocumentInfo() : BridgeMethod{"GetDocumentInfo", [&]() {
|
||||
GetDocumentInfo::GetDocumentInfo() : JSBridgeMethod{"GetDocumentInfo", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
@@ -33,19 +28,8 @@ GetDocumentInfo::GetDocumentInfo() : BridgeMethod{"GetDocumentInfo", [&]() {
|
||||
|
||||
return: The document info
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetDocumentInfo::run() const {
|
||||
auto docInfo = std::make_unique<DocumentInfo>();
|
||||
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));
|
||||
std::unique_ptr<Cargo> GetDocumentInfo::run(void) const {
|
||||
///TODO: Get the document info here - returning mocked values for now
|
||||
DocumentInfo docInfo{"Somewhere", "Something", String{active::utility::Guid{true}.operator active::utility::String()}};
|
||||
return std::make_unique<WrappedValue>(docInfo);
|
||||
} //GetDocumentInfo::run
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_INFO
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_INFO
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
JS Function class to retrieve the information about the active document
|
||||
*/
|
||||
class GetDocumentInfo : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
class GetDocumentInfo : public speckle::interfac::browser::bridge::JSBridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
@@ -24,7 +24,7 @@ namespace connector::interfac::browser::bridge {
|
||||
Get the document info
|
||||
@return The document info
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
std::unique_ptr<active::serialise::Cargo> run(void) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -1,35 +1,37 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Base/GetDocumentState.h"
|
||||
|
||||
#include "Connector/Connector.h"
|
||||
#include "Connector/Environment/ConnectorProject.h"
|
||||
#include "Connector/Database/ModelCardDatabase.h"
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/DocumentInfo.h"
|
||||
#include "Connector/Database/Model/Card/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 speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
using WrappedValue = active::serialise::CargoHold<PackageWrap, ModelCardDatabase>;
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetDocumentState::GetDocumentState() : BridgeMethod{"GetDocumentState", [&]() {
|
||||
GetDocumentState::GetDocumentState() : JSBridgeMethod{"GetDocumentState", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the document model cards
|
||||
Get the document info
|
||||
|
||||
return: The document model cards
|
||||
return: The document info
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetDocumentState::run() const {
|
||||
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;
|
||||
std::unique_ptr<Cargo> GetDocumentState::run(void) const {
|
||||
///TODO: Retrieve the model card database from connector()->getModelCards() in future (when implemented)
|
||||
ModelCardDatabase modelCards; //This is just a temp so something can be sent back to the JS for the interim
|
||||
return std::make_unique<WrappedValue>(modelCards);
|
||||
} //GetDocumentState::run
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_STATE
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_STATE
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
JS Function class to retrieve model cards stored in the current document
|
||||
JS Function class to retrieve the information about the active document
|
||||
*/
|
||||
class GetDocumentState : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
class GetDocumentState : public speckle::interfac::browser::bridge::JSBridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
@@ -21,10 +21,10 @@ namespace connector::interfac::browser::bridge {
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Get the document model cards
|
||||
@return The document model cards
|
||||
Get the document info
|
||||
@return The document info
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
std::unique_ptr<active::serialise::Cargo> run(void) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -18,7 +18,7 @@ namespace {
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetSourceApplicationName::GetSourceApplicationName() : BridgeMethod{"GetSourceApplicationName", [&]() {
|
||||
GetSourceApplicationName::GetSourceApplicationName() : JSBridgeMethod{"GetSourceApplicationName", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
@@ -28,7 +28,7 @@ GetSourceApplicationName::GetSourceApplicationName() : BridgeMethod{"GetSourceAp
|
||||
|
||||
return: The application name
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetSourceApplicationName::run() const {
|
||||
std::unique_ptr<Cargo> GetSourceApplicationName::run(void) const {
|
||||
//Implement other platforms as required
|
||||
#ifdef ARCHICAD
|
||||
String result{"Archicad"};
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_APP_NAME
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_APP_NAME
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
JS Function class to retrieve the host application name
|
||||
*/
|
||||
class GetSourceApplicationName : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
class GetSourceApplicationName : public speckle::interfac::browser::bridge::JSBridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ namespace {
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetSourceApplicationVersion::GetSourceApplicationVersion() : BridgeMethod{"GetSourceApplicationVersion", [&]() {
|
||||
GetSourceApplicationVersion::GetSourceApplicationVersion() : JSBridgeMethod{"GetSourceApplicationVersion", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_APP_VERSION
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_APP_VERSION
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace connector::interfac::browser::bridge {
|
||||
/*!
|
||||
JS Function class to get the host application version
|
||||
*/
|
||||
class GetSourceApplicationVersion : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
class GetSourceApplicationVersion : public speckle::interfac::browser::bridge::JSBridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
#include "Active/Setting/ValueSetting.h"
|
||||
#include "Active/Setting/Values/GuidValue.h"
|
||||
#include "Active/Event/Event.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Base/HighlightModel.h"
|
||||
#include "Connector/Connector.h"
|
||||
#include "Connector/ConnectorResource.h"
|
||||
#include "Connector/Environment/ConnectorProject.h"
|
||||
#include "Connector/Event/ConnectorEventID.h"
|
||||
#include "Connector/Database/ModelCardDatabase.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendError.h"
|
||||
#include "Connector/Record/Model/SenderModelCard.h"
|
||||
#include "Connector/Record/Model/Filter/SendFilter.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
||||
#include "Speckle/Record/Element/Element.h"
|
||||
#include "Speckle/Database/BIMElementDatabase.h"
|
||||
#include "Speckle/Environment/Host.h"
|
||||
#include "Speckle/Environment/Project.h"
|
||||
|
||||
using namespace active::event;
|
||||
using namespace active::setting;
|
||||
using namespace connector::environment;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace connector::record;
|
||||
using namespace speckle::environment;
|
||||
using namespace speckle::record::element;
|
||||
using namespace speckle::utility;
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
HighlightModel::HighlightModel() : BridgeMethod{"HighlightModel", [&](const HighlightModelArgs& args) {
|
||||
run(args);
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Highlight elements linked to the model card selection
|
||||
|
||||
modelCardID: The ID of the target model card
|
||||
--------------------------------------------------------------------*/
|
||||
void HighlightModel::run(const String& modelCardID) const {
|
||||
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())) {
|
||||
ValueSetting elementIDs{recordLinks};
|
||||
for (const auto& elementID : senderCard->getFilter().getElementIDs())
|
||||
elementIDs.emplace_back(GuidValue{elementID});
|
||||
connector()->publish(Event{setElementHighlight, { elementIDs }});
|
||||
}
|
||||
} //HighlightModel::run
|
||||
@@ -1,39 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_HIGHLIGHT_MODEL
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_HIGHLIGHT_MODEL
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
///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 HighlightModelArgs = speckle::interfac::browser::bridge::JSArgType<StringHold>;
|
||||
|
||||
/*!
|
||||
JS Function class to highlight elements from the selected model card in the open document
|
||||
*/
|
||||
class HighlightModel : public speckle::interfac::browser::bridge::BridgeMethod<HighlightModelArgs, void> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
HighlightModel();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
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;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_HIGHLIGHT_MODEL
|
||||
@@ -1,31 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Base/HighlightObjects.h"
|
||||
|
||||
#include "Active/Setting/ValueSetting.h"
|
||||
#include "Active/Event/Event.h"
|
||||
#include "Connector/Connector.h"
|
||||
#include "Connector/Event/ConnectorEventID.h"
|
||||
|
||||
using namespace active::event;
|
||||
using namespace active::setting;
|
||||
using namespace connector;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::database;
|
||||
using namespace speckle::environment;
|
||||
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 {
|
||||
connector()->publish(Event{setElementHighlight, { ValueSetting{objectIDs, recordLinks} }});
|
||||
} //HighlightObjects::run
|
||||
@@ -1,42 +0,0 @@
|
||||
#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
|
||||
@@ -1,24 +0,0 @@
|
||||
#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
|
||||
@@ -1,41 +0,0 @@
|
||||
#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
|
||||
@@ -1,34 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Base/RemoveModel.h"
|
||||
|
||||
#include "Connector/Connector.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::record;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
RemoveModel::RemoveModel() : BridgeMethod{"RemoveModel", [&](const ModelCardEventWrapper& card) {
|
||||
return run(card.get());
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Add a model card to document storage
|
||||
|
||||
card: The card to add
|
||||
--------------------------------------------------------------------*/
|
||||
void RemoveModel::run(const ModelCard& card) const {
|
||||
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
|
||||
@@ -1,40 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_REMOVE_MODEL
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_REMOVE_MODEL
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Connector/Record/Model/CardMover.h"
|
||||
#include "Connector/Record/Model/ModelCard.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
///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 remove a model card from the document storage
|
||||
*/
|
||||
class RemoveModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
RemoveModel();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Remove a model card from document storage
|
||||
@param card The card to remove
|
||||
*/
|
||||
void run(const connector::record::ModelCard& card) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_REMOVE_MODEL
|
||||
@@ -1,43 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Base/UpdateModel.h"
|
||||
|
||||
#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::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
|
||||
--------------------------------------------------------------------*/
|
||||
UpdateModel::UpdateModel() : BridgeMethod{"UpdateModel", [&](const ModelCardEventWrapper& card) {
|
||||
return run(card.get());
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Update a model card in document storage
|
||||
|
||||
card: The card to update
|
||||
--------------------------------------------------------------------*/
|
||||
void UpdateModel::run(const ModelCard& card) const {
|
||||
auto project = connector()->getActiveProject().lock();
|
||||
auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
|
||||
if (!connectorProject)
|
||||
return;
|
||||
if (auto modelCardDBase = connectorProject->getModelCardDatabase(); modelCardDBase != nullptr) {
|
||||
auto newCard = clone(card);
|
||||
modelCardDBase->write(*newCard);
|
||||
}
|
||||
} //UpdateModel::run
|
||||
@@ -1,40 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_UPDATE_MODEL
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_UPDATE_MODEL
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Connector/Record/Model/CardMover.h"
|
||||
#include "Connector/Record/Model/ModelCard.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
///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 update a model card in document storage
|
||||
*/
|
||||
class UpdateModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
UpdateModel();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Update a model card in document storage
|
||||
@param card The card to update
|
||||
*/
|
||||
void run(const connector::record::ModelCard& card) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_UPDATE_MODEL
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
#include "Connector/Interface/Browser/Bridge/Config/GetConfig.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/UpdateConfig.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/GetIsDevMode.h"
|
||||
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
|
||||
@@ -13,5 +12,4 @@ ConfigBridge::ConfigBridge() : BrowserBridge{"configBinding"} {
|
||||
//Add bridge methods
|
||||
addMethod<GetConfig>();
|
||||
addMethod<UpdateConfig>();
|
||||
addMethod<GetIsDevMode>();
|
||||
} //ConfigBridge::ConfigBridge
|
||||
|
||||
+2
-3
@@ -1,7 +1,6 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/ConnectorConfig.h"
|
||||
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
@@ -17,7 +16,7 @@ namespace {
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"darkTheme"},
|
||||
Identity{"DarkTheme"},
|
||||
};
|
||||
|
||||
}
|
||||
+1
-2
@@ -2,7 +2,6 @@
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_CONNECTOR_CONFIG
|
||||
|
||||
#include "Active/Serialise/Package/Package.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/ArgumentBase.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
@@ -25,7 +24,7 @@ namespace connector::interfac::browser::bridge {
|
||||
|
||||
// MARK: - Public variables (NB: Assuming to class invariants or overrides for this data, so making public for simplicity)
|
||||
|
||||
///True if the UI renders in dark mode
|
||||
///?
|
||||
bool isDarkTheme = true;
|
||||
|
||||
// MARK: - Serialisation
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Config/GetConfig.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h"
|
||||
#include "Active/Serialise/Package/PackageWrap.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/ConnectorConfig.h"
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
@@ -18,7 +18,7 @@ namespace {
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetConfig::GetConfig() : BridgeMethod{"GetConfig", [&]() {
|
||||
GetConfig::GetConfig() : JSBridgeMethod{"GetConfig", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
@@ -28,8 +28,8 @@ GetConfig::GetConfig() : BridgeMethod{"GetConfig", [&]() {
|
||||
|
||||
return: The settings
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetConfig::run() const {
|
||||
auto config = std::make_unique<ConnectorConfig>();
|
||||
///TODO: Get the data from a local SQLite database
|
||||
return std::make_unique<WrappedValue>(std::move(config));
|
||||
std::unique_ptr<Cargo> GetConfig::run(void) const {
|
||||
ConnectorConfig config;
|
||||
///TODO: Get the accounts here - returning an empty array for testing only
|
||||
return std::make_unique<WrappedValue>(config);
|
||||
} //GetConfig::run
|
||||
|
||||
@@ -1,20 +1,22 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_CONFIG
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_CONFIG
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/ConnectorConfig.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
JS Function class to retrieve the current display configuration settings
|
||||
JS Function class to retrieve the names of the methods supported by the bridge
|
||||
*/
|
||||
class GetConfig : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
class GetConfig : public speckle::interfac::browser::bridge::JSBridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
@param bridge The parent bridge object (provides access to bridge methods)
|
||||
*/
|
||||
GetConfig();
|
||||
|
||||
@@ -24,7 +26,7 @@ namespace connector::interfac::browser::bridge {
|
||||
Get the configuration settings
|
||||
@return The settings
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
std::unique_ptr<active::serialise::Cargo> run(void) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Config/GetIsDevMode.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
///Return type for retrieving the current configuration
|
||||
using WrappedValue = CargoHold<ValueWrap<bool>, bool>;
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetIsDevMode::GetIsDevMode() : BridgeMethod{"GetIsDevMode", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the DEBUG mode
|
||||
|
||||
return: true for DEBUG, false otherwise
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetIsDevMode::run() const {
|
||||
|
||||
#if DEBUG
|
||||
bool value = true;
|
||||
#else
|
||||
bool value = false;
|
||||
#endif
|
||||
|
||||
return std::make_unique<WrappedValue>(value);
|
||||
} //GetIsDevMode::run
|
||||
@@ -1,32 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_IS_DEV_MODE
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_IS_DEV_MODE
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
JS Function class to retrieve IsDebugMode
|
||||
*/
|
||||
class GetIsDevMode : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
GetIsDevMode();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Get the DEBUG mode
|
||||
@return true for DEBUG, false otherwise
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_GET_IS_DEV_MODE
|
||||
@@ -1,7 +1,8 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Config/UpdateConfig.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
|
||||
#include "Active/Serialise/Package/PackageWrap.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/ConnectorConfig.h"
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
@@ -10,8 +11,8 @@ using namespace speckle::utility;
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
UpdateConfig::UpdateConfig() : BridgeMethod{"UpdateConfig", [&](const UpdateArgs& args) {
|
||||
run(args);
|
||||
UpdateConfig::UpdateConfig() : JSBridgeMethod{"UpdateConfig", [&](UpdateArgs args) {
|
||||
run(args.value);
|
||||
}} {}
|
||||
|
||||
|
||||
@@ -21,5 +22,5 @@ UpdateConfig::UpdateConfig() : BridgeMethod{"UpdateConfig", [&](const UpdateArgs
|
||||
config: The new settings
|
||||
--------------------------------------------------------------------*/
|
||||
void UpdateConfig::run(const ConnectorConfig& config) const {
|
||||
///TODO: Store the active configuration settings in a local SQLite database
|
||||
///TODO: Store the active configuration settings here
|
||||
} //UpdateConfig::run
|
||||
|
||||
@@ -2,26 +2,27 @@
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_UPDATE_CONFIG
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Config/ConnectorConfig.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
class ConnectorConfig;
|
||||
|
||||
///Argument for a JS call to update the display configuration settings
|
||||
///Argument for a JS call to update the configuration
|
||||
using UpdateArgs = speckle::interfac::browser::bridge::JSArgType<ConnectorConfig>;
|
||||
|
||||
/*!
|
||||
JS Function class to update the display configuration settings
|
||||
JS Function class to retrieve the names of the methods supported by the bridge
|
||||
*/
|
||||
class UpdateConfig : public speckle::interfac::browser::bridge::BridgeMethod<UpdateArgs, void> {
|
||||
class UpdateConfig : public speckle::interfac::browser::bridge::JSBridgeMethod<UpdateArgs, void> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
@param bridge The parent bridge object (provides access to bridge methods)
|
||||
*/
|
||||
UpdateConfig();
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Receive/Receive.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
|
||||
#include "Connector/Connector.h"
|
||||
#include "Connector/ConnectorResource.h"
|
||||
#include "Connector/Database/ModelCardDatabase.h"
|
||||
#include "Connector/Environment/ConnectorProject.h"
|
||||
#include "Connector/Record/Collection/ProjectCollection.h"
|
||||
#include "Connector/Record/Model/ReceiverModelCard.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"
|
||||
|
||||
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;
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
Receive::Receive() : BridgeMethod{"Receive", [&](const ReceiveArgs& args) {
|
||||
run(args);
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Receive a specified model
|
||||
|
||||
modelCardID: The ID of the model card identifying the objects to receive
|
||||
--------------------------------------------------------------------*/
|
||||
void Receive::run(const String& modelCardID) const {
|
||||
} //Receive::run
|
||||
@@ -1,39 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_RECEIVE
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_RECEIVE
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
///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 ReceiveArgs = speckle::interfac::browser::bridge::JSArgType<StringHold>;
|
||||
|
||||
/*!
|
||||
JS Function class to receive a specified model
|
||||
*/
|
||||
class Receive : public speckle::interfac::browser::bridge::BridgeMethod<ReceiveArgs, void> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
Receive();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Receive a specified model
|
||||
@param modelCardID The ID of the model card identifying the objects to receive
|
||||
*/
|
||||
void run(const speckle::utility::String& modelCardID) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_RECEIVE
|
||||
@@ -1,30 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Receive/ReceiveBridge.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Receive/Receive.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/ReceiverModelCard.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
|
||||
--------------------------------------------------------------------*/
|
||||
ReceiveBridge::ReceiveBridge() : BrowserBridge{"receiveBinding"} {
|
||||
//Add bridge methods
|
||||
addMethod<Receive>();
|
||||
} //ReceiveBridge::ReceiveBridge
|
||||
@@ -1,29 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_RECEIVE_BRIDGE
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_RECEIVE_BRIDGE
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
A browser bridge to support receiving model data from a Speckle server
|
||||
*/
|
||||
class ReceiveBridge : public speckle::interfac::browser::bridge::BrowserBridge {
|
||||
public:
|
||||
|
||||
// MARK: - Types
|
||||
|
||||
using base = speckle::interfac::browser::bridge::BrowserBridge;
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
using base::base;
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
ReceiveBridge();
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_RECEIVE_BRIDGE
|
||||
@@ -1,89 +0,0 @@
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||
#include "Connector/Connector.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Selection/Arg/SelectionInfo.h"
|
||||
#include "Speckle/Database/BIMElementDatabase.h"
|
||||
#include "Speckle/Environment/Project.h"
|
||||
#include "Speckle/Record/Element/Element.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::record::element;
|
||||
|
||||
namespace {
|
||||
|
||||
///Serialisation fields
|
||||
enum FieldIndex {
|
||||
selectedObjectIdsID,
|
||||
summaryID,
|
||||
};
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"selectedObjectIds"},
|
||||
Identity{"summary"},
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
SelectionInfo::SelectionInfo() {
|
||||
auto project = connector()->getActiveProject().lock();
|
||||
if (!project) {
|
||||
// TODO: is this OK?
|
||||
return;
|
||||
}
|
||||
|
||||
auto elementDatabase = project->getElementDatabase();
|
||||
auto selected = elementDatabase->getSelection();
|
||||
|
||||
active::utility::String summary(selected.size());
|
||||
summary += " objects selected.";
|
||||
m_summary = summary;
|
||||
|
||||
for (const auto& link : selected) {
|
||||
m_selectedElementIds.push_back(link);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Fill an inventory with the package items
|
||||
|
||||
inventory: The inventory to receive the package items
|
||||
|
||||
return: True if the package has added items to the inventory
|
||||
--------------------------------------------------------------------*/
|
||||
bool SelectionInfo::fillInventory(Inventory& inventory) const {
|
||||
using enum Entry::Type;
|
||||
inventory.merge(Inventory{
|
||||
{
|
||||
{ fieldID[selectedObjectIdsID], selectedObjectIdsID, element },
|
||||
{ fieldID[summaryID], summaryID, element },
|
||||
},
|
||||
}.withType(&typeid(SelectionInfo)));
|
||||
return true;
|
||||
} //SelectionInfo::fillInventory
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the specified cargo
|
||||
|
||||
item: The inventory item to retrieve
|
||||
|
||||
return: The requested cargo (nullptr on failure)
|
||||
--------------------------------------------------------------------*/
|
||||
Cargo::Unique SelectionInfo::getCargo(const Inventory::Item& item) const {
|
||||
if (item.ownerType != &typeid(SelectionInfo))
|
||||
return nullptr;
|
||||
using namespace active::serialise;
|
||||
switch (item.index) {
|
||||
case selectedObjectIdsID:
|
||||
return std::make_unique<ContainerWrap<std::vector<active::utility::Guid>>>(m_selectedElementIds, false, fieldID[selectedObjectIdsID].name);
|
||||
case summaryID:
|
||||
return std::make_unique<ValueWrap<active::utility::String>>(m_summary);
|
||||
default:
|
||||
return nullptr; //Requested an unknown index
|
||||
}
|
||||
} //SelectionInfo::getCargo
|
||||
@@ -1,45 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SELECTION_INFO
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_SELECTION_INFO
|
||||
|
||||
#include "Active/Serialise/Package/Package.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
Configuration settings class
|
||||
*/
|
||||
class SelectionInfo : public active::serialise::Package {
|
||||
public:
|
||||
|
||||
// MARK: - Types
|
||||
|
||||
using base = active::serialise::Package;
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
SelectionInfo();
|
||||
|
||||
active::utility::String m_summary = "No objects selected";
|
||||
std::vector<active::utility::Guid> m_selectedElementIds;
|
||||
|
||||
// MARK: - Serialisation
|
||||
|
||||
/*!
|
||||
Fill an inventory with the package items
|
||||
@param inventory The inventory to receive the package items
|
||||
@return True if the package has added items to the inventory
|
||||
*/
|
||||
bool fillInventory(active::serialise::Inventory& inventory) const override;
|
||||
/*!
|
||||
Get the specified cargo
|
||||
@param item The inventory item to retrieve
|
||||
@return The requested cargo (nullptr on failure)
|
||||
*/
|
||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
||||
};
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SELECTION_INFO
|
||||
@@ -1,23 +0,0 @@
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Selection/GetSelection.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Selection/Arg/SelectionInfo.h"
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetSelection::GetSelection() : BridgeMethod{"GetSelection", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the current selection info
|
||||
based on the ArchiCAD mdoel selection
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetSelection::run() const {
|
||||
auto selectionInfo = std::make_unique<SelectionInfo>();
|
||||
return std::make_unique<CargoHold<PackageWrap, SelectionInfo>>(std::move(selectionInfo));
|
||||
} //GetSelection::run
|
||||
@@ -1,29 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GETSELECTION
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GETSELECTION
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
class GetSelection : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
GetSelection();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Get the current selection info
|
||||
based on the ArchiCAD mdoel selection
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_GETSELECTION
|
||||
@@ -1,30 +0,0 @@
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Selection/SelectionBridge.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Selection/GetSelection.h"
|
||||
#include "Connector/Interface/Browser/Bridge/Selection/Arg/SelectionInfo.h"
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
SelectionBridge::SelectionBridge() : BrowserBridge{"selectionBinding"} {
|
||||
//Add bridge methods
|
||||
addMethod<GetSelection>();
|
||||
} //SelectionBridge::SelectionBridge
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Handle a selection change
|
||||
|
||||
event: The selection event
|
||||
|
||||
return: True if the event should be closed
|
||||
--------------------------------------------------------------------*/
|
||||
bool SelectionBridge::handle(const speckle::event::SelectionEvent& event) {
|
||||
auto selectionInfo = std::make_unique<SelectionInfo>();
|
||||
auto wrapped = std::make_unique<CargoHold<PackageWrap, SelectionInfo>>(std::move(selectionInfo));
|
||||
sendEvent("setSelection", std::move(wrapped));
|
||||
return true;
|
||||
} //SelectionBridge::handle
|
||||
@@ -1,39 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SELECTION_BRIDGE
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_SELECTION_BRIDGE
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
||||
#include "Speckle/Event/Subscriber/SelectionSubscriber.h"
|
||||
#include "Speckle/Event/Type/SelectionEvent.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
A browser bridge to manage element selection information passed between the JS UI and the BIM application
|
||||
*/
|
||||
class SelectionBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::SelectionSubscriber {
|
||||
public:
|
||||
|
||||
// MARK: - Types
|
||||
|
||||
using base = speckle::interfac::browser::bridge::BrowserBridge;
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
using base::base;
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
SelectionBridge();
|
||||
|
||||
protected:
|
||||
/*!
|
||||
Handle a selection change
|
||||
@param event The selection event
|
||||
@return True if the event should be closed
|
||||
*/
|
||||
bool handle(const speckle::event::SelectionEvent& event) override;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SELECTION_BRIDGE
|
||||
@@ -1,121 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
///Serialisation fields
|
||||
enum FieldIndex {
|
||||
statusID,
|
||||
srcID,
|
||||
srcTypeID,
|
||||
resID,
|
||||
resTypeID,
|
||||
errorID,
|
||||
};
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"status"},
|
||||
Identity{"sourceId"},
|
||||
Identity{"sourceType"},
|
||||
Identity{"resultId"},
|
||||
Identity{"resultType"},
|
||||
Identity{"error"},
|
||||
};
|
||||
|
||||
///Conversion status enumerator names
|
||||
std::array statusName{
|
||||
"success",
|
||||
"warning",
|
||||
"info",
|
||||
"error",
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Fill an inventory with the package items
|
||||
|
||||
inventory: The inventory to receive the package items
|
||||
|
||||
return: True if the package has added items to the inventory
|
||||
--------------------------------------------------------------------*/
|
||||
bool ConversionResult::fillInventory(active::serialise::Inventory& inventory) const {
|
||||
using enum Entry::Type;
|
||||
inventory.merge(Inventory{
|
||||
{
|
||||
{ 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;
|
||||
} //ConversionResult::fillInventory
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the specified cargo
|
||||
|
||||
item: The inventory item to retrieve
|
||||
|
||||
return: The requested cargo (nullptr on failure)
|
||||
--------------------------------------------------------------------*/
|
||||
Cargo::Unique ConversionResult::getCargo(const active::serialise::Inventory::Item& item) const {
|
||||
if (item.ownerType != &typeid(ConversionResult))
|
||||
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<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
|
||||
@@ -1,117 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_CONVERSION_RESULT
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_CONVERSION_RESULT
|
||||
|
||||
#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 {
|
||||
|
||||
/*!
|
||||
The result of a conversion process (BIM records to/from Speckle)
|
||||
*/
|
||||
class ConversionResult : public active::serialise::Package {
|
||||
public:
|
||||
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
|
||||
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
ConversionResult() {}
|
||||
|
||||
// MARK: - Public variables
|
||||
|
||||
///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;
|
||||
///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;
|
||||
///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)
|
||||
SendError::Option error;
|
||||
|
||||
// MARK: - Serialisation
|
||||
|
||||
/*!
|
||||
Fill an inventory with the package items
|
||||
@param inventory The inventory to receive the package items
|
||||
@return True if the package has added items to the inventory
|
||||
*/
|
||||
bool fillInventory(active::serialise::Inventory& inventory) const override;
|
||||
/*!
|
||||
Get the specified cargo
|
||||
@param item The inventory item to retrieve
|
||||
@return The requested cargo (nullptr on failure)
|
||||
*/
|
||||
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);
|
||||
}
|
||||
|
||||
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
|
||||
@@ -1,49 +0,0 @@
|
||||
#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
|
||||
@@ -1,70 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendError.h"
|
||||
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
///Serialisation fields
|
||||
enum FieldIndex {
|
||||
messageID,
|
||||
cardID,
|
||||
stackID,
|
||||
};
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"message"},
|
||||
Identity{"modelCardId"},
|
||||
Identity{"stackTrace"},
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Fill an inventory with the package items
|
||||
|
||||
inventory: The inventory to receive the package items
|
||||
|
||||
return: True if the package has added items to the inventory
|
||||
--------------------------------------------------------------------*/
|
||||
bool SendError::fillInventory(active::serialise::Inventory& inventory) const {
|
||||
using enum Entry::Type;
|
||||
inventory.merge(Inventory{
|
||||
{
|
||||
{ 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;
|
||||
} //SendError::fillInventory
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the specified cargo
|
||||
|
||||
item: The inventory item to retrieve
|
||||
|
||||
return: The requested cargo (nullptr on failure)
|
||||
--------------------------------------------------------------------*/
|
||||
Cargo::Unique SendError::getCargo(const active::serialise::Inventory::Item& item) const {
|
||||
if (item.ownerType != &typeid(SendError))
|
||||
return nullptr;
|
||||
using namespace active::serialise;
|
||||
switch (item.index) {
|
||||
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
|
||||
}
|
||||
} //SendError::getCargo
|
||||
@@ -1,56 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND_ERROR
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_SEND_ERROR
|
||||
|
||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.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
|
||||
*/
|
||||
class SendError final : public active::serialise::Package {
|
||||
public:
|
||||
|
||||
// MARK: Types
|
||||
|
||||
///Optional
|
||||
using Option = std::optional<SendError>;
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
@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} {}
|
||||
|
||||
// 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 error stack trace
|
||||
speckle::utility::String stackTrace;
|
||||
|
||||
// MARK: - Serialisation
|
||||
|
||||
/*!
|
||||
Fill an inventory with the package items
|
||||
@param inventory The inventory to receive the package items
|
||||
@return True if the package has added items to the inventory
|
||||
*/
|
||||
bool fillInventory(active::serialise::Inventory& inventory) const override;
|
||||
/*!
|
||||
Get the specified cargo
|
||||
@param item The inventory item to retrieve
|
||||
@return The requested cargo (nullptr on failure)
|
||||
*/
|
||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SEND_ERROR
|
||||
@@ -1,87 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendObject.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;
|
||||
|
||||
namespace {
|
||||
|
||||
///Serialisation fields
|
||||
enum FieldIndex {
|
||||
idID,
|
||||
rootObjID,
|
||||
};
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"id"},
|
||||
Identity{"rootObject"},
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Fill an inventory with the package items
|
||||
|
||||
inventory: The inventory to receive the package items
|
||||
|
||||
return: True if the package has added items to the inventory
|
||||
--------------------------------------------------------------------*/
|
||||
bool SendObject::fillInventory(active::serialise::Inventory& inventory) const {
|
||||
using enum Entry::Type;
|
||||
inventory.merge(Inventory{
|
||||
{
|
||||
{ fieldID[idID], idID, element },
|
||||
{ fieldID[rootObjID], rootObjID, element },
|
||||
},
|
||||
}.withType(&typeid(SendObject)));
|
||||
return true;
|
||||
} //SendObject::fillInventory
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the specified cargo
|
||||
|
||||
item: The inventory item to retrieve
|
||||
|
||||
return: The requested cargo (nullptr on failure)
|
||||
--------------------------------------------------------------------*/
|
||||
Cargo::Unique SendObject::getCargo(const active::serialise::Inventory::Item& item) const {
|
||||
if (item.ownerType != &typeid(SendObject))
|
||||
return nullptr;
|
||||
using namespace active::serialise;
|
||||
switch (item.index) {
|
||||
case idID:
|
||||
return std::make_unique<StringWrap>(id);
|
||||
case rootObjID:
|
||||
if (m_object)
|
||||
return std::make_unique<PackageWrap>(*m_object);
|
||||
return std::make_unique<NullPackage>();
|
||||
default:
|
||||
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
|
||||
@@ -1,70 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND_OBJECT
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_SEND_OBJECT
|
||||
|
||||
#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"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
Class defining the primary content of a send
|
||||
*/
|
||||
class SendObject final : public active::serialise::Package {
|
||||
public:
|
||||
|
||||
using base = std::reference_wrapper<active::serialise::Package>;
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Default constructor
|
||||
@param object The object to send
|
||||
*/
|
||||
SendObject(std::unique_ptr<speckle::database::Record> object) : m_object{std::move(object)} { id = m_object->getID(); }
|
||||
|
||||
// MARK: - Public variables
|
||||
|
||||
///The root object id which should be used for creating the version
|
||||
speckle::utility::String id;
|
||||
|
||||
// MARK: - Serialisation
|
||||
|
||||
/*!
|
||||
Fill an inventory with the package items
|
||||
@param inventory The inventory to receive the package items
|
||||
@return True if the package has added items to the inventory
|
||||
*/
|
||||
bool fillInventory(active::serialise::Inventory& inventory) const override;
|
||||
/*!
|
||||
Get the specified cargo
|
||||
@param item The inventory item to retrieve
|
||||
@return The requested cargo (nullptr on failure)
|
||||
*/
|
||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
||||
/*!
|
||||
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
|
||||
*/
|
||||
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
|
||||
std::unique_ptr<speckle::database::Record> m_object;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SEND_OBJECT
|
||||
@@ -1,121 +0,0 @@
|
||||
#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"
|
||||
|
||||
#include <array>
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::record;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::database;
|
||||
using namespace speckle::record::cred;
|
||||
using namespace speckle::serialise;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
///Serialisation fields
|
||||
enum FieldIndex {
|
||||
cardID,
|
||||
projID,
|
||||
modID,
|
||||
tokenID,
|
||||
serverID,
|
||||
accID,
|
||||
messageID,
|
||||
sendObjectID,
|
||||
convResultID,
|
||||
};
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"modelCardId"},
|
||||
Identity{"projectId"},
|
||||
Identity{"modelId"},
|
||||
Identity{"token"},
|
||||
Identity{"serverUrl"},
|
||||
Identity{"accountId"},
|
||||
Identity{"message"},
|
||||
Identity{"sendObject"},
|
||||
Identity{"sendConversionResults"},
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Constructor
|
||||
|
||||
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
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Fill an inventory with the package items
|
||||
|
||||
inventory: The inventory to receive the package items
|
||||
|
||||
return: True if the package has added items to the inventory
|
||||
--------------------------------------------------------------------*/
|
||||
bool SendViaBrowserArgs::fillInventory(active::serialise::Inventory& inventory) const {
|
||||
using enum Entry::Type;
|
||||
inventory.merge(Inventory{
|
||||
{
|
||||
{ fieldID[cardID], cardID, element },
|
||||
{ fieldID[projID], projID, element },
|
||||
{ fieldID[modID], modID, element },
|
||||
{ fieldID[tokenID], tokenID, element },
|
||||
{ fieldID[serverID], serverID, element },
|
||||
{ fieldID[accID], accID, element },
|
||||
{ fieldID[messageID], messageID, element },
|
||||
{ fieldID[sendObjectID], sendObjectID, element },
|
||||
{ fieldID[convResultID], convResultID, element },
|
||||
},
|
||||
}.withType(&typeid(SendViaBrowserArgs)));
|
||||
return true;
|
||||
} //SendViaBrowserArgs::fillInventory
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the specified cargo
|
||||
|
||||
item: The inventory item to retrieve
|
||||
|
||||
return: The requested cargo (nullptr on failure)
|
||||
--------------------------------------------------------------------*/
|
||||
Cargo::Unique SendViaBrowserArgs::getCargo(const active::serialise::Inventory::Item& item) const {
|
||||
if (item.ownerType != &typeid(SendViaBrowserArgs))
|
||||
return nullptr;
|
||||
using namespace active::serialise;
|
||||
switch (item.index) {
|
||||
case cardID:
|
||||
return std::make_unique<StringWrap>(modelCardID);
|
||||
case projID:
|
||||
return std::make_unique<StringWrap>(projectID);
|
||||
case modID:
|
||||
return std::make_unique<StringWrap>(modelID);
|
||||
case tokenID:
|
||||
return std::make_unique<StringWrap>(token);
|
||||
case serverID:
|
||||
return std::make_unique<StringWrap>(serverURL);
|
||||
case accID:
|
||||
return std::make_unique<StringWrap>(accountID);
|
||||
case messageID:
|
||||
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
|
||||
}
|
||||
} //SendViaBrowserArgs::getCargo
|
||||
@@ -1,89 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND_VIA_BROWSER_ARGS
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_SEND_VIA_BROWSER_ARGS
|
||||
|
||||
#include "Active/Serialise/Package/Package.h"
|
||||
#include "Active/Utility/String.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"
|
||||
|
||||
namespace speckle::record::cred {
|
||||
class Account;
|
||||
}
|
||||
|
||||
namespace connector::record {
|
||||
class ModelCard;
|
||||
}
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
class ConnectorConfig;
|
||||
|
||||
/*!
|
||||
A commit of a project version (model) to the Speckle server
|
||||
|
||||
An object of this type is prepared by the Send bridge method
|
||||
*/
|
||||
class SendViaBrowserArgs final : public active::serialise::Package {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
@param modelCard The model card to populate into the send info for the browser
|
||||
@param account The account linked to the send
|
||||
@param object The object to be sent
|
||||
*/
|
||||
SendViaBrowserArgs(const connector::record::ModelCard& modelCard, const speckle::record::cred::Account& account, SendObject&& object);
|
||||
|
||||
// MARK: - Public variables
|
||||
|
||||
///ID of the model card driving the send request
|
||||
speckle::database::RecordID modelCardID;
|
||||
///The source project ID (from the model card)
|
||||
speckle::database::RecordID projectID;
|
||||
///The model ID (from the model card)
|
||||
speckle::database::RecordID modelID;
|
||||
///The account token (from the user account info)
|
||||
speckle::utility::String token;
|
||||
///The server URL (from the user account info)
|
||||
speckle::utility::String serverURL;
|
||||
///The user account ID
|
||||
speckle::utility::String accountID;
|
||||
///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)
|
||||
mutable std::vector<SendConversionResult> sendConversionResults;
|
||||
///The commit content
|
||||
SendObject sendObject;
|
||||
|
||||
// MARK: - Serialisation
|
||||
|
||||
/*!
|
||||
Fill an inventory with the package items
|
||||
@param inventory The inventory to receive the package items
|
||||
@return True if the package has added items to the inventory
|
||||
*/
|
||||
bool fillInventory(active::serialise::Inventory& inventory) const override;
|
||||
/*!
|
||||
Get the specified cargo
|
||||
@param item The inventory item to retrieve
|
||||
@return The requested cargo (nullptr on failure)
|
||||
*/
|
||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
||||
/*!
|
||||
Use a manager in (de)serialisation processes
|
||||
@param management The management to use
|
||||
*/
|
||||
void useManagement(active::serialise::Management* management) const override { sendObject.useManagement(management); }
|
||||
/*!
|
||||
Get the cargo management
|
||||
@return The active management
|
||||
*/
|
||||
active::serialise::Management* management() const override { return sendObject.management(); }
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SEND_VIA_BROWSER_ARGS
|
||||
@@ -1,41 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Send/GetSendFilters.h"
|
||||
|
||||
#include "Active/Container/Vector.h"
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
|
||||
#include "Connector/Record/Model/Filter/ArchicadEverythingFilter.h"
|
||||
#include "Connector/Record/Model/Filter/FilterMover.h"
|
||||
#include "Connector/Record/Model/Filter/ArchicadSelectionFilter.h"
|
||||
|
||||
using namespace active::container;
|
||||
using namespace active::serialise;
|
||||
using namespace connector::record;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
using WrappedValue = active::serialise::CargoHold<ContainerWrap<Vector<SendFilter>, FilterMover>, Vector<SendFilter>>;
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetSendFilters::GetSendFilters() : BridgeMethod{"GetSendFilters", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the send filters
|
||||
|
||||
return: The send filters
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetSendFilters::run() const {
|
||||
auto filters = std::make_unique<Vector<SendFilter>>();
|
||||
//filters.emplace_back(ArchicadEverythingFilter{}); //TODO: Implement as required
|
||||
filters->emplace_back(ArchicadSelectionFilter{});
|
||||
return std::make_unique<WrappedValue>(std::move(filters));
|
||||
} //GetSendFilters::run
|
||||
@@ -1,35 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_SEND_FILTERS
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_SEND_FILTERS
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
class ConnectorConfig;
|
||||
|
||||
/*!
|
||||
JS Function class to retrieve the send filters
|
||||
*/
|
||||
class GetSendFilters : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
GetSendFilters();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Get the send filters
|
||||
@return The send filters
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_GET_SEND_FILTERS
|
||||
@@ -1,36 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Send/GetSendSettings.h"
|
||||
|
||||
#include "Active/Container/Vector.h"
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||
#include "Connector/Record/Model/CardSetting.h"
|
||||
|
||||
using namespace active::container;
|
||||
using namespace active::serialise;
|
||||
using namespace connector::record;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
using WrappedValue = CargoHold<ContainerWrap<Vector<CardSetting>, PackageWrap>, Vector<CardSetting>>;
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetSendSettings::GetSendSettings() : BridgeMethod{"GetSendSettings", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get send settings relevant to the host BIM application
|
||||
|
||||
return: The send settings
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetSendSettings::run() const {
|
||||
auto filters = std::make_unique<Vector<CardSetting>>();
|
||||
return std::make_unique<WrappedValue>(std::move(filters));
|
||||
} //GetSendSettings::run
|
||||
@@ -1,35 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_SEND_SETTINGS
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_SEND_SETTINGS
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
class ConnectorConfig;
|
||||
|
||||
/*!
|
||||
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:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
GetSendSettings();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Get send settings relevant to the host BIM application
|
||||
@return The send settings
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_GET_SEND_SETTINGS
|
||||
@@ -1,97 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Send/Send.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
|
||||
#include "Connector/Connector.h"
|
||||
#include "Connector/ConnectorResource.h"
|
||||
#include "Connector/Database/ModelCardDatabase.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"
|
||||
|
||||
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;
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
Send::Send() : BridgeMethod{"Send", [&](const SendArgs& args) {
|
||||
run(args);
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Send a specified model
|
||||
|
||||
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 = connectorProject->getModelCardDatabase();
|
||||
auto modelCard = modelCardDatabase->getCard(modelCardID);
|
||||
if (!modelCard) {
|
||||
getBridge()->sendEvent("setModelError",
|
||||
std::make_unique<SendError>(connector()->getLocalString(errorString, modelCardNotFoundID), modelCardID));
|
||||
return;
|
||||
}
|
||||
//Get the user account
|
||||
auto accountDatabase = connector()->getAccountDatabase();
|
||||
auto account = accountDatabase->getAccount(modelCard->getAccountID(), modelCard->getServerURL());
|
||||
if (!account) {
|
||||
getBridge()->sendEvent("setModelError",
|
||||
std::make_unique<SendError>(connector()->getLocalString(errorString, accountNotFoundID), modelCardID));
|
||||
return;
|
||||
}
|
||||
//Get the selected elements from the modelcard
|
||||
auto elementDatabase = project->getElementDatabase();
|
||||
BIMRecordIDList 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, 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)});
|
||||
getBridge()->sendEvent("sendByBrowser", std::move(result));
|
||||
} //Send::run
|
||||
@@ -1,42 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_SEND
|
||||
|
||||
#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>;
|
||||
|
||||
/*!
|
||||
JS Function class to send a specified model
|
||||
*/
|
||||
class Send : public speckle::interfac::browser::bridge::BridgeMethod<SendArgs, void> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
Send();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Send a specified model
|
||||
@param modelCardID The ID of the model card identifying the objects to send
|
||||
*/
|
||||
void run(const speckle::utility::String& modelCardID) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SEND
|
||||
@@ -1,86 +0,0 @@
|
||||
#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
|
||||
--------------------------------------------------------------------*/
|
||||
SendBridge::SendBridge() : BrowserBridge{"sendBinding"} {
|
||||
//Add bridge methods
|
||||
addMethod<GetSendFilters>();
|
||||
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()); senderCard) {
|
||||
for (const auto& recordID : m_changedElements) {
|
||||
if (senderCard->contains(recordID)) {
|
||||
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.getElementID())
|
||||
m_changedElements.insert(*event.getElementID());
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
} //SendBridge::handle
|
||||
@@ -1,42 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND_BRIDGE
|
||||
#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, public speckle::event::ElementSubscriber {
|
||||
public:
|
||||
|
||||
// MARK: - Types
|
||||
|
||||
using base = speckle::interfac::browser::bridge::BrowserBridge;
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
using base::base;
|
||||
/*!
|
||||
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;
|
||||
|
||||
private:
|
||||
///List of changed element IDs
|
||||
speckle::database::BIMRecordIDList m_changedElements;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SEND_BRIDGE
|
||||
@@ -1,80 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Test/Arg/SayHiArg.h"
|
||||
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
///Serialisation fields
|
||||
enum FieldIndex {
|
||||
nameID,
|
||||
countID,
|
||||
isHelloID,
|
||||
};
|
||||
|
||||
///Serialisation field IDs. NB: This structure is never exported, so we only define the incoming argument indices
|
||||
static std::array fieldID = {
|
||||
Identity{"0"},
|
||||
Identity{"1"},
|
||||
Identity{"2"},
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Fill an inventory with the package items
|
||||
|
||||
inventory: The inventory to receive the package items
|
||||
|
||||
return: True if the package has added items to the inventory
|
||||
--------------------------------------------------------------------*/
|
||||
bool SayHiArg::fillInventory(Inventory& inventory) const {
|
||||
using enum Entry::Type;
|
||||
inventory.merge(Inventory{
|
||||
{
|
||||
{ fieldID[nameID], nameID, element },
|
||||
{ fieldID[countID], countID, element },
|
||||
{ fieldID[isHelloID], isHelloID, element },
|
||||
},
|
||||
}.withType(&typeid(SayHiArg)));
|
||||
return true;
|
||||
} //SayHiArg::fillInventory
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the specified cargo
|
||||
|
||||
item: The inventory item to retrieve
|
||||
|
||||
return: The requested cargo (nullptr on failure)
|
||||
--------------------------------------------------------------------*/
|
||||
Cargo::Unique SayHiArg::getCargo(const Inventory::Item& item) const {
|
||||
if (item.ownerType != &typeid(SayHiArg))
|
||||
return nullptr;
|
||||
using namespace active::serialise;
|
||||
switch (item.index) {
|
||||
case nameID:
|
||||
return std::make_unique<ValueWrap<String>>(name);
|
||||
case countID:
|
||||
return std::make_unique<ValueWrap<int32_t>>(count);
|
||||
case isHelloID:
|
||||
return std::make_unique<ValueWrap<bool>>(isHello);
|
||||
default:
|
||||
return nullptr; //Requested an unknown index
|
||||
}
|
||||
} //SayHiArg::getCargo
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Set to the default package content
|
||||
--------------------------------------------------------------------*/
|
||||
void SayHiArg::setDefault() {
|
||||
name.clear();
|
||||
count = 0;
|
||||
isHello = false;
|
||||
} //SayHiArg::setDefault
|
||||
@@ -1,133 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Test/GetComplexType.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
///Serialisation fields
|
||||
enum FieldIndex {
|
||||
unID,
|
||||
countID,
|
||||
isTestID,
|
||||
};
|
||||
|
||||
///Serialisation field IDs
|
||||
static std::array fieldID = {
|
||||
Identity{"id"},
|
||||
Identity{"count"},
|
||||
Identity{"thisIsABoolean"},
|
||||
};
|
||||
|
||||
/*!
|
||||
Object for testing Javascript communication (with TestBridge binding)
|
||||
*/
|
||||
class ComplexType final : public active::serialise::Package {
|
||||
public:
|
||||
|
||||
// MARK: - Types
|
||||
|
||||
using base = active::serialise::Package;
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
ComplexType();
|
||||
|
||||
// MARK: - Public variables
|
||||
|
||||
///Sample parameters for testing only
|
||||
speckle::utility::String ID;
|
||||
int32_t count = 0;
|
||||
bool testBool = false;
|
||||
|
||||
// MARK: - Serialisation
|
||||
|
||||
/*!
|
||||
Fill an inventory with the package items
|
||||
@param inventory The inventory to receive the package items
|
||||
@return True if the package has added items to the inventory
|
||||
*/
|
||||
bool fillInventory(active::serialise::Inventory& inventory) const override {
|
||||
using enum Entry::Type;
|
||||
inventory.merge(Inventory{
|
||||
{
|
||||
{ fieldID[unID], unID, element, !ID.empty() },
|
||||
{ fieldID[countID], countID, element, count != 0 },
|
||||
{ fieldID[isTestID], isTestID, element, testBool },
|
||||
},
|
||||
}.withType(&typeid(ComplexType)));
|
||||
return true;
|
||||
}
|
||||
/*!
|
||||
Get the specified cargo
|
||||
@param item The inventory item to retrieve
|
||||
@return The requested cargo (nullptr on failure)
|
||||
*/
|
||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override {
|
||||
if (item.ownerType != &typeid(ComplexType))
|
||||
return nullptr;
|
||||
using namespace active::serialise;
|
||||
switch (item.index) {
|
||||
case unID:
|
||||
return std::make_unique<ValueWrap<String>>(ID);
|
||||
case countID:
|
||||
return std::make_unique<ValueWrap<int32_t>>(count);
|
||||
case isTestID:
|
||||
return std::make_unique<ValueWrap<bool>>(testBool);
|
||||
default:
|
||||
return nullptr; //Requested an unknown index
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
///Return type for retrieving the current configuration
|
||||
using WrappedValue = CargoHold<PackageWrap, ComplexType>;
|
||||
|
||||
}
|
||||
|
||||
//Hashing specialisation
|
||||
template<>
|
||||
struct std::hash<ComplexType> {
|
||||
auto operator()(const ComplexType& obj) const {
|
||||
return hash<std::string>()(obj.ID) ^ rotl(hash<int32_t>()(obj.count), 1) ^ rotl(hash<bool>()(obj.testBool), 2);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
ComplexType::ComplexType() {
|
||||
//This is the required test values
|
||||
count = static_cast<int32_t>(std::hash<ComplexType>()(*this));
|
||||
ID = String{count} + " - I am a string";
|
||||
} //ComplexType::ComplexType
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GetComplexType::GetComplexType() : BridgeMethod{"GetComplexType", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Get the required object type
|
||||
|
||||
return: The required object
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> GetComplexType::run() const {
|
||||
auto object = std::make_unique<ComplexType>();
|
||||
return std::make_unique<WrappedValue>(std::move(object));
|
||||
} //GetComplexType::run
|
||||
@@ -1,32 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
JS Function class to return a specific object type
|
||||
*/
|
||||
class GetComplexType : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Constructor
|
||||
*/
|
||||
GetComplexType();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Get the required object type
|
||||
@return The required object
|
||||
*/
|
||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE
|
||||
@@ -1,21 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Test/GoAway.h"
|
||||
|
||||
#include "Speckle/Environment/Platform.h"
|
||||
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::environment;
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
GoAway::GoAway() : BridgeMethod{"GoAway", [&]() {
|
||||
return run();
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Write a message to the console
|
||||
--------------------------------------------------------------------*/
|
||||
void GoAway::run() const {
|
||||
platform()->writeToConsole("Okay, going away.");
|
||||
} //GoAway::run
|
||||
@@ -1,31 +0,0 @@
|
||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GO_AWAY
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_GO_AWAY
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
JS Function class to print a fixed message to the console
|
||||
*/
|
||||
class GoAway : public speckle::interfac::browser::bridge::BridgeMethod<void, void> {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
GoAway();
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
/*!
|
||||
Write a message to the console
|
||||
*/
|
||||
void run() const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif //CONNECTOR_INTERFACE_BRIDGE_GO_AWAY
|
||||
@@ -1,38 +0,0 @@
|
||||
#include "Connector/Interface/Browser/Bridge/Test/SayHi.h"
|
||||
|
||||
#include "Active/Serialise/CargoHold.h"
|
||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||
|
||||
using namespace active::serialise;
|
||||
using namespace active::setting;
|
||||
using namespace connector::interfac::browser::bridge;
|
||||
using namespace speckle::utility;
|
||||
|
||||
namespace {
|
||||
|
||||
///Return type for the test message
|
||||
using WrappedValue = CargoHold<ValueWrap<String>, String>;
|
||||
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Default constructor
|
||||
--------------------------------------------------------------------*/
|
||||
SayHi::SayHi() : BridgeMethod{"SayHi", [&](SayHiWrapper arg) {
|
||||
return run(arg);
|
||||
}} {}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Return a message based on sample data
|
||||
|
||||
arg: The sample data
|
||||
|
||||
return: The message based on sample data
|
||||
--------------------------------------------------------------------*/
|
||||
std::unique_ptr<Cargo> SayHi::run(SayHiArg arg) const {
|
||||
String result, baseGreeting{(arg.isHello ? "Hello" : "Hi") + arg.name + "!\n"};
|
||||
for (auto i = arg.count; i--; )
|
||||
result += baseGreeting;
|
||||
return std::make_unique<WrappedValue>(result);
|
||||
} //SayHi::run
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user