diff --git a/SpeckleConnector/Connector.vcxproj b/SpeckleConnector/Connector.vcxproj index 97d064d..d421318 100644 --- a/SpeckleConnector/Connector.vcxproj +++ b/SpeckleConnector/Connector.vcxproj @@ -111,6 +111,10 @@ + + + + @@ -157,6 +161,10 @@ + + + + diff --git a/SpeckleConnector/Connector.vcxproj.filters b/SpeckleConnector/Connector.vcxproj.filters index b449f8a..be45e91 100644 --- a/SpeckleConnector/Connector.vcxproj.filters +++ b/SpeckleConnector/Connector.vcxproj.filters @@ -62,6 +62,9 @@ {0ac4b0a4-6a2a-4a48-9757-1172effc20e7} + + {6693f9a9-5ece-4853-b008-4064d1c551ab} + @@ -207,6 +210,18 @@ Connector\Record\Collection + + Connector\Interface\Browser\Bridge\Send\Arg + + + Connector\Interface\Browser\Bridge\Send\Arg + + + Connector\Interface\Browser\Bridge\Send\Arg + + + Connector\Interface\Browser\Bridge\Send\Arg + @@ -348,5 +363,17 @@ Connector\Record\Collection + + Connector\Interface\Browser\Bridge\Send\Arg + + + Connector\Interface\Browser\Bridge\Send\Arg + + + Connector\Interface\Browser\Bridge\Send\Arg + + + Connector\Interface\Browser\Bridge\Send\Arg + \ No newline at end of file diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp index 3d69108..ee41ff0 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp @@ -2,6 +2,7 @@ #include "Active/Serialise/CargoHold.h" #include "Connector/Connector.h" +#include "Connector/Database/ModelCardDatabase.h" #include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h" #include "Speckle/Environment/Project.h" #include "Speckle/Utility/Guid.h" @@ -37,8 +38,8 @@ std::unique_ptr GetDocumentInfo::run() const { docInfo->name = info.name; if (info.path) docInfo->location = *info.path; - //TODO: No suitable project ID is currently available - docInfo->ID = Guid{true}.operator String(); + if (auto cardDatabase = connector()->getModelCardDatabase(); cardDatabase != nullptr) + docInfo->ID = cardDatabase->getStoreID(); } return std::make_unique(std::move(docInfo)); } //GetDocumentInfo::run diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.cpp index c12a724..d84990b 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/ConversionResult.cpp @@ -2,6 +2,8 @@ #include "Active/Serialise/item/Wrapper/ValueWrap.h" +#include + using namespace active::serialise; using namespace connector::interfac::browser::bridge; using namespace speckle::utility; diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendError.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendError.cpp index a16a49b..9fdd5c7 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendError.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendError.cpp @@ -2,6 +2,8 @@ #include "Active/Serialise/item/Wrapper/ValueWrap.h" +#include + using namespace active::serialise; using namespace connector::interfac::browser::bridge; using namespace speckle::utility; diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendObject.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendObject.cpp index 7b8eb71..711da6d 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendObject.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendObject.cpp @@ -2,6 +2,8 @@ #include "Active/Serialise/Package/Wrapper/ContainerWrap.h" +#include + using namespace active::serialise; using namespace connector::interfac::browser::bridge; using namespace speckle::serialise; diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.cpp index 103d72f..78e6234 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Arg/SendViaBrowserArgs.cpp @@ -3,6 +3,8 @@ #include "Connector/Record/Model/ModelCard.h" #include "Speckle/Record/Credentials/Account.h" +#include + using namespace active::serialise; using namespace connector::record; using namespace connector::interfac::browser::bridge; diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp index 4fe5560..596eba4 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp @@ -61,7 +61,7 @@ void Send::run(const String& modelCardID) const { } //We currently collect all detached object serialised data into a memory-based store - in future may be able to batch send and cache locally DetachedMemoryStore detachedObjects; - auto result = std::make_unique(modelCard, account); + auto result = std::make_unique(*modelCard, *account); getBridge()->sendEvent("sendByBrowser", std::move(result)); } //Send::run diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj index 9f10ec3..ebc0063 100644 --- a/SpeckleLib/SpeckleLib17.vcxproj +++ b/SpeckleLib/SpeckleLib17.vcxproj @@ -67,6 +67,11 @@ + + + + + @@ -105,6 +110,9 @@ + + + diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters index 444eb0e..8f90a7c 100644 --- a/SpeckleLib/SpeckleLib17.vcxproj.filters +++ b/SpeckleLib/SpeckleLib17.vcxproj.filters @@ -77,6 +77,12 @@ {93db2ed5-fd21-4ed1-86ee-f549682f66a5} + + {e9aec552-0aa8-4193-867d-69febdf93139} + + + {cb77e795-e8d8-4e31-9773-dd32beb694d3} + @@ -244,6 +250,21 @@ Speckle\Database\Identity + + Speckle\Serialise\Detached + + + Speckle\Serialise\Detached + + + Speckle\Serialise\Detached + + + Speckle\Serialise\Detached\Storage + + + Speckle\Serialise\Detached\Storage + @@ -345,6 +366,15 @@ Speckle\Database\Identity + + Speckle\Serialise\Detached + + + Speckle\Serialise\Detached + + + Speckle\Serialise\Detached +