diff --git a/SpeckleConnector/Connector.vcxproj b/SpeckleConnector/Connector.vcxproj index 07a207b..8d103bb 100644 --- a/SpeckleConnector/Connector.vcxproj +++ b/SpeckleConnector/Connector.vcxproj @@ -93,8 +93,16 @@ + + + + + + + + @@ -103,16 +111,26 @@ + + + + + + + + + + 16.0 diff --git a/SpeckleConnector/Connector.vcxproj.filters b/SpeckleConnector/Connector.vcxproj.filters index df2dbf4..81e0bc0 100644 --- a/SpeckleConnector/Connector.vcxproj.filters +++ b/SpeckleConnector/Connector.vcxproj.filters @@ -26,6 +26,18 @@ {4e5d7206-9d4b-4edf-88c2-be7260f5e41e} + + {34a1ed7b-2f9f-4407-aba7-bf9830118593} + + + {2f459f56-86f0-4794-b4b7-1bd7b8ee5617} + + + {2820ad4f-60d9-436e-a7a2-d019d7e0ce0c} + + + {85935d00-16ac-466a-a614-ad9ea802bffa} + @@ -77,6 +89,30 @@ Connector\Interface\Browser\Bridge\Config + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Database\Model\Card + @@ -109,5 +145,35 @@ Connector\Interface\Browser\Bridge\Config + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector\Interface\Browser\Bridge\Base + + + Connector + + + Connector + + + Connector\Database\Model\Card + \ No newline at end of file diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/BaseBridge.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/BaseBridge.cpp index 6743e09..94c5127 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/BaseBridge.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/BaseBridge.cpp @@ -2,6 +2,7 @@ #include "Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.h" #include "Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.h" +#include "Connector/Interface/Browser/Bridge/Base/GetDocumentState.h" #include "Connector/Interface/Browser/Bridge/Base/GetSourceApplicationName.h" #include "Connector/Interface/Browser/Bridge/Base/GetSourceApplicationVersion.h" @@ -14,6 +15,7 @@ BaseBridge::BaseBridge() : BrowserBridge{"baseBinding"} { //Add bridge methods addMethod(); addMethod(); + addMethod(); addMethod(); addMethod(); } //BaseBridge::BaseBridge diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.cpp index 04d3581..ea196a9 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetConnectorVersion.cpp @@ -31,12 +31,7 @@ GetConnectorVersion::GetConnectorVersion() : JSBridgeMethod{"GetConnectorVersion --------------------------------------------------------------------*/ std::unique_ptr GetConnectorVersion::run() const { //Implement other platforms as required -#ifdef ARCHICAD - API_ServerApplicationInfo appInfo{}; - ACAPI_GetReleaseNumber(&appInfo); - //NB: Assuming only the main version number is required - can be extended if necessary - String result{active::utility::String{versionMajor} + "." + active::utility::String{versionMinor} + "." + - active::utility::String{versionPatch}}; + String result{active::utility::String{connector::versionMajor} + "." + active::utility::String{connector::versionMinor} + "." + + active::utility::String{connector::versionPatch}}; return std::make_unique(result); -#endif } //GetConnectorVersion::run diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp index 9a1ab1d..62093b1 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp @@ -30,6 +30,6 @@ GetDocumentInfo::GetDocumentInfo() : JSBridgeMethod{"GetDocumentInfo", [&]() { --------------------------------------------------------------------*/ std::unique_ptr GetDocumentInfo::run(void) const { ///TODO: Get the document info here - returning mocked values for now - DocumentInfo docInfo{"Somewhere", "Something", String{active::utility::Guid{}}}; + DocumentInfo docInfo{"Somewhere", "Something", String{active::utility::Guid{true}.operator active::utility::String()}}; return std::make_unique(docInfo); } //GetDocumentInfo::run diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.h index c564a3e..6ce0be8 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.h +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.h @@ -1,5 +1,5 @@ -#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_INFO -#define CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_INFO +#ifndef CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_STATE +#define CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_STATE #include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h" @@ -29,4 +29,4 @@ namespace connector::interfac::browser::bridge { } -#endif //CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_INFO +#endif //CONNECTOR_INTERFACE_BRIDGE_GET_DOCUMENT_STATE diff --git a/SpeckleConnector/Connector/Version.h b/SpeckleConnector/Connector/Version.h index f228a9a..89ca855 100644 --- a/SpeckleConnector/Connector/Version.h +++ b/SpeckleConnector/Connector/Version.h @@ -1,10 +1,14 @@ #ifndef CONNECTOR_VERSION #define CONNECTOR_VERSION -static const unsigned int versionMajor = 0; +namespace connector { -static const unsigned int versionMinor = 1; + static const unsigned int versionMajor = 0; -static const unsigned int versionPatch = 0; + static const unsigned int versionMinor = 1; + + static const unsigned int versionPatch = 0; + +} #endif //CONNECTOR_VERSION