Skip to content

Remove tmsClientPropertyImpl and instead use the Core property #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denise-opendaq wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove tmsClientPropertyImpl and instead use the Core property #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bd84d3
init
denise-opendaq Aug 19, 2026
eed2c38
update opendaq ref
denise-opendaq Aug 19, 2026
2604adc
Rename sync_component_rework to move_propertyImpl_to_cpp
denise-opendaq Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opendaq_ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e6f13d80fa7c64697e5549fc1d897b03ad813415
move_propertyImpl_to_cpp
2 changes: 2 additions & 0 deletions ...braries/opcuatms/opcuatms_client/include/opcuatms_client/objects/tms_client_object_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

BEGIN_NAMESPACE_OPENDAQ_OPCUA_TMS

bool GetExecutePermission(const TmsClientContextPtr& clientContext, const ContextPtr& daqContext, const opcua::OpcUaNodeId& nodeId);

class TmsClientObjectImpl
{
public:
Expand Down
24 changes: 4 additions & 20 deletions ...es/opcuatms/opcuatms_client/include/opcuatms_client/objects/tms_client_property_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,13 @@
* limitations under the License.
*/
#pragma once
#include <coreobjects/property_ptr.h>
#include <opcuatms/opcuatms.h>
#include <opcuatms_client/objects/tms_client_context.h>
#include <opcuatms_client/objects/tms_client_property_impl.h>

BEGIN_NAMESPACE_OPENDAQ_OPCUA_TMS

OPENDAQ_DECLARE_CLASS_FACTORY_WITH_INTERFACE(INLINE_FACTORY,
TmsClientProperty, IProperty,
const daq::ContextPtr&, daqContext,
const daq::opcua::tms::TmsClientContextPtr&, ctx,
const opcua::OpcUaNodeId&, nodeId,
const daq::StringPtr&, propertyName)

OPENDAQ_DEFINE_CLASS_FACTORY_WITH_INTERFACE(INLINE_FACTORY,
TmsClientProperty, IProperty,
const daq::ContextPtr&, daqContext,
const daq::opcua::tms::TmsClientContextPtr&, client,
const opcua::OpcUaNodeId&, nodeId,
const daq::StringPtr&, propertyName)

inline PropertyPtr TmsClientProperty(const ContextPtr& daqContext, const TmsClientContextPtr& ctx, const OpcUaNodeId& nodeId, const StringPtr& propertyName = nullptr)
{
PropertyPtr obj(TmsClientProperty_Create(daqContext, ctx, nodeId, propertyName));
return obj;
}
// Reads a Property node from the OpcUa server and builds the corresponding openDAQ Property.
PropertyPtr TmsClientProperty(const ContextPtr& daqContext, const TmsClientContextPtr& ctx, const opcua::OpcUaNodeId& nodeId, const StringPtr& propertyName = nullptr);

END_NAMESPACE_OPENDAQ_OPCUA_TMS
36 changes: 0 additions & 36 deletions ...aries/opcuatms/opcuatms_client/include/opcuatms_client/objects/tms_client_property_impl.h
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions shared/libraries/opcuatms/opcuatms_client/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ set(SRC_Objects_Headers ${OBJECT_SRC_DIR}/tms_client_object_impl.h
${OBJECT_SRC_DIR}/tms_client_channel_impl.h
${OBJECT_SRC_DIR}/tms_client_channel_factory.h

${OBJECT_SRC_DIR}/tms_client_property_impl.h
${OBJECT_SRC_DIR}/tms_client_property_factory.h

${OBJECT_SRC_DIR}/tms_client_input_port_impl.h
Expand Down Expand Up @@ -77,7 +76,7 @@ set(SRC_Objects ${OBJECT_SRC_DIR}/tms_client_object_impl.cpp
${OBJECT_SRC_DIR}/tms_client_function_block_impl.cpp
${OBJECT_SRC_DIR}/tms_client_channel_impl.cpp
${OBJECT_SRC_DIR}/tms_client_input_port_impl.cpp
${OBJECT_SRC_DIR}/tms_client_property_impl.cpp
${OBJECT_SRC_DIR}/tms_client_property_factory.cpp
${OBJECT_SRC_DIR}/tms_client_property_object_impl.cpp
${OBJECT_SRC_DIR}/tms_client_device_impl.cpp
${OBJECT_SRC_DIR}/tms_client_folder_impl.cpp
Expand Down
13 changes: 9 additions & 4 deletions shared/libraries/opcuatms/opcuatms_client/src/objects/tms_client_object_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,13 @@ bool TmsClientObjectImpl::getAttributeWritePermission(const opcua::OpcUaNodeId&

bool TmsClientObjectImpl::getExecutePermission(const opcua::OpcUaNodeId& nodeId)
{
// Note: This method is used to determine if a method node is executable.
// Other nodes don't have executable attributes and this method will return true for them.
return GetExecutePermission(clientContext, daqContext, nodeId);
}

bool GetExecutePermission(const TmsClientContextPtr& clientContext, const ContextPtr& daqContext, const opcua::OpcUaNodeId& nodeId)
{
// Note: This function is used to determine if a method node is executable.
// Other nodes don't have executable attributes and this function will return true for them.
bool commonExecutable = true;
try
{
Expand All @@ -144,9 +149,9 @@ bool TmsClientObjectImpl::getExecutePermission(const opcua::OpcUaNodeId& nodeId)
}
catch (...)
{
if (this->daqContext.getLogger().assigned())
if (daqContext.getLogger().assigned())
{
auto loggerComponent = this->daqContext.getLogger().getOrAddComponent("OpcUaClientObject");
auto loggerComponent = daqContext.getLogger().getOrAddComponent("OpcUaClientObject");
LOG_W("Cannot read executable mask attributes for OpcUA node");
}
}
Expand Down
Loading
Loading