ElementChangedSubscriber renamed to ElementSubscriber
This commit is contained in:
@@ -2,14 +2,14 @@
|
||||
#define CONNECTOR_INTERFACE_BRIDGE_SEND_BRIDGE
|
||||
|
||||
#include "Speckle/Interface/Browser/Bridge/BrowserBridge.h"
|
||||
#include "Speckle/Event/Subscriber/ElementChangedSubscriber.h"
|
||||
#include "Speckle/Event/Subscriber/ElementSubscriber.h"
|
||||
|
||||
namespace connector::interfac::browser::bridge {
|
||||
|
||||
/*!
|
||||
A browser bridge to support sending model data to a Speckle server
|
||||
*/
|
||||
class SendBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ElementChangedSubscriber {
|
||||
class SendBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ElementSubscriber {
|
||||
public:
|
||||
|
||||
// MARK: - Types
|
||||
|
||||
+9
-9
@@ -1,4 +1,4 @@
|
||||
#include "Speckle/Event/Subscriber/ElementChangedSubscriber.h"
|
||||
#include "Speckle/Event/Subscriber/ElementSubscriber.h"
|
||||
#include "Speckle/Environment/Addon.h"
|
||||
#include "Speckle/Database/Identity/BIMLink.h"
|
||||
#include "Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.h"
|
||||
@@ -62,9 +62,9 @@ namespace {
|
||||
|
||||
return: The subscription list (an empty list will put the subscriber into a suspended state)
|
||||
--------------------------------------------------------------------*/
|
||||
Subscriber::Subscription ElementChangedSubscriber::subscription() const {
|
||||
Subscriber::Subscription ElementSubscriber::subscription() const {
|
||||
return { {ElementEvent::ID} };
|
||||
} //ElementChangedSubscriber::subscription
|
||||
} //ElementSubscriber::subscription
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
@@ -74,12 +74,12 @@ Subscriber::Subscription ElementChangedSubscriber::subscription() const {
|
||||
|
||||
return: True if the event should be closed
|
||||
--------------------------------------------------------------------*/
|
||||
bool ElementChangedSubscriber::receive(const Event& event) {
|
||||
bool ElementSubscriber::receive(const Event& event) {
|
||||
//Pass a menu event to the specified handler function
|
||||
if (auto changeEvent = dynamic_cast<const ElementEvent*>(&event); changeEvent != nullptr)
|
||||
return handle(*changeEvent);
|
||||
return false;
|
||||
} //ElementChangedSubscriber::receive
|
||||
} //ElementSubscriber::receive
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
@@ -87,7 +87,7 @@ bool ElementChangedSubscriber::receive(const Event& event) {
|
||||
|
||||
return: True if the participant is able to continue
|
||||
--------------------------------------------------------------------*/
|
||||
bool ElementChangedSubscriber::start() {
|
||||
bool ElementSubscriber::start() {
|
||||
#ifdef ARCHICAD
|
||||
GSErrCode err = ACAPI_Element_InstallElementObserver(elementChangedCallback);
|
||||
if (err != NoError)
|
||||
@@ -97,14 +97,14 @@ bool ElementChangedSubscriber::start() {
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
} //ElementChangedSubscriber::start
|
||||
} //ElementSubscriber::start
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
Stop participation (release resources etc)
|
||||
--------------------------------------------------------------------*/
|
||||
void ElementChangedSubscriber::stop() {
|
||||
void ElementSubscriber::stop() {
|
||||
#ifdef ARCHICAD
|
||||
ACAPI_Notification_CatchSelectionChange(nullptr);
|
||||
#endif
|
||||
} //ElementChangedSubscriber::stop
|
||||
} //ElementSubscriber::stop
|
||||
+4
-4
@@ -11,7 +11,7 @@ namespace speckle::event {
|
||||
/*!
|
||||
Base class for subscribers responding to element changes
|
||||
*/
|
||||
class ElementChangedSubscriber : public virtual active::event::Subscriber {
|
||||
class ElementSubscriber : public virtual active::event::Subscriber {
|
||||
public:
|
||||
|
||||
// MARK: - Constructors
|
||||
@@ -19,16 +19,16 @@ namespace speckle::event {
|
||||
/*!
|
||||
Default constructor
|
||||
*/
|
||||
ElementChangedSubscriber() = default;
|
||||
ElementSubscriber() = default;
|
||||
/*!
|
||||
Copy constructor
|
||||
@param source The object to copy
|
||||
*/
|
||||
ElementChangedSubscriber(const ElementChangedSubscriber& source) = default;
|
||||
ElementSubscriber(const ElementSubscriber& source) = default;
|
||||
/*!
|
||||
Destructor
|
||||
*/
|
||||
~ElementChangedSubscriber() = default;
|
||||
~ElementSubscriber() = default;
|
||||
|
||||
// MARK: - Functions (const)
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
<ClInclude Include="Speckle\Environment\Platform.h" />
|
||||
<ClInclude Include="Speckle\Environment\Project.h" />
|
||||
<ClInclude Include="Speckle\Event\Subscriber\DocStoreSubscriber.h" />
|
||||
<ClInclude Include="Speckle\Event\Subscriber\ElementChangedSubscriber.h" />
|
||||
<ClInclude Include="Speckle\Event\Subscriber\ElementSubscriber.h" />
|
||||
<ClInclude Include="Speckle\Event\Subscriber\MenuSubscriber.h" />
|
||||
<ClInclude Include="Speckle\Event\Subscriber\ProjectSubscriber.h" />
|
||||
<ClInclude Include="Speckle\Event\Subscriber\SelectionSubscriber.h" />
|
||||
@@ -140,7 +140,7 @@
|
||||
<ClCompile Include="Speckle\Environment\Platform.cpp" />
|
||||
<ClCompile Include="Speckle\Environment\Project.cpp" />
|
||||
<ClCompile Include="Speckle\Event\Subscriber\DocStoreSubscriber.cpp" />
|
||||
<ClCompile Include="Speckle\Event\Subscriber\ElementChangedSubscriber.cpp" />
|
||||
<ClCompile Include="Speckle\Event\Subscriber\ElementSubscriber.cpp" />
|
||||
<ClCompile Include="Speckle\Event\Subscriber\MenuSubscriber.cpp" />
|
||||
<ClCompile Include="Speckle\Event\Subscriber\ProjectSubscriber.cpp" />
|
||||
<ClCompile Include="Speckle\Event\Subscriber\SelectionSubscriber.cpp" />
|
||||
|
||||
@@ -415,7 +415,7 @@
|
||||
<ClInclude Include="Speckle\Record\Element\BeamSegment.h">
|
||||
<Filter>Speckle\Record\Element</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Speckle\Event\Subscriber\ElementChangedSubscriber.h">
|
||||
<ClInclude Include="Speckle\Event\Subscriber\ElementSubscriber.h">
|
||||
<Filter>Speckle\Event\Subscriber</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Speckle\Event\Type\ElementEvent.h" />
|
||||
@@ -634,7 +634,7 @@
|
||||
<ClCompile Include="Speckle\Record\Element\BeamSegment.cpp">
|
||||
<Filter>Speckle\Record\Element</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Speckle\Event\Subscriber\ElementChangedSubscriber.cpp">
|
||||
<ClCompile Include="Speckle\Event\Subscriber\ElementSubscriber.cpp">
|
||||
<Filter>Speckle\Event\Subscriber</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
||||
Reference in New Issue
Block a user