Compare commits
165 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| df1ef686f2 | |||
| 4ff7d68516 | |||
| d21f3da414 | |||
| 18ca0318a7 | |||
| e9dff1a12d | |||
| 67cbcba357 | |||
| 2784e6c38d | |||
| 90e133b03e | |||
| 861d6bf7b2 | |||
| 482f7a08a6 | |||
| 7fb898cc47 | |||
| ac16fe2974 | |||
| d78a443395 | |||
| 30b1d4d8b9 | |||
| e5754d51f0 | |||
| 4abf2b5719 | |||
| 84b234f26b | |||
| b71728086c | |||
| 79570b4070 | |||
| e974b360c1 | |||
| ca52be3c48 | |||
| 38a5254b30 | |||
| 37e04368ed | |||
| 7ffdc289d0 | |||
| 09b7ae77d5 | |||
| 73df695458 | |||
| 03dd5e5f5d | |||
| d2dde18fdb | |||
| 8c12621772 | |||
| c0d42b8316 | |||
| a38e44f2ea | |||
| 5d0e8d3ae4 | |||
| de0c645f5b | |||
| 218a67d92d | |||
| d6b76cfd56 | |||
| 45ccebc710 | |||
| b7c1f75d6a | |||
| c51b67318d | |||
| a330baf5da | |||
| ea103f3849 | |||
| 664fdaf39a | |||
| a6f15e9a53 | |||
| 0e0dc7da2d | |||
| cdd4df09ca | |||
| e612ed1192 | |||
| ed75c2110c | |||
| 96759f7e9e | |||
| 902ddcc8f1 | |||
| b62201cf95 | |||
| 4e60d95ce9 | |||
| 03ad5a80af | |||
| fbbf559e83 | |||
| da457a3438 | |||
| 767e379ff3 | |||
| 08c15c87a2 | |||
| 1827323712 | |||
| 653824c498 | |||
| 0dc823785d | |||
| bacdbc4d61 | |||
| 0343ac95ca | |||
| 53589d7ea0 | |||
| 98c6ac7c9e | |||
| 6d0cc1f7e6 | |||
| 077a74b2a3 | |||
| ef989ad8c7 | |||
| 8d8934657c | |||
| f019c88b27 | |||
| d7a95fd37c | |||
| 246b9099c4 | |||
| 74d4871fbd | |||
| 2f83e01f66 | |||
| 9e126e3dbf | |||
| c646129244 | |||
| 29e786574c | |||
| f634f158f9 | |||
| 48988fbe53 | |||
| 2c0d53c186 | |||
| 51370ababc | |||
| 8132eec03e | |||
| 86373c01c9 | |||
| 718c673845 | |||
| af8eb2c817 | |||
| 0d2d8028a2 | |||
| bed2cf9d42 | |||
| 5e4bcf48d6 | |||
| 59549e1065 | |||
| 16bbfae097 | |||
| 82bd96de61 | |||
| 51ed951d7d | |||
| cc6c884f47 | |||
| 4afed92ba9 | |||
| 326cb80f89 | |||
| ca2df4c020 | |||
| 787b2aa6e8 | |||
| 7d29bad9b5 | |||
| ba193c9dda | |||
| 764b548900 | |||
| 71dac48830 | |||
| 5684364119 | |||
| 45c4311d95 | |||
| 794658ed9c | |||
| ae521de698 | |||
| 0ff87576da | |||
| 141c503e81 | |||
| 319bc2826c | |||
| dee45512a1 | |||
| ce18804c95 | |||
| 2cfb66a872 | |||
| ed59150363 | |||
| 5715148cdd | |||
| 2f534e3fd0 | |||
| dd0cb8feb8 | |||
| 63c3c9befa | |||
| 281a2654c9 | |||
| 8fdbaaa52d | |||
| 67b12ae353 | |||
| 690e527b81 | |||
| 8f2e31c16e | |||
| e9b768daec | |||
| e5bf001590 | |||
| 7c0ac2e8f6 | |||
| 0969026f39 | |||
| 3d2aab8862 | |||
| bdea330c2e | |||
| b066b4ba3c | |||
| 3f772150ff | |||
| e00fd99d3c | |||
| 72e8ea78d9 | |||
| ede131ca0b | |||
| c4fcce4df8 | |||
| dcbd795b1f | |||
| 8a37d3fbd6 | |||
| 7256e11c3a | |||
| 9b8ab47eab | |||
| f72d5202f9 | |||
| dcac8390cf | |||
| 8893653583 | |||
| 0d5dd7156e | |||
| a5b681a6ed | |||
| 0c09205935 | |||
| 405d183124 | |||
| 7a1335681a | |||
| 889019a3e8 | |||
| 0dee313366 | |||
| a169d8b1d2 | |||
| 6d51b2d868 | |||
| 2c6909e98e | |||
| eeb4dab690 | |||
| e27808b73d | |||
| 5f1c942584 | |||
| 7dfe8fb964 | |||
| 73b04a7588 | |||
| 63bb28db0f | |||
| 3368e7a6dc | |||
| 01bb88b4a1 | |||
| 35f4e58a58 | |||
| 6d14607634 | |||
| 5363819e8d | |||
| 3be1676b1a | |||
| f5b5ff6487 | |||
| 878988df95 | |||
| f44f0413d0 | |||
| b80b5aef94 | |||
| 702f99eced | |||
| 42cf641a01 |
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"isRoot": true,
|
||||||
|
"tools": {
|
||||||
|
"gitversion.tool": {
|
||||||
|
"version": "6.0.2",
|
||||||
|
"commands": ["dotnet-gitversion"],
|
||||||
|
"rollForward": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
# This workflow uses actions that are not certified by GitHub.
|
||||||
|
# They are provided by a third-party and are governed by
|
||||||
|
# separate terms of service, privacy policy, and support
|
||||||
|
# documentation.
|
||||||
|
|
||||||
|
name: MSBuild
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: ["main", "develop", "release/*", "alan/*"] # Continuous delivery on every long-lived branch
|
||||||
|
tags: ["v3.*"] # Manual delivery on every 3.x tag
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: windows-latest
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.set-version.outputs.version }}
|
||||||
|
file_version: ${{ steps.set-info-version.outputs.file_version }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
path: speckle-cpp-connectors
|
||||||
|
fetch-depth: 0
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
repository: r-wessel/ActiveLib
|
||||||
|
path: ActiveLib
|
||||||
|
ref: develop
|
||||||
|
|
||||||
|
- name: Download zip file
|
||||||
|
run: |
|
||||||
|
New-Item -ItemType Directory -Path "Archicad 27" -Force
|
||||||
|
Invoke-WebRequest -Uri "https://github.com/GRAPHISOFT/archicad-api-devkit/releases/download/27.3001/API.Development.Kit.WIN.27.3001.zip" -OutFile "file.zip"
|
||||||
|
|
||||||
|
- name: Extract zip file to Archicad 27 folder
|
||||||
|
run: |
|
||||||
|
Add-Type -AssemblyName System.IO.Compression.FileSystem
|
||||||
|
[System.IO.Compression.ZipFile]::ExtractToDirectory("file.zip", "Archicad 27")
|
||||||
|
|
||||||
|
- name: Add MSBuild to PATH
|
||||||
|
uses: microsoft/setup-msbuild@v2
|
||||||
|
|
||||||
|
- name: ⚒️ Run GitVersion
|
||||||
|
working-directory: speckle-cpp-connectors
|
||||||
|
run: ./build.ps1 build-server-version
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
working-directory: speckle-cpp-connectors
|
||||||
|
run: ./build.ps1
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: output-${{ env.GitVersion_FullSemVer }}
|
||||||
|
path: speckle-cpp-connectors/output/*.zip
|
||||||
|
retention-days: 1
|
||||||
|
|
||||||
|
- id: set-version
|
||||||
|
name: Set version to output
|
||||||
|
run: echo "version=${{ env.GitVersion_FullSemVer }}" >> "$Env:GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- id: set-info-version
|
||||||
|
name: Set file version to output
|
||||||
|
run: echo "file_version=${{ env.GitVersion_AssemblySemVer}}" >> "$Env:GITHUB_OUTPUT" # version will be retrieved from tag?
|
||||||
|
deploy-installers:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: build
|
||||||
|
env:
|
||||||
|
IS_TAG_BUILD: ${{ github.ref_type == 'tag' }}
|
||||||
|
IS_RELEASE_BRANCH: true
|
||||||
|
steps:
|
||||||
|
- name: 🔫 Trigger Build Installers
|
||||||
|
uses: ALEEF02/workflow-dispatch@v3.0.0
|
||||||
|
continue-on-error: true
|
||||||
|
with:
|
||||||
|
workflow: build-cpp-installers
|
||||||
|
repo: specklesystems/connector-installers
|
||||||
|
token: ${{ secrets.CONNECTORS_GH_TOKEN }}
|
||||||
|
inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build.outputs.version }}", "file_version": "${{needs.build.outputs.file_version}}", "public_release": ${{ env.IS_TAG_BUILD }}, "store_artifacts": ${{ env.IS_RELEASE_BRANCH }} }'
|
||||||
|
ref: main
|
||||||
|
wait-for-completion: true
|
||||||
|
wait-for-completion-interval: 10s
|
||||||
|
wait-for-completion-timeout: 10m
|
||||||
|
display-workflow-run-url: true
|
||||||
|
display-workflow-run-url-interval: 10s
|
||||||
|
|
||||||
|
- uses: geekyeggo/delete-artifact@v5
|
||||||
|
with:
|
||||||
|
name: output-*
|
||||||
+5
-1
@@ -3,6 +3,7 @@ build/
|
|||||||
Documents/
|
Documents/
|
||||||
ResourceObjects/
|
ResourceObjects/
|
||||||
Install/
|
Install/
|
||||||
|
enc_temp_folder/
|
||||||
.vs/
|
.vs/
|
||||||
.vscode/
|
.vscode/
|
||||||
xcuserdata/
|
xcuserdata/
|
||||||
@@ -25,4 +26,7 @@ XCBuildData/
|
|||||||
*.log
|
*.log
|
||||||
.idea
|
.idea
|
||||||
*.mui
|
*.mui
|
||||||
*.aps
|
*.aps
|
||||||
|
**/obj
|
||||||
|
**/bin
|
||||||
|
output/
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
workflow: GitFlow/v1
|
||||||
|
next-version: 3.0.0
|
||||||
|
branches:
|
||||||
|
release:
|
||||||
|
prevent-increment:
|
||||||
|
when-current-commit-tagged: true
|
||||||
@@ -13,22 +13,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActiveLib17", "..\..\Active
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeckleLib17", "..\SpeckleLib\SpeckleLib17.vcxproj", "{942743B7-B3CB-4F91-BE46-28937F5E3FD1}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeckleLib17", "..\SpeckleLib\SpeckleLib17.vcxproj", "{942743B7-B3CB-4F91-BE46-28937F5E3FD1}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "..\ci-build\Build.csproj", "{702DE13A-1CCF-485D-A50D-846F645F07D3}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug16|x64 = Debug16|x64
|
Debug16|x64 = Debug16|x64
|
||||||
Debug16|x86 = Debug16|x86
|
Debug16|x86 = Debug16|x86
|
||||||
Debug17|x64 = Debug17|x64
|
Debug17|x64 = Debug17|x64
|
||||||
Debug17|x86 = Debug17|x86
|
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|x64 = DebugAC27|x64
|
||||||
DebugAC27|x86 = DebugAC27|x86
|
DebugAC27|x86 = DebugAC27|x86
|
||||||
|
DebugAC28|x64 = DebugAC28|x64
|
||||||
|
DebugAC28|x86 = DebugAC28|x86
|
||||||
DebugVS2022|x64 = DebugVS2022|x64
|
DebugVS2022|x64 = DebugVS2022|x64
|
||||||
DebugVS2022|x86 = DebugVS2022|x86
|
DebugVS2022|x86 = DebugVS2022|x86
|
||||||
Release16|x64 = Release16|x64
|
Release16|x64 = Release16|x64
|
||||||
Release16|x86 = Release16|x86
|
Release16|x86 = Release16|x86
|
||||||
Release17|x64 = Release17|x64
|
Release17|x64 = Release17|x64
|
||||||
Release17|x86 = Release17|x86
|
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|x64 = ReleaseAC27|x64
|
||||||
ReleaseAC27|x86 = ReleaseAC27|x86
|
ReleaseAC27|x86 = ReleaseAC27|x86
|
||||||
|
ReleaseAC28|x64 = ReleaseAC28|x64
|
||||||
|
ReleaseAC28|x86 = ReleaseAC28|x86
|
||||||
ReleaseVS2019|x64 = ReleaseVS2019|x64
|
ReleaseVS2019|x64 = ReleaseVS2019|x64
|
||||||
ReleaseVS2019|x86 = ReleaseVS2019|x86
|
ReleaseVS2019|x86 = ReleaseVS2019|x86
|
||||||
ReleaseVS2022|x64 = ReleaseVS2022|x64
|
ReleaseVS2022|x64 = ReleaseVS2022|x64
|
||||||
@@ -43,10 +57,22 @@ Global
|
|||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Debug17|x64.Build.0 = DebugVW2024|x64
|
{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.ActiveCfg = DebugAC27|Win32
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Debug17|x86.Build.0 = 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.ActiveCfg = DebugAC27|x64
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x64.Build.0 = 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.ActiveCfg = DebugVW2024|Win32
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x86.Build.0 = 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.ActiveCfg = DebugVW2024|x64
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x64.Build.0 = DebugVW2024|x64
|
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x64.Build.0 = DebugVW2024|x64
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x86.ActiveCfg = DebugRV2024|Win32
|
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x86.ActiveCfg = DebugRV2024|Win32
|
||||||
@@ -59,10 +85,22 @@ Global
|
|||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Release17|x64.Build.0 = ReleaseVW2024|x64
|
{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.ActiveCfg = ReleaseAC27|Win32
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Release17|x86.Build.0 = 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.ActiveCfg = ReleaseAC27|x64
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x64.Build.0 = 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.ActiveCfg = ReleaseVW2024|Win32
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x86.Build.0 = 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.ActiveCfg = ReleaseVW2024|x64
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x64.Build.0 = ReleaseVW2024|x64
|
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x64.Build.0 = ReleaseVW2024|x64
|
||||||
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x86.ActiveCfg = ReleaseRV2024|Win32
|
{CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x86.ActiveCfg = ReleaseRV2024|Win32
|
||||||
@@ -79,10 +117,22 @@ Global
|
|||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Debug17|x64.Build.0 = Debug17|x64
|
{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.ActiveCfg = Debug17|Win32
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Debug17|x86.Build.0 = 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.ActiveCfg = Debug16|x64
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x64.Build.0 = 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.ActiveCfg = Debug17|Win32
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x86.Build.0 = 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.ActiveCfg = Debug16|x64
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x64.Build.0 = Debug16|x64
|
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x64.Build.0 = Debug16|x64
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x86.ActiveCfg = Debug17|Win32
|
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x86.ActiveCfg = Debug17|Win32
|
||||||
@@ -95,10 +145,22 @@ Global
|
|||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Release17|x64.Build.0 = Release17|x64
|
{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.ActiveCfg = Release17|Win32
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Release17|x86.Build.0 = 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.ActiveCfg = Release16|x64
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x64.Build.0 = 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.ActiveCfg = Release17|Win32
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x86.Build.0 = 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.ActiveCfg = Release16|x64
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x64.Build.0 = Release16|x64
|
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x64.Build.0 = Release16|x64
|
||||||
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x86.ActiveCfg = Release17|Win32
|
{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x86.ActiveCfg = Release17|Win32
|
||||||
@@ -115,10 +177,22 @@ Global
|
|||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x64.Build.0 = DebugAC27|x64
|
{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.ActiveCfg = DebugAC27|Win32
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x86.Build.0 = 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.ActiveCfg = DebugAC27|x64
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x64.Build.0 = 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.ActiveCfg = DebugAC27|Win32
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x86.Build.0 = 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.ActiveCfg = DebugAC27|x64
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x64.Build.0 = DebugAC27|x64
|
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x64.Build.0 = DebugAC27|x64
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x86.ActiveCfg = DebugAC27|Win32
|
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x86.ActiveCfg = DebugAC27|Win32
|
||||||
@@ -131,10 +205,22 @@ Global
|
|||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x64.Build.0 = ReleaseAC27|x64
|
{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.ActiveCfg = ReleaseAC27|Win32
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x86.Build.0 = 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.ActiveCfg = ReleaseAC27|x64
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x64.Build.0 = 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.ActiveCfg = ReleaseAC27|Win32
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x86.Build.0 = 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.ActiveCfg = ReleaseAC27|x64
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x64.Build.0 = ReleaseAC27|x64
|
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x64.Build.0 = ReleaseAC27|x64
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x86.ActiveCfg = ReleaseAC27|Win32
|
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x86.ActiveCfg = ReleaseAC27|Win32
|
||||||
@@ -143,6 +229,58 @@ Global
|
|||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x64.Build.0 = ReleaseAC27|x64
|
{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.ActiveCfg = ReleaseAC27|Win32
|
||||||
{942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x86.Build.0 = 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
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -1,6 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="DebugAC25|Win32">
|
||||||
|
<Configuration>DebugAC25</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DebugAC25|x64">
|
||||||
|
<Configuration>DebugAC25</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DebugAC26|Win32">
|
||||||
|
<Configuration>DebugAC26</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DebugAC26|x64">
|
||||||
|
<Configuration>DebugAC26</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
<ProjectConfiguration Include="DebugAC27|Win32">
|
<ProjectConfiguration Include="DebugAC27|Win32">
|
||||||
<Configuration>DebugAC27</Configuration>
|
<Configuration>DebugAC27</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
@@ -9,6 +25,14 @@
|
|||||||
<Configuration>DebugAC27</Configuration>
|
<Configuration>DebugAC27</Configuration>
|
||||||
<Platform>x64</Platform>
|
<Platform>x64</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DebugAC28|Win32">
|
||||||
|
<Configuration>DebugAC28</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DebugAC28|x64">
|
||||||
|
<Configuration>DebugAC28</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
<ProjectConfiguration Include="DebugRV2024|Win32">
|
<ProjectConfiguration Include="DebugRV2024|Win32">
|
||||||
<Configuration>DebugRV2024</Configuration>
|
<Configuration>DebugRV2024</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
@@ -21,6 +45,22 @@
|
|||||||
<Configuration>DebugVW2024</Configuration>
|
<Configuration>DebugVW2024</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="ReleaseAC25|Win32">
|
||||||
|
<Configuration>ReleaseAC25</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="ReleaseAC25|x64">
|
||||||
|
<Configuration>ReleaseAC25</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="ReleaseAC26|Win32">
|
||||||
|
<Configuration>ReleaseAC26</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="ReleaseAC26|x64">
|
||||||
|
<Configuration>ReleaseAC26</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
<ProjectConfiguration Include="ReleaseAC27|Win32">
|
<ProjectConfiguration Include="ReleaseAC27|Win32">
|
||||||
<Configuration>ReleaseAC27</Configuration>
|
<Configuration>ReleaseAC27</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
@@ -29,6 +69,14 @@
|
|||||||
<Configuration>ReleaseAC27</Configuration>
|
<Configuration>ReleaseAC27</Configuration>
|
||||||
<Platform>x64</Platform>
|
<Platform>x64</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="ReleaseAC28|Win32">
|
||||||
|
<Configuration>ReleaseAC28</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="ReleaseAC28|x64">
|
||||||
|
<Configuration>ReleaseAC28</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
<ProjectConfiguration Include="ReleaseRV2024|Win32">
|
<ProjectConfiguration Include="ReleaseRV2024|Win32">
|
||||||
<Configuration>ReleaseRV2024</Configuration>
|
<Configuration>ReleaseRV2024</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
@@ -64,12 +112,24 @@
|
|||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseRV2024|x64'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseRV2024|x64'">true</ExcludedFromBuild>
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'">true</ExcludedFromBuild>
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC27|x64'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC27|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|x64'">true</ExcludedFromBuild>
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugRV2024|x64'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugRV2024|x64'">true</ExcludedFromBuild>
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC27|x64'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC27|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC28|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC26|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC25|x64'">true</ExcludedFromBuild>
|
||||||
</None>
|
</None>
|
||||||
<None Include="RFIX.win\Connector.rc2">
|
<None Include="RFIX.win\Connector.rc2">
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC27|x64'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC27|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|x64'">true</ExcludedFromBuild>
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC27|x64'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC27|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC28|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC26|x64'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugAC25|x64'">true</ExcludedFromBuild>
|
||||||
</None>
|
</None>
|
||||||
<None Include="RINT\Connector.grc" />
|
<None Include="RINT\Connector.grc" />
|
||||||
<None Include="RINT\ConnectorMenu.grc" />
|
<None Include="RINT\ConnectorMenu.grc" />
|
||||||
@@ -94,6 +154,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="Connector\Connector.cpp" />
|
<ClCompile Include="Connector\Connector.cpp" />
|
||||||
<ClCompile Include="Connector\Database\ModelCardDatabase.cpp" />
|
<ClCompile Include="Connector\Database\ModelCardDatabase.cpp" />
|
||||||
|
<ClCompile Include="Connector\Environment\ConnectorProject.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Account\AccountBridge.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Account\AccountBridge.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Account\GetAccounts.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Account\GetAccounts.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\AddModel.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\AddModel.cpp" />
|
||||||
@@ -104,6 +165,9 @@
|
|||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetDocumentState.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetDocumentState.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationName.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationName.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationVersion.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationVersion.cpp" />
|
||||||
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\HighlightModel.cpp" />
|
||||||
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\HighlightObjects.cpp" />
|
||||||
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\OpenUrl.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\RemoveModel.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\RemoveModel.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\UpdateModel.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Base\UpdateModel.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\Arg\ConnectorConfig.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\Arg\ConnectorConfig.cpp" />
|
||||||
@@ -111,6 +175,8 @@
|
|||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\GetConfig.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\GetConfig.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\GetIsDevMode.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\GetIsDevMode.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\UpdateConfig.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\UpdateConfig.cpp" />
|
||||||
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Receive\Receive.cpp" />
|
||||||
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Receive\ReceiveBridge.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\GetSelection.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\GetSelection.cpp" />
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\SelectionBridge.cpp" />
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\SelectionBridge.cpp" />
|
||||||
@@ -142,12 +208,14 @@
|
|||||||
<ClCompile Include="Connector\Record\Model\ModelCard.cpp" />
|
<ClCompile Include="Connector\Record\Model\ModelCard.cpp" />
|
||||||
<ClCompile Include="Connector\Record\Model\ReceiverModelCard.cpp" />
|
<ClCompile Include="Connector\Record\Model\ReceiverModelCard.cpp" />
|
||||||
<ClCompile Include="Connector\Record\Model\SenderModelCard.cpp" />
|
<ClCompile Include="Connector\Record\Model\SenderModelCard.cpp" />
|
||||||
|
<ClCompile Include="Connector\Tool\ElementHighlighter.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="Connector\Connector.h" />
|
<ClInclude Include="Connector\Connector.h" />
|
||||||
<ClInclude Include="Connector\ConnectorResource.h" />
|
<ClInclude Include="Connector\ConnectorResource.h" />
|
||||||
<ClInclude Include="Connector\Database\Identity\RecordID.h" />
|
<ClInclude Include="Connector\Database\Identity\RecordID.h" />
|
||||||
<ClInclude Include="Connector\Database\ModelCardDatabase.h" />
|
<ClInclude Include="Connector\Database\ModelCardDatabase.h" />
|
||||||
|
<ClInclude Include="Connector\Environment\ConnectorProject.h" />
|
||||||
<ClInclude Include="Connector\Event\ConnectorEventID.h" />
|
<ClInclude Include="Connector\Event\ConnectorEventID.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Account\AccountBridge.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Account\AccountBridge.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Account\GetAccounts.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Account\GetAccounts.h" />
|
||||||
@@ -159,6 +227,9 @@
|
|||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetDocumentState.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetDocumentState.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationName.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationName.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationVersion.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\GetSourceApplicationVersion.h" />
|
||||||
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\HighlightModel.h" />
|
||||||
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\HighlightObjects.h" />
|
||||||
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\OpenUrl.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\RemoveModel.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\RemoveModel.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\UpdateModel.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Base\UpdateModel.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\Arg\ConnectorConfig.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\Arg\ConnectorConfig.h" />
|
||||||
@@ -166,10 +237,13 @@
|
|||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\GetConfig.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\GetConfig.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\GetIsDevMode.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\GetIsDevMode.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\UpdateConfig.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\UpdateConfig.h" />
|
||||||
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Receive\Receive.h" />
|
||||||
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Receive\ReceiveBridge.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\GetSelection.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\GetSelection.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\SelectionBridge.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\SelectionBridge.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\ConversionResult.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\ConversionResult.h" />
|
||||||
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendConversionResult.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendError.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendError.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendObject.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendObject.h" />
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendViaBrowserArgs.h" />
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Arg\SendViaBrowserArgs.h" />
|
||||||
@@ -199,6 +273,7 @@
|
|||||||
<ClInclude Include="Connector\Record\Model\ModelCard.h" />
|
<ClInclude Include="Connector\Record\Model\ModelCard.h" />
|
||||||
<ClInclude Include="Connector\Record\Model\ReceiverModelCard.h" />
|
<ClInclude Include="Connector\Record\Model\ReceiverModelCard.h" />
|
||||||
<ClInclude Include="Connector\Record\Model\SenderModelCard.h" />
|
<ClInclude Include="Connector\Record\Model\SenderModelCard.h" />
|
||||||
|
<ClInclude Include="Connector\Tool\ElementHighlighter.h" />
|
||||||
<ClInclude Include="Connector\Version.h" />
|
<ClInclude Include="Connector\Version.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
@@ -228,6 +303,24 @@
|
|||||||
<PlatformToolset>v143</PlatformToolset>
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
@@ -249,6 +342,27 @@
|
|||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'" Label="Configuration">
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
@@ -274,6 +388,30 @@
|
|||||||
<VCToolsVersion>
|
<VCToolsVersion>
|
||||||
</VCToolsVersion>
|
</VCToolsVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
|
||||||
|
<VCToolsVersion />
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
|
||||||
|
<VCToolsVersion />
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
|
||||||
|
<VCToolsVersion />
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|x64'" Label="Configuration">
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
@@ -302,6 +440,33 @@
|
|||||||
<VCToolsVersion>
|
<VCToolsVersion>
|
||||||
</VCToolsVersion>
|
</VCToolsVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
|
||||||
|
<VCToolsVersion />
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
|
||||||
|
<VCToolsVersion />
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
|
||||||
|
<VCToolsVersion />
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
<ImportGroup Label="ExtensionSettings">
|
<ImportGroup Label="ExtensionSettings">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
@@ -316,6 +481,15 @@
|
|||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC27|Win32'" Label="PropertySheets">
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC27|Win32'" Label="PropertySheets">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|Win32'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|Win32'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
@@ -325,6 +499,15 @@
|
|||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC27|Win32'" Label="PropertySheets">
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC27|Win32'" Label="PropertySheets">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="..\SpeckleLib\Make.win\VW2024.props" />
|
<Import Project="..\SpeckleLib\Make.win\VW2024.props" />
|
||||||
@@ -340,6 +523,21 @@
|
|||||||
<Import Project="..\SpeckleLib\Make.win\AC27.props" />
|
<Import Project="..\SpeckleLib\Make.win\AC27.props" />
|
||||||
<Import Project="Make.win\ConnectorAC27.props" />
|
<Import Project="Make.win\ConnectorAC27.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\SpeckleLib\Make.win\AC28.props" />
|
||||||
|
<Import Project="Make.win\ConnectorAC28.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\SpeckleLib\Make.win\AC26.props" />
|
||||||
|
<Import Project="Make.win\ConnectorAC26.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\SpeckleLib\Make.win\AC25.props" />
|
||||||
|
<Import Project="Make.win\ConnectorAC25.props" />
|
||||||
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="..\SpeckleLib\Make.win\VW2024.props" />
|
<Import Project="..\SpeckleLib\Make.win\VW2024.props" />
|
||||||
@@ -355,6 +553,21 @@
|
|||||||
<Import Project="..\SpeckleLib\Make.win\AC27.props" />
|
<Import Project="..\SpeckleLib\Make.win\AC27.props" />
|
||||||
<Import Project="Make.win\ConnectorAC27.props" />
|
<Import Project="Make.win\ConnectorAC27.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\SpeckleLib\Make.win\AC28.props" />
|
||||||
|
<Import Project="Make.win\ConnectorAC28.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\SpeckleLib\Make.win\AC26.props" />
|
||||||
|
<Import Project="Make.win\ConnectorAC26.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\SpeckleLib\Make.win\AC25.props" />
|
||||||
|
<Import Project="Make.win\ConnectorAC25.props" />
|
||||||
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|Win32'">
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
@@ -365,6 +578,15 @@
|
|||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC27|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC27|Win32'">
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|Win32'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|Win32'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|Win32'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|Win32'">
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@@ -374,6 +596,15 @@
|
|||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC27|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC27|Win32'">
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|Win32'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|Win32'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|Win32'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'">
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
<SourcePath>$(SourcePath)</SourcePath>
|
<SourcePath>$(SourcePath)</SourcePath>
|
||||||
@@ -395,6 +626,27 @@
|
|||||||
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||||
<TargetName>$(BASE_NAME)</TargetName>
|
<TargetName>$(BASE_NAME)</TargetName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<SourcePath>$(SourcePath)</SourcePath>
|
||||||
|
<TargetExt>.apx</TargetExt>
|
||||||
|
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<TargetName>$(BASE_NAME)</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<SourcePath>$(SourcePath)</SourcePath>
|
||||||
|
<TargetExt>.apx</TargetExt>
|
||||||
|
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<TargetName>$(BASE_NAME)</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<SourcePath>$(SourcePath)</SourcePath>
|
||||||
|
<TargetExt>.apx</TargetExt>
|
||||||
|
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<TargetName>$(BASE_NAME)</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|x64'">
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
<TargetExt>.vlb</TargetExt>
|
<TargetExt>.vlb</TargetExt>
|
||||||
@@ -413,6 +665,24 @@
|
|||||||
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||||
<TargetName>$(BASE_NAME)</TargetName>
|
<TargetName>$(BASE_NAME)</TargetName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<TargetExt>.apx</TargetExt>
|
||||||
|
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<TargetName>$(BASE_NAME)</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<TargetExt>.apx</TargetExt>
|
||||||
|
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<TargetName>$(BASE_NAME)</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<TargetExt>.apx</TargetExt>
|
||||||
|
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<TargetName>$(BASE_NAME)</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
@@ -458,6 +728,51 @@
|
|||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
@@ -515,6 +830,63 @@
|
|||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugVW2024|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
@@ -676,6 +1048,219 @@ CALL "$(ProjectDir)..\SpeckleLib\Make.win\install.bat"</Command>
|
|||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>REM Archicad installbuild script
|
<Command>REM Archicad installbuild script
|
||||||
|
|
||||||
|
SET PROJECTDIR=$(ProjectDir)
|
||||||
|
SET TARGETNAME=$(TargetName)
|
||||||
|
SET TARGETDIR=$(TargetDir)
|
||||||
|
SET BIMVERSION=$(BIM_VERSION)
|
||||||
|
ECHO ON
|
||||||
|
ECHO "Starting Install"
|
||||||
|
set CONFIGURATION=$(Configuration)
|
||||||
|
set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\install.bat"</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Message>Creating VWR File</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\buildResAC.bat"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<ResourceCompile>
|
||||||
|
<AdditionalIncludeDirectories>$(HEADER_PATH_5)\Inc;$(HEADER_PATH_5)\Modules\DGLib;$(RES_OUTPUT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ResourceCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC28|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>
|
||||||
|
</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>TESTING_MODE;DEBUG;ARCHICAD;"__ACENV_CALL= ";WIN32;_WINDOWS;WINDOWS;AddOn_EXPORTS;ACExtension;_STLP_DONT_FORCE_MSVC_LIB_NAME;_USRDLL;_WIN_EXTERNAL_;_WINDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX20_DEPRECATION_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>false</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||||
|
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<LanguageStandard>stdcpp20</LanguageStandard>
|
||||||
|
<AdditionalIncludeDirectories>./;$(HEADER_PATH_1)/;$(HEADER_PATH_2)/;$(HEADER_PATH_3)/;$(HEADER_PATH_3)/$(BIM_PLATFORM)/;$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Inc;$(HEADER_PATH_5)/Modules/AnalyticalModelAPI;$(HEADER_PATH_5)/Modules/ArchicadAPI;$(HEADER_PATH_5)/Modules/Brep;$(HEADER_PATH_5)/Modules/BuiltInLibrary;$(HEADER_PATH_5)/Modules/CADInfrastructureBase;$(HEADER_PATH_5)/Modules/CommunicationClient;$(HEADER_PATH_5)/Modules/CommunicationCommon;$(HEADER_PATH_5)/Modules/DGGraphix;$(HEADER_PATH_5)/Modules/DGLib;$(HEADER_PATH_5)/Modules/DesignVariantAPI;$(HEADER_PATH_5)/Modules/GDL;$(HEADER_PATH_5)/Modules/GSMSections;$(HEADER_PATH_5)/Modules/GSModelDevLib;$(HEADER_PATH_5)/Modules/GSModeler;$(HEADER_PATH_5)/Modules/GSModeler2D;$(HEADER_PATH_5)/Modules/GSRoot;$(HEADER_PATH_5)/Modules/GSUtils;$(HEADER_PATH_5)/Modules/GSXML;$(HEADER_PATH_5)/Modules/GSXMLUtils;$(HEADER_PATH_5)/Modules/GX;$(HEADER_PATH_5)/Modules/GXImage;$(HEADER_PATH_5)/Modules/GXImageBase;$(HEADER_PATH_5)/Modules/GXMedia;$(HEADER_PATH_5)/Modules/Geometry;$(HEADER_PATH_5)/Modules/Graphix;$(HEADER_PATH_5)/Modules/HTTP;$(HEADER_PATH_5)/Modules/InputOutput;$(HEADER_PATH_5)/Modules/JSON;$(HEADER_PATH_5)/Modules/JSONConversion;$(HEADER_PATH_5)/Modules/JavascriptEngine;$(HEADER_PATH_5)/Modules/LibXL;$(HEADER_PATH_5)/Modules/MEPAPI;$(HEADER_PATH_5)/Modules/MPIInterfaceDevLib;$(HEADER_PATH_5)/Modules/MPIInterfaceImpDevLib;$(HEADER_PATH_5)/Modules/Model3D;$(HEADER_PATH_5)/Modules/Model3DViewerControl;$(HEADER_PATH_5)/Modules/Network;$(HEADER_PATH_5)/Modules/Pattern;$(HEADER_PATH_5)/Modules/PointCloud;$(HEADER_PATH_5)/Modules/PointCloudManager;$(HEADER_PATH_5)/Modules/QGDrawing;$(HEADER_PATH_5)/Modules/RS;$(HEADER_PATH_5)/Modules/RapidJSON;$(HEADER_PATH_5)/Modules/SecureCommunication;$(HEADER_PATH_5)/Modules/TWClientLib;$(HEADER_PATH_5)/Modules/TWRoot;$(HEADER_PATH_5)/Modules/TextEngine;$(HEADER_PATH_5)/Modules/TransparentWindowLib;$(HEADER_PATH_5)/Modules/UCLib;$(HEADER_PATH_5)/Modules/UDLib;$(HEADER_PATH_5)/Modules/UserInterfaceAPI;$(HEADER_PATH_5)/Modules/VBElemDialogs;$(HEADER_PATH_5)/Modules/VBUtils;$(HEADER_PATH_5)/Modules/VectorImage $(inherited)</AdditionalIncludeDirectories>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<StringPooling>true</StringPooling>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>CompileAsCpp</CompileAs>
|
||||||
|
<ForcedIncludeFiles>
|
||||||
|
</ForcedIncludeFiles>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<FunctionLevelLinking>
|
||||||
|
</FunctionLevelLinking>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
|
<FloatingPointExceptions>false</FloatingPointExceptions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
||||||
|
<AdditionalDependencies>$(HEADER_PATH_5)\Lib\ACAP_STATD.lib;$(HEADER_PATH_5)\Modules\DGGraphix\Win\DGGraphixImp.LIB;$(HEADER_PATH_5)\Modules\DGLib\Win\DGImp.lib;$(HEADER_PATH_5)\Modules\Geometry\Win\GeometryImp.LIB;$(HEADER_PATH_5)\Modules\Graphix\Win\GraphixImp.LIB;$(HEADER_PATH_5)\Modules\GSModeler\Win\GSModelerImp.LIB;$(HEADER_PATH_5)\Modules\GSRoot\Win\GSRootImp.lib;$(HEADER_PATH_5)\Modules\GXImage\Win\GXImageImp.lib;$(HEADER_PATH_5)\Modules\GXImageBase\Win\GXImageBaseImp.lib;$(HEADER_PATH_5)\Modules\GX\Win\GXImp.LIB;$(HEADER_PATH_5)\Modules\InputOutput\Win\InputOutputImp.lib;$(HEADER_PATH_5)\Modules\RS\Win\RSImp.LIB;$(HEADER_PATH_5)\Modules\UCLib\Win\UCImp.lib;$(HEADER_PATH_5)\Modules\UDLib\Win\UDImp.lib;$(HEADER_PATH_5)\Modules\VBElemDialogs\Win\VBElemDialogsImp.LIB;$(HEADER_PATH_5)\Modules\VectorImage\Win\VectorImageImp.LIB;$(HEADER_PATH_5)\Modules\JavascriptEngine\Win\JavascriptEngineImp.LIB;$(HEADER_PATH_5)\Modules\JSON\Win\JSONImp.LIB;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<IgnoreAllDefaultLibraries>
|
||||||
|
</IgnoreAllDefaultLibraries>
|
||||||
|
<IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
|
||||||
|
<AdditionalLibraryDirectories>$(HEADER_PATH_5)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
|
<EntryPointSymbol>DllMainEntry</EntryPointSymbol>
|
||||||
|
<AdditionalOptions>/export:GetExportedFuncAddrs,%401 /export:SetImportedFuncAddrs,%402 %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</Link>
|
||||||
|
<Lib>
|
||||||
|
<AdditionalDependencies>../zlib/x64/ZlibStatRelease/zlibstat.lib</AdditionalDependencies>
|
||||||
|
</Lib>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>REM Archicad installbuild script
|
||||||
|
|
||||||
|
SET PROJECTDIR=$(ProjectDir)
|
||||||
|
SET TARGETNAME=$(TargetName)
|
||||||
|
SET TARGETDIR=$(TargetDir)
|
||||||
|
SET BIMVERSION=$(BIM_VERSION)
|
||||||
|
ECHO ON
|
||||||
|
ECHO "Starting Install"
|
||||||
|
set CONFIGURATION=$(Configuration)
|
||||||
|
set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\install.bat"</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Message>Creating VWR File</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\buildResAC.bat"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<ResourceCompile>
|
||||||
|
<AdditionalIncludeDirectories>$(HEADER_PATH_5)\Inc;$(HEADER_PATH_5)\Modules\DGLib;$(RES_OUTPUT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ResourceCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC26|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>
|
||||||
|
</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>TESTING_MODE;DEBUG;ARCHICAD;WIN32;_WINDOWS;WINDOWS;AddOn_EXPORTS;ACExtension;_STLP_DONT_FORCE_MSVC_LIB_NAME;_USRDLL;_WIN_EXTERNAL_;_WINDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX20_DEPRECATION_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>false</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||||
|
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<LanguageStandard>stdcpp20</LanguageStandard>
|
||||||
|
<AdditionalIncludeDirectories>./;$(HEADER_PATH_1)/;$(HEADER_PATH_2)/;$(HEADER_PATH_3)/;$(HEADER_PATH_3)/$(BIM_PLATFORM)/;$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Inc;$(HEADER_PATH_5)/Modules/AnalyticalModelAPI;$(HEADER_PATH_5)/Modules/ArchicadAPI;$(HEADER_PATH_5)/Modules/Brep;$(HEADER_PATH_5)/Modules/BuiltInLibrary;$(HEADER_PATH_5)/Modules/CADInfrastructureBase;$(HEADER_PATH_5)/Modules/CommunicationClient;$(HEADER_PATH_5)/Modules/CommunicationCommon;$(HEADER_PATH_5)/Modules/DGGraphix;$(HEADER_PATH_5)/Modules/DGLib;$(HEADER_PATH_5)/Modules/DesignVariantAPI;$(HEADER_PATH_5)/Modules/GDL;$(HEADER_PATH_5)/Modules/GSMSections;$(HEADER_PATH_5)/Modules/GSModelDevLib;$(HEADER_PATH_5)/Modules/GSModeler;$(HEADER_PATH_5)/Modules/GSModeler2D;$(HEADER_PATH_5)/Modules/GSRoot;$(HEADER_PATH_5)/Modules/GSUtils;$(HEADER_PATH_5)/Modules/GSXML;$(HEADER_PATH_5)/Modules/GSXMLUtils;$(HEADER_PATH_5)/Modules/GX;$(HEADER_PATH_5)/Modules/GXImage;$(HEADER_PATH_5)/Modules/GXImageBase;$(HEADER_PATH_5)/Modules/GXMedia;$(HEADER_PATH_5)/Modules/Geometry;$(HEADER_PATH_5)/Modules/Graphix;$(HEADER_PATH_5)/Modules/HTTP;$(HEADER_PATH_5)/Modules/InputOutput;$(HEADER_PATH_5)/Modules/JSON;$(HEADER_PATH_5)/Modules/JSONConversion;$(HEADER_PATH_5)/Modules/JavascriptEngine;$(HEADER_PATH_5)/Modules/LibXL;$(HEADER_PATH_5)/Modules/MEPAPI;$(HEADER_PATH_5)/Modules/MPIInterfaceDevLib;$(HEADER_PATH_5)/Modules/MPIInterfaceImpDevLib;$(HEADER_PATH_5)/Modules/Model3D;$(HEADER_PATH_5)/Modules/Model3DViewerControl;$(HEADER_PATH_5)/Modules/Network;$(HEADER_PATH_5)/Modules/Pattern;$(HEADER_PATH_5)/Modules/PointCloud;$(HEADER_PATH_5)/Modules/PointCloudManager;$(HEADER_PATH_5)/Modules/QGDrawing;$(HEADER_PATH_5)/Modules/RS;$(HEADER_PATH_5)/Modules/RapidJSON;$(HEADER_PATH_5)/Modules/SecureCommunication;$(HEADER_PATH_5)/Modules/TWClientLib;$(HEADER_PATH_5)/Modules/TWRoot;$(HEADER_PATH_5)/Modules/TextEngine;$(HEADER_PATH_5)/Modules/TransparentWindowLib;$(HEADER_PATH_5)/Modules/UCLib;$(HEADER_PATH_5)/Modules/UDLib;$(HEADER_PATH_5)/Modules/UserInterfaceAPI;$(HEADER_PATH_5)/Modules/VBElemDialogs;$(HEADER_PATH_5)/Modules/VBUtils;$(HEADER_PATH_5)/Modules/VectorImage $(inherited)</AdditionalIncludeDirectories>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<StringPooling>true</StringPooling>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>CompileAsCpp</CompileAs>
|
||||||
|
<ForcedIncludeFiles>
|
||||||
|
</ForcedIncludeFiles>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<FunctionLevelLinking>
|
||||||
|
</FunctionLevelLinking>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
|
<FloatingPointExceptions>false</FloatingPointExceptions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
||||||
|
<AdditionalDependencies>$(HEADER_PATH_5)\Lib\Win\ACAP_STATD.lib;$(HEADER_PATH_5)\Modules\DGGraphix\Win\DGGraphixImp.LIB;$(HEADER_PATH_5)\Modules\DGLib\Win\DGImp.lib;$(HEADER_PATH_5)\Modules\Geometry\Win\GeometryImp.LIB;$(HEADER_PATH_5)\Modules\Graphix\Win\GraphixImp.LIB;$(HEADER_PATH_5)\Modules\GSModeler\Win\GSModelerImp.LIB;$(HEADER_PATH_5)\Modules\GSRoot\Win\GSRootImp.lib;$(HEADER_PATH_5)\Modules\GXImage\Win\GXImageImp.lib;$(HEADER_PATH_5)\Modules\GXImageBase\Win\GXImageBaseImp.lib;$(HEADER_PATH_5)\Modules\GX\Win\GXImp.LIB;$(HEADER_PATH_5)\Modules\InputOutput\Win\InputOutputImp.lib;$(HEADER_PATH_5)\Modules\RS\Win\RSImp.LIB;$(HEADER_PATH_5)\Modules\TextEngine\Win\TextEngineImp.LIB;$(HEADER_PATH_5)\Modules\UCLib\Win\UCImp.lib;$(HEADER_PATH_5)\Modules\UDLib\Win\UDImp.lib;$(HEADER_PATH_5)\Modules\VBElemDialogs\Win\VBElemDialogsImp.LIB;$(HEADER_PATH_5)\Modules\VectorImage\Win\VectorImageImp.LIB;$(HEADER_PATH_5)\Modules\JSON\Win\JSONImp.LIB;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<IgnoreAllDefaultLibraries>
|
||||||
|
</IgnoreAllDefaultLibraries>
|
||||||
|
<IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
|
||||||
|
<AdditionalLibraryDirectories>$(HEADER_PATH_5)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
|
<EntryPointSymbol>DllMainEntry</EntryPointSymbol>
|
||||||
|
<AdditionalOptions>/export:GetExportedFuncAddrs,%401 /export:SetImportedFuncAddrs,%402 %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</Link>
|
||||||
|
<Lib>
|
||||||
|
<AdditionalDependencies>../zlib/x64/ZlibStatRelease/zlibstat.lib</AdditionalDependencies>
|
||||||
|
</Lib>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>REM Archicad installbuild script
|
||||||
|
|
||||||
|
SET PROJECTDIR=$(ProjectDir)
|
||||||
|
SET TARGETNAME=$(TargetName)
|
||||||
|
SET TARGETDIR=$(TargetDir)
|
||||||
|
SET BIMVERSION=$(BIM_VERSION)
|
||||||
|
ECHO ON
|
||||||
|
ECHO "Starting Install"
|
||||||
|
set CONFIGURATION=$(Configuration)
|
||||||
|
set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\install.bat"</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Message>Creating VWR File</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\buildResAC.bat"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<ResourceCompile>
|
||||||
|
<AdditionalIncludeDirectories>$(HEADER_PATH_5)\Inc;$(HEADER_PATH_5)\Modules\DGLib;$(RES_OUTPUT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ResourceCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAC25|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>
|
||||||
|
</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>TESTING_MODE;DEBUG;ARCHICAD;WIN32;_WINDOWS;WINDOWS;AddOn_EXPORTS;ACExtension;_STLP_DONT_FORCE_MSVC_LIB_NAME;_USRDLL;_WIN_EXTERNAL_;_WINDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX20_DEPRECATION_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>false</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||||
|
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<LanguageStandard>stdcpp20</LanguageStandard>
|
||||||
|
<AdditionalIncludeDirectories>./;$(HEADER_PATH_1)/;$(HEADER_PATH_2)/;$(HEADER_PATH_3)/;$(HEADER_PATH_3)/$(BIM_PLATFORM)/;$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Inc;$(HEADER_PATH_5)/Modules/AnalyticalModelAPI;$(HEADER_PATH_5)/Modules/ArchicadAPI;$(HEADER_PATH_5)/Modules/Brep;$(HEADER_PATH_5)/Modules/BuiltInLibrary;$(HEADER_PATH_5)/Modules/CADInfrastructureBase;$(HEADER_PATH_5)/Modules/CommunicationClient;$(HEADER_PATH_5)/Modules/CommunicationCommon;$(HEADER_PATH_5)/Modules/DGGraphix;$(HEADER_PATH_5)/Modules/DGLib;$(HEADER_PATH_5)/Modules/DesignVariantAPI;$(HEADER_PATH_5)/Modules/GDL;$(HEADER_PATH_5)/Modules/GSMSections;$(HEADER_PATH_5)/Modules/GSModelDevLib;$(HEADER_PATH_5)/Modules/GSModeler;$(HEADER_PATH_5)/Modules/GSModeler2D;$(HEADER_PATH_5)/Modules/GSRoot;$(HEADER_PATH_5)/Modules/GSUtils;$(HEADER_PATH_5)/Modules/GSXML;$(HEADER_PATH_5)/Modules/GSXMLUtils;$(HEADER_PATH_5)/Modules/GX;$(HEADER_PATH_5)/Modules/GXImage;$(HEADER_PATH_5)/Modules/GXImageBase;$(HEADER_PATH_5)/Modules/GXMedia;$(HEADER_PATH_5)/Modules/Geometry;$(HEADER_PATH_5)/Modules/Graphix;$(HEADER_PATH_5)/Modules/HTTP;$(HEADER_PATH_5)/Modules/InputOutput;$(HEADER_PATH_5)/Modules/JSON;$(HEADER_PATH_5)/Modules/JSONConversion;$(HEADER_PATH_5)/Modules/JavascriptEngine;$(HEADER_PATH_5)/Modules/LibXL;$(HEADER_PATH_5)/Modules/MEPAPI;$(HEADER_PATH_5)/Modules/MPIInterfaceDevLib;$(HEADER_PATH_5)/Modules/MPIInterfaceImpDevLib;$(HEADER_PATH_5)/Modules/Model3D;$(HEADER_PATH_5)/Modules/Model3DViewerControl;$(HEADER_PATH_5)/Modules/Network;$(HEADER_PATH_5)/Modules/Pattern;$(HEADER_PATH_5)/Modules/PointCloud;$(HEADER_PATH_5)/Modules/PointCloudManager;$(HEADER_PATH_5)/Modules/QGDrawing;$(HEADER_PATH_5)/Modules/RS;$(HEADER_PATH_5)/Modules/RapidJSON;$(HEADER_PATH_5)/Modules/SecureCommunication;$(HEADER_PATH_5)/Modules/TWClientLib;$(HEADER_PATH_5)/Modules/TWRoot;$(HEADER_PATH_5)/Modules/TextEngine;$(HEADER_PATH_5)/Modules/TransparentWindowLib;$(HEADER_PATH_5)/Modules/UCLib;$(HEADER_PATH_5)/Modules/UDLib;$(HEADER_PATH_5)/Modules/UserInterfaceAPI;$(HEADER_PATH_5)/Modules/VBElemDialogs;$(HEADER_PATH_5)/Modules/VBUtils;$(HEADER_PATH_5)/Modules/VectorImage $(inherited)</AdditionalIncludeDirectories>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<StringPooling>true</StringPooling>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>CompileAsCpp</CompileAs>
|
||||||
|
<ForcedIncludeFiles>
|
||||||
|
</ForcedIncludeFiles>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<FunctionLevelLinking>
|
||||||
|
</FunctionLevelLinking>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
|
<FloatingPointExceptions>false</FloatingPointExceptions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
||||||
|
<AdditionalDependencies>$(HEADER_PATH_5)\Lib\Win\ACAP_STATD.lib;$(HEADER_PATH_5)\Modules\DGGraphix\Win\DGGraphixImp.LIB;$(HEADER_PATH_5)\Modules\DGLib\Win\DGImp.lib;$(HEADER_PATH_5)\Modules\Geometry\Win\GeometryImp.LIB;$(HEADER_PATH_5)\Modules\Graphix\Win\GraphixImp.LIB;$(HEADER_PATH_5)\Modules\GSModeler\Win\GSModelerImp.LIB;$(HEADER_PATH_5)\Modules\GSRoot\Win\GSRootImp.lib;$(HEADER_PATH_5)\Modules\GXImage\Win\GXImageImp.lib;$(HEADER_PATH_5)\Modules\GXImageBase\Win\GXImageBaseImp.lib;$(HEADER_PATH_5)\Modules\GX\Win\GXImp.LIB;$(HEADER_PATH_5)\Modules\InputOutput\Win\InputOutputImp.lib;$(HEADER_PATH_5)\Modules\RS\Win\RSImp.LIB;$(HEADER_PATH_5)\Modules\TextEngine\Win\TextEngineImp.LIB;$(HEADER_PATH_5)\Modules\UCLib\Win\UCImp.lib;$(HEADER_PATH_5)\Modules\UDLib\Win\UDImp.lib;$(HEADER_PATH_5)\Modules\VBAttributes\Win\VBAttributesImp.LIB;$(HEADER_PATH_5)\Modules\VBElemDialogs\Win\VBElemDialogsImp.LIB;$(HEADER_PATH_5)\Modules\VectorImage\Win\VectorImageImp.LIB;$(HEADER_PATH_5)\Modules\ObjectDatabase\Win\ObjectDatabaseImp.LIB;$(HEADER_PATH_5)\Modules\JSON\Win\JSONImp.LIB;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<IgnoreAllDefaultLibraries>
|
||||||
|
</IgnoreAllDefaultLibraries>
|
||||||
|
<IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
|
||||||
|
<AdditionalLibraryDirectories>$(HEADER_PATH_5)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
|
<EntryPointSymbol>DllMainEntry</EntryPointSymbol>
|
||||||
|
<AdditionalOptions>/export:GetExportedFuncAddrs,%401 /export:SetImportedFuncAddrs,%402 %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</Link>
|
||||||
|
<Lib>
|
||||||
|
<AdditionalDependencies>../zlib/x64/ZlibStatRelease/zlibstat.lib</AdditionalDependencies>
|
||||||
|
</Lib>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>REM Archicad installbuild script
|
||||||
|
|
||||||
SET PROJECTDIR=$(ProjectDir)
|
SET PROJECTDIR=$(ProjectDir)
|
||||||
SET TARGETNAME=$(TargetName)
|
SET TARGETNAME=$(TargetName)
|
||||||
SET TARGETDIR=$(TargetDir)
|
SET TARGETDIR=$(TargetDir)
|
||||||
@@ -863,6 +1448,228 @@ CALL "$(ProjectDir)..\SpeckleLib\Make.win\install.bat"</Command>
|
|||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>REM Archicad installbuild script
|
<Command>REM Archicad installbuild script
|
||||||
|
|
||||||
|
SET PROJECTDIR=$(ProjectDir)
|
||||||
|
SET TARGETNAME=$(TargetName)
|
||||||
|
SET TARGETDIR=$(TargetDir)
|
||||||
|
SET BIMVERSION=$(BIM_VERSION)
|
||||||
|
ECHO ON
|
||||||
|
ECHO "Starting Install $(TargetName)"
|
||||||
|
set CONFIGURATION=$(Configuration)
|
||||||
|
set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\install.bat"</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Message>Creating VWR File</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\buildResAC.bat"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<ResourceCompile>
|
||||||
|
<AdditionalIncludeDirectories>$(HEADER_PATH_5)\Inc;$(HEADER_PATH_5)\Modules\DGLib;$(RES_OUTPUT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ResourceCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC28|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>
|
||||||
|
</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>
|
||||||
|
</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;ARCHICAD;"__ACENV_CALL= ";WIN32;_WINDOWS;WINDOWS;AddOn_EXPORTS;ACExtension;_USRDLL;_WIN_EXTERNAL_;_WINDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX20_DEPRECATION_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>./;$(HEADER_PATH_1)/;$(HEADER_PATH_2)/;$(HEADER_PATH_3)/;$(HEADER_PATH_3)/$(BIM_PLATFORM)/;$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Inc;$(HEADER_PATH_5)/Modules/AnalyticalModelAPI;$(HEADER_PATH_5)/Modules/ArchicadAPI;$(HEADER_PATH_5)/Modules/Brep;$(HEADER_PATH_5)/Modules/BuiltInLibrary;$(HEADER_PATH_5)/Modules/CADInfrastructureBase;$(HEADER_PATH_5)/Modules/CommunicationClient;$(HEADER_PATH_5)/Modules/CommunicationCommon;$(HEADER_PATH_5)/Modules/DGGraphix;$(HEADER_PATH_5)/Modules/DGLib;$(HEADER_PATH_5)/Modules/DesignVariantAPI;$(HEADER_PATH_5)/Modules/GDL;$(HEADER_PATH_5)/Modules/GSMSections;$(HEADER_PATH_5)/Modules/GSModelDevLib;$(HEADER_PATH_5)/Modules/GSModeler;$(HEADER_PATH_5)/Modules/GSModeler2D;$(HEADER_PATH_5)/Modules/GSRoot;$(HEADER_PATH_5)/Modules/GSUtils;$(HEADER_PATH_5)/Modules/GSXML;$(HEADER_PATH_5)/Modules/GSXMLUtils;$(HEADER_PATH_5)/Modules/GX;$(HEADER_PATH_5)/Modules/GXImage;$(HEADER_PATH_5)/Modules/GXImageBase;$(HEADER_PATH_5)/Modules/GXMedia;$(HEADER_PATH_5)/Modules/Geometry;$(HEADER_PATH_5)/Modules/Graphix;$(HEADER_PATH_5)/Modules/HTTP;$(HEADER_PATH_5)/Modules/InputOutput;$(HEADER_PATH_5)/Modules/JSON;$(HEADER_PATH_5)/Modules/JSONConversion;$(HEADER_PATH_5)/Modules/JavascriptEngine;$(HEADER_PATH_5)/Modules/LibXL;$(HEADER_PATH_5)/Modules/MEPAPI;$(HEADER_PATH_5)/Modules/MPIInterfaceDevLib;$(HEADER_PATH_5)/Modules/MPIInterfaceImpDevLib;$(HEADER_PATH_5)/Modules/Model3D;$(HEADER_PATH_5)/Modules/Model3DViewerControl;$(HEADER_PATH_5)/Modules/Network;$(HEADER_PATH_5)/Modules/Pattern;$(HEADER_PATH_5)/Modules/PointCloud;$(HEADER_PATH_5)/Modules/PointCloudManager;$(HEADER_PATH_5)/Modules/QGDrawing;$(HEADER_PATH_5)/Modules/RS;$(HEADER_PATH_5)/Modules/RapidJSON;$(HEADER_PATH_5)/Modules/SecureCommunication;$(HEADER_PATH_5)/Modules/TWClientLib;$(HEADER_PATH_5)/Modules/TWRoot;$(HEADER_PATH_5)/Modules/TextEngine;$(HEADER_PATH_5)/Modules/TransparentWindowLib;$(HEADER_PATH_5)/Modules/UCLib;$(HEADER_PATH_5)/Modules/UDLib;$(HEADER_PATH_5)/Modules/UserInterfaceAPI;$(HEADER_PATH_5)/Modules/VBElemDialogs;$(HEADER_PATH_5)/Modules/VBUtils;$(HEADER_PATH_5)/Modules/VectorImage $(inherited)</AdditionalIncludeDirectories>
|
||||||
|
<LanguageStandard>stdcpp20</LanguageStandard>
|
||||||
|
<ForcedIncludeFiles>
|
||||||
|
</ForcedIncludeFiles>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
|
<StringPooling>true</StringPooling>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<ForceConformanceInForLoopScope>
|
||||||
|
</ForceConformanceInForLoopScope>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>CompileAsCpp</CompileAs>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
||||||
|
<AdditionalDependencies>$(HEADER_PATH_5)\Lib\ACAP_STAT.lib;$(HEADER_PATH_5)\Modules\DGGraphix\Win\DGGraphixImp.LIB;$(HEADER_PATH_5)\Modules\DGLib\Win\DGImp.lib;$(HEADER_PATH_5)\Modules\Geometry\Win\GeometryImp.LIB;$(HEADER_PATH_5)\Modules\Graphix\Win\GraphixImp.LIB;$(HEADER_PATH_5)\Modules\GSModeler\Win\GSModelerImp.LIB;$(HEADER_PATH_5)\Modules\GSRoot\Win\GSRootImp.lib;$(HEADER_PATH_5)\Modules\GXImage\Win\GXImageImp.lib;$(HEADER_PATH_5)\Modules\GXImageBase\Win\GXImageBaseImp.lib;$(HEADER_PATH_5)\Modules\GX\Win\GXImp.LIB;$(HEADER_PATH_5)\Modules\InputOutput\Win\InputOutputImp.lib;$(HEADER_PATH_5)\Modules\RS\Win\RSImp.LIB;$(HEADER_PATH_5)\Modules\UCLib\Win\UCImp.lib;$(HEADER_PATH_5)\Modules\UDLib\Win\UDImp.lib;$(HEADER_PATH_5)\Modules\VBElemDialogs\Win\VBElemDialogsImp.LIB;$(HEADER_PATH_5)\Modules\VectorImage\Win\VectorImageImp.LIB;$(HEADER_PATH_5)\Modules\JavascriptEngine\Win\JavascriptEngineImp.LIB;$(HEADER_PATH_5)\Modules\JSON\Win\JSONImp.LIB;msvcrt.lib;msvcprt.lib;IPHLPAPI.lib;Wininet.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<AdditionalLibraryDirectories>$(HEADER_PATH_5)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
|
<IgnoreAllDefaultLibraries>
|
||||||
|
</IgnoreAllDefaultLibraries>
|
||||||
|
<IgnoreSpecificDefaultLibraries>msvcrtd.lib</IgnoreSpecificDefaultLibraries>
|
||||||
|
<AdditionalOptions>/export:GetExportedFuncAddrs,%401 /export:SetImportedFuncAddrs,%402 %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</Link>
|
||||||
|
<Lib>
|
||||||
|
<AdditionalDependencies>../zlib/x64/ZlibStatRelease/zlibstat.lib</AdditionalDependencies>
|
||||||
|
</Lib>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>REM Archicad installbuild script
|
||||||
|
|
||||||
|
SET PROJECTDIR=$(ProjectDir)
|
||||||
|
SET TARGETNAME=$(TargetName)
|
||||||
|
SET TARGETDIR=$(TargetDir)
|
||||||
|
SET BIMVERSION=$(BIM_VERSION)
|
||||||
|
ECHO ON
|
||||||
|
ECHO "Starting Install $(TargetName)"
|
||||||
|
set CONFIGURATION=$(Configuration)
|
||||||
|
set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\install.bat"</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Message>Creating VWR File</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\buildResAC.bat"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<ResourceCompile>
|
||||||
|
<AdditionalIncludeDirectories>$(HEADER_PATH_5)\Inc;$(HEADER_PATH_5)\Modules\DGLib;$(RES_OUTPUT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ResourceCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC26|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>
|
||||||
|
</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>
|
||||||
|
</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;ARCHICAD;WIN32;_WINDOWS;WINDOWS;AddOn_EXPORTS;ACExtension;_USRDLL;_WIN_EXTERNAL_;_WINDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX20_DEPRECATION_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>./;$(HEADER_PATH_1)/;$(HEADER_PATH_2)/;$(HEADER_PATH_3)/;$(HEADER_PATH_3)/$(BIM_PLATFORM)/;$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Inc;$(HEADER_PATH_5)/Modules/AnalyticalModelAPI;$(HEADER_PATH_5)/Modules/ArchicadAPI;$(HEADER_PATH_5)/Modules/Brep;$(HEADER_PATH_5)/Modules/BuiltInLibrary;$(HEADER_PATH_5)/Modules/CADInfrastructureBase;$(HEADER_PATH_5)/Modules/CommunicationClient;$(HEADER_PATH_5)/Modules/CommunicationCommon;$(HEADER_PATH_5)/Modules/DGGraphix;$(HEADER_PATH_5)/Modules/DGLib;$(HEADER_PATH_5)/Modules/DesignVariantAPI;$(HEADER_PATH_5)/Modules/GDL;$(HEADER_PATH_5)/Modules/GSMSections;$(HEADER_PATH_5)/Modules/GSModelDevLib;$(HEADER_PATH_5)/Modules/GSModeler;$(HEADER_PATH_5)/Modules/GSModeler2D;$(HEADER_PATH_5)/Modules/GSRoot;$(HEADER_PATH_5)/Modules/GSUtils;$(HEADER_PATH_5)/Modules/GSXML;$(HEADER_PATH_5)/Modules/GSXMLUtils;$(HEADER_PATH_5)/Modules/GX;$(HEADER_PATH_5)/Modules/GXImage;$(HEADER_PATH_5)/Modules/GXImageBase;$(HEADER_PATH_5)/Modules/GXMedia;$(HEADER_PATH_5)/Modules/Geometry;$(HEADER_PATH_5)/Modules/Graphix;$(HEADER_PATH_5)/Modules/HTTP;$(HEADER_PATH_5)/Modules/InputOutput;$(HEADER_PATH_5)/Modules/JSON;$(HEADER_PATH_5)/Modules/JSONConversion;$(HEADER_PATH_5)/Modules/JavascriptEngine;$(HEADER_PATH_5)/Modules/LibXL;$(HEADER_PATH_5)/Modules/MEPAPI;$(HEADER_PATH_5)/Modules/MPIInterfaceDevLib;$(HEADER_PATH_5)/Modules/MPIInterfaceImpDevLib;$(HEADER_PATH_5)/Modules/Model3D;$(HEADER_PATH_5)/Modules/Model3DViewerControl;$(HEADER_PATH_5)/Modules/Network;$(HEADER_PATH_5)/Modules/Pattern;$(HEADER_PATH_5)/Modules/PointCloud;$(HEADER_PATH_5)/Modules/PointCloudManager;$(HEADER_PATH_5)/Modules/QGDrawing;$(HEADER_PATH_5)/Modules/RS;$(HEADER_PATH_5)/Modules/RapidJSON;$(HEADER_PATH_5)/Modules/SecureCommunication;$(HEADER_PATH_5)/Modules/TWClientLib;$(HEADER_PATH_5)/Modules/TWRoot;$(HEADER_PATH_5)/Modules/TextEngine;$(HEADER_PATH_5)/Modules/TransparentWindowLib;$(HEADER_PATH_5)/Modules/UCLib;$(HEADER_PATH_5)/Modules/UDLib;$(HEADER_PATH_5)/Modules/UserInterfaceAPI;$(HEADER_PATH_5)/Modules/VBElemDialogs;$(HEADER_PATH_5)/Modules/VBUtils;$(HEADER_PATH_5)/Modules/VectorImage $(inherited)</AdditionalIncludeDirectories>
|
||||||
|
<LanguageStandard>stdcpp20</LanguageStandard>
|
||||||
|
<ForcedIncludeFiles>
|
||||||
|
</ForcedIncludeFiles>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
|
<StringPooling>true</StringPooling>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<ForceConformanceInForLoopScope>
|
||||||
|
</ForceConformanceInForLoopScope>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>CompileAsCpp</CompileAs>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
||||||
|
<AdditionalDependencies>$(HEADER_PATH_5)\Lib\Win\ACAP_STAT.lib;$(HEADER_PATH_5)\Modules\DGGraphix\Win\DGGraphixImp.LIB;$(HEADER_PATH_5)\Modules\DGLib\Win\DGImp.lib;$(HEADER_PATH_5)\Modules\Geometry\Win\GeometryImp.LIB;$(HEADER_PATH_5)\Modules\Graphix\Win\GraphixImp.LIB;$(HEADER_PATH_5)\Modules\GSModeler\Win\GSModelerImp.LIB;$(HEADER_PATH_5)\Modules\GSRoot\Win\GSRootImp.lib;$(HEADER_PATH_5)\Modules\GXImage\Win\GXImageImp.lib;$(HEADER_PATH_5)\Modules\GXImageBase\Win\GXImageBaseImp.lib;$(HEADER_PATH_5)\Modules\GX\Win\GXImp.LIB;$(HEADER_PATH_5)\Modules\InputOutput\Win\InputOutputImp.lib;$(HEADER_PATH_5)\Modules\RS\Win\RSImp.LIB;$(HEADER_PATH_5)\Modules\TextEngine\Win\TextEngineImp.LIB;$(HEADER_PATH_5)\Modules\UCLib\Win\UCImp.lib;$(HEADER_PATH_5)\Modules\UDLib\Win\UDImp.lib;$(HEADER_PATH_5)\Modules\VBElemDialogs\Win\VBElemDialogsImp.LIB;$(HEADER_PATH_5)\Modules\VectorImage\Win\VectorImageImp.LIB;$(HEADER_PATH_5)\Modules\JSON\Win\JSONImp.LIB;msvcrt.lib;msvcprt.lib;IPHLPAPI.lib;Wininet.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<AdditionalLibraryDirectories>$(HEADER_PATH_5)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
|
<IgnoreAllDefaultLibraries>
|
||||||
|
</IgnoreAllDefaultLibraries>
|
||||||
|
<IgnoreSpecificDefaultLibraries>msvcrtd.lib</IgnoreSpecificDefaultLibraries>
|
||||||
|
<AdditionalOptions>/export:GetExportedFuncAddrs,%401 /export:SetImportedFuncAddrs,%402 %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</Link>
|
||||||
|
<Lib>
|
||||||
|
<AdditionalDependencies>../zlib/x64/ZlibStatRelease/zlibstat.lib</AdditionalDependencies>
|
||||||
|
</Lib>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>REM Archicad installbuild script
|
||||||
|
|
||||||
|
SET PROJECTDIR=$(ProjectDir)
|
||||||
|
SET TARGETNAME=$(TargetName)
|
||||||
|
SET TARGETDIR=$(TargetDir)
|
||||||
|
SET BIMVERSION=$(BIM_VERSION)
|
||||||
|
ECHO ON
|
||||||
|
ECHO "Starting Install $(TargetName)"
|
||||||
|
set CONFIGURATION=$(Configuration)
|
||||||
|
set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\install.bat"</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Message>Creating VWR File</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>set PLATFORM_NAME=$(Platform)
|
||||||
|
set SYMROOT=$(SolutionDir)
|
||||||
|
"$(ProjectDir)..\SpeckleLib\Make.win\buildResAC.bat"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
|
<ResourceCompile>
|
||||||
|
<AdditionalIncludeDirectories>$(HEADER_PATH_5)\Inc;$(HEADER_PATH_5)\Modules\DGLib;$(RES_OUTPUT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ResourceCompile>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAC25|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>
|
||||||
|
</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>
|
||||||
|
</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;ARCHICAD;WIN32;_WINDOWS;WINDOWS;AddOn_EXPORTS;ACExtension;_USRDLL;_WIN_EXTERNAL_;_WINDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX20_DEPRECATION_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>
|
||||||
|
</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>./;$(HEADER_PATH_1)/;$(HEADER_PATH_2)/;$(HEADER_PATH_3)/;$(HEADER_PATH_3)/$(BIM_PLATFORM)/;$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Inc;$(HEADER_PATH_5)/Modules/AnalyticalModelAPI;$(HEADER_PATH_5)/Modules/ArchicadAPI;$(HEADER_PATH_5)/Modules/Brep;$(HEADER_PATH_5)/Modules/BuiltInLibrary;$(HEADER_PATH_5)/Modules/CADInfrastructureBase;$(HEADER_PATH_5)/Modules/CommunicationClient;$(HEADER_PATH_5)/Modules/CommunicationCommon;$(HEADER_PATH_5)/Modules/DGGraphix;$(HEADER_PATH_5)/Modules/DGLib;$(HEADER_PATH_5)/Modules/DesignVariantAPI;$(HEADER_PATH_5)/Modules/GDL;$(HEADER_PATH_5)/Modules/GSMSections;$(HEADER_PATH_5)/Modules/GSModelDevLib;$(HEADER_PATH_5)/Modules/GSModeler;$(HEADER_PATH_5)/Modules/GSModeler2D;$(HEADER_PATH_5)/Modules/GSRoot;$(HEADER_PATH_5)/Modules/GSUtils;$(HEADER_PATH_5)/Modules/GSXML;$(HEADER_PATH_5)/Modules/GSXMLUtils;$(HEADER_PATH_5)/Modules/GX;$(HEADER_PATH_5)/Modules/GXImage;$(HEADER_PATH_5)/Modules/GXImageBase;$(HEADER_PATH_5)/Modules/GXMedia;$(HEADER_PATH_5)/Modules/Geometry;$(HEADER_PATH_5)/Modules/Graphix;$(HEADER_PATH_5)/Modules/HTTP;$(HEADER_PATH_5)/Modules/InputOutput;$(HEADER_PATH_5)/Modules/JSON;$(HEADER_PATH_5)/Modules/JSONConversion;$(HEADER_PATH_5)/Modules/JavascriptEngine;$(HEADER_PATH_5)/Modules/LibXL;$(HEADER_PATH_5)/Modules/MEPAPI;$(HEADER_PATH_5)/Modules/MPIInterfaceDevLib;$(HEADER_PATH_5)/Modules/MPIInterfaceImpDevLib;$(HEADER_PATH_5)/Modules/Model3D;$(HEADER_PATH_5)/Modules/Model3DViewerControl;$(HEADER_PATH_5)/Modules/Network;$(HEADER_PATH_5)/Modules/Pattern;$(HEADER_PATH_5)/Modules/PointCloud;$(HEADER_PATH_5)/Modules/PointCloudManager;$(HEADER_PATH_5)/Modules/QGDrawing;$(HEADER_PATH_5)/Modules/RS;$(HEADER_PATH_5)/Modules/RapidJSON;$(HEADER_PATH_5)/Modules/SecureCommunication;$(HEADER_PATH_5)/Modules/TWClientLib;$(HEADER_PATH_5)/Modules/TWRoot;$(HEADER_PATH_5)/Modules/TextEngine;$(HEADER_PATH_5)/Modules/TransparentWindowLib;$(HEADER_PATH_5)/Modules/UCLib;$(HEADER_PATH_5)/Modules/UDLib;$(HEADER_PATH_5)/Modules/UserInterfaceAPI;$(HEADER_PATH_5)/Modules/VBElemDialogs;$(HEADER_PATH_5)/Modules/VBUtils;$(HEADER_PATH_5)/Modules/VectorImage $(inherited)</AdditionalIncludeDirectories>
|
||||||
|
<LanguageStandard>stdcpp20</LanguageStandard>
|
||||||
|
<ForcedIncludeFiles>
|
||||||
|
</ForcedIncludeFiles>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
|
<StringPooling>true</StringPooling>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||||
|
<PrecompiledHeaderOutputFile>
|
||||||
|
</PrecompiledHeaderOutputFile>
|
||||||
|
<ForceConformanceInForLoopScope>
|
||||||
|
</ForceConformanceInForLoopScope>
|
||||||
|
<CallingConvention>FastCall</CallingConvention>
|
||||||
|
<CompileAs>CompileAsCpp</CompileAs>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>
|
||||||
|
</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
||||||
|
<AdditionalDependencies>$(HEADER_PATH_5)\Lib\Win\ACAP_STAT.lib;$(HEADER_PATH_5)\Modules\DGGraphix\Win\DGGraphixImp.LIB;$(HEADER_PATH_5)\Modules\DGLib\Win\DGImp.lib;$(HEADER_PATH_5)\Modules\Geometry\Win\GeometryImp.LIB;$(HEADER_PATH_5)\Modules\Graphix\Win\GraphixImp.LIB;$(HEADER_PATH_5)\Modules\GSModeler\Win\GSModelerImp.LIB;$(HEADER_PATH_5)\Modules\GSRoot\Win\GSRootImp.lib;$(HEADER_PATH_5)\Modules\GXImage\Win\GXImageImp.lib;$(HEADER_PATH_5)\Modules\GXImageBase\Win\GXImageBaseImp.lib;$(HEADER_PATH_5)\Modules\GX\Win\GXImp.LIB;$(HEADER_PATH_5)\Modules\InputOutput\Win\InputOutputImp.lib;$(HEADER_PATH_5)\Modules\RS\Win\RSImp.LIB;$(HEADER_PATH_5)\Modules\TextEngine\Win\TextEngineImp.LIB;$(HEADER_PATH_5)\Modules\UCLib\Win\UCImp.lib;$(HEADER_PATH_5)\Modules\UDLib\Win\UDImp.lib;$(HEADER_PATH_5)\Modules\VBAttributes\Win\VBAttributesImp.LIB;$(HEADER_PATH_5)\Modules\VBElemDialogs\Win\VBElemDialogsImp.LIB;$(HEADER_PATH_5)\Modules\VectorImage\Win\VectorImageImp.LIB;$(HEADER_PATH_5)\Modules\ObjectDatabase\Win\ObjectDatabaseImp.LIB;$(HEADER_PATH_5)\Modules\JSON\Win\JSONImp.LIB;msvcrt.lib;msvcprt.lib;IPHLPAPI.lib;Wininet.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<AdditionalLibraryDirectories>$(HEADER_PATH_5)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
|
<IgnoreAllDefaultLibraries>
|
||||||
|
</IgnoreAllDefaultLibraries>
|
||||||
|
<IgnoreSpecificDefaultLibraries>msvcrtd.lib</IgnoreSpecificDefaultLibraries>
|
||||||
|
<AdditionalOptions>/export:GetExportedFuncAddrs,%401 /export:SetImportedFuncAddrs,%402 %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</Link>
|
||||||
|
<Lib>
|
||||||
|
<AdditionalDependencies>../zlib/x64/ZlibStatRelease/zlibstat.lib</AdditionalDependencies>
|
||||||
|
</Lib>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>REM Archicad installbuild script
|
||||||
|
|
||||||
SET PROJECTDIR=$(ProjectDir)
|
SET PROJECTDIR=$(ProjectDir)
|
||||||
SET TARGETNAME=$(TargetName)
|
SET TARGETNAME=$(TargetName)
|
||||||
SET TARGETDIR=$(TargetDir)
|
SET TARGETDIR=$(TargetDir)
|
||||||
|
|||||||
@@ -71,6 +71,15 @@
|
|||||||
<Filter Include="Connector\Interface\Browser\Bridge\Selection\Arg">
|
<Filter Include="Connector\Interface\Browser\Bridge\Selection\Arg">
|
||||||
<UniqueIdentifier>{8bb3df60-affe-4b66-8d78-f1b98e6ba8df}</UniqueIdentifier>
|
<UniqueIdentifier>{8bb3df60-affe-4b66-8d78-f1b98e6ba8df}</UniqueIdentifier>
|
||||||
</Filter>
|
</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>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="RFIX.win\Connector.rc2">
|
<None Include="RFIX.win\Connector.rc2">
|
||||||
@@ -95,9 +104,6 @@
|
|||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="Connector\Connector.cpp">
|
|
||||||
<Filter>Connector</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="Connector\Interface\ConnectorMenu.cpp">
|
<ClCompile Include="Connector\Interface\ConnectorMenu.cpp">
|
||||||
<Filter>Connector\Interface</Filter>
|
<Filter>Connector\Interface</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@@ -164,7 +170,6 @@
|
|||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\SendBridge.cpp">
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\SendBridge.cpp">
|
||||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Config\GetIsDevMode.cpp" />
|
|
||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\Send.cpp">
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Send\Send.cpp">
|
||||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@@ -243,6 +248,33 @@
|
|||||||
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.cpp">
|
<ClCompile Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.cpp">
|
||||||
<Filter>Connector\Interface\Browser\Bridge\Selection\Arg</Filter>
|
<Filter>Connector\Interface\Browser\Bridge\Selection\Arg</Filter>
|
||||||
</ClCompile>
|
</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>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="Connector\ConnectorResource.h">
|
<ClInclude Include="Connector\ConnectorResource.h">
|
||||||
@@ -323,7 +355,6 @@
|
|||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\SendBridge.h">
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\SendBridge.h">
|
||||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Config\GetIsDevMode.h" />
|
|
||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Send.h">
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Send\Send.h">
|
||||||
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
<Filter>Connector\Interface\Browser\Bridge\Send</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
@@ -411,5 +442,32 @@
|
|||||||
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.h">
|
<ClInclude Include="Connector\Interface\Browser\Bridge\Selection\Arg\SelectionInfo.h">
|
||||||
<Filter>Connector\Interface\Browser\Bridge\Selection\Arg</Filter>
|
<Filter>Connector\Interface\Browser\Bridge\Selection\Arg</Filter>
|
||||||
</ClInclude>
|
</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>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -15,6 +15,21 @@
|
|||||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
</PropertyGroup>
|
</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'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVW2024|x64'">
|
||||||
<LocalDebuggerCommand>C:\Program Files\Vectorworks 2024\Vectorworks2024.exe</LocalDebuggerCommand>
|
<LocalDebuggerCommand>C:\Program Files\Vectorworks 2024\Vectorworks2024.exe</LocalDebuggerCommand>
|
||||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||||
@@ -30,4 +45,19 @@
|
|||||||
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
<LocalDebuggerAttach>false</LocalDebuggerAttach>
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
</PropertyGroup>
|
</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>
|
</Project>
|
||||||
File diff suppressed because it is too large
Load Diff
+71
@@ -0,0 +1,71 @@
|
|||||||
|
<?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
@@ -0,0 +1,71 @@
|
|||||||
|
<?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
@@ -0,0 +1,72 @@
|
|||||||
|
<?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
@@ -0,0 +1,71 @@
|
|||||||
|
<?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>
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Scheme
|
<Scheme
|
||||||
LastUpgradeVersion = "1530"
|
LastUpgradeVersion = "1610"
|
||||||
version = "1.7">
|
version = "1.7">
|
||||||
<BuildAction
|
<BuildAction
|
||||||
parallelizeBuildables = "YES"
|
parallelizeBuildables = "YES"
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Scheme
|
<Scheme
|
||||||
LastUpgradeVersion = "1530"
|
LastUpgradeVersion = "1610"
|
||||||
version = "1.7">
|
version = "1.7">
|
||||||
<BuildAction
|
<BuildAction
|
||||||
parallelizeBuildables = "YES"
|
parallelizeBuildables = "YES"
|
||||||
|
|||||||
+5
-1
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Scheme
|
<Scheme
|
||||||
LastUpgradeVersion = "1530"
|
LastUpgradeVersion = "1610"
|
||||||
version = "1.7">
|
version = "1.7">
|
||||||
<BuildAction
|
<BuildAction
|
||||||
parallelizeBuildables = "YES"
|
parallelizeBuildables = "YES"
|
||||||
@@ -39,6 +39,10 @@
|
|||||||
debugDocumentVersioning = "YES"
|
debugDocumentVersioning = "YES"
|
||||||
debugServiceExtension = "internal"
|
debugServiceExtension = "internal"
|
||||||
allowLocationSimulation = "YES">
|
allowLocationSimulation = "YES">
|
||||||
|
<PathRunnable
|
||||||
|
runnableDebuggingMode = "0"
|
||||||
|
FilePath = "/Applications/Graphisoft/Archicad 27/Archicad 27.app">
|
||||||
|
</PathRunnable>
|
||||||
</LaunchAction>
|
</LaunchAction>
|
||||||
<ProfileAction
|
<ProfileAction
|
||||||
buildConfiguration = "Release"
|
buildConfiguration = "Release"
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Scheme
|
<Scheme
|
||||||
LastUpgradeVersion = "1530"
|
LastUpgradeVersion = "1610"
|
||||||
version = "1.7">
|
version = "1.7">
|
||||||
<BuildAction
|
<BuildAction
|
||||||
parallelizeBuildables = "YES"
|
parallelizeBuildables = "YES"
|
||||||
|
|||||||
+71
@@ -0,0 +1,71 @@
|
|||||||
|
<?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
@@ -0,0 +1,71 @@
|
|||||||
|
<?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>
|
||||||
Executable → Regular
+53
-9
@@ -1,17 +1,28 @@
|
|||||||
#include "Active/File/Directory.h"
|
#include "Active/File/Directory.h"
|
||||||
#include "ConnectorResource.h"
|
#include "ConnectorResource.h"
|
||||||
#include "Connector/Connector.h"
|
#include "Connector/Connector.h"
|
||||||
#include "Connector/Database/ModelCardDatabase.h"
|
#include "Connector/Environment/ConnectorProject.h"
|
||||||
#include "Connector/Interface/ConnectorMenu.h"
|
#include "Connector/Interface/ConnectorMenu.h"
|
||||||
#include "Connector/Interface/ConnectorPalette.h"
|
#include "Connector/Interface/ConnectorPalette.h"
|
||||||
|
#include "Connector/Tool/ElementHighlighter.h"
|
||||||
#include "Speckle/Database/AccountDatabase.h"
|
#include "Speckle/Database/AccountDatabase.h"
|
||||||
#include "Speckle/Environment/Addon.h"
|
#include "Speckle/Environment/Addon.h"
|
||||||
#include "Speckle/Utility/String.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::file;
|
||||||
using namespace active::environment;
|
using namespace active::environment;
|
||||||
using namespace connector;
|
using namespace connector;
|
||||||
using namespace connector::database;
|
using namespace connector::environment;
|
||||||
using namespace speckle::database;
|
using namespace speckle::database;
|
||||||
using namespace speckle::environment;
|
using namespace speckle::environment;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
@@ -23,14 +34,24 @@ namespace {
|
|||||||
//The account database name
|
//The account database name
|
||||||
const char* accountDBaseName = "Accounts.db";
|
const char* accountDBaseName = "Accounts.db";
|
||||||
|
|
||||||
///The Connector addon class
|
|
||||||
|
/*!
|
||||||
|
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
|
||||||
|
*/
|
||||||
class ConnectorInstance : public ConnectorAddon {
|
class ConnectorInstance : public ConnectorAddon {
|
||||||
public:
|
public:
|
||||||
|
/*!
|
||||||
|
Constructor
|
||||||
|
@param name The connector add-on name
|
||||||
|
*/
|
||||||
ConnectorInstance(const String& name) : ConnectorAddon{name} {
|
ConnectorInstance(const String& name) : ConnectorAddon{name} {
|
||||||
|
//Define the connector UI components
|
||||||
add<ConnectorMenu>();
|
add<ConnectorMenu>();
|
||||||
add<ConnectorPalette>();
|
add<ConnectorPalette>();
|
||||||
//The connector 'owns' the model card database, so the publisher list should only hold a weak reference
|
add<ElementHighlighter>();
|
||||||
addWeak(m_modelCards.getSubscription());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: Functions (const)
|
// MARK: Functions (const)
|
||||||
@@ -40,17 +61,24 @@ namespace {
|
|||||||
@return The account database
|
@return The account database
|
||||||
*/
|
*/
|
||||||
const AccountDatabase* getAccountDatabase() const override;
|
const AccountDatabase* getAccountDatabase() const override;
|
||||||
|
|
||||||
|
protected:
|
||||||
/*!
|
/*!
|
||||||
Get the model card database
|
Make a new new project. Allows Addon subclasses to define a Project subclass with additional functions/databases
|
||||||
@return The model card database
|
@return A new project instance
|
||||||
*/
|
*/
|
||||||
const ModelCardDatabase* getModelCardDatabase() const override { return &m_modelCards; }
|
virtual std::shared_ptr<Project> makeProject() const override {
|
||||||
|
return std::dynamic_pointer_cast<Project>(std::make_shared<ConnectorProject>());
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
///The accounts database - always a single instance for the active user
|
||||||
mutable std::unique_ptr<AccountDatabase> m_account;
|
mutable std::unique_ptr<AccountDatabase> m_account;
|
||||||
ModelCardDatabase m_modelCards;
|
///Mutex to control access to the accounts database
|
||||||
|
mutable std::mutex m_accountMutex;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
///The active addon instance
|
///The active addon instance
|
||||||
std::unique_ptr<ConnectorAddon> m_addonInstance;
|
std::unique_ptr<ConnectorAddon> m_addonInstance;
|
||||||
|
|
||||||
@@ -66,6 +94,18 @@ namespace {
|
|||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
return Directory{*appData, speckleDataDirName, true};
|
return Directory{*appData, speckleDataDirName, true};
|
||||||
} //getAppDataDirectory
|
} //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
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,6 +115,9 @@ namespace {
|
|||||||
name: The add-on name
|
name: The add-on name
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
ConnectorAddon::ConnectorAddon(const speckle::utility::String& name) : Addon{name} {
|
ConnectorAddon::ConnectorAddon(const speckle::utility::String& name) : Addon{name} {
|
||||||
|
#ifdef WINDOWS
|
||||||
|
invokeSpecialisation();
|
||||||
|
#endif
|
||||||
} //ConnectorAddon::ConnectorAddon
|
} //ConnectorAddon::ConnectorAddon
|
||||||
|
|
||||||
|
|
||||||
@@ -84,6 +127,7 @@ ConnectorAddon::ConnectorAddon(const speckle::utility::String& name) : Addon{nam
|
|||||||
return: The account database
|
return: The account database
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
const AccountDatabase* ConnectorInstance::getAccountDatabase() const {
|
const AccountDatabase* ConnectorInstance::getAccountDatabase() const {
|
||||||
|
const std::lock_guard<std::mutex> lock{m_accountMutex};
|
||||||
if (!m_account) {
|
if (!m_account) {
|
||||||
auto speckleDirectory = getAppDataDirectory();
|
auto speckleDirectory = getAppDataDirectory();
|
||||||
if (!speckleDirectory)
|
if (!speckleDirectory)
|
||||||
|
|||||||
@@ -1,12 +1,7 @@
|
|||||||
#include "Speckle/Environment/Addon.h"
|
#include "Speckle/Environment/Addon.h"
|
||||||
#include "Speckle/Utility/String.h"
|
|
||||||
|
|
||||||
namespace speckle::database {
|
namespace speckle::database {
|
||||||
class AccountDatabase;
|
class AccountDatabase;
|
||||||
class BIMElementDatabase;
|
|
||||||
}
|
|
||||||
namespace connector::database {
|
|
||||||
class ModelCardDatabase;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace connector {
|
namespace connector {
|
||||||
@@ -22,11 +17,6 @@ namespace connector {
|
|||||||
@return The account database
|
@return The account database
|
||||||
*/
|
*/
|
||||||
const virtual speckle::database::AccountDatabase* getAccountDatabase() const = 0;
|
const virtual speckle::database::AccountDatabase* getAccountDatabase() const = 0;
|
||||||
/*!
|
|
||||||
Get the model card database
|
|
||||||
@return The model card database
|
|
||||||
*/
|
|
||||||
const virtual database::ModelCardDatabase* getModelCardDatabase() const = 0;
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ enum TitleString {
|
|||||||
addonNameID = 1,
|
addonNameID = 1,
|
||||||
addonDescriptionID,
|
addonDescriptionID,
|
||||||
noStoreyID,
|
noStoreyID,
|
||||||
|
showLayersID,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -44,6 +45,7 @@ enum GeneralString {
|
|||||||
|
|
||||||
//Notification strings (advice displayed in alerts)
|
//Notification strings (advice displayed in alerts)
|
||||||
enum NotifyString {
|
enum NotifyString {
|
||||||
|
showHiddenLayersID = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -58,6 +60,7 @@ enum ErrorString {
|
|||||||
modelCardNotFoundID,
|
modelCardNotFoundID,
|
||||||
noProjectOpenID,
|
noProjectOpenID,
|
||||||
accountNotFoundID,
|
accountNotFoundID,
|
||||||
|
elementTypeNotConvertedID,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif //CONNECTOR_RESOURCE
|
#endif //CONNECTOR_RESOURCE
|
||||||
|
|||||||
@@ -1,16 +1,8 @@
|
|||||||
#ifndef CONNECTOR_DATABASE_ID
|
#ifndef CONNECTOR_DATABASE_ID
|
||||||
#define CONNECTOR_DATABASE_ID
|
#define CONNECTOR_DATABASE_ID
|
||||||
|
|
||||||
#include "Speckle/Utility/Guid.h"
|
|
||||||
|
|
||||||
namespace connector::database {
|
namespace connector::database {
|
||||||
|
|
||||||
//BIM element record identifier
|
|
||||||
using ElementID = speckle::utility::Guid;
|
|
||||||
|
|
||||||
//A list of element IDs
|
|
||||||
using ElementIDList = std::vector<ElementID>;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //CONNECTOR_DATABASE_ID
|
#endif //CONNECTOR_DATABASE_ID
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ Vector<ModelCard> ModelCardDatabase::getCards() const {
|
|||||||
|
|
||||||
card: The card to write
|
card: The card to write
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
void ModelCardDatabase::write(const ModelCard& card) const {
|
void ModelCardDatabase::write(ModelCard& card) const {
|
||||||
m_store->write(card);
|
m_store->write(card);
|
||||||
} //ModelCardDatabase::write
|
} //ModelCardDatabase::write
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ namespace connector::database {
|
|||||||
Write a card to storage
|
Write a card to storage
|
||||||
@param card The card to write
|
@param card The card to write
|
||||||
*/
|
*/
|
||||||
void write(const record::ModelCard& card) const;
|
void write(record::ModelCard& card) const;
|
||||||
/*!
|
/*!
|
||||||
Erase a card
|
Erase a card
|
||||||
@param cardID The ID of the card to erase
|
@param cardID The ID of the card to erase
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
#include "Connector/Environment/ConnectorProject.h"
|
||||||
|
|
||||||
|
#include "Connector/Connector.h"
|
||||||
|
#include "Connector/Database/ModelCardDatabase.h"
|
||||||
|
|
||||||
|
using namespace active::event;
|
||||||
|
using namespace connector::database;
|
||||||
|
using namespace connector::environment;
|
||||||
|
using namespace speckle::utility;
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Default constructor
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
ConnectorProject::ConnectorProject() {
|
||||||
|
m_modelCards = std::make_shared<ModelCardDatabase>();
|
||||||
|
connector()->addWeak(m_modelCards->getSubscription());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Destructor
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
ConnectorProject::~ConnectorProject() {}
|
||||||
|
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Get the model card database
|
||||||
|
|
||||||
|
return; The model card database
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
const ModelCardDatabase* ConnectorProject::getModelCardDatabase() const {
|
||||||
|
return m_modelCards.get();
|
||||||
|
} //ConnectorProject::getModelCardDatabase
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
#ifndef CONNECTOR_ENVIRONMENT_CONNECTOR_PROJECT
|
||||||
|
#define CONNECTOR_ENVIRONMENT_CONNECTOR_PROJECT
|
||||||
|
|
||||||
|
#include "Speckle/Environment/Project.h"
|
||||||
|
|
||||||
|
namespace connector::database {
|
||||||
|
class ModelCardDatabase;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace connector::environment {
|
||||||
|
|
||||||
|
/*!
|
||||||
|
A BIM project contained Speckle connector data, e.g. a model card database
|
||||||
|
*/
|
||||||
|
class ConnectorProject : public speckle::environment::Project {
|
||||||
|
public:
|
||||||
|
|
||||||
|
// MARK: - Types
|
||||||
|
|
||||||
|
///Shared pointer
|
||||||
|
using Shared = std::shared_ptr<ConnectorProject>;
|
||||||
|
///Weak pointer
|
||||||
|
using Weak = std::weak_ptr<ConnectorProject>;
|
||||||
|
|
||||||
|
// MARK: - Constructors
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Default constructor
|
||||||
|
*/
|
||||||
|
ConnectorProject();
|
||||||
|
|
||||||
|
ConnectorProject(const ConnectorProject&) = delete;
|
||||||
|
/*!
|
||||||
|
Destructor
|
||||||
|
*/
|
||||||
|
~ConnectorProject();
|
||||||
|
|
||||||
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Get the model card database
|
||||||
|
@return The model card database
|
||||||
|
*/
|
||||||
|
const connector::database::ModelCardDatabase* getModelCardDatabase() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
///The model card database
|
||||||
|
std::shared_ptr<connector::database::ModelCardDatabase> m_modelCards;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //CONNECTOR_ENVIRONMENT_CONNECTOR_PROJECT
|
||||||
@@ -3,6 +3,20 @@
|
|||||||
|
|
||||||
#include "Active/Utility/NameID.h"
|
#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"};
|
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
|
#endif //CONNECTOR_EVENT_ID
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ using namespace speckle::utility;
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
using WrappedValue = active::serialise::CargoHold<ContainerWrap<Vector<Account>>, Vector<Account>>;
|
using WrappedValue = CargoHold<ContainerWrap<Vector<Account>>, Vector<Account>>;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
JS Function class to retrieve the names of the methods supported by the bridge
|
JS Function class to retrieve the user's account(s)
|
||||||
*/
|
*/
|
||||||
class GetAccounts : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
class GetAccounts : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -1,21 +1,16 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Base/AddModel.h"
|
#include "Connector/Interface/Browser/Bridge/Base/AddModel.h"
|
||||||
|
|
||||||
#include "Connector/Connector.h"
|
#include "Connector/Connector.h"
|
||||||
|
#include "Connector/Environment/ConnectorProject.h"
|
||||||
#include "Connector/Database/ModelCardDatabase.h"
|
#include "Connector/Database/ModelCardDatabase.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
|
|
||||||
|
|
||||||
using namespace active::container;
|
using namespace active::container;
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
|
using namespace connector::environment;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
using namespace connector::interfac::browser::bridge;
|
using namespace connector::interfac::browser::bridge;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
namespace {
|
|
||||||
|
|
||||||
using WrappedValue = active::serialise::CargoHold<PackageWrap, DocumentInfo>;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Default constructor
|
Default constructor
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
@@ -30,6 +25,12 @@ AddModel::AddModel() : BridgeMethod{"AddModel", [&](const ModelCardEventWrapper&
|
|||||||
card: The card to add
|
card: The card to add
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
void AddModel::run(const ModelCard& card) const {
|
void AddModel::run(const ModelCard& card) const {
|
||||||
if (auto modelCardDBase = connector()->getModelCardDatabase(); modelCardDBase != nullptr)
|
auto project = connector()->getActiveProject().lock();
|
||||||
modelCardDBase->write(card);
|
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
|
} //AddModel::run
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
///Argument parameter for a string
|
///Argument parameter for a model card
|
||||||
using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
|
using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
|
||||||
///Argument type for this method
|
///Argument type for this method
|
||||||
using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;
|
using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Base/BaseBridge.h"
|
#include "Connector/Interface/Browser/Bridge/Base/BaseBridge.h"
|
||||||
|
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/AddModel.h"
|
#include "Connector/Interface/Browser/Bridge/Base/AddModel.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.h"
|
#include "Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.h"
|
#include "Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.h"
|
||||||
@@ -8,6 +7,20 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Base/GetSourceApplicationVersion.h"
|
#include "Connector/Interface/Browser/Bridge/Base/GetSourceApplicationVersion.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/RemoveModel.h"
|
#include "Connector/Interface/Browser/Bridge/Base/RemoveModel.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/UpdateModel.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;
|
using namespace connector::interfac::browser::bridge;
|
||||||
|
|
||||||
@@ -22,6 +35,28 @@ BaseBridge::BaseBridge() : BrowserBridge{"baseBinding"} {
|
|||||||
addMethod<GetDocumentState>();
|
addMethod<GetDocumentState>();
|
||||||
addMethod<GetSourceApplicationName>();
|
addMethod<GetSourceApplicationName>();
|
||||||
addMethod<GetSourceApplicationVersion>();
|
addMethod<GetSourceApplicationVersion>();
|
||||||
|
addMethod<HighlightModel>();
|
||||||
|
addMethod<HighlightObjects>();
|
||||||
|
addMethod<OpenUrl>();
|
||||||
addMethod<RemoveModel>();
|
addMethod<RemoveModel>();
|
||||||
addMethod<UpdateModel>();
|
addMethod<UpdateModel>();
|
||||||
} //BaseBridge::BaseBridge
|
} //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,13 +2,14 @@
|
|||||||
#define CONNECTOR_INTERFACE_BRIDGE_BASE_BRIDGE
|
#define CONNECTOR_INTERFACE_BRIDGE_BASE_BRIDGE
|
||||||
|
|
||||||
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
||||||
|
#include "Speckle/Event/Subscriber/ProjectSubscriber.h"
|
||||||
|
|
||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
A browser bridge to provide configuration settings
|
A browser bridge to manage document settings
|
||||||
*/
|
*/
|
||||||
class BaseBridge : public speckle::interfac::browser::bridge::BrowserBridge {
|
class BaseBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ProjectSubscriber {
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// MARK: - Types
|
// MARK: - Types
|
||||||
@@ -22,6 +23,14 @@ namespace connector::interfac::browser::bridge {
|
|||||||
Default constructor
|
Default constructor
|
||||||
*/
|
*/
|
||||||
BaseBridge();
|
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;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,13 +25,13 @@ GetConnectorVersion::GetConnectorVersion() : BridgeMethod{"GetConnectorVersion",
|
|||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Get the host application version
|
Get the connector software version
|
||||||
|
|
||||||
return: The application version
|
return: The connector software version
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
std::unique_ptr<Cargo> GetConnectorVersion::run() const {
|
std::unique_ptr<Cargo> GetConnectorVersion::run() const {
|
||||||
//Implement other platforms as required
|
//Implement other platforms as required
|
||||||
String result{active::utility::String{connector::versionMajor} + "." + active::utility::String{connector::versionMinor} + "." +
|
String result{String{connector::versionMajor} + "." + String{connector::versionMinor} + "." +
|
||||||
active::utility::String{connector::versionPatch}};
|
String{connector::versionPatch}};
|
||||||
return std::make_unique<WrappedValue>(result);
|
return std::make_unique<WrappedValue>(result);
|
||||||
} //GetConnectorVersion::run
|
} //GetConnectorVersion::run
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ namespace connector::interfac::browser::bridge {
|
|||||||
class ConnectorConfig;
|
class ConnectorConfig;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
JS Function class to retrieve the names of the methods supported by the bridge
|
JS Function class to get the connector software version
|
||||||
*/
|
*/
|
||||||
class GetConnectorVersion : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
class GetConnectorVersion : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||||
public:
|
public:
|
||||||
@@ -23,8 +23,8 @@ namespace connector::interfac::browser::bridge {
|
|||||||
// MARK: - Functions (const)
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Get the host application version
|
Get the connector software version
|
||||||
@return The application version
|
@return The connector software version
|
||||||
*/
|
*/
|
||||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#include "Active/Serialise/CargoHold.h"
|
#include "Active/Serialise/CargoHold.h"
|
||||||
#include "Connector/Connector.h"
|
#include "Connector/Connector.h"
|
||||||
|
#include "Connector/Environment/ConnectorProject.h"
|
||||||
#include "Connector/Database/ModelCardDatabase.h"
|
#include "Connector/Database/ModelCardDatabase.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
|
#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
|
||||||
#include "Speckle/Environment/Project.h"
|
#include "Speckle/Environment/Project.h"
|
||||||
@@ -9,6 +10,7 @@
|
|||||||
|
|
||||||
using namespace active::container;
|
using namespace active::container;
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
|
using namespace connector::environment;
|
||||||
using namespace connector::interfac::browser::bridge;
|
using namespace connector::interfac::browser::bridge;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
@@ -33,14 +35,17 @@ GetDocumentInfo::GetDocumentInfo() : BridgeMethod{"GetDocumentInfo", [&]() {
|
|||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
std::unique_ptr<Cargo> GetDocumentInfo::run() const {
|
std::unique_ptr<Cargo> GetDocumentInfo::run() const {
|
||||||
auto docInfo = std::make_unique<DocumentInfo>();
|
auto docInfo = std::make_unique<DocumentInfo>();
|
||||||
if (auto project = connector()->getActiveProject().lock(); project) {
|
auto project = connector()->getActiveProject().lock();
|
||||||
auto info = project->getInfo();
|
auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
|
||||||
docInfo->name = info.name;
|
if (!connectorProject)
|
||||||
if (info.path)
|
return nullptr;
|
||||||
docInfo->location = *info.path;
|
auto info = connectorProject->getInfo();
|
||||||
if (auto cardDatabase = connector()->getModelCardDatabase(); cardDatabase != nullptr)
|
docInfo->name = info.name;
|
||||||
docInfo->ID = cardDatabase->getStoreID();
|
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();
|
docInfo->ID = Guid{true}.operator String();
|
||||||
}
|
|
||||||
return std::make_unique<WrappedValue>(std::move(docInfo));
|
return std::make_unique<WrappedValue>(std::move(docInfo));
|
||||||
} //GetDocumentInfo::run
|
} //GetDocumentInfo::run
|
||||||
|
|||||||
@@ -1,15 +1,13 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Base/GetDocumentState.h"
|
#include "Connector/Interface/Browser/Bridge/Base/GetDocumentState.h"
|
||||||
|
|
||||||
#include "Active/Serialise/CargoHold.h"
|
|
||||||
#include "Connector/Connector.h"
|
#include "Connector/Connector.h"
|
||||||
#include "Connector/Record/Model/ModelCard.h"
|
#include "Connector/Environment/ConnectorProject.h"
|
||||||
#include "Connector/Database/ModelCardDatabase.h"
|
#include "Connector/Database/ModelCardDatabase.h"
|
||||||
|
|
||||||
using namespace active::container;
|
using namespace active::container;
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
|
using namespace connector::environment;
|
||||||
using namespace connector::interfac::browser::bridge;
|
using namespace connector::interfac::browser::bridge;
|
||||||
using namespace connector::database;
|
|
||||||
using namespace connector::record;
|
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
@@ -21,12 +19,16 @@ GetDocumentState::GetDocumentState() : BridgeMethod{"GetDocumentState", [&]() {
|
|||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Get the document info
|
Get the document model cards
|
||||||
|
|
||||||
return: The document info
|
return: The document model cards
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
std::unique_ptr<Cargo> GetDocumentState::run() const {
|
std::unique_ptr<Cargo> GetDocumentState::run() const {
|
||||||
if (auto modelCardDBase = connector()->getModelCardDatabase(); modelCardDBase != nullptr) {
|
auto project = connector()->getActiveProject().lock();
|
||||||
|
auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
|
||||||
|
if (!connectorProject)
|
||||||
|
return nullptr;
|
||||||
|
if (auto modelCardDBase = connectorProject->getModelCardDatabase(); modelCardDBase != nullptr) {
|
||||||
return modelCardDBase->wrapper();
|
return modelCardDBase->wrapper();
|
||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
JS Function class to retrieve the information about the active document
|
JS Function class to retrieve model cards stored in the current document
|
||||||
*/
|
*/
|
||||||
class GetDocumentState : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
class GetDocumentState : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||||
public:
|
public:
|
||||||
@@ -21,8 +21,8 @@ namespace connector::interfac::browser::bridge {
|
|||||||
// MARK: - Functions (const)
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Get the document info
|
Get the document model cards
|
||||||
@return The document info
|
@return The document model cards
|
||||||
*/
|
*/
|
||||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
#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
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
#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
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
#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
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
#ifndef CONNECTOR_INTERFACE_BRIDGE_HIGHLIGHT_OBJECTS
|
||||||
|
#define CONNECTOR_INTERFACE_BRIDGE_HIGHLIGHT_OBJECTS
|
||||||
|
|
||||||
|
#include "Active/Serialise/CargoHold.h"
|
||||||
|
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||||
|
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||||
|
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||||
|
|
||||||
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
|
///List of strings
|
||||||
|
using StringList = std::vector<active::utility::String>;
|
||||||
|
///Argument parameter for a string
|
||||||
|
using StringListHold = active::serialise::CargoHold<active::serialise::ContainerWrap<StringList>, StringList>;
|
||||||
|
///Argument type for this method
|
||||||
|
using HighlightObjectArgs = speckle::interfac::browser::bridge::JSArgType<StringListHold>;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
JS Function class to highlight objects using passed application IDs
|
||||||
|
*/
|
||||||
|
class HighlightObjects : public speckle::interfac::browser::bridge::BridgeMethod<HighlightObjectArgs, void> {
|
||||||
|
public:
|
||||||
|
|
||||||
|
// MARK: - Constructors
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Constructor
|
||||||
|
*/
|
||||||
|
HighlightObjects();
|
||||||
|
|
||||||
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Highlight specified objects
|
||||||
|
@param objectIDs List of object IDs to be highlighted
|
||||||
|
*/
|
||||||
|
void run(const StringList& objectIDs) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //CONNECTOR_INTERFACE_BRIDGE_HIGHLIGHT_OBJECTS
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
#include "Connector/Interface/Browser/Bridge/Base/OpenUrl.h"
|
||||||
|
|
||||||
|
#include "Speckle/Environment/Platform.h"
|
||||||
|
|
||||||
|
using namespace connector::interfac::browser::bridge;
|
||||||
|
using namespace speckle::environment;
|
||||||
|
using namespace speckle::utility;
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Default constructor
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
OpenUrl::OpenUrl() : BridgeMethod{"OpenUrl", [&](const SendArgs& args) {
|
||||||
|
run(args);
|
||||||
|
}} {}
|
||||||
|
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Opens an url
|
||||||
|
|
||||||
|
url: The URL to open
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
void OpenUrl::run(const String& url) const {
|
||||||
|
platform()->openURL(url);
|
||||||
|
} //OpenUrl::run
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
#ifndef CONNECTOR_INTERFACE_BRIDGE_OPEN_URL
|
||||||
|
#define CONNECTOR_INTERFACE_BRIDGE_OPEN_URL
|
||||||
|
|
||||||
|
#include "Active/Serialise/CargoHold.h"
|
||||||
|
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||||
|
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||||
|
|
||||||
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
|
class ConnectorConfig;
|
||||||
|
|
||||||
|
///Argument parameter for a string
|
||||||
|
using StringHold = active::serialise::CargoHold<active::serialise::ValueWrap<speckle::utility::String>, speckle::utility::String>;
|
||||||
|
///Argument type for this method
|
||||||
|
using SendArgs = speckle::interfac::browser::bridge::JSArgType<StringHold>;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
JS Function class to highlight elements from the selected model card in the open document
|
||||||
|
*/
|
||||||
|
class OpenUrl : public speckle::interfac::browser::bridge::BridgeMethod<SendArgs, void> {
|
||||||
|
public:
|
||||||
|
|
||||||
|
// MARK: - Constructors
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Constructor
|
||||||
|
*/
|
||||||
|
OpenUrl();
|
||||||
|
|
||||||
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Opens an url
|
||||||
|
@param url The URL to open
|
||||||
|
*/
|
||||||
|
void run(const speckle::utility::String& url) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //CONNECTOR_INTERFACE_BRIDGE_OPEN_URL
|
||||||
@@ -1,22 +1,16 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Base/RemoveModel.h"
|
#include "Connector/Interface/Browser/Bridge/Base/RemoveModel.h"
|
||||||
|
|
||||||
#include "Connector/Connector.h"
|
#include "Connector/Connector.h"
|
||||||
|
#include "Connector/Environment/ConnectorProject.h"
|
||||||
#include "Connector/Database/ModelCardDatabase.h"
|
#include "Connector/Database/ModelCardDatabase.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
|
|
||||||
|
|
||||||
using namespace active::container;
|
using namespace active::container;
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
using namespace connector::database;
|
using namespace connector::environment;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
using namespace connector::interfac::browser::bridge;
|
using namespace connector::interfac::browser::bridge;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
namespace {
|
|
||||||
|
|
||||||
using WrappedValue = active::serialise::CargoHold<PackageWrap, DocumentInfo>;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Default constructor
|
Default constructor
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
@@ -31,6 +25,10 @@ RemoveModel::RemoveModel() : BridgeMethod{"RemoveModel", [&](const ModelCardEven
|
|||||||
card: The card to add
|
card: The card to add
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
void RemoveModel::run(const ModelCard& card) const {
|
void RemoveModel::run(const ModelCard& card) const {
|
||||||
if (auto modelCardDBase = connector()->getModelCardDatabase(); modelCardDBase != nullptr)
|
auto project = connector()->getActiveProject().lock();
|
||||||
|
auto connectorProject = dynamic_cast<ConnectorProject*>(project.get());
|
||||||
|
if (!connectorProject)
|
||||||
|
return;
|
||||||
|
if (auto modelCardDBase = connectorProject->getModelCardDatabase(); modelCardDBase != nullptr)
|
||||||
modelCardDBase->erase(card.getID());
|
modelCardDBase->erase(card.getID());
|
||||||
} //RemoveModel::run
|
} //RemoveModel::run
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
///Argument parameter for a string
|
///Argument parameter for a model card
|
||||||
using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
|
using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
|
||||||
///Argument type for this method
|
///Argument type for this method
|
||||||
using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;
|
using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
JS Function class to add a model card to the document storage
|
JS Function class to remove a model card from the document storage
|
||||||
*/
|
*/
|
||||||
class RemoveModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
|
class RemoveModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
|
||||||
public:
|
public:
|
||||||
@@ -29,8 +29,8 @@ namespace connector::interfac::browser::bridge {
|
|||||||
// MARK: - Functions (const)
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Add a model card to document storage
|
Remove a model card from document storage
|
||||||
@param card The card to add
|
@param card The card to remove
|
||||||
*/
|
*/
|
||||||
void run(const connector::record::ModelCard& card) const;
|
void run(const connector::record::ModelCard& card) const;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,11 +2,12 @@
|
|||||||
|
|
||||||
#include "Connector/Connector.h"
|
#include "Connector/Connector.h"
|
||||||
#include "Connector/Database/ModelCardDatabase.h"
|
#include "Connector/Database/ModelCardDatabase.h"
|
||||||
|
#include "Connector/Environment/ConnectorProject.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
|
#include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h"
|
||||||
|
|
||||||
using namespace active::container;
|
using namespace active::container;
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
using namespace connector::database;
|
using namespace connector::environment;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
using namespace connector::interfac::browser::bridge;
|
using namespace connector::interfac::browser::bridge;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
@@ -26,11 +27,17 @@ UpdateModel::UpdateModel() : BridgeMethod{"UpdateModel", [&](const ModelCardEven
|
|||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Add a model card to document storage
|
Update a model card in document storage
|
||||||
|
|
||||||
card: The card to add
|
card: The card to update
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
void UpdateModel::run(const ModelCard& card) const {
|
void UpdateModel::run(const ModelCard& card) const {
|
||||||
if (auto modelCardDBase = connector()->getModelCardDatabase(); modelCardDBase != nullptr)
|
auto project = connector()->getActiveProject().lock();
|
||||||
modelCardDBase->write(card);
|
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
|
} //UpdateModel::run
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
///Argument parameter for a string
|
///Argument parameter for a model card
|
||||||
using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
|
using CardHold = active::serialise::CargoHold<connector::record::CardMover, connector::record::ModelCard>;
|
||||||
///Argument type for this method
|
///Argument type for this method
|
||||||
using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;
|
using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType<CardHold>;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
JS Function class to add a model card to the document storage
|
JS Function class to update a model card in document storage
|
||||||
*/
|
*/
|
||||||
class UpdateModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
|
class UpdateModel : public speckle::interfac::browser::bridge::BridgeMethod<ModelCardEventWrapper, void> {
|
||||||
public:
|
public:
|
||||||
@@ -29,8 +29,8 @@ namespace connector::interfac::browser::bridge {
|
|||||||
// MARK: - Functions (const)
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Add a model card to document storage
|
Update a model card in document storage
|
||||||
@param card The card to add
|
@param card The card to update
|
||||||
*/
|
*/
|
||||||
void run(const connector::record::ModelCard& card) const;
|
void run(const connector::record::ModelCard& card) const;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
JS Function class to retrieve the names of the methods supported by the bridge
|
JS Function class to retrieve the current display configuration settings
|
||||||
*/
|
*/
|
||||||
class GetConfig : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
class GetConfig : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
class ConnectorConfig;
|
class ConnectorConfig;
|
||||||
|
|
||||||
///Argument for a JS call to update the configuration
|
///Argument for a JS call to update the display configuration settings
|
||||||
using UpdateArgs = speckle::interfac::browser::bridge::JSArgType<ConnectorConfig>;
|
using UpdateArgs = speckle::interfac::browser::bridge::JSArgType<ConnectorConfig>;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
JS Function class to retrieve the names of the methods supported by the bridge
|
JS Function class to update the display configuration settings
|
||||||
*/
|
*/
|
||||||
class UpdateConfig : public speckle::interfac::browser::bridge::BridgeMethod<UpdateArgs, void> {
|
class UpdateConfig : public speckle::interfac::browser::bridge::BridgeMethod<UpdateArgs, void> {
|
||||||
public:
|
public:
|
||||||
@@ -22,7 +22,6 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
Constructor
|
Constructor
|
||||||
@param bridge The parent bridge object (provides access to bridge methods)
|
|
||||||
*/
|
*/
|
||||||
UpdateConfig();
|
UpdateConfig();
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
#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
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
#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
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
#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
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
#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
|
||||||
@@ -29,13 +29,9 @@ namespace {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SelectionInfo::SelectionInfo() {
|
SelectionInfo::SelectionInfo() {
|
||||||
initialize();
|
|
||||||
}
|
|
||||||
|
|
||||||
void SelectionInfo::initialize() {
|
|
||||||
auto project = connector()->getActiveProject().lock();
|
auto project = connector()->getActiveProject().lock();
|
||||||
if (!project) {
|
if (!project) {
|
||||||
// TODO: is thi OK?
|
// TODO: is this OK?
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,6 +47,7 @@ void SelectionInfo::initialize() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Fill an inventory with the package items
|
Fill an inventory with the package items
|
||||||
|
|
||||||
@@ -83,7 +80,7 @@ Cargo::Unique SelectionInfo::getCargo(const Inventory::Item& item) const {
|
|||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
switch (item.index) {
|
switch (item.index) {
|
||||||
case selectedObjectIdsID:
|
case selectedObjectIdsID:
|
||||||
return std::make_unique<ContainerWrap<std::vector<active::utility::Guid>>>(m_selectedElementIds);
|
return std::make_unique<ContainerWrap<std::vector<active::utility::Guid>>>(m_selectedElementIds, false, fieldID[selectedObjectIdsID].name);
|
||||||
case summaryID:
|
case summaryID:
|
||||||
return std::make_unique<ValueWrap<active::utility::String>>(m_summary);
|
return std::make_unique<ValueWrap<active::utility::String>>(m_summary);
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -39,10 +39,6 @@ namespace connector::interfac::browser::bridge {
|
|||||||
@return The requested cargo (nullptr on failure)
|
@return The requested cargo (nullptr on failure)
|
||||||
*/
|
*/
|
||||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
void initialize();
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
Constructor
|
Constructor
|
||||||
@param bridge The parent bridge object (provides access to bridge methods)
|
|
||||||
*/
|
*/
|
||||||
GetSelection();
|
GetSelection();
|
||||||
|
|
||||||
|
|||||||
@@ -14,14 +14,17 @@ SelectionBridge::SelectionBridge() : BrowserBridge{"selectionBinding"} {
|
|||||||
addMethod<GetSelection>();
|
addMethod<GetSelection>();
|
||||||
} //SelectionBridge::SelectionBridge
|
} //SelectionBridge::SelectionBridge
|
||||||
|
|
||||||
/*!
|
|
||||||
Handle the menu selection
|
/*--------------------------------------------------------------------
|
||||||
@param event The selection event
|
Handle a selection change
|
||||||
@return True if the event should be closed
|
|
||||||
*/
|
event: The selection event
|
||||||
|
|
||||||
|
return: True if the event should be closed
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
bool SelectionBridge::handle(const speckle::event::SelectionEvent& event) {
|
bool SelectionBridge::handle(const speckle::event::SelectionEvent& event) {
|
||||||
auto selectionInfo = std::make_unique<SelectionInfo>();
|
auto selectionInfo = std::make_unique<SelectionInfo>();
|
||||||
auto wrapped = std::make_unique<CargoHold<PackageWrap, SelectionInfo>>(std::move(selectionInfo));
|
auto wrapped = std::make_unique<CargoHold<PackageWrap, SelectionInfo>>(std::move(selectionInfo));
|
||||||
sendEvent("setSelection", std::move(wrapped));
|
sendEvent("setSelection", std::move(wrapped));
|
||||||
return true;
|
return true;
|
||||||
} //SelectionBridge::handle
|
} //SelectionBridge::handle
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
A browser bridge to support sending model data to a Speckle server
|
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 {
|
class SelectionBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::SelectionSubscriber {
|
||||||
public:
|
public:
|
||||||
@@ -27,7 +27,7 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
/*!
|
/*!
|
||||||
Handle the menu selection
|
Handle a selection change
|
||||||
@param event The selection event
|
@param event The selection event
|
||||||
@return True if the event should be closed
|
@return True if the event should be closed
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h"
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h"
|
||||||
|
|
||||||
|
#include "Active/Serialise/CargoHold.h"
|
||||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
@@ -12,14 +13,30 @@ namespace {
|
|||||||
|
|
||||||
///Serialisation fields
|
///Serialisation fields
|
||||||
enum FieldIndex {
|
enum FieldIndex {
|
||||||
|
statusID,
|
||||||
|
srcID,
|
||||||
|
srcTypeID,
|
||||||
|
resID,
|
||||||
|
resTypeID,
|
||||||
errorID,
|
errorID,
|
||||||
cardID,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
///Serialisation field IDs
|
///Serialisation field IDs
|
||||||
static std::array fieldID = {
|
static std::array fieldID = {
|
||||||
|
Identity{"status"},
|
||||||
|
Identity{"sourceId"},
|
||||||
|
Identity{"sourceType"},
|
||||||
|
Identity{"resultId"},
|
||||||
|
Identity{"resultType"},
|
||||||
Identity{"error"},
|
Identity{"error"},
|
||||||
Identity{"modelCardId"},
|
};
|
||||||
|
|
||||||
|
///Conversion status enumerator names
|
||||||
|
std::array statusName{
|
||||||
|
"success",
|
||||||
|
"warning",
|
||||||
|
"info",
|
||||||
|
"error",
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -35,8 +52,12 @@ bool ConversionResult::fillInventory(active::serialise::Inventory& inventory) co
|
|||||||
using enum Entry::Type;
|
using enum Entry::Type;
|
||||||
inventory.merge(Inventory{
|
inventory.merge(Inventory{
|
||||||
{
|
{
|
||||||
{ fieldID[errorID], errorID, element },
|
{ fieldID[statusID], statusID, element },
|
||||||
{ fieldID[cardID], cardID, 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)));
|
}.withType(&typeid(ConversionResult)));
|
||||||
return true;
|
return true;
|
||||||
@@ -55,11 +76,46 @@ Cargo::Unique ConversionResult::getCargo(const active::serialise::Inventory::Ite
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
switch (item.index) {
|
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:
|
case errorID:
|
||||||
return std::make_unique<ValueWrap<String>>(message);
|
return std::make_unique<PackageWrap>(*error);
|
||||||
case cardID:
|
|
||||||
return std::make_unique<ValueWrap<String>>(modelCardID);
|
|
||||||
default:
|
default:
|
||||||
return nullptr; //Requested an unknown index
|
return nullptr; //Requested an unknown index
|
||||||
}
|
}
|
||||||
} //ConversionResult::getCargo
|
} //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,47 +1,42 @@
|
|||||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
|
#ifndef CONNECTOR_INTERFACE_BRIDGE_CONVERSION_RESULT
|
||||||
#define CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
|
#define CONNECTOR_INTERFACE_BRIDGE_CONVERSION_RESULT
|
||||||
|
|
||||||
#include "Active/Serialise/Package/Wrapper/PackageWrap.h"
|
#include "Active/Serialise/Package/Package.h"
|
||||||
|
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendError.h"
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendError.h"
|
||||||
#include "Speckle/Utility/String.h"
|
#include "Speckle/Utility/String.h"
|
||||||
|
|
||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
A send error to return to the JS in the event of an error
|
The result of a conversion process (BIM records to/from Speckle)
|
||||||
*/
|
*/
|
||||||
class ConversionResult final : public active::serialise::Package {
|
class ConversionResult : public active::serialise::Package {
|
||||||
public:
|
public:
|
||||||
enum class Status {
|
enum class Status : uint16_t {
|
||||||
success = 1,
|
success = 1, ///<The conversion was successful
|
||||||
info,
|
info, ///<Not in use yet, maybe later as discussed
|
||||||
warning,
|
warning, ///<Not in use yet, maybe later as discussed
|
||||||
error,
|
error, ///<An error occurred during conversion
|
||||||
};
|
};
|
||||||
|
|
||||||
// MARK: - Constructors
|
// MARK: - Constructors
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Constructor
|
Default constructor
|
||||||
@param errMess The error message
|
|
||||||
@param card The ID of the model card associated with the wrror
|
|
||||||
*/
|
*/
|
||||||
ConversionResult(const speckle::utility::String& errMess, const speckle::utility::String& card) : message{errMess}, modelCardID{card} {}
|
ConversionResult() {}
|
||||||
|
|
||||||
// MARK: - Public variables
|
// MARK: - Public variables
|
||||||
|
|
||||||
///The error message
|
|
||||||
speckle::utility::String message;
|
|
||||||
///The ID of the model card associated with the data
|
|
||||||
speckle::utility::String modelCardID;
|
|
||||||
///The element conversion status
|
///The element conversion status
|
||||||
Status status = Status::info;
|
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.
|
///For receive conversion reports, this is the id of the speckle object. For send, it's the host app object id.
|
||||||
speckle::utility::String sourceId;
|
speckle::utility::String sourceID;
|
||||||
///For receive conversion reports, this is the type of the speckle object. For send, it's the host app object type.
|
///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;
|
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.
|
///For receive conversion reports, this is the id of the host app object. For send, it's the speckle object id.
|
||||||
speckle::utility::String resultId;
|
speckle::utility::String resultID;
|
||||||
///For receive conversion reports, this is the type of the host app object. For send, it's the speckle object type.
|
///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;
|
speckle::utility::String resultType;
|
||||||
///The exception (nullopt = no exception)
|
///The exception (nullopt = no exception)
|
||||||
@@ -63,6 +58,60 @@ namespace connector::interfac::browser::bridge {
|
|||||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Get a conversion status enumerator from text
|
||||||
|
@param text The incoming text
|
||||||
|
@return The equivalent conversion status (nullopt on failure)
|
||||||
|
*/
|
||||||
|
std::optional<ConversionResult::Status> toConversionStatus(const speckle::utility::String& text);
|
||||||
|
/*!
|
||||||
|
Get the text for a conversion status value
|
||||||
|
@param status The incoming status
|
||||||
|
@return The conversion status as text
|
||||||
|
*/
|
||||||
|
speckle::utility::String fromConversionStatus(ConversionResult::Status status);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
|
namespace active::serialise {
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Import the object from the specified string (specialisation for bool)
|
||||||
|
@param source The string to read
|
||||||
|
@return True if the data was successfully read
|
||||||
|
*/
|
||||||
|
template<> inline
|
||||||
|
bool ValueWrap<connector::interfac::browser::bridge::ConversionResult::Status>::read(const utility::String& source) {
|
||||||
|
auto converted = connector::interfac::browser::bridge::toConversionStatus(source);
|
||||||
|
if (!converted)
|
||||||
|
return false;
|
||||||
|
base::get() = *converted;
|
||||||
|
return true;
|
||||||
|
} //ValueWrap<bool>::read
|
||||||
|
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Import the object from the specified string (specialisation for bool)
|
||||||
|
@param source The string to read
|
||||||
|
@return True if the data was successfully read
|
||||||
|
*/
|
||||||
|
template<> inline
|
||||||
|
bool ValueWrap<std::optional<connector::interfac::browser::bridge::ConversionResult::Status>>::read(const utility::String& source) {
|
||||||
|
auto converted = connector::interfac::browser::bridge::toConversionStatus(source);
|
||||||
|
base::get() = converted;
|
||||||
|
return converted.operator bool();
|
||||||
|
} //ValueWrap<bool>::read
|
||||||
|
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Export the object to the specified string (specialisation for bool)
|
||||||
|
@param dest The string to write the data to
|
||||||
|
@return True if the data was successfully written
|
||||||
|
*/
|
||||||
|
template<> inline
|
||||||
|
bool ValueWrap<connector::interfac::browser::bridge::ConversionResult::Status>::write(utility::String& dest) const {
|
||||||
|
dest = connector::interfac::browser::bridge::fromConversionStatus(get());
|
||||||
|
return true;
|
||||||
|
} //ValueWrap<bool>::write
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //CONNECTOR_INTERFACE_BRIDGE_CONVERSION_RESULT
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
#ifndef CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
|
||||||
|
#define CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
|
||||||
|
|
||||||
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h"
|
||||||
|
#include "Speckle/Serialise/Collection/ConversionReporter.h"
|
||||||
|
|
||||||
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
|
/*!
|
||||||
|
A result from converting a record to Speckle
|
||||||
|
*/
|
||||||
|
class SendConversionResult : public ConversionResult {
|
||||||
|
public:
|
||||||
|
|
||||||
|
// MARK: - Constructors
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Constructor
|
||||||
|
@param stat The send/conversion status of the target record
|
||||||
|
@param srcID The record application ID
|
||||||
|
@param srcType The record application type name
|
||||||
|
@param err An optional error report
|
||||||
|
*/
|
||||||
|
SendConversionResult(Status stat, speckle::utility::String srcID, speckle::utility::String srcType, SendError::Option err = std::nullopt) {
|
||||||
|
status = stat;
|
||||||
|
sourceID = srcID;
|
||||||
|
sourceType = srcType;
|
||||||
|
error = err;
|
||||||
|
}
|
||||||
|
/*!
|
||||||
|
Constructor
|
||||||
|
@param stat The send/conversion status of the target record
|
||||||
|
@param srcID The record application ID
|
||||||
|
@param srcType The record application type name
|
||||||
|
@param err An optional error report
|
||||||
|
*/
|
||||||
|
SendConversionResult(const speckle::database::BIMRecordID& srcID, const speckle::serialise::ConversionReporter::Data& data) {
|
||||||
|
status = data.status == speckle::serialise::ConversionReporter::Data::Status::success ?
|
||||||
|
ConversionResult::Status::success : ConversionResult::Status::error;
|
||||||
|
sourceID = srcID.operator speckle::utility::String();
|
||||||
|
sourceType = data.typeName;
|
||||||
|
if (!data.message.empty())
|
||||||
|
error = SendError{data.message};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //CONNECTOR_INTERFACE_BRIDGE_SEND_CONVERSION_RESULT
|
||||||
@@ -12,14 +12,16 @@ namespace {
|
|||||||
|
|
||||||
///Serialisation fields
|
///Serialisation fields
|
||||||
enum FieldIndex {
|
enum FieldIndex {
|
||||||
errorID,
|
messageID,
|
||||||
cardID,
|
cardID,
|
||||||
|
stackID,
|
||||||
};
|
};
|
||||||
|
|
||||||
///Serialisation field IDs
|
///Serialisation field IDs
|
||||||
static std::array fieldID = {
|
static std::array fieldID = {
|
||||||
Identity{"error"},
|
Identity{"message"},
|
||||||
Identity{"modelCardId"},
|
Identity{"modelCardId"},
|
||||||
|
Identity{"stackTrace"},
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -35,8 +37,9 @@ bool SendError::fillInventory(active::serialise::Inventory& inventory) const {
|
|||||||
using enum Entry::Type;
|
using enum Entry::Type;
|
||||||
inventory.merge(Inventory{
|
inventory.merge(Inventory{
|
||||||
{
|
{
|
||||||
{ fieldID[errorID], errorID, element },
|
{ fieldID[messageID], messageID, element },
|
||||||
{ fieldID[cardID], cardID, 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)));
|
}.withType(&typeid(SendError)));
|
||||||
return true;
|
return true;
|
||||||
@@ -55,10 +58,12 @@ Cargo::Unique SendError::getCargo(const active::serialise::Inventory::Item& item
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
switch (item.index) {
|
switch (item.index) {
|
||||||
case errorID:
|
case messageID:
|
||||||
return std::make_unique<ValueWrap<String>>(message);
|
return std::make_unique<ValueWrap<String>>(message);
|
||||||
case cardID:
|
case cardID:
|
||||||
return std::make_unique<ValueWrap<String>>(modelCardID);
|
return std::make_unique<ValueWrap<String>>(modelCardID);
|
||||||
|
case stackID:
|
||||||
|
return std::make_unique<ValueWrap<String>>(stackTrace);
|
||||||
default:
|
default:
|
||||||
return nullptr; //Requested an unknown index
|
return nullptr; //Requested an unknown index
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ namespace connector::interfac::browser::bridge {
|
|||||||
@param errMess The error message
|
@param errMess The error message
|
||||||
@param card The ID of the model card associated with the wrror
|
@param card The ID of the model card associated with the wrror
|
||||||
*/
|
*/
|
||||||
SendError(const speckle::utility::String& errMess, const speckle::utility::String& card) : message{errMess}, modelCardID{card} {}
|
SendError(const speckle::utility::String& errMess, const speckle::utility::String& card = {}) : message{errMess}, modelCardID{card} {}
|
||||||
|
|
||||||
// MARK: - Public variables
|
// MARK: - Public variables
|
||||||
|
|
||||||
@@ -32,6 +32,8 @@ namespace connector::interfac::browser::bridge {
|
|||||||
speckle::utility::String message;
|
speckle::utility::String message;
|
||||||
///The ID of the model card associated with the data
|
///The ID of the model card associated with the data
|
||||||
speckle::utility::String modelCardID;
|
speckle::utility::String modelCardID;
|
||||||
|
///The error stack trace
|
||||||
|
speckle::utility::String stackTrace;
|
||||||
|
|
||||||
// MARK: - Serialisation
|
// MARK: - Serialisation
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendObject.h"
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendObject.h"
|
||||||
|
|
||||||
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
|
||||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||||
|
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||||
|
#include "Connector/Record/Collection/ProjectCollection.h"
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
using namespace connector::interfac::browser::bridge;
|
using namespace connector::interfac::browser::bridge;
|
||||||
|
using namespace connector::record;
|
||||||
using namespace speckle::serialise;
|
using namespace speckle::serialise;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
@@ -67,3 +69,19 @@ Cargo::Unique SendObject::getCargo(const active::serialise::Inventory::Item& ite
|
|||||||
return nullptr; //Requested an unknown index
|
return nullptr; //Requested an unknown index
|
||||||
}
|
}
|
||||||
} //SendObject::getCargo
|
} //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
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include "Active/Serialise/CargoHold.h"
|
#include "Active/Serialise/CargoHold.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.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/Database/Content/Record.h"
|
||||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||||
|
|
||||||
@@ -44,15 +45,20 @@ namespace connector::interfac::browser::bridge {
|
|||||||
*/
|
*/
|
||||||
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
Cargo::Unique getCargo(const active::serialise::Inventory::Item& item) const override;
|
||||||
/*!
|
/*!
|
||||||
Use a manager in (de)serialisation processes
|
Use a manager in (de)serialisation processes
|
||||||
@param management The management to use
|
@param management The management to use
|
||||||
*/
|
*/
|
||||||
void useManagement(active::serialise::Management* management) const override { m_object->useManagement(management); }
|
void useManagement(active::serialise::Management* management) const override { m_object->useManagement(management); }
|
||||||
/*!
|
/*!
|
||||||
Get the cargo management
|
Get the cargo management
|
||||||
@return The active management
|
@return The active management
|
||||||
*/
|
*/
|
||||||
active::serialise::Management* management() const override { return m_object->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:
|
private:
|
||||||
///The object to send
|
///The object to send
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.h"
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.h"
|
||||||
|
|
||||||
|
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||||
#include "Connector/Record/Model/ModelCard.h"
|
#include "Connector/Record/Model/ModelCard.h"
|
||||||
#include "Speckle/Record/Credentials/Account.h"
|
#include "Speckle/Record/Credentials/Account.h"
|
||||||
|
|
||||||
@@ -25,6 +26,7 @@ namespace {
|
|||||||
accID,
|
accID,
|
||||||
messageID,
|
messageID,
|
||||||
sendObjectID,
|
sendObjectID,
|
||||||
|
convResultID,
|
||||||
};
|
};
|
||||||
|
|
||||||
///Serialisation field IDs
|
///Serialisation field IDs
|
||||||
@@ -37,6 +39,7 @@ namespace {
|
|||||||
Identity{"accountId"},
|
Identity{"accountId"},
|
||||||
Identity{"message"},
|
Identity{"message"},
|
||||||
Identity{"sendObject"},
|
Identity{"sendObject"},
|
||||||
|
Identity{"sendConversionResults"},
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -47,11 +50,11 @@ namespace {
|
|||||||
modelCard: The model card to populate into the send info for the browser
|
modelCard: The model card to populate into the send info for the browser
|
||||||
account: The account linked to the send
|
account: The account linked to the send
|
||||||
object: The object to be sent
|
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) :
|
SendViaBrowserArgs::SendViaBrowserArgs(const ModelCard& modelCard, const Account& account, SendObject&& object) :
|
||||||
modelCardID(modelCard.getID()), projectID(modelCard.getProjectID()), modelID(modelCard.getModelID()), token{account.getToken()},
|
modelCardID(modelCard.getID()), projectID(modelCard.getProjectID()), modelID(modelCard.getModelID()), token{account.getToken()},
|
||||||
serverURL{account.getServerURL()}, accountID{account.getID()}, sendObject{std::move(object)} {
|
serverURL{account.getServerURL()}, accountID{account.getID()}, sendObject{std::move(object)} {
|
||||||
|
|
||||||
} //SendViaBrowserArgs::SendViaBrowserArgs
|
} //SendViaBrowserArgs::SendViaBrowserArgs
|
||||||
|
|
||||||
|
|
||||||
@@ -74,6 +77,7 @@ bool SendViaBrowserArgs::fillInventory(active::serialise::Inventory& inventory)
|
|||||||
{ fieldID[accID], accID, element },
|
{ fieldID[accID], accID, element },
|
||||||
{ fieldID[messageID], messageID, element },
|
{ fieldID[messageID], messageID, element },
|
||||||
{ fieldID[sendObjectID], sendObjectID, element },
|
{ fieldID[sendObjectID], sendObjectID, element },
|
||||||
|
{ fieldID[convResultID], convResultID, element },
|
||||||
},
|
},
|
||||||
}.withType(&typeid(SendViaBrowserArgs)));
|
}.withType(&typeid(SendViaBrowserArgs)));
|
||||||
return true;
|
return true;
|
||||||
@@ -108,6 +112,9 @@ Cargo::Unique SendViaBrowserArgs::getCargo(const active::serialise::Inventory::I
|
|||||||
return std::make_unique<StringWrap>(message);
|
return std::make_unique<StringWrap>(message);
|
||||||
case sendObjectID:
|
case sendObjectID:
|
||||||
return std::make_unique<PackageWrap>(sendObject);
|
return std::make_unique<PackageWrap>(sendObject);
|
||||||
|
case convResultID:
|
||||||
|
sendConversionResults = sendObject.getConversionResults();
|
||||||
|
return Cargo::Unique{new ContainerWrap{sendConversionResults}};
|
||||||
default:
|
default:
|
||||||
return nullptr; //Requested an unknown index
|
return nullptr; //Requested an unknown index
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include "Active/Serialise/Package/Package.h"
|
#include "Active/Serialise/Package/Package.h"
|
||||||
#include "Active/Utility/String.h"
|
#include "Active/Utility/String.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.h"
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendConversionResult.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendObject.h"
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendObject.h"
|
||||||
#include "Speckle/Database/Identity/RecordID.h"
|
#include "Speckle/Database/Identity/RecordID.h"
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ namespace connector::interfac::browser::bridge {
|
|||||||
///The send message
|
///The send message
|
||||||
speckle::utility::String message; //TODO: Clarify what this is used for
|
speckle::utility::String message; //TODO: Clarify what this is used for
|
||||||
///The conversion report (summarising the conversion results on an element-by-element basis)
|
///The conversion report (summarising the conversion results on an element-by-element basis)
|
||||||
std::vector<ConversionResult> sendConversionResults;
|
mutable std::vector<SendConversionResult> sendConversionResults;
|
||||||
///The commit content
|
///The commit content
|
||||||
SendObject sendObject;
|
SendObject sendObject;
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
Constructor
|
Constructor
|
||||||
@param bridge The parent bridge object (provides access to bridge methods)
|
|
||||||
*/
|
*/
|
||||||
GetSendFilters();
|
GetSendFilters();
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ using namespace speckle::utility;
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
using WrappedValue = active::serialise::CargoHold<ContainerWrap<Vector<CardSetting>, PackageWrap>, Vector<CardSetting>>;
|
using WrappedValue = CargoHold<ContainerWrap<Vector<CardSetting>, PackageWrap>, Vector<CardSetting>>;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,9 +26,9 @@ GetSendSettings::GetSendSettings() : BridgeMethod{"GetSendSettings", [&]() {
|
|||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Get the send filters
|
Get send settings relevant to the host BIM application
|
||||||
|
|
||||||
return: The send filters
|
return: The send settings
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
std::unique_ptr<Cargo> GetSendSettings::run() const {
|
std::unique_ptr<Cargo> GetSendSettings::run() const {
|
||||||
auto filters = std::make_unique<Vector<CardSetting>>();
|
auto filters = std::make_unique<Vector<CardSetting>>();
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace connector::interfac::browser::bridge {
|
|||||||
class ConnectorConfig;
|
class ConnectorConfig;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
JS Function class to retrieve the send filters
|
JS Function class to retrieve the send settings relevant to the host BIM application
|
||||||
*/
|
*/
|
||||||
class GetSendSettings : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
class GetSendSettings : public speckle::interfac::browser::bridge::BridgeMethod<void, active::serialise::Cargo> {
|
||||||
public:
|
public:
|
||||||
@@ -18,15 +18,14 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
Constructor
|
Constructor
|
||||||
@param bridge The parent bridge object (provides access to bridge methods)
|
|
||||||
*/
|
*/
|
||||||
GetSendSettings();
|
GetSendSettings();
|
||||||
|
|
||||||
// MARK: - Functions (const)
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Get the send filters
|
Get send settings relevant to the host BIM application
|
||||||
@return The send filters
|
@return The send settings
|
||||||
*/
|
*/
|
||||||
std::unique_ptr<active::serialise::Cargo> run() const;
|
std::unique_ptr<active::serialise::Cargo> run() const;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,34 +5,33 @@
|
|||||||
#include "Connector/Connector.h"
|
#include "Connector/Connector.h"
|
||||||
#include "Connector/ConnectorResource.h"
|
#include "Connector/ConnectorResource.h"
|
||||||
#include "Connector/Database/ModelCardDatabase.h"
|
#include "Connector/Database/ModelCardDatabase.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendError.h"
|
#include "Connector/Environment/ConnectorProject.h"
|
||||||
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendConversionResult.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.h"
|
#include "Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.h"
|
||||||
#include "Connector/Record/Collection/ProjectCollection.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/AccountDatabase.h"
|
||||||
|
#include "Speckle/Database/BIMElementDatabase.h"
|
||||||
#include "Speckle/Database/Content/BIMRecord.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/Interface/Browser/Bridge/BrowserBridge.h"
|
||||||
#include "Speckle/Record/Credentials/Account.h"
|
#include "Speckle/Record/Credentials/Account.h"
|
||||||
|
#include "Speckle/Record/Element/Element.h"
|
||||||
#include "Speckle/Serialise/Detached/Storage/DetachedMemoryStore.h"
|
#include "Speckle/Serialise/Detached/Storage/DetachedMemoryStore.h"
|
||||||
#include "Speckle/Utility/Exception.h"
|
#include "Speckle/Utility/Exception.h"
|
||||||
|
|
||||||
#include "Speckle/Database/BIMElementDatabase.h"
|
|
||||||
#include "Speckle/Environment/Project.h"
|
|
||||||
#include "Speckle/Record/Element/Element.h"
|
|
||||||
using namespace speckle::record::element;
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
|
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
|
using namespace connector::environment;
|
||||||
using namespace connector::interfac::browser::bridge;
|
using namespace connector::interfac::browser::bridge;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
using namespace speckle::database;
|
using namespace speckle::database;
|
||||||
|
using namespace speckle::environment;
|
||||||
|
using namespace speckle::record::element;
|
||||||
using namespace speckle::serialise;
|
using namespace speckle::serialise;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
namespace {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Default constructor
|
Default constructor
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
@@ -44,11 +43,23 @@ Send::Send() : BridgeMethod{"Send", [&](const SendArgs& args) {
|
|||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Send a specified model
|
Send a specified model
|
||||||
|
|
||||||
modelCardID: The ID of the model to send
|
modelCardID: The ID of the model card identifying the objects to send
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
void Send::run(const String& modelCardID) const {
|
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
|
//Find the specified model card
|
||||||
auto modelCardDatabase = connector()->getModelCardDatabase();
|
auto modelCardDatabase = connectorProject->getModelCardDatabase();
|
||||||
auto modelCard = modelCardDatabase->getCard(modelCardID);
|
auto modelCard = modelCardDatabase->getCard(modelCardID);
|
||||||
if (!modelCard) {
|
if (!modelCard) {
|
||||||
getBridge()->sendEvent("setModelError",
|
getBridge()->sendEvent("setModelError",
|
||||||
@@ -63,25 +74,22 @@ void Send::run(const String& modelCardID) const {
|
|||||||
std::make_unique<SendError>(connector()->getLocalString(errorString, accountNotFoundID), modelCardID));
|
std::make_unique<SendError>(connector()->getLocalString(errorString, accountNotFoundID), modelCardID));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//Get the active project
|
//Get the selected elements from the modelcard
|
||||||
auto project = connector()->getActiveProject().lock();
|
|
||||||
if (!project) {
|
|
||||||
getBridge()->sendEvent("setModelError",
|
|
||||||
std::make_unique<SendError>(connector()->getLocalString(errorString, noProjectOpenID), modelCardID));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//Build a collection from the selected elements
|
|
||||||
auto collection = std::make_unique<ProjectCollection>(project);
|
|
||||||
auto elementDatabase = project->getElementDatabase();
|
auto elementDatabase = project->getElementDatabase();
|
||||||
auto selected = elementDatabase->getSelection();
|
BIMRecordIDList selected{};
|
||||||
if (selected.empty()) {
|
if (auto senderCard = dynamic_cast<SenderModelCard*>(modelCard.get()))
|
||||||
getBridge()->sendEvent("setModelError",
|
selected = senderCard->getFilter().getElementIDs();
|
||||||
std::make_unique<SendError>(connector()->getLocalString(errorString, noSelectedModelItemsID), modelCardID));
|
//Build a collection from the selected elements
|
||||||
return;
|
auto collection = std::make_unique<ProjectCollection>(project, modelCard->getID());
|
||||||
}
|
|
||||||
for (const auto& link : selected) {
|
for (const auto& link : selected) {
|
||||||
if (auto element = elementDatabase->getElement(link); element)
|
if (auto element = elementDatabase->getElement(link); element)
|
||||||
collection->addElement(*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
|
//Send the collected information
|
||||||
auto result = std::make_unique<SendViaBrowserArgs>(*modelCard, *account, SendObject{std::move(collection)});
|
auto result = std::make_unique<SendViaBrowserArgs>(*modelCard, *account, SendObject{std::move(collection)});
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
Constructor
|
Constructor
|
||||||
@param bridge The parent bridge object (provides access to bridge methods)
|
|
||||||
*/
|
*/
|
||||||
Send();
|
Send();
|
||||||
|
|
||||||
@@ -33,7 +32,7 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
Send a specified model
|
Send a specified model
|
||||||
@param modelCardID The ID of the model to send
|
@param modelCardID The ID of the model card identifying the objects to send
|
||||||
*/
|
*/
|
||||||
void run(const speckle::utility::String& modelCardID) const;
|
void run(const speckle::utility::String& modelCardID) const;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,10 +1,28 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Send/SendBridge.h"
|
#include "Connector/Interface/Browser/Bridge/Send/SendBridge.h"
|
||||||
|
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/GetSendFilters.h"
|
#include "Connector/Interface/Browser/Bridge/Send/GetSendFilters.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/GetSendSettings.h"
|
#include "Connector/Interface/Browser/Bridge/Send/GetSendSettings.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/Send.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 connector::interfac::browser::bridge;
|
||||||
|
using namespace speckle::utility;
|
||||||
|
using namespace speckle::event;
|
||||||
|
using namespace active::serialise;
|
||||||
|
using namespace connector::record;
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Default constructor
|
Default constructor
|
||||||
@@ -15,3 +33,54 @@ SendBridge::SendBridge() : BrowserBridge{"sendBinding"} {
|
|||||||
addMethod<GetSendSettings>();
|
addMethod<GetSendSettings>();
|
||||||
addMethod<Send>();
|
addMethod<Send>();
|
||||||
} //SendBridge::SendBridge
|
} //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
|
||||||
|
|||||||
@@ -2,13 +2,14 @@
|
|||||||
#define CONNECTOR_INTERFACE_BRIDGE_SEND_BRIDGE
|
#define CONNECTOR_INTERFACE_BRIDGE_SEND_BRIDGE
|
||||||
|
|
||||||
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
||||||
|
#include "Speckle/Event/Subscriber/ElementSubscriber.h"
|
||||||
|
|
||||||
namespace connector::interfac::browser::bridge {
|
namespace connector::interfac::browser::bridge {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
A browser bridge to support sending model data to a Speckle server
|
A browser bridge to support sending model data to a Speckle server
|
||||||
*/
|
*/
|
||||||
class SendBridge : public speckle::interfac::browser::bridge::BrowserBridge {
|
class SendBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ElementSubscriber {
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// MARK: - Types
|
// MARK: - Types
|
||||||
@@ -22,6 +23,18 @@ namespace connector::interfac::browser::bridge {
|
|||||||
Default constructor
|
Default constructor
|
||||||
*/
|
*/
|
||||||
SendBridge();
|
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;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_CONFIG
|
#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE
|
||||||
#define CONNECTOR_INTERFACE_BRIDGE_GET_CONFIG
|
#define CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE
|
||||||
|
|
||||||
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
#include "Speckle/Interface/Browser/Bridge/BridgeMethod.h"
|
||||||
|
|
||||||
@@ -15,7 +15,6 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
Constructor
|
Constructor
|
||||||
@param bridge The parent bridge object (provides access to bridge methods)
|
|
||||||
*/
|
*/
|
||||||
GetComplexType();
|
GetComplexType();
|
||||||
|
|
||||||
@@ -30,4 +29,4 @@ namespace connector::interfac::browser::bridge {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //CONNECTOR_INTERFACE_BRIDGE_GET_CONFIG
|
#endif //CONNECTOR_INTERFACE_BRIDGE_GET_COMPLEX_TYPE
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
#include "Connector/Interface/Browser/Bridge/Test/GoAway.h"
|
#include "Connector/Interface/Browser/Bridge/Test/GoAway.h"
|
||||||
|
|
||||||
using namespace connector::interfac::browser::bridge;
|
#include "Speckle/Environment/Platform.h"
|
||||||
|
|
||||||
#include <iostream>
|
using namespace connector::interfac::browser::bridge;
|
||||||
|
using namespace speckle::environment;
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Default constructor
|
Default constructor
|
||||||
@@ -16,5 +17,5 @@ GoAway::GoAway() : BridgeMethod{"GoAway", [&]() {
|
|||||||
Write a message to the console
|
Write a message to the console
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
void GoAway::run() const {
|
void GoAway::run() const {
|
||||||
std::cout << "Okay, going away.";
|
platform()->writeToConsole("Okay, going away.");
|
||||||
} //GoAway::run
|
} //GoAway::run
|
||||||
|
|||||||
@@ -11,6 +11,12 @@ using namespace active::event;
|
|||||||
using namespace connector;
|
using namespace connector;
|
||||||
using namespace speckle::event;
|
using namespace speckle::event;
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
auto connectorMenuItem = 1;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Default constructor
|
Default constructor
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
@@ -22,6 +28,35 @@ ConnectorMenu::ConnectorMenu()
|
|||||||
} //ConnectorMenu::ConnectorMenu
|
} //ConnectorMenu::ConnectorMenu
|
||||||
|
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Get the event subscription list
|
||||||
|
|
||||||
|
return: The subscription list (an empty list will put the subscriber into a suspended state)
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
Subscriber::Subscription ConnectorMenu::subscription() const {
|
||||||
|
auto result = MenuSubscriber::subscription();
|
||||||
|
result.insert(reflectPaletteVisibilityID);
|
||||||
|
return result;
|
||||||
|
} //ConnectorMenu::subscription
|
||||||
|
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Receive a subscribed event
|
||||||
|
|
||||||
|
event: The incoming event
|
||||||
|
|
||||||
|
return: True if the event should be closed
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
bool ConnectorMenu::receive(const active::event::Event& event) {
|
||||||
|
if (event != reflectPaletteVisibilityID)
|
||||||
|
return MenuSubscriber::receive(event);
|
||||||
|
//Set the menu checked state based on the palette visibility from the event
|
||||||
|
if (auto menuState = event.findValue(paletteVisibilityStateID); menuState != nullptr)
|
||||||
|
setMenuChecked(connectorMenuItem, menuState->boolVal());
|
||||||
|
return false;
|
||||||
|
} //ConnectorMenu::receive
|
||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Handle the menu selection
|
Handle the menu selection
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,21 @@ namespace connector {
|
|||||||
Default constructor
|
Default constructor
|
||||||
*/
|
*/
|
||||||
ConnectorMenu();
|
ConnectorMenu();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Get the event subscription list
|
||||||
|
@return The subscription list (an empty list will put the subscriber into a suspended state)
|
||||||
|
*/
|
||||||
|
Subscription subscription() const override;
|
||||||
|
|
||||||
|
// MARK: - Functions (mutating)
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Receive a subscribed event
|
||||||
|
@param event The incoming event
|
||||||
|
@return True if the event should be closed
|
||||||
|
*/
|
||||||
|
bool receive(const active::event::Event& event) override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -1,20 +1,23 @@
|
|||||||
#include "Connector/Interface/ConnectorPalette.h"
|
#include "Connector/Interface/ConnectorPalette.h"
|
||||||
|
|
||||||
#include "Active/Event/Event.h"
|
#include "Active/Event/Event.h"
|
||||||
#include "Active/Utility/String.h"
|
#include "Active/Setting/ValueSetting.h"
|
||||||
#include "Active/Serialise/JSON/JSONTransport.h"
|
#include "Active/Serialise/JSON/JSONTransport.h"
|
||||||
#include "Active/Utility/BufferOut.h"
|
#include "Active/Utility/BufferOut.h"
|
||||||
|
#include "Active/Utility/String.h"
|
||||||
#include "Connector/Connector.h"
|
#include "Connector/Connector.h"
|
||||||
#include "Connector/ConnectorResource.h"
|
#include "Connector/ConnectorResource.h"
|
||||||
#include "Connector/Event/ConnectorEventID.h"
|
#include "Connector/Event/ConnectorEventID.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Account/AccountBridge.h"
|
#include "Connector/Interface/Browser/Bridge/Account/AccountBridge.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Base/BaseBridge.h"
|
#include "Connector/Interface/Browser/Bridge/Base/BaseBridge.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Config/ConfigBridge.h"
|
#include "Connector/Interface/Browser/Bridge/Config/ConfigBridge.h"
|
||||||
|
#include "Connector/Interface/Browser/Bridge/Receive/ReceiveBridge.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Send/SendBridge.h"
|
#include "Connector/Interface/Browser/Bridge/Send/SendBridge.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Selection/SelectionBridge.h"
|
#include "Connector/Interface/Browser/Bridge/Selection/SelectionBridge.h"
|
||||||
#include "Connector/Interface/Browser/Bridge/Test/TestBridge.h"
|
#include "Connector/Interface/Browser/Bridge/Test/TestBridge.h"
|
||||||
#include "Speckle/Environment/Addon.h"
|
#include "Speckle/Environment/Addon.h"
|
||||||
#include "Speckle/Event/Type/MenuEvent.h"
|
#include "Speckle/Event/Type/MenuEvent.h"
|
||||||
|
#include "Speckle/Event/Type/ProjectEvent.h"
|
||||||
#include "Speckle/Interface/Browser/JSPortal.h"
|
#include "Speckle/Interface/Browser/JSPortal.h"
|
||||||
|
|
||||||
#include <ACAPinc.h>
|
#include <ACAPinc.h>
|
||||||
@@ -23,6 +26,7 @@
|
|||||||
|
|
||||||
using namespace active::environment;
|
using namespace active::environment;
|
||||||
using namespace active::event;
|
using namespace active::event;
|
||||||
|
using namespace active::setting;
|
||||||
using namespace connector;
|
using namespace connector;
|
||||||
using namespace speckle::interfac::browser;
|
using namespace speckle::interfac::browser;
|
||||||
using namespace connector::interfac::browser::bridge;
|
using namespace connector::interfac::browser::bridge;
|
||||||
@@ -73,7 +77,7 @@ namespace {
|
|||||||
std::shared_ptr<DG::Browser> browser;
|
std::shared_ptr<DG::Browser> browser;
|
||||||
|
|
||||||
void InitBrowserControl();
|
void InitBrowserControl();
|
||||||
void SetMenuItemCheckedState(bool);
|
void publshVisibilityChange(bool);
|
||||||
|
|
||||||
virtual void PanelResized(const DG::PanelResizeEvent& ev) override;
|
virtual void PanelResized(const DG::PanelResizeEvent& ev) override;
|
||||||
virtual void PanelCloseRequested(const DG::PanelCloseRequestEvent& ev, bool* accepted) override;
|
virtual void PanelCloseRequested(const DG::PanelCloseRequestEvent& ev, bool* accepted) override;
|
||||||
@@ -108,7 +112,9 @@ ConnectorPalette::ConnectorPalette() {
|
|||||||
return: The subscription list (an empty list will put the subscriber into a suspended state)
|
return: The subscription list (an empty list will put the subscriber into a suspended state)
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
ConnectorPalette::Subscription ConnectorPalette::subscription() const {
|
ConnectorPalette::Subscription ConnectorPalette::subscription() const {
|
||||||
return { {toggleConnectorPaletteID} };
|
auto result = ProjectSubscriber::subscription();
|
||||||
|
result.insert(toggleConnectorPaletteID);
|
||||||
|
return result;
|
||||||
} //ConnectorPalette::subscription
|
} //ConnectorPalette::subscription
|
||||||
|
|
||||||
|
|
||||||
@@ -130,16 +136,48 @@ bool ConnectorPalette::start() {
|
|||||||
return: True if the event should be closed
|
return: True if the event should be closed
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
bool ConnectorPalette::receive(const active::event::Event& event) {
|
bool ConnectorPalette::receive(const active::event::Event& event) {
|
||||||
if (BrowserPalette::HasInstance() && BrowserPalette::GetInstance().IsVisible()) {
|
if (event == toggleConnectorPaletteID) {
|
||||||
BrowserPalette::GetInstance().Hide ();
|
if (BrowserPalette::HasInstance() && BrowserPalette::GetInstance().IsVisible()) {
|
||||||
} else {
|
BrowserPalette::GetInstance().Hide();
|
||||||
if (!BrowserPalette::HasInstance())
|
}
|
||||||
BrowserPalette::CreateInstance();
|
else {
|
||||||
BrowserPalette::GetInstance().Show();
|
if (!BrowserPalette::HasInstance())
|
||||||
}
|
BrowserPalette::CreateInstance();
|
||||||
return true;
|
BrowserPalette::GetInstance().Show();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ProjectSubscriber::receive(event);
|
||||||
} //ConnectorPalette::receive
|
} //ConnectorPalette::receive
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Handle a project event
|
||||||
|
|
||||||
|
event: The project event
|
||||||
|
|
||||||
|
return: True if the event should be closed
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
bool ConnectorPalette::handle(const speckle::event::ProjectEvent& event) {
|
||||||
|
using enum speckle::event::ProjectEvent::Type;
|
||||||
|
switch (event.getType()) {
|
||||||
|
case open: {
|
||||||
|
if (BrowserPalette::HasInstance() && !BrowserPalette::GetInstance().IsVisible()) {
|
||||||
|
BrowserPalette::GetInstance().Show();
|
||||||
|
BrowserPalette::GetInstance().EnableItems();
|
||||||
|
}
|
||||||
|
} break;
|
||||||
|
case close: {
|
||||||
|
if (BrowserPalette::HasInstance() && BrowserPalette::GetInstance().IsVisible()) {
|
||||||
|
BrowserPalette::GetInstance().Hide();
|
||||||
|
}
|
||||||
|
} break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
} //ConnectorPalette::handle
|
||||||
|
|
||||||
|
|
||||||
//NB: Following is placeholder from GS example code - will be refactored to better suit our purposes
|
//NB: Following is placeholder from GS example code - will be refactored to better suit our purposes
|
||||||
|
|
||||||
@@ -161,14 +199,28 @@ static GSErrCode __ACENV_CALL NotificationHandler(API_NotifyEventID notifID, Int
|
|||||||
BrowserPalette::BrowserPalette() :
|
BrowserPalette::BrowserPalette() :
|
||||||
DG::Palette(ACAPI_GetOwnResModule(), BrowserPaletteResId, ACAPI_GetOwnResModule(), paletteGuid) {
|
DG::Palette(ACAPI_GetOwnResModule(), BrowserPaletteResId, ACAPI_GetOwnResModule(), paletteGuid) {
|
||||||
browser = std::make_shared<DG::Browser>(GetReference(), BrowserId);
|
browser = std::make_shared<DG::Browser>(GetReference(), BrowserId);
|
||||||
|
#ifdef ServerMainVers_2700
|
||||||
ACAPI_ProjectOperation_CatchProjectEvent(APINotify_Quit, NotificationHandler);
|
ACAPI_ProjectOperation_CatchProjectEvent(APINotify_Quit, NotificationHandler);
|
||||||
|
#else
|
||||||
|
ACAPI_Notify_CatchProjectEvent(APINotify_Quit, NotificationHandler);
|
||||||
|
#endif
|
||||||
Attach(*this);
|
Attach(*this);
|
||||||
BeginEventProcessing();
|
BeginEventProcessing();
|
||||||
//Install required connector bridges
|
//Install required connector bridges
|
||||||
install<AccountBridge>();
|
install<AccountBridge>();
|
||||||
install<BaseBridge>();
|
if (auto ref = install<BaseBridge>(); ref) {
|
||||||
|
if (auto baseBridgeRef = std::dynamic_pointer_cast<BaseBridge>(ref); baseBridgeRef) {
|
||||||
|
connector::connector()->addWeak(baseBridgeRef);
|
||||||
|
}
|
||||||
|
}
|
||||||
install<ConfigBridge>();
|
install<ConfigBridge>();
|
||||||
install<SendBridge>();
|
install<ReceiveBridge>();
|
||||||
|
if (auto ref = install<SendBridge>(); ref) {
|
||||||
|
if (auto sendBridgeRef = std::dynamic_pointer_cast<SendBridge>(ref); sendBridgeRef) {
|
||||||
|
connector::connector()->addWeak(sendBridgeRef);
|
||||||
|
sendBridgeRef->start();
|
||||||
|
}
|
||||||
|
}
|
||||||
if (auto ref = install<SelectionBridge>(); ref) {
|
if (auto ref = install<SelectionBridge>(); ref) {
|
||||||
if (auto selectionBridgeRef = std::dynamic_pointer_cast<SelectionBridge>(ref); selectionBridgeRef) {
|
if (auto selectionBridgeRef = std::dynamic_pointer_cast<SelectionBridge>(ref); selectionBridgeRef) {
|
||||||
connector::connector()->addWeak(selectionBridgeRef);
|
connector::connector()->addWeak(selectionBridgeRef);
|
||||||
@@ -204,37 +256,27 @@ void BrowserPalette::DestroyInstance() {
|
|||||||
|
|
||||||
void BrowserPalette::Show() {
|
void BrowserPalette::Show() {
|
||||||
DG::Palette::Show();
|
DG::Palette::Show();
|
||||||
SetMenuItemCheckedState(true);
|
publshVisibilityChange(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserPalette::Hide() {
|
void BrowserPalette::Hide() {
|
||||||
DG::Palette::Hide();
|
DG::Palette::Hide();
|
||||||
SetMenuItemCheckedState(false);
|
publshVisibilityChange(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserPalette::InitBrowserControl() {
|
void BrowserPalette::InitBrowserControl() {
|
||||||
#ifdef TESTING_MODE
|
#ifdef TESTING_MODE
|
||||||
browser->LoadURL("https://deploy-preview-3180--boisterous-douhua-e3cefb.netlify.app/");
|
|
||||||
//browser->LoadURL("https://boisterous-douhua-e3cefb.netlify.app/test");
|
//browser->LoadURL("https://boisterous-douhua-e3cefb.netlify.app/test");
|
||||||
|
browser->LoadURL("https://boisterous-douhua-e3cefb.netlify.app");
|
||||||
#else
|
#else
|
||||||
browser->LoadURL("https://boisterous-douhua-e3cefb.netlify.app/");
|
browser->LoadURL("https://boisterous-douhua-e3cefb.netlify.app/");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void BrowserPalette::SetMenuItemCheckedState(bool isChecked) {
|
void BrowserPalette::publshVisibilityChange(bool isChecked) {
|
||||||
API_MenuItemRef itemRef = {};
|
//Signal that the palette visibility has changed
|
||||||
GSFlags itemFlags = {};
|
app()->publish(Event{reflectPaletteVisibilityID, { ValueSetting{isChecked, paletteVisibilityStateID} }});
|
||||||
|
|
||||||
itemRef.menuResID = BrowserPaletteMenuResId;
|
|
||||||
itemRef.itemIndex = BrowserPaletteMenuItemIndex;
|
|
||||||
|
|
||||||
ACAPI_MenuItem_GetMenuItemFlags(&itemRef, &itemFlags);
|
|
||||||
if(isChecked)
|
|
||||||
itemFlags |= API_MenuItemChecked;
|
|
||||||
else
|
|
||||||
itemFlags &= ~API_MenuItemChecked;
|
|
||||||
ACAPI_MenuItem_SetMenuItemFlags(&itemRef, &itemFlags);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserPalette::PanelResized(const DG::PanelResizeEvent& ev) {
|
void BrowserPalette::PanelResized(const DG::PanelResizeEvent& ev) {
|
||||||
@@ -269,17 +311,9 @@ GSErrCode __ACENV_CALL BrowserPalette::PaletteControlCallBack(Int32, API_Palette
|
|||||||
|
|
||||||
case APIPalMsg_HidePalette_End:
|
case APIPalMsg_HidePalette_End:
|
||||||
if(HasInstance() && !GetInstance().IsVisible())
|
if(HasInstance() && !GetInstance().IsVisible())
|
||||||
|
{
|
||||||
GetInstance().Show();
|
GetInstance().Show();
|
||||||
break;
|
}
|
||||||
|
|
||||||
case APIPalMsg_DisableItems_Begin:
|
|
||||||
if(HasInstance() && GetInstance().IsVisible())
|
|
||||||
GetInstance().DisableItems();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case APIPalMsg_DisableItems_End:
|
|
||||||
if(HasInstance() && GetInstance().IsVisible())
|
|
||||||
GetInstance().EnableItems();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case APIPalMsg_IsPaletteVisible:
|
case APIPalMsg_IsPaletteVisible:
|
||||||
|
|||||||
@@ -2,10 +2,11 @@
|
|||||||
#define CONNECTOR_CONNECTOR_PALETTE
|
#define CONNECTOR_CONNECTOR_PALETTE
|
||||||
|
|
||||||
#include "Active/Event/Subscriber.h"
|
#include "Active/Event/Subscriber.h"
|
||||||
|
#include "Speckle/Event/Subscriber/ProjectSubscriber.h"
|
||||||
|
|
||||||
namespace connector {
|
namespace connector {
|
||||||
|
|
||||||
class ConnectorPalette : public active::event::Subscriber {
|
class ConnectorPalette : public speckle::event::ProjectSubscriber {
|
||||||
public:
|
public:
|
||||||
/*!
|
/*!
|
||||||
Default constructor
|
Default constructor
|
||||||
@@ -32,6 +33,13 @@ namespace connector {
|
|||||||
@return True if the event should be closed
|
@return True if the event should be closed
|
||||||
*/
|
*/
|
||||||
bool receive(const active::event::Event& event) override;
|
bool receive(const active::event::Event& event) override;
|
||||||
|
protected:
|
||||||
|
/*!
|
||||||
|
Handle the project events
|
||||||
|
@param event The project event
|
||||||
|
@return True if the event should be closed
|
||||||
|
*/
|
||||||
|
bool handle(const speckle::event::ProjectEvent& event) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,11 @@
|
|||||||
#include "Connector/Record/Collection/FinishProxy.h"
|
#include "Connector/Record/Collection/FinishProxy.h"
|
||||||
#include "Speckle/Database/BIMAttributeDatabase.h"
|
#include "Speckle/Database/BIMAttributeDatabase.h"
|
||||||
#include "Speckle/Database/BIMElementDatabase.h"
|
#include "Speckle/Database/BIMElementDatabase.h"
|
||||||
|
#include "Speckle/Record/Attribute/Finish.h"
|
||||||
#include "Speckle/Record/Element/Element.h"
|
#include "Speckle/Record/Element/Element.h"
|
||||||
|
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
#ifdef ARCHICAD
|
#ifdef ARCHICAD
|
||||||
#include <ACAPinc.h>
|
#include <ACAPinc.h>
|
||||||
#include <ModelMaterial.hpp>
|
#include <ModelMaterial.hpp>
|
||||||
@@ -24,7 +27,7 @@ using namespace speckle::utility;
|
|||||||
|
|
||||||
#ifdef ARCHICAD
|
#ifdef ARCHICAD
|
||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
class ProjectCollection::FinishCache : public std::unordered_map<active::utility::Guid, Finish::Unique> {};
|
class ProjectCollection::FinishCache : public std::unordered_map<active::utility::Guid, Finish> {};
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -48,9 +51,12 @@ namespace {
|
|||||||
Constructor
|
Constructor
|
||||||
|
|
||||||
project: The source project
|
project: The source project
|
||||||
|
modelCardID: The model card ID for the send operation
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
ProjectCollection::ProjectCollection(speckle::environment::Project::Shared project) : base{project->getInfo().name, project},
|
ProjectCollection::ProjectCollection(speckle::environment::Project::Shared project, const RecordID& modelCardID) :
|
||||||
m_management{std::make_unique<Management>()} {
|
base{project->getInfo().name, project}, ConversionReporter{modelCardID}, m_management {
|
||||||
|
std::make_unique<Management>()
|
||||||
|
} {
|
||||||
m_management->push_back(this);
|
m_management->push_back(this);
|
||||||
m_finishes = std::make_unique<FinishCache>();
|
m_finishes = std::make_unique<FinishCache>();
|
||||||
base::useManagement(m_management.get());
|
base::useManagement(m_management.get());
|
||||||
@@ -102,7 +108,10 @@ bool ProjectCollection::addElement(const speckle::record::element::Element& elem
|
|||||||
RecordCollection* collection = this;
|
RecordCollection* collection = this;
|
||||||
for (const auto& childName : collectionNames)
|
for (const auto& childName : collectionNames)
|
||||||
collection = collection->getChild(childName);
|
collection = collection->getChild(childName);
|
||||||
return collection->addIndex(BIMIndex{element.getBIMID(), element.getTableID()});
|
if (!collection->addIndex(BIMIndex{element.getBIMID(), element.getTableID()}))
|
||||||
|
return false;
|
||||||
|
incrementProjectedRecords();
|
||||||
|
return true;
|
||||||
} //ProjectCollection::addElement
|
} //ProjectCollection::addElement
|
||||||
|
|
||||||
|
|
||||||
@@ -114,15 +123,14 @@ bool ProjectCollection::addElement(const speckle::record::element::Element& elem
|
|||||||
|
|
||||||
return: True if the material proxy was added (false typically means the record already exists)
|
return: True if the material proxy was added (false typically means the record already exists)
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
bool ProjectCollection::addMaterialProxy(const speckle::database::BIMIndex& materialIndex, const speckle::database::BIMRecordID& objectID) {
|
bool ProjectCollection::addFinishProxy(const speckle::database::BIMIndex& materialIndex, const speckle::database::BIMRecordID& objectID) {
|
||||||
auto iter = m_finishProxies.find(materialIndex);
|
auto iter = m_finishProxies.find(materialIndex);
|
||||||
if (iter == m_finishProxies.end())
|
if (iter == m_finishProxies.end())
|
||||||
iter = m_finishProxies.insert({materialIndex, {}}).first;
|
iter = m_finishProxies.insert({materialIndex, {}}).first;
|
||||||
return iter->second.insert(objectID).second;
|
return iter->second.insert(objectID).second;
|
||||||
} //ProjectCollection::addMaterialProxy
|
} //ProjectCollection::addFinishProxy
|
||||||
|
|
||||||
|
|
||||||
#ifdef ARCHICAD
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Add a ModelerAPI material to the collection (NB: These are not persistent so need to be captured by this method)
|
Add a ModelerAPI material to the collection (NB: These are not persistent so need to be captured by this method)
|
||||||
|
|
||||||
@@ -131,16 +139,12 @@ bool ProjectCollection::addMaterialProxy(const speckle::database::BIMIndex& mate
|
|||||||
|
|
||||||
return: True if the material proxy was added (false typically means the record already exists)
|
return: True if the material proxy was added (false typically means the record already exists)
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
bool ProjectCollection::addMaterialProxy(const ModelerAPI::Material& material, const speckle::database::BIMRecordID& objectID) {
|
bool ProjectCollection::addFinishProxy(const Finish& finish, const speckle::database::BIMRecordID& objectID) {
|
||||||
auto finishID = Guid::fromInt(material.GenerateHashValue());
|
auto iter = m_finishes->find(finish.getBIMID());
|
||||||
auto iter = m_finishes->find(finishID);
|
if (iter == m_finishes->end())
|
||||||
if (iter == m_finishes->end()) {
|
iter = m_finishes->insert({finish.getBIMID(), finish}).first;
|
||||||
auto finish = std::make_unique<Finish>(material);
|
return addFinishProxy(speckle::database::BIMIndex{finish.getBIMID()}, objectID);
|
||||||
iter = m_finishes->insert({ finishID, std::move(finish) }).first;
|
} //ProjectCollection::addFinishProxy
|
||||||
}
|
|
||||||
return addMaterialProxy(finishID, objectID);
|
|
||||||
} //ProjectCollection::addMaterialProxy
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
@@ -155,7 +159,7 @@ bool ProjectCollection::fillInventory(active::serialise::Inventory& inventory) c
|
|||||||
base::fillInventory(inventory);
|
base::fillInventory(inventory);
|
||||||
inventory.merge(Inventory{
|
inventory.merge(Inventory{
|
||||||
{
|
{
|
||||||
{ Identity{fieldID[finishProxyID]}, finishProxyID, 100, std::nullopt },
|
{ Identity{fieldID[finishProxyID]}, finishProxyID, std::numeric_limits<size_t>::max(), std::nullopt },
|
||||||
},
|
},
|
||||||
}.withType(&typeid(ProjectCollection)));
|
}.withType(&typeid(ProjectCollection)));
|
||||||
return true;
|
return true;
|
||||||
@@ -181,7 +185,7 @@ Cargo::Unique ProjectCollection::getCargo(const Inventory::Item& item) const {
|
|||||||
std::advance(iter, item.available);
|
std::advance(iter, item.available);
|
||||||
const Finish* finish = nullptr;
|
const Finish* finish = nullptr;
|
||||||
if (auto fin = m_finishes->find(iter->first); fin != m_finishes->end())
|
if (auto fin = m_finishes->find(iter->first); fin != m_finishes->end())
|
||||||
finish = fin->second.get();
|
finish = &fin->second;
|
||||||
else if (auto attribute = m_project->getAttributeDatabase()->getAttribute(iter->first, iter->first.tableID); attribute)
|
else if (auto attribute = m_project->getAttributeDatabase()->getAttribute(iter->first, iter->first.tableID); attribute)
|
||||||
finish = dynamic_cast<const Finish*>(attribute.get());
|
finish = dynamic_cast<const Finish*>(attribute.get());
|
||||||
if (finish != nullptr) {
|
if (finish != nullptr) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include "Connector/Record/Collection/RecordCollection.h"
|
#include "Connector/Record/Collection/RecordCollection.h"
|
||||||
#include "Speckle/Serialise/Collection/FinishCollector.h"
|
#include "Speckle/Serialise/Collection/FinishCollector.h"
|
||||||
|
#include "Speckle/Serialise/Collection/ConversionReporter.h"
|
||||||
|
|
||||||
#include <stack>
|
#include <stack>
|
||||||
|
|
||||||
@@ -25,7 +26,7 @@ namespace connector::record {
|
|||||||
- Other attributes, e.g. materials
|
- Other attributes, e.g. materials
|
||||||
Add all this supplementary data to the root container as required
|
Add all this supplementary data to the root container as required
|
||||||
*/
|
*/
|
||||||
class ProjectCollection : public RecordCollection, public speckle::serialise::FinishCollector {
|
class ProjectCollection : public RecordCollection, public speckle::serialise::FinishCollector, public speckle::serialise::ConversionReporter {
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// MARK: - Types
|
// MARK: - Types
|
||||||
@@ -37,8 +38,9 @@ namespace connector::record {
|
|||||||
/*!
|
/*!
|
||||||
Constructor
|
Constructor
|
||||||
@param project The source project
|
@param project The source project
|
||||||
|
@param modelCardID The model card ID for the send operation
|
||||||
*/
|
*/
|
||||||
ProjectCollection(speckle::environment::Project::Shared project);
|
ProjectCollection(speckle::environment::Project::Shared project, const speckle::database::RecordID& modelCardID);
|
||||||
ProjectCollection(const ProjectCollection&) = delete;
|
ProjectCollection(const ProjectCollection&) = delete;
|
||||||
/*!
|
/*!
|
||||||
Destructor
|
Destructor
|
||||||
@@ -69,16 +71,14 @@ namespace connector::record {
|
|||||||
@param objectID The object the material is applied to
|
@param objectID The object the material is applied to
|
||||||
@return True if the material proxy was added (false typically means the record already exists)
|
@return True if the material proxy was added (false typically means the record already exists)
|
||||||
*/
|
*/
|
||||||
bool addMaterialProxy(const speckle::database::BIMIndex& materialIndex, const speckle::database::BIMRecordID& objectID) override;
|
bool addFinishProxy(const speckle::database::BIMIndex& materialIndex, const speckle::database::BIMRecordID& objectID) override;
|
||||||
#ifdef ARCHICAD
|
|
||||||
/*!
|
/*!
|
||||||
Add a ModelerAPI material to the collection (NB: These are not persistent so need to be captured by this method)
|
Add a ModelerAPI material to the collection (NB: These are not persistent so need to be captured by this method)
|
||||||
@param material A material
|
@param finish A finish
|
||||||
@param objectID The object the material is applied to
|
@param objectID The object the material is applied to
|
||||||
@return True if the material proxy was added (false typically means the record already exists)
|
@return True if the material proxy was added (false typically means the record already exists)
|
||||||
*/
|
*/
|
||||||
bool addMaterialProxy(const ModelerAPI::Material& material, const speckle::database::BIMRecordID& objectID) override;
|
bool addFinishProxy(const speckle::record::attribute::Finish& finish, const speckle::database::BIMRecordID& objectID) override;
|
||||||
#endif
|
|
||||||
|
|
||||||
// MARK: - Serialisation
|
// MARK: - Serialisation
|
||||||
|
|
||||||
@@ -101,11 +101,9 @@ namespace connector::record {
|
|||||||
std::unique_ptr<active::serialise::Management> m_management;
|
std::unique_ptr<active::serialise::Management> m_management;
|
||||||
///Finish proxies accumulated from meshes generated from the collection elements
|
///Finish proxies accumulated from meshes generated from the collection elements
|
||||||
FinishProxies m_finishProxies;
|
FinishProxies m_finishProxies;
|
||||||
#ifdef ARCHICAD
|
|
||||||
class FinishCache;
|
class FinishCache;
|
||||||
///Finishes cached from ModelerAPI materials
|
///Finishes cache
|
||||||
std::unique_ptr<FinishCache> m_finishes;
|
std::unique_ptr<FinishCache> m_finishes;
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
/*!
|
|
||||||
Copyright 2024 Ralph Wessel and Hugh Wessel
|
|
||||||
Distributed under the MIT License (See accompanying file LICENSE.txt or copy at https://opensource.org/license/mit/)
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Connector/Record/Model/CardMover.h"
|
#include "Connector/Record/Model/CardMover.h"
|
||||||
|
|
||||||
#include "Connector/Record/Model/ReceiverModelCard.h"
|
#include "Connector/Record/Model/ReceiverModelCard.h"
|
||||||
#include "Connector/Record/Model/SenderModelCard.h"
|
#include "Connector/Record/Model/SenderModelCard.h"
|
||||||
|
|
||||||
|
using namespace active::serialise;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
@@ -37,7 +33,7 @@ namespace {
|
|||||||
}
|
}
|
||||||
|
|
||||||
///The handler for model card packages
|
///The handler for model card packages
|
||||||
std::shared_ptr<active::serialise::Handler> CardMover::m_handler = std::make_shared<active::serialise::Handler>(attributeTag);
|
std::shared_ptr<Handler> CardMover::m_handler = std::make_shared<Handler>(attributeTag);
|
||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
|
|||||||
@@ -6,10 +6,10 @@
|
|||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Wrapper to box/unbox objects during (de)serialisation, including reading/writing a specified attribute to determine object type
|
Wrapper to box/unbox model cards during (de)serialisation
|
||||||
|
|
||||||
Note that a derived class could also define the package handler, allowing the wrapper to be created via a default constructor that is
|
Model cards are polymorphic - this class ensures the type information is included when a card is serialised
|
||||||
automatically bound to a set of internally defined object types
|
and the correct object type is constructed on deserialisation
|
||||||
*/
|
*/
|
||||||
class CardMover : public active::serialise::Mover {
|
class CardMover : public active::serialise::Mover {
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CONNECTOR_RECORD_ARCHICAD_EVERYTHING_FILTER
|
#ifndef CONNECTOR_RECORD_ARCHICAD_EVERYTHING_FILTER
|
||||||
#define CONNECTOR_RECORD_ARCHICAD_EVERYTHING_FILTER
|
#define CONNECTOR_RECORD_ARCHICAD_EVERYTHING_FILTER
|
||||||
|
|
||||||
#include "Connector/Database/Identity/RecordID.h"
|
#include "Speckle/Database/Identity/RecordID.h"
|
||||||
#include "Connector/Record/Model/Filter/EverythingSendFilter.h"
|
#include "Connector/Record/Model/Filter/EverythingSendFilter.h"
|
||||||
|
|
||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CONNECTOR_RECORD_ARCHICAD_SELECTION_FILTER
|
#ifndef CONNECTOR_RECORD_ARCHICAD_SELECTION_FILTER
|
||||||
#define CONNECTOR_RECORD_ARCHICAD_SELECTION_FILTER
|
#define CONNECTOR_RECORD_ARCHICAD_SELECTION_FILTER
|
||||||
|
|
||||||
#include "Connector/Database/Identity/RecordID.h"
|
#include "Speckle/Database/Identity/RecordID.h"
|
||||||
#include "Connector/Record/Model/Filter/DirectSelectionSendFilter.h"
|
#include "Connector/Record/Model/Filter/DirectSelectionSendFilter.h"
|
||||||
|
|
||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
using namespace connector::database;
|
using namespace speckle::database;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
@@ -56,7 +56,7 @@ Cargo::Unique DirectSelectionSendFilter::getCargo(const Inventory::Item& item) c
|
|||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
switch (item.index) {
|
switch (item.index) {
|
||||||
case selectedElemID:
|
case selectedElemID:
|
||||||
return std::make_unique<ContainerWrap<ElementIDList>>(m_selectedElements);
|
return std::make_unique<ContainerWrap<BIMRecordIDList>>(m_selectedElements, false, fieldID[selectedElemID].name);
|
||||||
default:
|
default:
|
||||||
return nullptr; //Requested an unknown index
|
return nullptr; //Requested an unknown index
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CONNECTOR_RECORD_DIRECT_SELECT_SEND_FILTER
|
#ifndef CONNECTOR_RECORD_DIRECT_SELECT_SEND_FILTER
|
||||||
#define CONNECTOR_RECORD_DIRECT_SELECT_SEND_FILTER
|
#define CONNECTOR_RECORD_DIRECT_SELECT_SEND_FILTER
|
||||||
|
|
||||||
#include "Connector/Database/Identity/RecordID.h"
|
#include "Speckle/Database/Identity/RecordID.h"
|
||||||
#include "Connector/Record/Model/Filter/SendFilter.h"
|
#include "Connector/Record/Model/Filter/SendFilter.h"
|
||||||
|
|
||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
@@ -32,11 +32,17 @@ namespace connector::record {
|
|||||||
|
|
||||||
// MARK: - Functions (const)
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Determine if the send filter contains a specified record ID
|
||||||
|
@param recordID The record ID to search for
|
||||||
|
@return True if the filter contains the record ID
|
||||||
|
*/
|
||||||
|
virtual bool contains(const speckle::database::BIMRecordID& recordID) const override { return m_selectedElements.contains(recordID); }
|
||||||
/*!
|
/*!
|
||||||
Get the filtered element IDs
|
Get the filtered element IDs
|
||||||
@return The filter elements
|
@return The filter elements
|
||||||
*/
|
*/
|
||||||
const database::ElementIDList& getElementIDs() const override { return m_selectedElements; }
|
const speckle::database::BIMRecordIDList& getElementIDs() const override { return m_selectedElements; }
|
||||||
|
|
||||||
// MARK: - Serialisation
|
// MARK: - Serialisation
|
||||||
|
|
||||||
@@ -59,7 +65,7 @@ namespace connector::record {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
///A list of selected element IDs
|
///A list of selected element IDs
|
||||||
database::ElementIDList m_selectedElements;
|
speckle::database::BIMRecordIDList m_selectedElements;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
using namespace connector::database;
|
using namespace speckle::database;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ Cargo::Unique EverythingSendFilter::getCargo(const Inventory::Item& item) const
|
|||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
switch (item.index) {
|
switch (item.index) {
|
||||||
case selectedElemID:
|
case selectedElemID:
|
||||||
return std::make_unique<ContainerWrap<ElementIDList>>(m_emptyList);
|
return std::make_unique<ContainerWrap<BIMRecordIDList>>(m_emptyList);
|
||||||
default:
|
default:
|
||||||
return nullptr; //Requested an unknown index
|
return nullptr; //Requested an unknown index
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CONNECTOR_RECORD_EVERYTHING_SEND_FILTER
|
#ifndef CONNECTOR_RECORD_EVERYTHING_SEND_FILTER
|
||||||
#define CONNECTOR_RECORD_EVERYTHING_SEND_FILTER
|
#define CONNECTOR_RECORD_EVERYTHING_SEND_FILTER
|
||||||
|
|
||||||
#include "Connector/Database/Identity/RecordID.h"
|
#include "Speckle/Database/Identity/RecordID.h"
|
||||||
#include "Connector/Record/Model/Filter/SendFilter.h"
|
#include "Connector/Record/Model/Filter/SendFilter.h"
|
||||||
|
|
||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
@@ -32,17 +32,23 @@ namespace connector::record {
|
|||||||
|
|
||||||
// MARK: - Functions (const)
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Determine if the send filter contains a specified record ID
|
||||||
|
@param recordID The record ID to search for
|
||||||
|
@return True if the filter contains the record ID
|
||||||
|
*/
|
||||||
|
virtual bool contains(const speckle::database::BIMRecordID& recordID) const override { return true; }
|
||||||
/*!
|
/*!
|
||||||
Get the filtered element IDs
|
Get the filtered element IDs
|
||||||
@return The filter elements
|
@return The filter elements
|
||||||
*/
|
*/
|
||||||
const database::ElementIDList& getElementIDs() const override { return m_emptyList; }
|
const speckle::database::BIMRecordIDList& getElementIDs() const override { return m_emptyList; }
|
||||||
/*!
|
/*!
|
||||||
Determine if the filter has expired because an element in the selection has changed
|
Determine if the filter has expired because an element in the selection has changed
|
||||||
@param changed The list of changed element IDs
|
@param changed The list of changed element IDs
|
||||||
@return True if the one of the changed elements is in the selection
|
@return True if the one of the changed elements is in the selection
|
||||||
*/
|
*/
|
||||||
virtual bool checkExpiry(const database::ElementIDList& changed) const override { return true; }
|
virtual bool checkExpiry(const speckle::database::BIMRecordIDList& changed) const override { return true; }
|
||||||
|
|
||||||
// MARK: - Serialisation
|
// MARK: - Serialisation
|
||||||
|
|
||||||
@@ -65,7 +71,7 @@ namespace connector::record {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
///Enables a const empty list to be returned
|
///Enables a const empty list to be returned
|
||||||
database::ElementIDList m_emptyList;
|
speckle::database::BIMRecordIDList m_emptyList;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
/*!
|
|
||||||
Copyright 2024 Ralph Wessel and Hugh Wessel
|
|
||||||
Distributed under the MIT License (See accompanying file LICENSE.txt or copy at https://opensource.org/license/mit/)
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Connector/Record/Model/Filter/FilterMover.h"
|
#include "Connector/Record/Model/Filter/FilterMover.h"
|
||||||
|
|
||||||
#include "Connector/Record/Model/Filter/ArchicadEverythingFilter.h"
|
#include "Connector/Record/Model/Filter/ArchicadEverythingFilter.h"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
using namespace connector::database;
|
using namespace speckle::database;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
|
|
||||||
@@ -34,12 +34,10 @@ namespace {
|
|||||||
|
|
||||||
return: True if the one of the changed elements is in the selection
|
return: True if the one of the changed elements is in the selection
|
||||||
--------------------------------------------------------------------*/
|
--------------------------------------------------------------------*/
|
||||||
bool SendFilter::checkExpiry(const ElementIDList& changed) const {
|
bool SendFilter::checkExpiry(const BIMRecordIDList& changed) const {
|
||||||
ElementIDList intersect;
|
BIMRecordIDList intersect;
|
||||||
ElementIDList mine{getElementIDs()}, theirs{changed};
|
BIMRecordIDList mine{getElementIDs()}, theirs{changed};
|
||||||
std::sort(mine.begin(), mine.end());
|
std::set_intersection(mine.begin(), mine.end(), theirs.begin(), theirs.end(), std::inserter(intersect, intersect.begin()));
|
||||||
std::sort(theirs.begin(), theirs.end());
|
|
||||||
std::set_intersection (mine.begin(), mine.end(), theirs.begin(), theirs.end(), std::back_inserter(intersect));
|
|
||||||
return !intersect.empty();
|
return !intersect.empty();
|
||||||
} //SendFilter::checkExpiry
|
} //SendFilter::checkExpiry
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
|
|
||||||
#include "Active/Serialise/Package/Package.h"
|
#include "Active/Serialise/Package/Package.h"
|
||||||
#include "Active/Utility/Cloner.h"
|
#include "Active/Utility/Cloner.h"
|
||||||
#include "Connector/Database/Identity/RecordID.h"
|
#include "Speckle/Database/Identity/RecordID.h"
|
||||||
|
#include "Speckle/Database/Identity/BIMRecordID.h"
|
||||||
#include "Speckle/Utility/String.h"
|
#include "Speckle/Utility/String.h"
|
||||||
|
|
||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
@@ -55,17 +56,23 @@ namespace connector::record {
|
|||||||
@return True if this is the default filter
|
@return True if this is the default filter
|
||||||
*/
|
*/
|
||||||
bool isDefault() const { return m_isDefault; };
|
bool isDefault() const { return m_isDefault; };
|
||||||
|
/*!
|
||||||
|
Determine if the send filter contains a specified record ID
|
||||||
|
@param recordID The record ID to search for
|
||||||
|
@return True if the filter contains the record ID
|
||||||
|
*/
|
||||||
|
virtual bool contains(const speckle::database::BIMRecordID& recordID) const = 0;
|
||||||
/*!
|
/*!
|
||||||
Get the filtered element IDs
|
Get the filtered element IDs
|
||||||
@return The filter elements
|
@return The filter elements
|
||||||
*/
|
*/
|
||||||
virtual const database::ElementIDList& getElementIDs() const = 0;
|
virtual const speckle::database::BIMRecordIDList& getElementIDs() const = 0;
|
||||||
/*!
|
/*!
|
||||||
Determine if the filter has expired because an element in the selection has changed
|
Determine if the filter has expired because an element in the selection has changed
|
||||||
@param changed The list of changed element IDs
|
@param changed The list of changed element IDs
|
||||||
@return True if the one of the changed elements is in the selection
|
@return True if the one of the changed elements is in the selection
|
||||||
*/
|
*/
|
||||||
virtual bool checkExpiry(const database::ElementIDList& changed) const;
|
virtual bool checkExpiry(const speckle::database::BIMRecordIDList& changed) const;
|
||||||
|
|
||||||
// MARK: - Serialisation
|
// MARK: - Serialisation
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,10 @@
|
|||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
A connector send filter
|
Base class for a Speckle model card
|
||||||
|
|
||||||
|
A model card captures key information about a model submitted to a Speckle server, e.g. the model ID, the target server
|
||||||
|
and account, and any settings or filters applicable to the host BIM application and open document
|
||||||
*/
|
*/
|
||||||
class ModelCard : public speckle::database::Record {
|
class ModelCard : public speckle::database::Record {
|
||||||
public:
|
public:
|
||||||
@@ -60,13 +63,13 @@ namespace connector::record {
|
|||||||
*/
|
*/
|
||||||
const speckle::utility::String& getModelID() const { return m_modelID; }
|
const speckle::utility::String& getModelID() const { return m_modelID; }
|
||||||
/*!
|
/*!
|
||||||
Get the setting type
|
Get the ID of the active BIM project
|
||||||
@return The setting type
|
@return The ID of the active BIM project
|
||||||
*/
|
*/
|
||||||
const speckle::utility::String& getProjectID() const { return m_projectID; }
|
const speckle::utility::String& getProjectID() const { return m_projectID; }
|
||||||
/*!
|
/*!
|
||||||
Get the setting type
|
Get the user account ID
|
||||||
@return The setting type
|
@return The user account ID
|
||||||
*/
|
*/
|
||||||
const speckle::utility::String& getAccountID() const { return m_accountID; }
|
const speckle::utility::String& getAccountID() const { return m_accountID; }
|
||||||
/*!
|
/*!
|
||||||
@@ -75,8 +78,8 @@ namespace connector::record {
|
|||||||
*/
|
*/
|
||||||
const speckle::utility::String& getMessage() const { return m_message; }
|
const speckle::utility::String& getMessage() const { return m_message; }
|
||||||
/*!
|
/*!
|
||||||
Get the setting type
|
Get the server URL
|
||||||
@return The setting type
|
@return The server URL
|
||||||
*/
|
*/
|
||||||
const speckle::utility::String& getServerURL() const { return m_serverURL; }
|
const speckle::utility::String& getServerURL() const { return m_serverURL; }
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -2,11 +2,12 @@
|
|||||||
|
|
||||||
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
#include "Active/Serialise/Item/Wrapper/ValueWrap.h"
|
||||||
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
#include "Active/Serialise/Package/Wrapper/ContainerWrap.h"
|
||||||
|
#include "Speckle/Database/Identity/BIMRecordID.h"
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
using namespace active::serialise;
|
using namespace active::serialise;
|
||||||
using namespace connector::database;
|
using namespace speckle::database;
|
||||||
using namespace connector::record;
|
using namespace connector::record;
|
||||||
using namespace speckle::database;
|
using namespace speckle::database;
|
||||||
using namespace speckle::utility;
|
using namespace speckle::utility;
|
||||||
@@ -81,7 +82,7 @@ Cargo::Unique ReceiverModelCard::getCargo(const Inventory::Item& item) const {
|
|||||||
case warningDismissedID:
|
case warningDismissedID:
|
||||||
return std::make_unique<BoolWrap>(m_hasDismissedUpdateWarning);
|
return std::make_unique<BoolWrap>(m_hasDismissedUpdateWarning);
|
||||||
case bakedObjectsID:
|
case bakedObjectsID:
|
||||||
return std::make_unique<ContainerWrap<ElementIDList>>(m_bakedObjectIDs);
|
return std::make_unique<ContainerWrap<BIMRecordIDList>>(m_bakedObjectIDs);
|
||||||
default:
|
default:
|
||||||
return nullptr; //Requested an unknown index
|
return nullptr; //Requested an unknown index
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CONNECTOR_RECORD_RECEIVER_MODEL_CARD
|
#ifndef CONNECTOR_RECORD_RECEIVER_MODEL_CARD
|
||||||
#define CONNECTOR_RECORD_RECEIVER_MODEL_CARD
|
#define CONNECTOR_RECORD_RECEIVER_MODEL_CARD
|
||||||
|
|
||||||
#include "Connector/Database/Identity/RecordID.h"
|
#include "Speckle/Database/Identity/BIMRecordID.h"
|
||||||
#include "Connector/Record/Model/ModelCard.h"
|
#include "Connector/Record/Model/ModelCard.h"
|
||||||
|
|
||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
@@ -37,7 +37,7 @@ namespace connector::record {
|
|||||||
const speckle::database::RecordID& modelID, const speckle::utility::String& modelName,
|
const speckle::database::RecordID& modelID, const speckle::utility::String& modelName,
|
||||||
const speckle::database::RecordID& selectedVersion, const speckle::database::RecordID& latestVersion,
|
const speckle::database::RecordID& selectedVersion, const speckle::database::RecordID& latestVersion,
|
||||||
const speckle::database::RecordID& accountID, const speckle::utility::String& serverURL,
|
const speckle::database::RecordID& accountID, const speckle::utility::String& serverURL,
|
||||||
bool hasDimissedWarning, database::ElementIDList&& bakedObjects, const SettingList& settings) :
|
bool hasDimissedWarning, speckle::database::BIMRecordIDList&& bakedObjects, const SettingList& settings) :
|
||||||
ModelCard{modelID, projectID, accountID, serverURL, settings},
|
ModelCard{modelID, projectID, accountID, serverURL, settings},
|
||||||
m_projectName{projectName}, m_modelName{modelName}, m_selectedVersionID{selectedVersion}, m_latestVersionID{latestVersion},
|
m_projectName{projectName}, m_modelName{modelName}, m_selectedVersionID{selectedVersion}, m_latestVersionID{latestVersion},
|
||||||
m_hasDismissedUpdateWarning{hasDimissedWarning}, m_bakedObjectIDs{bakedObjects} {}
|
m_hasDismissedUpdateWarning{hasDimissedWarning}, m_bakedObjectIDs{bakedObjects} {}
|
||||||
@@ -78,7 +78,7 @@ namespace connector::record {
|
|||||||
Get the IDs of objects accepted in the receive
|
Get the IDs of objects accepted in the receive
|
||||||
@return The accepted object IDs
|
@return The accepted object IDs
|
||||||
*/
|
*/
|
||||||
const database::ElementIDList& getBakedObjectIDs() const { return m_bakedObjectIDs; }
|
const speckle::database::BIMRecordIDList& getBakedObjectIDs() const { return m_bakedObjectIDs; }
|
||||||
|
|
||||||
// MARK: - Serialisation
|
// MARK: - Serialisation
|
||||||
|
|
||||||
@@ -111,7 +111,7 @@ namespace connector::record {
|
|||||||
///True if the user has already dismissed an alert to update
|
///True if the user has already dismissed an alert to update
|
||||||
bool m_hasDismissedUpdateWarning = false;
|
bool m_hasDismissedUpdateWarning = false;
|
||||||
///IDs of objects accepted in the receive
|
///IDs of objects accepted in the receive
|
||||||
database::ElementIDList m_bakedObjectIDs;
|
speckle::database::BIMRecordIDList m_bakedObjectIDs;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,18 @@ SenderModelCard::~SenderModelCard() {
|
|||||||
} //SenderModelCard::~SenderModelCard
|
} //SenderModelCard::~SenderModelCard
|
||||||
|
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------
|
||||||
|
Determine if the send filter contains a specified record ID
|
||||||
|
|
||||||
|
recordID: The record ID to search for
|
||||||
|
|
||||||
|
return: True if the filter contains the record ID
|
||||||
|
--------------------------------------------------------------------*/
|
||||||
|
bool SenderModelCard::contains(const speckle::database::BIMRecordID& recordID) const {
|
||||||
|
return m_filter->contains(recordID);
|
||||||
|
} //SenderModelCard::contains
|
||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
Fill an inventory with the package items
|
Fill an inventory with the package items
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
#define CONNECTOR_RECORD_SENDER_MODEL_CARD
|
#define CONNECTOR_RECORD_SENDER_MODEL_CARD
|
||||||
|
|
||||||
#include "Connector/Record/Model/ModelCard.h"
|
#include "Connector/Record/Model/ModelCard.h"
|
||||||
|
#include "Speckle/Database/Identity/BIMRecordID.h"
|
||||||
|
|
||||||
namespace connector::record {
|
namespace connector::record {
|
||||||
|
|
||||||
@@ -46,6 +47,12 @@ namespace connector::record {
|
|||||||
|
|
||||||
// MARK: - Functions (const)
|
// MARK: - Functions (const)
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Determine if the send filter contains a specified record ID
|
||||||
|
@param recordID The record ID to search for
|
||||||
|
@return True if the filter contains the record ID
|
||||||
|
*/
|
||||||
|
bool contains(const speckle::database::BIMRecordID& recordID) const;
|
||||||
/*!
|
/*!
|
||||||
Get the filter applied when the model was sent
|
Get the filter applied when the model was sent
|
||||||
@return The model filter
|
@return The model filter
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user