From 945fa86c7c22d6df1b96a1fab20f522b07ab2cd5 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Tue, 17 Sep 2024 16:20:08 +0100 Subject: [PATCH 01/19] SendFilters populated with class names via 'typeDiscriminator' --- .../Browser/Bridge/Send/GetSendFilters.cpp | 3 +- .../Record/Model/Filter/FilterMover.cpp | 41 ++++++++++--------- .../Record/Model/Filter/FilterMover.h | 7 +--- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.cpp index efddd60..26bf6d6 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.cpp @@ -5,6 +5,7 @@ #include "Active/Serialise/Package/Wrapper/ContainerWrap.h" #include "Active/Serialise/Package/Wrapper/PackageWrap.h" #include "Connector/Record/Model/Filter/ArchicadEverythingFilter.h" +#include "Connector/Record/Model/Filter/FilterMover.h" #include "Connector/Record/Model/Filter/ArchicadSelectionFilter.h" using namespace active::container; @@ -15,7 +16,7 @@ using namespace speckle::utility; namespace { - using WrappedValue = active::serialise::CargoHold>, Vector>; + using WrappedValue = active::serialise::CargoHold, FilterMover>, Vector>; } diff --git a/SpeckleConnector/Connector/Record/Model/Filter/FilterMover.cpp b/SpeckleConnector/Connector/Record/Model/Filter/FilterMover.cpp index a4f5c32..cd624ce 100644 --- a/SpeckleConnector/Connector/Record/Model/Filter/FilterMover.cpp +++ b/SpeckleConnector/Connector/Record/Model/Filter/FilterMover.cpp @@ -16,10 +16,25 @@ namespace { ///The tag used to identify a Speckle type name value const char* attributeTag = "typeDiscriminator"; - ///Identity for a SenderModelCard - const char* ArchicadSelectionTypeName = "ArchicadSelectionFilter"; - ///Identity for a SenderModelCard + ///Identity for selecting everything const char* ArchicadEverythingTypeName = "ArchicadEverythingFilter"; + ///Identity for a selection filter + const char* ArchicadSelectionTypeName = "ArchicadSelectionFilter"; + + /*-------------------------------------------------------------------- + Ensure the handler is populated + + handler: The filter handler to validate + + return: A reference to the handler + --------------------------------------------------------------------*/ + std::shared_ptr& validateHandler(std::shared_ptr& handler) { + if (!handler->empty()) + return handler; + handler->add(ArchicadEverythingTypeName); + handler->add(ArchicadSelectionTypeName); + return handler; + } //validateHandler } @@ -32,8 +47,7 @@ std::shared_ptr FilterMover::m_handler = std::make_s handler: A package handler to reconstruct incoming packages --------------------------------------------------------------------*/ -FilterMover::FilterMover() : Mover{m_handler} { - validateHandler(); +FilterMover::FilterMover() : Mover{validateHandler(m_handler)} { } //FilterMover::FilterMover @@ -42,8 +56,7 @@ FilterMover::FilterMover() : Mover{m_handler} { outgoing: An outgoing package --------------------------------------------------------------------*/ -FilterMover::FilterMover(const active::serialise::Package& outgoing) : Mover{outgoing, m_handler} { - validateHandler(); +FilterMover::FilterMover(const active::serialise::Package& outgoing) : Mover{outgoing, validateHandler(m_handler)} { } //FilterMover::FilterMover @@ -52,17 +65,5 @@ FilterMover::FilterMover(const active::serialise::Package& outgoing) : Mover{out package: A reference to the member variable --------------------------------------------------------------------*/ -FilterMover::FilterMover(active::serialise::PackageUniqueWrap&& package) : Mover{std::move(package), m_handler} { - +FilterMover::FilterMover(active::serialise::PackageUniqueWrap&& package) : Mover{std::move(package), validateHandler(m_handler)} { } //FilterMover::FilterMover - - -/*-------------------------------------------------------------------- - Ensure the handler is populated - --------------------------------------------------------------------*/ -void FilterMover::validateHandler() { - if (!m_handler->empty()) - return; - m_handler->add(ArchicadEverythingTypeName); - m_handler->add(ArchicadSelectionTypeName); -} //FilterMover::validateHandler diff --git a/SpeckleConnector/Connector/Record/Model/Filter/FilterMover.h b/SpeckleConnector/Connector/Record/Model/Filter/FilterMover.h index dc326a1..eade628 100644 --- a/SpeckleConnector/Connector/Record/Model/Filter/FilterMover.h +++ b/SpeckleConnector/Connector/Record/Model/Filter/FilterMover.h @@ -37,12 +37,7 @@ namespace connector::record { FilterMover(active::serialise::PackageUniqueWrap&& package); private: - /*! - Ensure the handler is populated - */ - static void validateHandler(); - - ///The handler for model card packages + ///The handler for model filter packages static std::shared_ptr m_handler; }; From 4fadcaf466e6f509c1ba6b2d874fc4bad80df934 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Wed, 18 Sep 2024 15:48:20 +0100 Subject: [PATCH 02/19] Added Project class Addon class now manages an active project instance that can be accessed with getActiveProject GetDocumentInfo now uses information extracted from the active project Updated ProjectSubscriber and ProjectEvent accordingly "Send" bridge method now throws exception reporting no selected elements (placeholder until we implement a real send process) --- .../Connector.xcodeproj/project.pbxproj | 2 +- .../Browser/Bridge/Base/GetDocumentInfo.cpp | 11 ++- .../Interface/Browser/Bridge/Send/Send.cpp | 4 +- .../Record/Model/Filter/SendFilter.cpp | 4 +- SpeckleConnector/RINT/Connector.grc | 5 +- SpeckleLib/RINT/Speckle.grc | 4 + .../DocumentStore/DocumentStoreCore.cpp | 16 ++-- SpeckleLib/Speckle/Environment/Addon.cpp | 78 ++++++++++++++++--- SpeckleLib/Speckle/Environment/Addon.h | 38 ++++++--- SpeckleLib/Speckle/Environment/Project.cpp | 67 ++++++++++++++++ SpeckleLib/Speckle/Environment/Project.h | 69 ++++++++++++++++ .../Event/Subscriber/ProjectSubscriber.h | 5 +- .../Speckle/Event/Type/ProjectEvent.cpp | 38 +++++++++ SpeckleLib/Speckle/Event/Type/ProjectEvent.h | 38 ++++++++- SpeckleLib/Speckle/SpeckleResource.h | 44 +++++++++++ .../SpeckleLib.xcodeproj/project.pbxproj | 24 ++++++ 16 files changed, 405 insertions(+), 42 deletions(-) create mode 100644 SpeckleLib/RINT/Speckle.grc create mode 100644 SpeckleLib/Speckle/Environment/Project.cpp create mode 100644 SpeckleLib/Speckle/Environment/Project.h create mode 100644 SpeckleLib/Speckle/Event/Type/ProjectEvent.cpp create mode 100755 SpeckleLib/Speckle/SpeckleResource.h diff --git a/SpeckleConnector/Connector.xcodeproj/project.pbxproj b/SpeckleConnector/Connector.xcodeproj/project.pbxproj index 11398cd..695b45b 100644 --- a/SpeckleConnector/Connector.xcodeproj/project.pbxproj +++ b/SpeckleConnector/Connector.xcodeproj/project.pbxproj @@ -1365,7 +1365,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "mkdir -p \"$HEADER_PATH_3/ResourceObjects\"\npython3 \"$HEADER_PATH_5/Tools/CompileResources.py\" INT \"$HEADER_PATH_5/..\" \"$HEADER_PATH_6\" \"$SRCROOT\" \"$HEADER_PATH_3/ResourceObjects\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/Resources\"\ncp \"$HEADER_PATH_5/Inc/PkgInfo\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/PkgInfo\"\ntouch \"$HEADER_PATH_3/ResourceObjects/AddOnResources.stamp\"\n"; + shellScript = "mkdir -p \"$HEADER_PATH_6/ResourceObjects\"\npython3 \"$HEADER_PATH_5/Tools/CompileResources.py\" INT \"$HEADER_PATH_5/..\" \"$HEADER_PATH_6\" \"$SRCROOT\" \"$HEADER_PATH_6/ResourceObjects\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/Resources\"\npython3 \"$HEADER_PATH_5/Tools/CompileResources.py\" INT \"$HEADER_PATH_5/..\" \"$HEADER_PATH_3\" \"$SRCROOT\" \"$HEADER_PATH_6/ResourceObjects\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/Resources\"\ncp \"$HEADER_PATH_5/Inc/PkgInfo\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/PkgInfo\"\ntouch \"$HEADER_PATH_6/ResourceObjects/AddOnResources.stamp\"\n"; }; 213CC3A12B1101F500088049 /* Install */ = { isa = PBXShellScriptBuildPhase; diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp index 5c4a9a9..0154aef 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp @@ -1,7 +1,9 @@ #include "Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.h" #include "Active/Serialise/CargoHold.h" +#include "Connector/Connector.h" #include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h" +#include "Speckle/Environment/Project.h" using namespace active::container; using namespace active::serialise; @@ -29,6 +31,13 @@ GetDocumentInfo::GetDocumentInfo() : BridgeMethod{"GetDocumentInfo", [&]() { --------------------------------------------------------------------*/ std::unique_ptr GetDocumentInfo::run() const { ///TODO: Get the document info here - returning mocked values for now - DocumentInfo docInfo{"Somewhere", "Something", String{active::utility::Guid{true}.operator active::utility::String()}}; + DocumentInfo docInfo; + if (auto project = connector()->getActiveProject().lock(); project) { + auto info = project->getInfo(); + docInfo.name = info.name; + if (info.path) + docInfo.location = *info.path; + //TODO: No suitable project ID is currently available + } return std::make_unique(docInfo); } //GetDocumentInfo::run diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp index 12ce6ed..b0278b3 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp @@ -2,6 +2,7 @@ #include "Active/Serialise/CargoHold.h" #include "Active/Serialise/Package/Wrapper/PackageWrap.h" +#include "Speckle/Utility/Exception.h" using namespace active::serialise; using namespace connector::interfac::browser::bridge; @@ -21,5 +22,6 @@ Send::Send() : BridgeMethod{"Send", [&](UpdateArgs args) { modelCardID: The ID of the madel to send --------------------------------------------------------------------*/ void Send::run(const String& modelCardID) const { - ///TODO: Send the requested model + ///TODO: Find and send selected elements - the following is a placeholder + throw Exception{"No objects were found to convert. Please update your publish filter!"}; } //Send::run diff --git a/SpeckleConnector/Connector/Record/Model/Filter/SendFilter.cpp b/SpeckleConnector/Connector/Record/Model/Filter/SendFilter.cpp index c624d96..81e2bf2 100644 --- a/SpeckleConnector/Connector/Record/Model/Filter/SendFilter.cpp +++ b/SpeckleConnector/Connector/Record/Model/Filter/SendFilter.cpp @@ -56,8 +56,8 @@ bool SendFilter::fillInventory(Inventory& inventory) const { inventory.merge(Inventory{ { { fieldID[nameID], nameID, element }, - { fieldID[summaryID], summaryID, element }, - { fieldID[defaultID], defaultID, element }, + { fieldID[summaryID], summaryID, element, !m_summary.empty() }, + { fieldID[defaultID], defaultID, element, m_isDefault }, }, }.withType(&typeid(SendFilter))); return true; diff --git a/SpeckleConnector/RINT/Connector.grc b/SpeckleConnector/RINT/Connector.grc index 20de2c7..0d04b7f 100644 --- a/SpeckleConnector/RINT/Connector.grc +++ b/SpeckleConnector/RINT/Connector.grc @@ -1,4 +1,3 @@ -'STR#' 32600 "Title strings" { -/* [ 1] */ "Speckle Connector" -/* [ 2] */ "Connector to share model content with Speckle" +'STR#' 32700 "Title strings" { +/* [ 1] */ "Untitled" } diff --git a/SpeckleLib/RINT/Speckle.grc b/SpeckleLib/RINT/Speckle.grc new file mode 100644 index 0000000..20de2c7 --- /dev/null +++ b/SpeckleLib/RINT/Speckle.grc @@ -0,0 +1,4 @@ +'STR#' 32600 "Title strings" { +/* [ 1] */ "Speckle Connector" +/* [ 2] */ "Connector to share model content with Speckle" +} diff --git a/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp b/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp index 84e653e..11b81ac 100644 --- a/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp +++ b/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp @@ -4,6 +4,7 @@ #include "Active/Utility/Memory.h" #include "Active/Utility/String.h" #include "Speckle/Environment/Addon.h" +#include "Speckle/Environment/Project.h" #include "Speckle/Event/Type/DocStoreMergeEvent.h" #include "Speckle/Event/Type/ProjectEvent.h" #include "Speckle/Utility/Guid.h" @@ -174,18 +175,17 @@ bool DocumentStoreCore::handle(const DocStoreMergeEvent& event) { return: True if the event should be closed --------------------------------------------------------------------*/ bool DocumentStoreCore::handle(const event::ProjectEvent& event) { -#ifdef ARCHICAD + using enum ProjectEvent::Type; switch (event.getType()) { - case APINotify_Close: + case close: resetStore(); //Wipe the cache, forcing a full reload when the data is requested again (after a project is opened) break; - case APINotify_PreSave: case APINotify_SendChanges: + case presave: case send: writeStore(); //Ensure the data is stored with the save/send break; default: break; } -#endif return false; } //DocumentStoreCore::handle @@ -221,6 +221,10 @@ active::utility::Memory DocumentStoreCore::readStore() const { --------------------------------------------------------------------*/ void DocumentStoreCore::writeStore() { #ifdef ARCHICAD + auto activeProject = addon()->getActiveProject(); + bool shared = false; + if (auto project = activeProject.lock(); project && project->getInfo().isShared) + shared = true; //Ensure a suitable data store exists if (!isExistingStore(m_id)) { //Create when missing @@ -230,7 +234,7 @@ void DocumentStoreCore::writeStore() { m_id.id = Guid{acID}; } //Reserve the storage object in TW - if (addon()->isSharedDocument()) { + if (shared) { GS::HashTable conflicts; if (auto statusCode = convertArchicadError(ACAPI_AddOnObject_ReserveObjects({Guid{m_id.id}}, &conflicts)); statusCode != nominal) throw std::system_error(makeError(statusCode)); @@ -244,7 +248,7 @@ void DocumentStoreCore::writeStore() { if (auto statusCode = convertArchicadError(ACAPI_AddOnObject_ModifyObject(Guid{m_id.id}, nullptr, &output)); statusCode != nominal) throw std::system_error(makeError(statusCode)); //Release the storage object in TW - if (addon()->isSharedDocument()) { + if (shared) { if (auto statusCode = convertArchicadError(ACAPI_AddOnObject_ReleaseObjects({Guid{m_id.id}})); statusCode != nominal) throw std::system_error(makeError(statusCode)); } diff --git a/SpeckleLib/Speckle/Environment/Addon.cpp b/SpeckleLib/Speckle/Environment/Addon.cpp index 015e643..1714805 100644 --- a/SpeckleLib/Speckle/Environment/Addon.cpp +++ b/SpeckleLib/Speckle/Environment/Addon.cpp @@ -1,10 +1,16 @@ #include "Speckle/Environment/Addon.h" +#include "Speckle/Environment/Project.h" +#include "Speckle/Event/Type/ProjectEvent.h" + +#include + #ifdef ARCHICAD #include #endif using namespace speckle::environment; +using namespace speckle::event; using namespace speckle::utility; namespace { @@ -52,19 +58,15 @@ String Addon::getLocalString(short itemIndex, short resourceIndex) const { /*-------------------------------------------------------------------- - Determine if the active document is shared (in collaborative environments) + Get the active project - return: True if the active document is shared + return: The active project (nullptr = no open project) --------------------------------------------------------------------*/ -bool Addon::isSharedDocument() const { -#ifdef ARCHICAD - API_ProjectInfo pi{}; - ACAPI_ProjectOperation_Project(&pi); - return pi.teamwork; -#else - return false; -#endif -} //Addon::isSharedDocument +std::weak_ptr Addon::getActiveProject() const { + if (m_activeProject) + return m_activeProject; + return std::weak_ptr{}; +} //Addon::getActiveProject /*-------------------------------------------------------------------- @@ -76,7 +78,9 @@ void Addon::publishExternal(const active::event::Event& event) { if (!logCallback()) return; try { + preprocessEvent(event); publish(event); + postprocessEvent(event); } catch (...) { //Add error logging in future } @@ -147,7 +151,7 @@ speckle::environment::Addon* speckle::environment::addon() { return: True if the callback can continue (false on error) --------------------------------------------------------------------*/ -bool speckle::environment::Addon::logCallback(bool initialise) { +bool Addon::logCallback(bool initialise) { if (initialise) m_callDepth = 1; else @@ -162,3 +166,53 @@ bool speckle::environment::Addon::logCallback(bool initialise) { } return true; } //Addon::publishExternalEvent + + +/*-------------------------------------------------------------------- + Preprocess an external event (allowing key add-on operations to act before other subscribers) + + event: An incoming event + + return: True if the event should be closed, i.e. not passed to other subscribers + --------------------------------------------------------------------*/ +bool Addon::preprocessEvent(const active::event::Event& event) { + if (auto projectEvent = dynamic_cast(&event); projectEvent != nullptr) { + using enum ProjectEvent::Type; + switch (projectEvent->getType()) { + case newDocument: case newAndReset: case open: + m_activeProject = makeProject(); //Ensure a project object is available + default: + break; + } + } + return false; +} //Addon::preprocessEvent + + +/*-------------------------------------------------------------------- + Postprocess an external event (allowing key add-on operations to act after all other subscribers are complete) + + event: An incoming (completed) event + --------------------------------------------------------------------*/ +void Addon::postprocessEvent(const active::event::Event& event) { + if (auto projectEvent = dynamic_cast(&event); projectEvent != nullptr) { + using enum ProjectEvent::Type; + switch (projectEvent->getType()) { + case close: case quit: + m_activeProject.reset(); //Release the active project on close/quit + default: + break; + } + } +} //Addon::postprocessEvent + + +/*-------------------------------------------------------------------- + Make a new new project. Allows Addon subclasses to define a Project subclass with additional functions/databases + + return: A new project instance + --------------------------------------------------------------------*/ +std::shared_ptr Addon::makeProject() const { + auto project = new Project; //make_shared can't use protected constructor + return std::shared_ptr{project}; +} //Addon::makeProject diff --git a/SpeckleLib/Speckle/Environment/Addon.h b/SpeckleLib/Speckle/Environment/Addon.h index 7f52e71..bc0ea7b 100644 --- a/SpeckleLib/Speckle/Environment/Addon.h +++ b/SpeckleLib/Speckle/Environment/Addon.h @@ -5,7 +5,9 @@ #include "Speckle/Utility/String.h" namespace speckle::environment { - + + class Project; + /*! A base class for an addon */ @@ -19,11 +21,7 @@ namespace speckle::environment { @param identity Optional name/ID for the subscriber */ Addon(const active::utility::NameID& identity); - /*! - Copy constructor - @param source The object to copy - */ - Addon(const App& source) : App{source} {} + Addon(const App&) = delete; /*! Destructor */ @@ -39,10 +37,10 @@ namespace speckle::environment { */ speckle::utility::String getLocalString(short itemIndex, short resourceIndex) const; /*! - Determine if the active document is shared (in collaborative environments) - @return True if the active document is shared + Get the active project + @return The active project (nullptr = no open project) */ - bool isSharedDocument() const; + std::weak_ptr getActiveProject() const; // MARK: - Functions (mutating) @@ -50,7 +48,7 @@ namespace speckle::environment { Set the add-on name @param nm The add-on name */ - void setName(const speckle::utility::String& nm) { name = nm; } + void setName(const speckle::utility::String& nm) { App::name = nm; } /*! Publish an event from an external source to subscribers @param event The event to publish @@ -75,6 +73,7 @@ namespace speckle::environment { Shut down event handling */ void stop() override; + protected: /*! Log a callback into the add-on (allows checking of re-entry) @@ -82,8 +81,27 @@ namespace speckle::environment { @return True if the callback can continue (false on error) */ bool logCallback(bool initialise = true); + /*! + Preprocess an external event (allowing key add-on operations to act before other subscribers) + @param event An incoming event + @return True if the event should be closed, i.e. not passed to other subscribers + */ + virtual bool preprocessEvent(const active::event::Event& event); + /*! + Postprocess an external event (allowing key add-on operations to act after all other subscribers are complete) + @param event An incoming (completed) event + */ + virtual void postprocessEvent(const active::event::Event& event); + /*! + Make a new new project. Allows Addon subclasses to define a Project subclass with additional functions/databases + @return A new project instance + */ + virtual std::shared_ptr makeProject() const; private: + ///The active project + std::shared_ptr m_activeProject; + ///The depth of nested callbacks - the root call starts at depth 0 (important for some entry-point initialisation) uint32_t m_callDepth = 0; }; diff --git a/SpeckleLib/Speckle/Environment/Project.cpp b/SpeckleLib/Speckle/Environment/Project.cpp new file mode 100644 index 0000000..ead4930 --- /dev/null +++ b/SpeckleLib/Speckle/Environment/Project.cpp @@ -0,0 +1,67 @@ +#include "Speckle/Environment/Project.h" + +#include "Speckle/Environment/Addon.h" +#include "Speckle/SpeckleResource.h" + +#ifdef ARCHICAD +#include +#endif + +using namespace speckle::environment; +using namespace speckle::utility; + +namespace { + +} + +/*-------------------------------------------------------------------- + Constructor (NB: this object is assumed to be the active instance) + + identity: Optional name/ID for the subscriber + --------------------------------------------------------------------*/ +Project::Project() { +} //Project::Project + + +/*-------------------------------------------------------------------- + Destructor + --------------------------------------------------------------------*/ +Project::~Project() { +} //Project::~Project + + +/*-------------------------------------------------------------------- + Get information about the project + + return: Project information + --------------------------------------------------------------------*/ +Project::Info Project::getInfo() const { + //Start with an untitled project - this will be replaced if a saved project is active + Info result{addon()->getLocalString(titleStringLib, untitledProjectID)}; +#ifdef ARCHICAD + API_ProjectInfo projectInfo; + if (ACAPI_ProjectOperation_Project(&projectInfo) == NoError) { + if (projectInfo.projectName != nullptr) + result.name = *projectInfo.projectName; + result.isShared = projectInfo.teamwork; + if (projectInfo.teamwork) { + if (projectInfo.projectPath != nullptr) + result.path = String{*projectInfo.projectPath}; + else if (projectInfo.location_team != nullptr) { + GS::UniString path; + if (projectInfo.location_team->ToPath(&path) == NoError) + result.path = String{path}; + } + } else { + if (projectInfo.projectPath != nullptr) + result.path = String{*projectInfo.projectPath}; + else if (projectInfo.location != nullptr) { + GS::UniString path; + if (projectInfo.location->ToPath(&path) == NoError) + result.path = String{path}; + } + } + } +#endif + return result; +} //Project::getInfo diff --git a/SpeckleLib/Speckle/Environment/Project.h b/SpeckleLib/Speckle/Environment/Project.h new file mode 100644 index 0000000..1aac39b --- /dev/null +++ b/SpeckleLib/Speckle/Environment/Project.h @@ -0,0 +1,69 @@ +#ifndef SPECKLE_ENVIRONMENT_PROJECT +#define SPECKLE_ENVIRONMENT_PROJECT + +#include "Active/File/Path.h" +#include "Speckle/Utility/String.h" + +namespace speckle::environment { + + class Addon; + + /*! + A BIM project + + This class is currently skeletal, but is intended to be the primnary conduit for any document-based data, e.g. elements, attributes, properties + etc. Any databases managing document-based content should be retrieved from this class rather than Add-on (or subclasses) or static functions. + */ + class Project { + public: + + // MARK: - Types + + ///Shared pointer + using Shared = std::shared_ptr; + ///Weak pointer + using Weak = std::weak_ptr; + ///Project information + struct Info { + //The project name + utility::String name; + //The project ID + utility::String ID; + //Either local path or server URL where the project is stored (nullopt if memory-based only, i.e. unsaved) + active::file::Path::Option path; + //True if the project is shared (cloud-based) + bool isShared = false; + }; + + // MARK: - Constructors + + Project(const Project&) = delete; + /*! + Destructor + */ + ~Project(); + + // MARK: - Functions (const) + + /*! + Get information about the project + @return Project information + */ + Info getInfo() const; + + // MARK: - Functions (mutating) + + protected: + friend class speckle::environment::Addon; + + /*! + Default constructor + + NB: Only the Addon class can create projects. Clients can get the active project from the running add-on. + */ + Project(); + }; + +} + +#endif //SPECKLE_ENVIRONMENT_PROJECT diff --git a/SpeckleLib/Speckle/Event/Subscriber/ProjectSubscriber.h b/SpeckleLib/Speckle/Event/Subscriber/ProjectSubscriber.h index 60096ca..0e8c164 100644 --- a/SpeckleLib/Speckle/Event/Subscriber/ProjectSubscriber.h +++ b/SpeckleLib/Speckle/Event/Subscriber/ProjectSubscriber.h @@ -17,8 +17,9 @@ namespace speckle::event { /*! Default constructor - */ - ProjectSubscriber() = default; + @param priority The subscriber priority (determines the order in which subscribers receive events) + */ + ProjectSubscriber(int32_t priority = 0) : active::event::Subscriber{priority} {} /*! Copy constructor @param source The object to copy diff --git a/SpeckleLib/Speckle/Event/Type/ProjectEvent.cpp b/SpeckleLib/Speckle/Event/Type/ProjectEvent.cpp new file mode 100644 index 0000000..e9109b5 --- /dev/null +++ b/SpeckleLib/Speckle/Event/Type/ProjectEvent.cpp @@ -0,0 +1,38 @@ +#include "Speckle/Event/Type/ProjectEvent.h" + +using namespace speckle::event; + +#ifdef ARCHICAD +/*-------------------------------------------------------------------- + Convert an Archicad project event type + + return: The equivalent Speckle event type + --------------------------------------------------------------------*/ +std::optional ProjectEvent::convert(API_NotifyEventID acEventType) { + using enum ProjectEvent::Type; + switch (acEventType) { + case APINotify_New: + return newDocument; + case APINotify_NewAndReset: + return newAndReset; + case APINotify_Open: + return open; + case APINotify_PreSave: + return presave; + case APINotify_Save: + return save; + case APINotify_Close: + return close; + case APINotify_Quit: + return quit; + case APINotify_TempSave: + return tempSave; + case APINotify_SendChanges: + return send; + case APINotify_ReceiveChanges: + return receive; + default: + return std::nullopt; + } //ProjectEvent::convert +} +#endif diff --git a/SpeckleLib/Speckle/Event/Type/ProjectEvent.h b/SpeckleLib/Speckle/Event/Type/ProjectEvent.h index 30c46df..e4dd7bb 100644 --- a/SpeckleLib/Speckle/Event/Type/ProjectEvent.h +++ b/SpeckleLib/Speckle/Event/Type/ProjectEvent.h @@ -6,6 +6,10 @@ #include "Active/Utility/Guid.h" #include "Active/Utility/String.h" +#ifdef ARCHICAD +#include +#endif + namespace speckle::event { /*! @@ -14,6 +18,23 @@ namespace speckle::event { class ProjectEvent : public active::event::Event { public: + // MARK: - Types + + ///Common project event types + enum class Type { + unknown, + newDocument, + newAndReset, + open, + presave, + save, + close, + quit, + tempSave, + send, + receive, + }; + static const inline active::utility::NameID ID{active::utility::String{"project event"}, active::utility::Guid{active::utility::String{"0ffb9ec5-2164-4fc2-aa57-17b5a1f15355"}}}; @@ -30,15 +51,17 @@ namespace speckle::event { @param param An additional parameter relevant to some project events */ ProjectEvent(API_NotifyEventID notifyEvent, int32_t param) : Event{ID} { - m_eventID = notifyEvent; + m_eventID = convert(notifyEvent).value_or(Type::unknown); m_param = param; } +#endif /*! Get the event type @return The event type */ - API_NotifyEventID getType() const { return m_eventID; } + Type getType() const { return m_eventID; } +#ifdef ARCHICAD /*! Get the event parameter @return The event parameter @@ -46,10 +69,17 @@ namespace speckle::event { int32_t getParam() const { return m_param; } #endif + private: + ///The event type + Type m_eventID; #ifdef ARCHICAD - //Incoming document objects to merge - API_NotifyEventID m_eventID; + ///An additional event parameter int32_t m_param; + /*! + Convert an Archicad project event type + @return The equivalent Speckle event type + */ + static std::optional convert(API_NotifyEventID acEventType); #endif }; diff --git a/SpeckleLib/Speckle/SpeckleResource.h b/SpeckleLib/Speckle/SpeckleResource.h new file mode 100755 index 0000000..70843ea --- /dev/null +++ b/SpeckleLib/Speckle/SpeckleResource.h @@ -0,0 +1,44 @@ +#ifndef SPECKLE_RESOURCE +#define SPECKLE_RESOURCE + + //String resource IDs +enum SpeckleStringResource { + titleStringLib = 32700, + generalStringLib, + notifyStringLib, + warningStringLib, + errorStringLib, +}; + + + //Title strings (UI title/label for dialogs, controls, menu items etc) +enum SpeckleTitleString { + untitledProjectID = 1, +}; + + + //Help strings +enum SpecklePromptString { +}; + + + //Information strings (in UI content, logging, reports) +enum SpeckleInfoString { +}; + + + //Notification strings (advice displayed in alerts) +enum SpeckleNotifyString { +}; + + + //Warning strings (warnings displayed in alerts) +enum SpeckleWarningString { +}; + + + //Error strings (errors displayed in alerts) +enum SpeckleErrorString { +}; + +#endif //SPECKLE_RESOURCE diff --git a/SpeckleLib/SpeckleLib.xcodeproj/project.pbxproj b/SpeckleLib/SpeckleLib.xcodeproj/project.pbxproj index 0953228..4db2969 100644 --- a/SpeckleLib/SpeckleLib.xcodeproj/project.pbxproj +++ b/SpeckleLib/SpeckleLib.xcodeproj/project.pbxproj @@ -15,6 +15,9 @@ 210CC89F2C81E34400610F58 /* Platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 210CC89D2C81E34400610F58 /* Platform.cpp */; }; 210CC8A02C81E34400610F58 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 210CC89E2C81E34400610F58 /* Platform.h */; }; 212A88132AE48821001EAFE7 /* libArchicad27.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21379E082AE47A6400A1584C /* libArchicad27.a */; platformFilters = (macos, ); }; + 215F08552C99DA8D00CD343B /* Project.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 215F08512C99DA8D00CD343B /* Project.cpp */; }; + 215F08562C99DA8D00CD343B /* Project.h in Headers */ = {isa = PBXBuildFile; fileRef = 215F08542C99DA8D00CD343B /* Project.h */; }; + 215F08662C9B006800CD343B /* ProjectEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 215F08652C9B006700CD343B /* ProjectEvent.cpp */; }; 2193517B2C624FC100E5A69C /* MenuSubscriber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 219351782C624FC100E5A69C /* MenuSubscriber.cpp */; }; 2193519B2C6278D900E5A69C /* SelectionSubscriber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 219351992C6278D900E5A69C /* SelectionSubscriber.cpp */; }; 219351B12C62CC1A00E5A69C /* Guid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 219351AC2C62CC1A00E5A69C /* Guid.cpp */; }; @@ -106,6 +109,11 @@ 21379E082AE47A6400A1584C /* libArchicad27.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libArchicad27.a; sourceTree = BUILT_PRODUCTS_DIR; }; 214EA4C52BA374FD008E5358 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = ""; }; 214EA4C62BA3762D008E5358 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = SOURCE_ROOT; }; + 215F08512C99DA8D00CD343B /* Project.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Project.cpp; sourceTree = ""; }; + 215F08542C99DA8D00CD343B /* Project.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Project.h; sourceTree = ""; }; + 215F085B2C9AE23200CD343B /* SpeckleResource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SpeckleResource.h; sourceTree = ""; }; + 215F08622C9AE3D200CD343B /* Speckle.grc */ = {isa = PBXFileReference; lastKnownFileType = text; path = Speckle.grc; sourceTree = ""; }; + 215F08652C9B006700CD343B /* ProjectEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectEvent.cpp; sourceTree = ""; }; 2167E2782C4911E2000827D3 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = ""; }; 2167E2792C4911EB000827D3 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = ""; }; 2167E27C2C49121F000827D3 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = ""; }; @@ -207,6 +215,7 @@ 21F69F1B2C6A0FE2008B6A06 /* Interface */, 21F69F952C71087A008B6A06 /* Record */, 212A834E2AE47AD9001EAFE7 /* Serialise */, + 215F085B2C9AE23200CD343B /* SpeckleResource.h */, 219351B02C62CC1A00E5A69C /* Utility */, 218953A32C0C9CB00078F182 /* Version.h */, ); @@ -231,6 +240,7 @@ 21F69F012C66C229008B6A06 /* Doxyfile */, 21379E092AE47A6400A1584C /* Products */, 21329F472BFA611C00B5C7AF /* README.md */, + 215F08612C9AE3D200CD343B /* RINT */, 212A83422AE47AD9001EAFE7 /* Speckle */, 219987FA2BD708BC0035E5EA /* SpeckleLibDoctest */, ); @@ -245,6 +255,14 @@ name = Products; sourceTree = ""; }; + 215F08612C9AE3D200CD343B /* RINT */ = { + isa = PBXGroup; + children = ( + 215F08622C9AE3D200CD343B /* Speckle.grc */, + ); + path = RINT; + sourceTree = SOURCE_ROOT; + }; 218953A92C0F29FB0078F182 /* EventTests */ = { isa = PBXGroup; children = ( @@ -281,6 +299,7 @@ children = ( 21D0BDBE2C90F36B0077E104 /* DocStoreMergeEvent.h */, 219351892C62655700E5A69C /* MenuEvent.h */, + 215F08652C9B006700CD343B /* ProjectEvent.cpp */, 21D0BDC62C9245E40077E104 /* ProjectEvent.h */, 2193519C2C627E3100E5A69C /* SelectionEvent.h */, ); @@ -467,6 +486,8 @@ 21F93AE92B2F406D009A2C5B /* Addon.h */, 210CC89D2C81E34400610F58 /* Platform.cpp */, 210CC89E2C81E34400610F58 /* Platform.h */, + 215F08512C99DA8D00CD343B /* Project.cpp */, + 215F08542C99DA8D00CD343B /* Project.h */, 21329F632BFD452C00B5C7AF /* Environment.md */, ); path = Environment; @@ -491,6 +512,7 @@ 21B67D002C7CE15100FD64FC /* Exception.h in Headers */, 21D0BD2C2C86FC350077E104 /* Record.h in Headers */, 21D0BDB42C8F8AB60077E104 /* DocumentStoreCore.h in Headers */, + 215F08562C99DA8D00CD343B /* Project.h in Headers */, 210CC8802C80CD2A00610F58 /* BridgeChild.h in Headers */, 21D0BD4D2C8901A00077E104 /* ServerInfo.h in Headers */, 21D0BDB52C8F8AB60077E104 /* DocumentStoreEngine.h in Headers */, @@ -626,6 +648,7 @@ 21F69F812C6FF3B0008B6A06 /* BridgeArgumentWrap.cpp in Sources */, 2193517B2C624FC100E5A69C /* MenuSubscriber.cpp in Sources */, 21F69F612C6D0286008B6A06 /* GetBindingsMethodNames.cpp in Sources */, + 215F08662C9B006800CD343B /* ProjectEvent.cpp in Sources */, 21D0BDBD2C90F2830077E104 /* DocStoreSubscriber.cpp in Sources */, 21D0BDB32C8F8AB60077E104 /* DocumentStoreCore.cpp in Sources */, 21F93AEC2B2F406E009A2C5B /* Addon.cpp in Sources */, @@ -641,6 +664,7 @@ 219351B32C62CC1A00E5A69C /* String.cpp in Sources */, 219351B12C62CC1A00E5A69C /* Guid.cpp in Sources */, 21F69F512C6CCC25008B6A06 /* BrowserBridge.cpp in Sources */, + 215F08552C99DA8D00CD343B /* Project.cpp in Sources */, 21F69F3B2C6B880C008B6A06 /* JSBaseTransport.cpp in Sources */, 210CC89F2C81E34400610F58 /* Platform.cpp in Sources */, 21D0BD202C86F0280077E104 /* AccountDatabase.cpp in Sources */, From 5a77e7b30a322c2c112d6b470d87957d4bd774b3 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Wed, 18 Sep 2024 16:24:04 +0100 Subject: [PATCH 03/19] Include SpeckleLib resources in build process --- SpeckleConnector/Connector.xcodeproj/project.pbxproj | 2 +- SpeckleConnector/RINT/Connector.grc | 5 +++-- SpeckleLib/RINT/Speckle.grc | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SpeckleConnector/Connector.xcodeproj/project.pbxproj b/SpeckleConnector/Connector.xcodeproj/project.pbxproj index 695b45b..9a34eba 100644 --- a/SpeckleConnector/Connector.xcodeproj/project.pbxproj +++ b/SpeckleConnector/Connector.xcodeproj/project.pbxproj @@ -1365,7 +1365,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "mkdir -p \"$HEADER_PATH_6/ResourceObjects\"\npython3 \"$HEADER_PATH_5/Tools/CompileResources.py\" INT \"$HEADER_PATH_5/..\" \"$HEADER_PATH_6\" \"$SRCROOT\" \"$HEADER_PATH_6/ResourceObjects\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/Resources\"\npython3 \"$HEADER_PATH_5/Tools/CompileResources.py\" INT \"$HEADER_PATH_5/..\" \"$HEADER_PATH_3\" \"$SRCROOT\" \"$HEADER_PATH_6/ResourceObjects\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/Resources\"\ncp \"$HEADER_PATH_5/Inc/PkgInfo\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/PkgInfo\"\ntouch \"$HEADER_PATH_6/ResourceObjects/AddOnResources.stamp\"\n"; + shellScript = "mkdir -p \"$HEADER_PATH_6/ResourceObjects\"\npython3 \"$HEADER_PATH_5/Tools/CompileResources.py\" INT \"$HEADER_PATH_5/..\" \"$HEADER_PATH_6\" \"$SRCROOT\" \"$HEADER_PATH_6/ResourceObjects\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/Resources\"\npython3 \"$HEADER_PATH_5/Tools/CompileResources.py\" INT \"$HEADER_PATH_5/..\" \"$HEADER_PATH_3\" \"$HEADER_PATH_3\" \"$HEADER_PATH_6/ResourceObjects\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/Resources\"\ncp \"$HEADER_PATH_5/Inc/PkgInfo\" \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/PkgInfo\"\ntouch \"$HEADER_PATH_6/ResourceObjects/AddOnResources.stamp\"\n"; }; 213CC3A12B1101F500088049 /* Install */ = { isa = PBXShellScriptBuildPhase; diff --git a/SpeckleConnector/RINT/Connector.grc b/SpeckleConnector/RINT/Connector.grc index 0d04b7f..20de2c7 100644 --- a/SpeckleConnector/RINT/Connector.grc +++ b/SpeckleConnector/RINT/Connector.grc @@ -1,3 +1,4 @@ -'STR#' 32700 "Title strings" { -/* [ 1] */ "Untitled" +'STR#' 32600 "Title strings" { +/* [ 1] */ "Speckle Connector" +/* [ 2] */ "Connector to share model content with Speckle" } diff --git a/SpeckleLib/RINT/Speckle.grc b/SpeckleLib/RINT/Speckle.grc index 20de2c7..552987b 100644 --- a/SpeckleLib/RINT/Speckle.grc +++ b/SpeckleLib/RINT/Speckle.grc @@ -1,4 +1,3 @@ -'STR#' 32600 "Title strings" { -/* [ 1] */ "Speckle Connector" -/* [ 2] */ "Connector to share model content with Speckle" +'STR#' 32700 "Speckle Title strings" { +/* [ 1] */ "Untitled" } From d3c734131450618717ce123c6fd7e1a4d002556e Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 08:20:06 +0100 Subject: [PATCH 04/19] Updated Xcode project --- SpeckleConnector/Connector.xcodeproj/project.pbxproj | 12 ++++++------ .../Browser/Bridge/Base/GetDocumentInfo.cpp | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/SpeckleConnector/Connector.xcodeproj/project.pbxproj b/SpeckleConnector/Connector.xcodeproj/project.pbxproj index 9a34eba..8431d0f 100644 --- a/SpeckleConnector/Connector.xcodeproj/project.pbxproj +++ b/SpeckleConnector/Connector.xcodeproj/project.pbxproj @@ -723,16 +723,16 @@ 0867D691FE84028FC02AAC07 /* SampleObject */ = { isa = PBXGroup; children = ( - 21F69EED2C64FE91008B6A06 /* ActiveLib.xcodeproj */, - 21F69EC62C64C035008B6A06 /* SpeckleLib.xcodeproj */, - 219388682C4E5DE2002A0180 /* CMakeLists.txt */, - 2161FD902BF2600C006D9527 /* README.md */, 21F69F112C677BC0008B6A06 /* Connector */, + 21F69EC62C64C035008B6A06 /* SpeckleLib.xcodeproj */, + 21F69EED2C64FE91008B6A06 /* ActiveLib.xcodeproj */, + 219388682C4E5DE2002A0180 /* CMakeLists.txt */, 219F30412C769282009834E9 /* ConnectorTests */, - 81494D9D09DA5892006864FB /* Resource */, 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, - 034768DDFF38A45A11DB9C8B /* Products */, 213CC4E02B1107CF00088049 /* Frameworks */, + 034768DDFF38A45A11DB9C8B /* Products */, + 2161FD902BF2600C006D9527 /* README.md */, + 81494D9D09DA5892006864FB /* Resource */, ); name = SampleObject; sourceTree = ""; diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp index 0154aef..964ec0a 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp @@ -4,6 +4,7 @@ #include "Connector/Connector.h" #include "Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h" #include "Speckle/Environment/Project.h" +#include "Speckle/Utility/Guid.h" using namespace active::container; using namespace active::serialise; @@ -38,6 +39,7 @@ std::unique_ptr GetDocumentInfo::run() const { if (info.path) docInfo.location = *info.path; //TODO: No suitable project ID is currently available + docInfo.ID = Guid{true}.operator String(); } return std::make_unique(docInfo); } //GetDocumentInfo::run From 95e0033d2a58a8fec2b9f1fd9ee23d2cf9349854 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 09:06:29 +0100 Subject: [PATCH 05/19] Updated ModelCard to the latest schema --- .../Connector/Record/Model/ModelCard.cpp | 13 ++++++++++++- SpeckleConnector/Connector/Record/Model/ModelCard.h | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/SpeckleConnector/Connector/Record/Model/ModelCard.cpp b/SpeckleConnector/Connector/Record/Model/ModelCard.cpp index ec29cd7..8cd90ac 100644 --- a/SpeckleConnector/Connector/Record/Model/ModelCard.cpp +++ b/SpeckleConnector/Connector/Record/Model/ModelCard.cpp @@ -19,6 +19,7 @@ namespace { accountID, serverURLID, settingsID, + expiredID, }; ///Serialisation field IDs @@ -28,6 +29,7 @@ namespace { Identity{"accountId"}, Identity{"serverURL"}, Identity{"settings"}, + Identity{"expired"}, }; } @@ -48,9 +50,16 @@ bool ModelCard::fillInventory(Inventory& inventory) const { { fieldID[accountID], accountID, element }, { fieldID[serverURLID], serverURLID, element }, { fieldID[settingsID], settingsID, element }, + { fieldID[expiredID], expiredID, element }, }, }.withType(&typeid(ModelCard))); - return base::fillInventory(inventory); + //This class has a unique serialisation tag for the record ID - override the base class ID + inventory.merge(Inventory{ + { + { Identity{"modelCardId"}, active::database::record::FieldIndex::idIndex, element }, + }, + }.withType(&typeid(active::database::Record<>))); + return true; } //ModelCard::fillInventory @@ -76,6 +85,8 @@ Cargo::Unique ModelCard::getCargo(const Inventory::Item& item) const { return std::make_unique>(m_serverURL); case settingsID: return std::make_unique>>(m_settings); + case expiredID: + return std::make_unique>(m_isExpired); default: return nullptr; //Requested an unknown index } diff --git a/SpeckleConnector/Connector/Record/Model/ModelCard.h b/SpeckleConnector/Connector/Record/Model/ModelCard.h index 6db4ec5..a192a8b 100644 --- a/SpeckleConnector/Connector/Record/Model/ModelCard.h +++ b/SpeckleConnector/Connector/Record/Model/ModelCard.h @@ -108,6 +108,8 @@ namespace connector::record { speckle::utility::String m_serverURL; ///Settings for the model rendering, e.g. level of detail (LoD) SettingList m_settings; + ///True if the card has expired + bool m_isExpired = false; }; } From 6f7bd66a2dead037571fd323c0645339ecd97c57 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 10:20:03 +0100 Subject: [PATCH 06/19] "Send" method argument updated Serialisation tag for server URL of ModelCard fixed --- .../Connector/Interface/Browser/Bridge/Send/Send.cpp | 2 +- .../Connector/Interface/Browser/Bridge/Send/Send.h | 11 +++++++---- SpeckleConnector/Connector/Record/Model/ModelCard.cpp | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp index b0278b3..a037058 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp @@ -11,7 +11,7 @@ using namespace speckle::utility; /*-------------------------------------------------------------------- Default constructor --------------------------------------------------------------------*/ -Send::Send() : BridgeMethod{"Send", [&](UpdateArgs args) { +Send::Send() : BridgeMethod{"Send", [&](const SendArgs& args) { run(args); }} {} diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h index 6ab3a91..60ab477 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h @@ -2,6 +2,7 @@ #define CONNECTOR_INTERFACE_BRIDGE_SEND #include "Active/Serialise/CargoHold.h" +#include "Active/Serialise/Item/Wrapper/ValueWrap.h" #include "Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h" #include "Speckle/Interface/Browser/Bridge/BridgeMethod.h" @@ -9,13 +10,15 @@ namespace connector::interfac::browser::bridge { class ConnectorConfig; - ///Argument for a JS call to update the configuration - using UpdateArgs = speckle::interfac::browser::bridge::JSArgType; + ///Argument parameter for a string + using StringHold = active::serialise::CargoHold, speckle::utility::String>; + ///Argument type for this method + using SendArgs = speckle::interfac::browser::bridge::JSArgType; /*! - JS Function class to retrieve the names of the methods supported by the bridge + JS Function class to send a specified model */ - class Send : public speckle::interfac::browser::bridge::BridgeMethod { + class Send : public speckle::interfac::browser::bridge::BridgeMethod { public: // MARK: - Constructors diff --git a/SpeckleConnector/Connector/Record/Model/ModelCard.cpp b/SpeckleConnector/Connector/Record/Model/ModelCard.cpp index 8cd90ac..d97a542 100644 --- a/SpeckleConnector/Connector/Record/Model/ModelCard.cpp +++ b/SpeckleConnector/Connector/Record/Model/ModelCard.cpp @@ -27,7 +27,7 @@ namespace { Identity{"modelId"}, Identity{"projectId"}, Identity{"accountId"}, - Identity{"serverURL"}, + Identity{"serverUrl"}, Identity{"settings"}, Identity{"expired"}, }; From e6543fe06593cf46009f132f3c5e66fc44446e2e Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 10:31:32 +0100 Subject: [PATCH 07/19] Clarified DocumentInfo documentation --- .../Interface/Browser/Bridge/Base/Arg/DocumentInfo.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h index b9ed59f..56ac1b5 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/Arg/DocumentInfo.h @@ -29,12 +29,12 @@ namespace connector::interfac::browser::bridge { // MARK: - Public variables (NB: Assuming to class invariants or overrides for this data, so making public for simplicity) - ///The project location - speckle::utility::String location; //TODO: Confirm this is an address + ///The URL of the project file (non-teamwork) or server (teamwork) + speckle::utility::String location; ///The project name - speckle::utility::String name; //TODO: Assume project name rather than document (file) name - need to confirm + speckle::utility::String name; ///A unique, persistent ID for the project document - speckle::utility::String ID; //TODO: should possibly be a guid - need to check + speckle::utility::String ID; // MARK: - Serialisation From 6e0cc4d5f38155a46d19c89e3172e1fda1b539c1 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 11:23:19 +0100 Subject: [PATCH 08/19] Updated VS projects and resources More document info retrieved from open project --- .../Browser/Bridge/Base/GetDocumentState.cpp | 6 ----- SpeckleConnector/RFIX.WIN/Connector.rc | 1 + SpeckleLib/Make.win/buildResAC.bat | 3 ++- SpeckleLib/Speckle/Environment/Project.cpp | 22 ++++++++----------- SpeckleLib/SpeckleLib17.vcxproj | 6 +++++ SpeckleLib/SpeckleLib17.vcxproj.filters | 18 +++++++++++++++ 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.cpp index 04d0f6c..ed812b5 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.cpp @@ -13,12 +13,6 @@ using namespace connector::database; using namespace connector::record; using namespace speckle::utility; -namespace { - - using WrappedValue = active::serialise::CargoHold>, Vector>; - -} - /*-------------------------------------------------------------------- Default constructor --------------------------------------------------------------------*/ diff --git a/SpeckleConnector/RFIX.WIN/Connector.rc b/SpeckleConnector/RFIX.WIN/Connector.rc index 8a453da..4a82144 100644 --- a/SpeckleConnector/RFIX.WIN/Connector.rc +++ b/SpeckleConnector/RFIX.WIN/Connector.rc @@ -8,6 +8,7 @@ #include "Connector.grc.rc2" #include "ConnectorMenu.grc.rc2" #include "SpecklePalette.grc.rc2" +#include "Speckle.grc.rc2" #include "ConnectorFix.grc.rc2" diff --git a/SpeckleLib/Make.win/buildResAC.bat b/SpeckleLib/Make.win/buildResAC.bat index 622e09d..cfb508f 100644 --- a/SpeckleLib/Make.win/buildResAC.bat +++ b/SpeckleLib/Make.win/buildResAC.bat @@ -3,6 +3,7 @@ REM AC Resource build script ECHO "Building AC Resources" if not exist "%RES_OUTPUT%" MD "%RES_OUTPUT%" -python "%HEADER_PATH_5%\Tools\CompileResources.py" "INT" "%HEADER_PATH_5%\.." "%HEADER_PATH_6%Source" "%SYMROOT%\" "%RES_OUTPUT%" "%RES_SOURCE%\CodesignImport.apx.mui" +python "%HEADER_PATH_5%\Tools\CompileResources.py" "INT" "%HEADER_PATH_5%\.." "%HEADER_PATH_6%\Connector" "%SYMROOT%\" "%RES_OUTPUT%" "%RES_SOURCE%\Speckle Connector.apx.mui" +python "%HEADER_PATH_5%\Tools\CompileResources.py" "INT" "%HEADER_PATH_5%\.." "%HEADER_PATH_4%\Speckle" "%HEADER_PATH_4%" "%RES_OUTPUT%" "%RES_SOURCE%\Speckle Connector.apx.mui" ECHO "Finished AC Resource" diff --git a/SpeckleLib/Speckle/Environment/Project.cpp b/SpeckleLib/Speckle/Environment/Project.cpp index ead4930..69722ed 100644 --- a/SpeckleLib/Speckle/Environment/Project.cpp +++ b/SpeckleLib/Speckle/Environment/Project.cpp @@ -41,25 +41,21 @@ Project::Info Project::getInfo() const { #ifdef ARCHICAD API_ProjectInfo projectInfo; if (ACAPI_ProjectOperation_Project(&projectInfo) == NoError) { - if (projectInfo.projectName != nullptr) + if ((projectInfo.projectName != nullptr) && !projectInfo.projectName->IsEmpty()) result.name = *projectInfo.projectName; result.isShared = projectInfo.teamwork; - if (projectInfo.teamwork) { - if (projectInfo.projectPath != nullptr) - result.path = String{*projectInfo.projectPath}; - else if (projectInfo.location_team != nullptr) { + if ((projectInfo.projectPath != nullptr) && !projectInfo.projectPath->IsEmpty()) + result.path = String{*projectInfo.projectPath}; + else if (projectInfo.teamwork) { + if (projectInfo.location_team != nullptr) { GS::UniString path; if (projectInfo.location_team->ToPath(&path) == NoError) result.path = String{path}; } - } else { - if (projectInfo.projectPath != nullptr) - result.path = String{*projectInfo.projectPath}; - else if (projectInfo.location != nullptr) { - GS::UniString path; - if (projectInfo.location->ToPath(&path) == NoError) - result.path = String{path}; - } + } else if (projectInfo.location != nullptr) { + GS::UniString path; + if (projectInfo.location->ToPath(&path) == NoError) + result.path = String{path}; } } #endif diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj index e79772c..3c8e9f8 100644 --- a/SpeckleLib/SpeckleLib17.vcxproj +++ b/SpeckleLib/SpeckleLib17.vcxproj @@ -27,6 +27,7 @@ + @@ -58,10 +59,12 @@ + + @@ -70,10 +73,12 @@ + + @@ -97,6 +102,7 @@ + diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters index 078a9b6..c2784c1 100644 --- a/SpeckleLib/SpeckleLib17.vcxproj.filters +++ b/SpeckleLib/SpeckleLib17.vcxproj.filters @@ -193,6 +193,15 @@ Speckle\Database\Storage\DocumentStore + + Speckle\Environment + + + Speckle + + + Speckle + @@ -270,6 +279,12 @@ Speckle\Database\Storage\DocumentStore + + Speckle\Environment + + + Speckle\Event\Type + @@ -295,5 +310,8 @@ Speckle\Serialise + + Resource Files + \ No newline at end of file From 009f670af72518877788e829fd7e5cc41ebdb6f4 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 13:39:58 +0100 Subject: [PATCH 09/19] ModelCard incorrectly identified base Record type --- SpeckleConnector/Connector/Record/Model/ModelCard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpeckleConnector/Connector/Record/Model/ModelCard.cpp b/SpeckleConnector/Connector/Record/Model/ModelCard.cpp index d97a542..47f3a96 100644 --- a/SpeckleConnector/Connector/Record/Model/ModelCard.cpp +++ b/SpeckleConnector/Connector/Record/Model/ModelCard.cpp @@ -58,7 +58,7 @@ bool ModelCard::fillInventory(Inventory& inventory) const { { { Identity{"modelCardId"}, active::database::record::FieldIndex::idIndex, element }, }, - }.withType(&typeid(active::database::Record<>))); + }.withType(&typeid(base::base))); return true; } //ModelCard::fillInventory From 9f35e86372731342b8eaa6f788df69ac0922992d Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 22:02:39 +0100 Subject: [PATCH 10/19] Update browser bridge functions names retrieval --- SpeckleConnector/Connector/Connector.cpp | 1 + .../Interface/Browser/Bridge/BrowserBridge.cpp | 8 ++++---- .../Interface/Browser/Bridge/BrowserBridge.h | 4 ++-- .../Bridge/Functions/GetBindingsMethodNames.cpp | 8 ++++---- .../Bridge/Functions/GetBindingsMethodNames.h | 13 ++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SpeckleConnector/Connector/Connector.cpp b/SpeckleConnector/Connector/Connector.cpp index 4306b0b..c4369dd 100755 --- a/SpeckleConnector/Connector/Connector.cpp +++ b/SpeckleConnector/Connector/Connector.cpp @@ -29,6 +29,7 @@ namespace { ConnectorInstance(const String& name) : ConnectorAddon{name} { add(); add(); + //The connector 'owns' the model card database, so the publisher list should only hold a weak reference addWeak(m_modelCards.getSubscription()); } diff --git a/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.cpp b/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.cpp index 33e1982..f6036cb 100644 --- a/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.cpp +++ b/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.cpp @@ -53,13 +53,13 @@ BrowserBridge::~BrowserBridge() { /*-------------------------------------------------------------------- Get the names of the methods supported by this bridge - + return: The supported method names --------------------------------------------------------------------*/ -ValueSetting BrowserBridge::getMethodNames() const { - ValueSetting result; +std::vector BrowserBridge::getMethodNames() const { + std::vector result; for (const auto& method : *m_methods) - result.emplace_back(StringValue{method->getName()}); + result.emplace_back(method->getName()); return result; } //BrowserBridge::getMethodNames diff --git a/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.h b/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.h index 2b24c49..022a44d 100644 --- a/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.h +++ b/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.h @@ -27,7 +27,7 @@ namespace speckle::interfac::browser::bridge { Constructor @param name The JS object name */ - BrowserBridge(const speckle::utility::String& name); + BrowserBridge(const utility::String& name); /*! Destructor */ @@ -39,7 +39,7 @@ namespace speckle::interfac::browser::bridge { Get the names of the methods supported by this bridge @return The supported method names */ - active::setting::ValueSetting getMethodNames() const; + std::vector getMethodNames() const; /*! Get a browser method by name @return A pointer to the requested method (owner does not take ownership, nullptr = failure) diff --git a/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetBindingsMethodNames.cpp b/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetBindingsMethodNames.cpp index 81d42e1..e92bf61 100644 --- a/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetBindingsMethodNames.cpp +++ b/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetBindingsMethodNames.cpp @@ -6,21 +6,21 @@ using namespace active::serialise; using namespace speckle::serialise::jsbase; using namespace speckle::interfac::browser; using namespace speckle::interfac::browser::bridge; +using namespace speckle::utility; /*-------------------------------------------------------------------- Constructor - + bridge: The parent bridge object (provides access to bridge methods) --------------------------------------------------------------------*/ GetBindingsMethodNames::GetBindingsMethodNames() : JSFunction{"GetBindingsMethodNames", [&]() { return getMethodNames(); - }} { -} //GetBindingsMethodNames::GetBindingsMethodNames +}} {} //GetBindingsMethodNames::GetBindingsMethodNames /*-------------------------------------------------------------------- Get the names of the methods supported by the parent browser - + return: The supported method names --------------------------------------------------------------------*/ std::unique_ptr GetBindingsMethodNames::getMethodNames() const { diff --git a/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetBindingsMethodNames.h b/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetBindingsMethodNames.h index 4d26239..affcbeb 100644 --- a/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetBindingsMethodNames.h +++ b/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetBindingsMethodNames.h @@ -2,17 +2,16 @@ #define SPECKLE_INTERFACE_BRIDGE_GET_METHOD_NAMES #include "Active/Serialise/CargoHold.h" +#include "Active/Serialise/Package/Wrapper/ContainerWrap.h" #include "Active/Serialise/Package/Wrapper/ValueSettingWrap.h" #include "Speckle/Interface/Browser/PlatformBinding.h" #include "Speckle/Interface/Browser/JSFunction.h" #include "Speckle/Interface/Browser/Bridge/BridgeChild.h" namespace speckle::interfac::browser::bridge { - - class BrowserBridge; - - using WrappedValue = active::serialise::CargoHold; - + + using WrappedValue = active::serialise::CargoHold>, std::vector>; + /*! JS Function class to retrieve the names of the methods supported by the bridge */ @@ -20,12 +19,12 @@ namespace speckle::interfac::browser::bridge { public: // MARK: - Constructors - + /*! Default constructor */ GetBindingsMethodNames(); - + private: /*! Get the names of the methods supported by the parent browser From bd200492fdac13b4f279ade91d500f1c0f671b73 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 22:13:48 +0100 Subject: [PATCH 11/19] Docs --- .../Connector/Interface/Browser/Bridge/Config/GetConfig.cpp | 2 +- .../Connector/Interface/Browser/Bridge/Config/UpdateConfig.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.cpp index c486370..80b7b7b 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.cpp @@ -30,6 +30,6 @@ GetConfig::GetConfig() : BridgeMethod{"GetConfig", [&]() { --------------------------------------------------------------------*/ std::unique_ptr GetConfig::run() const { ConnectorConfig config; - ///TODO: Get the accounts here - returning an empty array for testing only + ///TODO: Get the data from a local SQLite database return std::make_unique(config); } //GetConfig::run diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/UpdateConfig.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/UpdateConfig.cpp index 515f127..beb0674 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/UpdateConfig.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/UpdateConfig.cpp @@ -21,5 +21,5 @@ UpdateConfig::UpdateConfig() : BridgeMethod{"UpdateConfig", [&](const UpdateArgs config: The new settings --------------------------------------------------------------------*/ void UpdateConfig::run(const ConnectorConfig& config) const { - ///TODO: Store the active configuration settings here + ///TODO: Store the active configuration settings in a local SQLite database } //UpdateConfig::run From 6d3126e1e1ef1d3b40b13adad2ddbf74c98694fe Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Fri, 20 Sep 2024 11:34:46 +0100 Subject: [PATCH 12/19] Updated GetSendFilters to support export of polymorphic objects DocumentStoreCore didn't check for null handle when retrieving stored data --- .../Interface/Browser/Bridge/Send/GetSendFilters.cpp | 6 +++--- .../Database/Storage/DocumentStore/DocumentStoreCore.cpp | 3 ++- .../Database/Storage/DocumentStore/DocumentStoreEngine.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.cpp index 26bf6d6..8ec9121 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/GetSendFilters.cpp @@ -34,8 +34,8 @@ GetSendFilters::GetSendFilters() : BridgeMethod{"GetSendFilters", [&]() { return: The send filters --------------------------------------------------------------------*/ std::unique_ptr GetSendFilters::run() const { - Vector filters; + auto filters = std::make_unique>(); //filters.emplace_back(ArchicadEverythingFilter{}); //TODO: Implement as required - filters.emplace_back(ArchicadSelectionFilter{}); - return std::make_unique(filters); + filters->emplace_back(ArchicadSelectionFilter{}); + return std::make_unique(std::move(filters)); } //GetSendFilters::run diff --git a/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp b/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp index 11b81ac..c12d603 100644 --- a/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp +++ b/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreCore.cpp @@ -94,7 +94,8 @@ namespace { void copyHandleToMemory(const GSHandle& handle, active::utility::Memory& memory) { auto storeSize = BMGetHandleSize(handle); memory.resize(storeSize); - active::utility::Memory::copy(memory.data(), *handle, storeSize, storeSize); + if ((storeSize > 0) && (*handle != nullptr)) + active::utility::Memory::copy(memory.data(), *handle, storeSize, storeSize); } //copyHandleToMemory #endif diff --git a/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreEngine.h b/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreEngine.h index d911977..e303953 100644 --- a/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreEngine.h +++ b/SpeckleLib/Speckle/Database/Storage/DocumentStore/DocumentStoreEngine.h @@ -162,7 +162,7 @@ namespace speckle::database { return m_cache.get(); //Return an empty container if there's no data //Import the document data into the record cache if constexpr (std::is_same_v) - Transport().receive(std::forward(*m_cache), active::serialise::Identity{}, storedData); + Transport().receive(std:: forward(*m_cache), active::serialise::Identity{}, storedData); else Transport().receive(ObjWrapper{*m_cache}, active::serialise::Identity{}, storedData); return m_cache.get(); From b44644ad88139afc6dee743d346be7479c85b800 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Fri, 20 Sep 2024 14:17:39 +0100 Subject: [PATCH 13/19] Bridge methods using CargoHold to return results need to allocate results in a unique_ptr (can't reference local vars that go out of scope) --- .../Interface/Browser/Bridge/Account/GetAccounts.cpp | 8 +++++--- .../Interface/Browser/Bridge/Base/GetDocumentInfo.cpp | 11 +++++------ .../Interface/Browser/Bridge/Config/GetConfig.cpp | 6 +++--- .../Interface/Browser/Bridge/Functions/RunMethod.cpp | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Account/GetAccounts.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Account/GetAccounts.cpp index ecf0f99..0c042a8 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Account/GetAccounts.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Account/GetAccounts.cpp @@ -32,8 +32,10 @@ GetAccounts::GetAccounts() : BridgeMethod{"GetAccounts", [&]() { return: The accounts (empty array when none defined) --------------------------------------------------------------------*/ std::unique_ptr GetAccounts::run() const { - Vector accounts; + std::unique_ptr> result; if (auto accountDBase = connector()->getAccountDatabase(); accountDBase != nullptr) - accounts = accountDBase->getAccounts(); - return std::make_unique(accounts); + result = std::make_unique>(accountDBase->getAccounts()); + else + result = std::make_unique>(); + return std::make_unique(std::move(result)); } //GetAccounts::run diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp index 964ec0a..3d69108 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentInfo.cpp @@ -31,15 +31,14 @@ GetDocumentInfo::GetDocumentInfo() : BridgeMethod{"GetDocumentInfo", [&]() { return: The document info --------------------------------------------------------------------*/ std::unique_ptr GetDocumentInfo::run() const { - ///TODO: Get the document info here - returning mocked values for now - DocumentInfo docInfo; + auto docInfo = std::make_unique(); if (auto project = connector()->getActiveProject().lock(); project) { auto info = project->getInfo(); - docInfo.name = info.name; + docInfo->name = info.name; if (info.path) - docInfo.location = *info.path; + docInfo->location = *info.path; //TODO: No suitable project ID is currently available - docInfo.ID = Guid{true}.operator String(); + docInfo->ID = Guid{true}.operator String(); } - return std::make_unique(docInfo); + return std::make_unique(std::move(docInfo)); } //GetDocumentInfo::run diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.cpp index 80b7b7b..e515d74 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/GetConfig.cpp @@ -29,7 +29,7 @@ GetConfig::GetConfig() : BridgeMethod{"GetConfig", [&]() { return: The settings --------------------------------------------------------------------*/ std::unique_ptr GetConfig::run() const { - ConnectorConfig config; - ///TODO: Get the data from a local SQLite database - return std::make_unique(config); + auto config = std::make_unique(); + ///TODO: Get the data from a local SQLite database + return std::make_unique(std::move(config)); } //GetConfig::run diff --git a/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/RunMethod.cpp b/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/RunMethod.cpp index 17f3376..02efefb 100644 --- a/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/RunMethod.cpp +++ b/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/RunMethod.cpp @@ -66,7 +66,7 @@ namespace { errorReport = ErrorReport{defaultError}; errorReport->message = formattedErrorMessage(errorReport->message, argument); //Cache the error report to be sent back to the JS caller against the request ID - bridge.cacheResult(std::make_unique>(*errorReport), argument.getRequestID()); + bridge.cacheResult(std::make_unique>(std::make_unique(*errorReport)), argument.getRequestID()); } //executeMethod From daae9fd6e35cbc49cfc9e26117ecdfbe69e51297 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Fri, 20 Sep 2024 23:48:19 +0100 Subject: [PATCH 14/19] ModelCard arguments should use CardMover --- .../Connector/Interface/Browser/Bridge/Base/AddModel.h | 4 ++-- .../Connector/Interface/Browser/Bridge/Base/RemoveModel.h | 4 ++-- .../Connector/Interface/Browser/Bridge/Base/UpdateModel.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/AddModel.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/AddModel.h index bca8410..b616315 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/AddModel.h +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/AddModel.h @@ -2,14 +2,14 @@ #define CONNECTOR_INTERFACE_BRIDGE_ADD_MODEL #include "Active/Serialise/CargoHold.h" -#include "Active/Serialise/Package/Wrapper/PackageWrap.h" +#include "Connector/Record/Model/CardMover.h" #include "Connector/Record/Model/ModelCard.h" #include "Speckle/Interface/Browser/Bridge/BridgeMethod.h" namespace connector::interfac::browser::bridge { ///Argument parameter for a string - using CardHold = active::serialise::CargoHold; + using CardHold = active::serialise::CargoHold; ///Argument type for this method using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType; diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/RemoveModel.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/RemoveModel.h index 50c6d00..d6a900d 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/RemoveModel.h +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/RemoveModel.h @@ -2,14 +2,14 @@ #define CONNECTOR_INTERFACE_BRIDGE_REMOVE_MODEL #include "Active/Serialise/CargoHold.h" -#include "Active/Serialise/Package/Wrapper/PackageWrap.h" +#include "Connector/Record/Model/CardMover.h" #include "Connector/Record/Model/ModelCard.h" #include "Speckle/Interface/Browser/Bridge/BridgeMethod.h" namespace connector::interfac::browser::bridge { ///Argument parameter for a string - using CardHold = active::serialise::CargoHold; + using CardHold = active::serialise::CargoHold; ///Argument type for this method using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType; diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/UpdateModel.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/UpdateModel.h index e4263fe..024151a 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/UpdateModel.h +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Base/UpdateModel.h @@ -2,14 +2,14 @@ #define CONNECTOR_INTERFACE_BRIDGE_UPDATE_MODEL #include "Active/Serialise/CargoHold.h" -#include "Active/Serialise/Package/Wrapper/PackageWrap.h" +#include "Connector/Record/Model/CardMover.h" #include "Connector/Record/Model/ModelCard.h" #include "Speckle/Interface/Browser/Bridge/BridgeMethod.h" namespace connector::interfac::browser::bridge { ///Argument parameter for a string - using CardHold = active::serialise::CargoHold; + using CardHold = active::serialise::CargoHold; ///Argument type for this method using ModelCardEventWrapper = speckle::interfac::browser::bridge::JSArgType; From 0060aabd8b91f1aa2af84bffc89610f7a99e32b7 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Sat, 21 Sep 2024 01:13:54 +0100 Subject: [PATCH 15/19] Added Doxyfile Updated gitignore to skip doxygen output Removed redundant namespaces from CardMover --- .gitignore | 6 +- .../Connector/Record/Model/CardMover.cpp | 2 - SpeckleConnector/Documentation/Doxyfile | 2890 +++++++++++++++++ 3 files changed, 2894 insertions(+), 4 deletions(-) create mode 100644 SpeckleConnector/Documentation/Doxyfile diff --git a/.gitignore b/.gitignore index 3230d7c..c182158 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,10 @@ xcuserdata/ x64/ .DS_Store .cache/ -Documentation/* -!Documentation/Doxyfile +SpeckleConnector/Documentation/* +!SpeckleConnector/Documentation/Doxyfile +SpeckleLib/Documentation/* +!SpeckleLib/Documentation/Doxyfile CMakeCache.txt _deps/ CMakeFiles/ diff --git a/SpeckleConnector/Connector/Record/Model/CardMover.cpp b/SpeckleConnector/Connector/Record/Model/CardMover.cpp index 48e9c94..ae4e451 100644 --- a/SpeckleConnector/Connector/Record/Model/CardMover.cpp +++ b/SpeckleConnector/Connector/Record/Model/CardMover.cpp @@ -8,8 +8,6 @@ Distributed under the MIT License (See accompanying file LICENSE.txt or copy at #include "Connector/Record/Model/ReceiverModelCard.h" #include "Connector/Record/Model/SenderModelCard.h" -using namespace active::serialise; -using namespace active::utility; using namespace connector::record; namespace { diff --git a/SpeckleConnector/Documentation/Doxyfile b/SpeckleConnector/Documentation/Doxyfile new file mode 100644 index 0000000..b44298b --- /dev/null +++ b/SpeckleConnector/Documentation/Doxyfile @@ -0,0 +1,2890 @@ +# Doxyfile 1.10.0 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the configuration +# file that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = Connector + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = + +# With the PROJECT_ICON tag one can specify an icon that is included in the tabs +# when the HTML document is shown. Doxygen will copy the logo to the output +# directory. + +PROJECT_ICON = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = ./ + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line +# such as +# /*************** +# as being the beginning of a Javadoc-style comment "banner". If set to NO, the +# Javadoc-style will behave just like regular comments and it will not be +# interpreted by doxygen. +# The default value is: NO. + +JAVADOC_BANNER = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# By default Python docstrings are displayed as preformatted text and doxygen's +# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the +# doxygen's special commands can be used and the contents of the docstring +# documentation blocks is shown as doxygen documentation. +# The default value is: YES. + +PYTHON_DOCSTRING = YES + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:^^" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". Note that you cannot put \n's in the value part of an alias +# to insert newlines (in the resulting output). You can put ^^ in the value part +# of an alias to insert a newline as if a physical newline was in the original +# file. When you need a literal { or } or , in the value part of an alias you +# have to escape them by means of a backslash (\), this can lead to conflicts +# with the commands \{ and \} for these it is advised to use the version @{ and +# @} or use a double escape (\\{ and \\}) + +ALIASES = "license=@par License:\n" + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice +# sources only. Doxygen will then generate output that is more tailored for that +# language. For instance, namespaces will be presented as modules, types will be +# separated into more groups, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_SLICE = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, +# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice, +# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: +# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser +# tries to guess whether the code is fixed or free formatted code, this is the +# default for Fortran type files). For instance to make doxygen treat .inc files +# as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. When specifying no_extension you should add +# * to the FILE_PATTERNS. +# +# Note see also the list of default file extension mappings. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See https://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 5. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 0 + +# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to +# generate identifiers for the Markdown headings. Note: Every identifier is +# unique. +# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a +# sequence number starting at 0 and GITHUB use the lower case version of title +# with any whitespace replaced by '-' and punctuation characters removed. +# The default value is: DOXYGEN. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +MARKDOWN_ID_STYLE = DOXYGEN + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use +# during processing. When set to 0 doxygen will based this on the number of +# cores available in the system. You can set it explicitly to a value larger +# than 0 to get more control over the balance between CPU load and processing +# speed. At this moment only the input processing can be done using multiple +# threads. Since this is still an experimental feature the default is set to 1, +# which effectively disables parallel processing. Please report any issues you +# encounter. Generating dot graphs in parallel is controlled by the +# DOT_NUM_THREADS setting. +# Minimum value: 0, maximum value: 32, default value: 1. + +NUM_PROC_THREADS = 1 + +# If the TIMESTAMP tag is set different from NO then each generated page will +# contain the date or date and time when the page was generated. Setting this to +# NO can help when comparing the output of multiple runs. +# Possible values are: YES, NO, DATETIME and DATE. +# The default value is: NO. + +TIMESTAMP = NO + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual +# methods of a class will be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIV_VIRTUAL = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If this flag is set to YES, the name of an unnamed parameter in a declaration +# will be determined by the corresponding definition. By default unnamed +# parameters remain unnamed in the output. +# The default value is: YES. + +RESOLVE_UNNAMED_PARAMS = YES + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# declarations. If set to NO, these declarations will be included in the +# documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# With the correct setting of option CASE_SENSE_NAMES doxygen will better be +# able to match the capabilities of the underlying filesystem. In case the +# filesystem is case sensitive (i.e. it supports files in the same directory +# whose names only differ in casing), the option must be set to YES to properly +# deal with such files in case they appear in the input. For filesystems that +# are not case sensitive the option should be set to NO to properly deal with +# output files written for symbols that only differ in casing, such as for two +# classes, one named CLASS and the other named Class, and to also support +# references to files without having to specify the exact matching casing. On +# Windows (including Cygwin) and MacOS, users should typically set this option +# to NO, whereas on Linux or other Unix flavors it should typically be set to +# YES. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class +# will show which file needs to be included to use the class. +# The default value is: YES. + +SHOW_HEADERFILE = YES + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. See also section "Changing the +# layout of pages" for information. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as documenting some parameters in +# a documented function twice, or documenting parameters that don't exist or +# using markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete +# function parameter documentation. If set to NO, doxygen will accept that some +# parameters have no documentation without warning. +# The default value is: YES. + +WARN_IF_INCOMPLETE_DOC = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong parameter +# documentation, but not about the absence of documentation. If EXTRACT_ALL is +# set to YES then this flag will automatically be disabled. See also +# WARN_IF_INCOMPLETE_DOC +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS +# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but +# at the end of the doxygen process doxygen will return with a non-zero status. +# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves +# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not +# write the warning messages in between other messages but write them at the end +# of a run, in case a WARN_LOGFILE is defined the warning messages will be +# besides being in the defined file also be shown at the end of a run, unless +# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case +# the behavior will remain as with the setting FAIL_ON_WARNINGS. +# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT. +# The default value is: NO. + +WARN_AS_ERROR = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. + +INPUT = ../Connector \ + ../README.md \ + " ../../SpeckleLib/Speckle" \ + " ../../../ActiveLib/Active" + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: +# https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# Note the list of default checked file patterns might differ from the list of +# default file extension mappings. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm, +# *.cpp, *.cppm, *.ccm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, +# *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d, +# *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to +# be provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice. + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.idl \ + *.ddl \ + *.odl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.cs \ + *.d \ + *.php \ + *.php4 \ + *.php5 \ + *.phtml \ + *.inc \ + *.m \ + *.markdown \ + *.md \ + *.mm \ + *.dox \ + *.py \ + *.pyw \ + *.f90 \ + *.f95 \ + *.f03 \ + *.f08 \ + *.f \ + *.for \ + *.tcl \ + *.vhd \ + *.vhdl \ + *.ucf \ + *.qsf + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# ANamespace::AClass, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = ../Assets/Images/ + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = README.md + +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# multi-line macros, enums or list initialized variables directly into the +# documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# entity all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see https://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: +# http://clang.llvm.org/) for more accurate parsing at the cost of reduced +# performance. This can be particularly helpful with template rich C++ code for +# which doxygen's built-in parser lacks the necessary type information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse_libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = YES + +# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS +# tag is set to YES then doxygen will add the directory of each input to the +# include path. +# The default value is: YES. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_ADD_INC_PATHS = YES + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + +# If clang assisted parsing is enabled you can provide the clang parser with the +# path to the directory containing a file called compile_commands.json. This +# file is the compilation database (see: +# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the +# options used when the source files were built. This is equivalent to +# specifying the -p option to a clang tool, such as clang-check. These options +# will then be passed to the parser. Any options specified with CLANG_OPTIONS +# will be added as well. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse_libclang=ON option for CMake. + +CLANG_DATABASE_PATH = + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a color-wheel, see +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use gray-scales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via JavaScript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have JavaScript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# If the HTML_CODE_FOLDING tag is set to YES then classes and functions can be +# dynamically folded and expanded in the generated HTML source code. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_CODE_FOLDING = YES + +# If the HTML_COPY_CLIPBOARD tag is set to YES then doxygen will show an icon in +# the top right corner of code and text fragments that allows the user to copy +# its content to the clipboard. Note this only works if supported by the browser +# and the web page is served via a secure context (see: +# https://www.w3.org/TR/secure-contexts/), i.e. using the https: or file: +# protocol. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COPY_CLIPBOARD = YES + +# Doxygen stores a couple of settings persistently in the browser (via e.g. +# cookies). By default these settings apply to all HTML pages generated by +# doxygen across all projects. The HTML_PROJECT_COOKIE tag can be used to store +# the settings under a project specific key, such that the user preferences will +# be stored separately. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_PROJECT_COOKIE = + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: +# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To +# create a documentation set, doxygen will generate a Makefile in the HTML +# output directory. Running make will produce the docset in that directory and +# running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy +# genXcode/_index.html for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# on Windows. In the beginning of 2021 Microsoft took the original page, with +# a.o. the download links, offline the HTML help workshop was already many years +# in maintenance mode). You can download the HTML help workshop from the web +# archives at Installation executable (see: +# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo +# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe). +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the main .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# The SITEMAP_URL tag is used to specify the full URL of the place where the +# generated documentation will be placed on the server by the user during the +# deployment of the documentation. The generated sitemap is called sitemap.xml +# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL +# is specified no sitemap is generated. For information about the sitemap +# protocol see https://www.sitemaps.org +# This tag requires that the tag GENERATE_HTML is set to YES. + +SITEMAP_URL = + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location (absolute path +# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to +# run qhelpgenerator on the generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine tune the look of the index (see "Fine-tuning the output"). As an +# example, the default style sheet generated by doxygen has an example that +# shows how to put an image at the root of the tree instead of the PROJECT_NAME. +# Since the tree basically has the same information as the tab index, you could +# consider setting DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the +# FULL_SIDEBAR option determines if the side bar is limited to only the treeview +# area (value NO) or if it should extend to the full height of the window (value +# YES). Setting this to YES gives a layout similar to +# https://docs.readthedocs.io with more room for contents, but less room for the +# project logo, title, and description. If either GENERATE_TREEVIEW or +# DISABLE_INDEX is set to NO, this option has no effect. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FULL_SIDEBAR = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + +# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg +# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see +# https://inkscape.org) to generate formulas as SVG images instead of PNGs for +# the HTML output. These images will generally look nicer at scaled resolutions. +# Possible values are: png (the default) and svg (looks nicer but requires the +# pdf2svg or inkscape tool). +# The default value is: png. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FORMULA_FORMAT = png + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands +# to create new LaTeX commands to be used in formulas as building blocks. See +# the section "Including formulas" for details. + +FORMULA_MACROFILE = + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# https://www.mathjax.org) which uses client side JavaScript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# With MATHJAX_VERSION it is possible to specify the MathJax version to be used. +# Note that the different versions of MathJax have different requirements with +# regards to the different settings, so it is possible that also other MathJax +# settings have to be changed when switching between the different MathJax +# versions. +# Possible values are: MathJax_2 and MathJax_3. +# The default value is: MathJax_2. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_VERSION = MathJax_2 + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. For more details about the output format see MathJax +# version 2 (see: +# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3 +# (see: +# http://docs.mathjax.org/en/latest/web/components/output.html). +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility. This is the name for Mathjax version 2, for MathJax version 3 +# this will be translated into chtml), NativeMML (i.e. MathML. Only supported +# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This +# is the name for Mathjax version 3, for MathJax version 2 this will be +# translated into HTML-CSS) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from https://www.mathjax.org before deployment. The default value is: +# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2 +# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3 +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/ + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# for MathJax version 2 (see +# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions): +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# For example for MathJax version 3 (see +# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html): +# MATHJAX_EXTENSIONS = ams +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: +# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /