Skip to content
Snippets Groups Projects
Commit 6df454b7 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

Refactoring of aron

parent 34fff8b6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 146 additions and 218 deletions
source/RobotAPI/applications/AronCodeGenerator/main.cpp
+ 2
− 2
View file @ 6df454b7
......@@ -39,8 +39,8 @@
#include <ArmarXCore/libraries/cppgen/CppMethod.h>
#include <ArmarXCore/libraries/cppgen/CppClass.h>
#include <RobotAPI/libraries/aron/aroncore/codegenerator/typeReaders/xmlReader/AronTypeXMLReader.h>
#include <RobotAPI/libraries/aron/aroncore/codegenerator/codeWriters/cppWriter/AronCppWriter.h>
#include <RobotAPI/libraries/aron/aroncore/codegenerator/typeReader/xml/AronTypeXMLReader.h>
#include <RobotAPI/libraries/aron/aroncore/codegenerator/codeWriter/cpp/AronCppWriter.h>
using namespace armarx;
using namespace aron;
......
source/RobotAPI/components/armem/ArMemDebugMemory/xmls/ExampleData.xml deleted 100644 → 0
+ 0
− 86
View file @ 34fff8b6
<!--Some fancy comment -->
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
<CodeIncludes>
<Include include="<Eigen/Core>" />
<Include include="<Image/ByteImage.h>" />
</CodeIncludes>
<GenerateTypes>
<GenerateType name='armarx::armem::aron::example::ExampleData'>
<ObjectChild key='the_int'>
<Int />
</ObjectChild>
<ObjectChild key='the_long'>
<Long />
</ObjectChild>
<ObjectChild key='the_float'>
<Float />
</ObjectChild>
<ObjectChild key='the_double'>
<Double />
</ObjectChild>
<ObjectChild key='the_string'>
<String />
</ObjectChild>
<ObjectChild key='the_bool'>
<Bool />
</ObjectChild>
<ObjectChild key='the_eigen_position'>
<EigenMatrix rows="3" cols="1" type="float" />
</ObjectChild>
<ObjectChild key='the_eigen_pose'>
<EigenMatrix rows="4" cols="4" type="float" />
</ObjectChild>
<ObjectChild key='the_ivt_image'>
<IVTCByteImage type="GrayScale" />
</ObjectChild>
<ObjectChild key='the_float_list'>
<List>
<Float />
</List>
</ObjectChild>
<ObjectChild key='the_int_list'>
<List>
<Int />
</List>
</ObjectChild>
<ObjectChild key='the_string_list'>
<List>
<String />
</List>
</ObjectChild>
<ObjectChild key='the_object_list'>
<List>
<Object name='ListClass'>
<ObjectChild key='element_int'>
<Int />
</ObjectChild>
<ObjectChild key='element_float'>
<Float />
</ObjectChild>
<ObjectChild key='element_string'>
<String />
</ObjectChild>
</Object>
</List>
</ObjectChild>
<ObjectChild key='the_float_dict'>
<Dict>
<Float />
</Dict>
</ObjectChild>
<ObjectChild key='the_int_dict'>
<Dict>
<Int />
</Dict>
</ObjectChild>
</GenerateType>
</GenerateTypes>
</AronTypeDefinition>
source/RobotAPI/components/armem/ArMemExampleMemory/test/CMakeLists.txt deleted 100644 → 0
+ 0
− 5
View file @ 34fff8b6
# Libs required for the tests
SET(LIBS ${LIBS} ArmarXCore ArMemExampleMemory)
armarx_add_test(ArMemExampleMemoryTest ArMemExampleMemoryTest.cpp "${LIBS}")
source/RobotAPI/components/armem/ArMemMemoryNameSystem/test/CMakeLists.txt deleted 100644 → 0
+ 0
− 5
View file @ 34fff8b6
# Libs required for the tests
SET(LIBS ${LIBS} ArmarXCore ArMemMemoryNameSystem)
armarx_add_test(ArMemMemoryNameSystemTest ArMemMemoryNameSystemTest.cpp "${LIBS}")
source/RobotAPI/components/armem/CMakeLists.txt
+ 14
− 4
View file @ 6df454b7
add_subdirectory(ArMemExampleMemory)
add_subdirectory(ArMemDebugMemory)
add_subdirectory(ArMemExampleClient)
add_subdirectory(ArMemMemoryNameSystem)
# memory servers
add_subdirectory(server/ExampleMemory)
add_subdirectory(server/GeneralPurposeMemory)
add_subdirectory(server/RobotSensorMemory)
add_subdirectory(server/SkillsMemory)
# memory server addons
# clients
add_subdirectory(client/ExampleClient)
# The memory name system
add_subdirectory(MemoryNameSystem)
source/RobotAPI/components/armem/MemoryNameSystem/CMakeLists.txt 0 → 100644
+ 22
− 0
View file @ 6df454b7
armarx_component_set_name("MemoryNameSystem")
set(COMPONENT_LIBS
ArmarXCore ArmarXCoreInterfaces # for DebugObserverInterface
ArmarXGuiComponentPlugins
RobotAPICore RobotAPIInterfaces armem
# RobotAPIComponentPlugins # for ArViz and other plugins
)
set(SOURCES
MemoryNameSystem.cpp
)
set(HEADERS
MemoryNameSystem.h
)
armarx_add_component("${SOURCES}" "${HEADERS}")
#generate the application
armarx_generate_and_add_component_executable()
source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.cpp → source/RobotAPI/components/armem/MemoryNameSystem/MemoryNameSystem.cpp
+ 15
− 15
View file @ 6df454b7
......@@ -13,14 +13,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package RobotAPI::ArmarXObjects::ArMemMemoryNameSystem
* @package RobotAPI::ArmarXObjects::MemoryNameSystem
* @author Rainer Kartmann ( rainer dot kartmann at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
#include "ArMemMemoryNameSystem.h"
#include "MemoryNameSystem.h"
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
......@@ -31,49 +31,49 @@
namespace armarx
{
ArMemMemoryNameSystemPropertyDefinitions::ArMemMemoryNameSystemPropertyDefinitions(std::string prefix) :
MemoryNameSystemPropertyDefinitions::MemoryNameSystemPropertyDefinitions(std::string prefix) :
armarx::ComponentPropertyDefinitions(prefix)
{
}
armarx::PropertyDefinitionsPtr ArMemMemoryNameSystem::createPropertyDefinitions()
armarx::PropertyDefinitionsPtr MemoryNameSystem::createPropertyDefinitions()
{
armarx::PropertyDefinitionsPtr defs = new ArMemMemoryNameSystemPropertyDefinitions(getConfigIdentifier());
armarx::PropertyDefinitionsPtr defs = new MemoryNameSystemPropertyDefinitions(getConfigIdentifier());
return defs;
}
std::string ArMemMemoryNameSystem::getDefaultName() const
std::string MemoryNameSystem::getDefaultName() const
{
return "ArMemMemoryNameSystem";
return "MemoryNameSystem";
}
void ArMemMemoryNameSystem::onInitComponent()
void MemoryNameSystem::onInitComponent()
{
}
void ArMemMemoryNameSystem::onConnectComponent()
void MemoryNameSystem::onConnectComponent()
{
RemoteGui__createTab();
RemoteGui_startRunningTask();
}
void ArMemMemoryNameSystem::onDisconnectComponent()
void MemoryNameSystem::onDisconnectComponent()
{
}
void ArMemMemoryNameSystem::onExitComponent()
void MemoryNameSystem::onExitComponent()
{
}
armem::data::RegisterMemoryResult ArMemMemoryNameSystem::registerMemory(
armem::data::RegisterMemoryResult MemoryNameSystem::registerMemory(
const armem::data::RegisterMemoryInput& input, const Ice::Current& c)
{
armem::data::RegisterMemoryResult result = Plugin::registerMemory(input, c);
......@@ -82,7 +82,7 @@ namespace armarx
}
armem::data::RemoveMemoryResult ArMemMemoryNameSystem::removeMemory(
armem::data::RemoveMemoryResult MemoryNameSystem::removeMemory(
const armem::data::RemoveMemoryInput& input, const Ice::Current& c)
{
armem::data::RemoveMemoryResult result = Plugin::removeMemory(input, c);
......@@ -94,7 +94,7 @@ namespace armarx
// REMOTE GUI
void ArMemMemoryNameSystem::RemoteGui__createTab()
void MemoryNameSystem::RemoteGui__createTab()
{
using namespace armarx::RemoteGui::Client;
......@@ -106,7 +106,7 @@ namespace armarx
}
void ArMemMemoryNameSystem::RemoteGui_update()
void MemoryNameSystem::RemoteGui_update()
{
if (tab.rebuild.exchange(false))
{
......
source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.h → source/RobotAPI/components/armem/MemoryNameSystem/MemoryNameSystem.h
+ 12
− 12
View file @ 6df454b7
......@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package RobotAPI::ArmarXObjects::ArMemMemoryNameSystem
* @package RobotAPI::ArmarXObjects::MemoryNameSystem
* @author Rainer Kartmann ( rainer dot kartmann at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
......@@ -37,30 +37,30 @@
namespace armarx
{
/**
* @class ArMemMemoryNameSystemPropertyDefinitions
* @brief Property definitions of `ArMemMemoryNameSystem`.
* @class MemoryNameSystemPropertyDefinitions
* @brief Property definitions of `MemoryNameSystem`.
*/
class ArMemMemoryNameSystemPropertyDefinitions :
class MemoryNameSystemPropertyDefinitions :
public armarx::ComponentPropertyDefinitions
{
public:
ArMemMemoryNameSystemPropertyDefinitions(std::string prefix);
MemoryNameSystemPropertyDefinitions(std::string prefix);
};
/**
* @defgroup Component-ArMemMemoryNameSystem ArMemMemoryNameSystem
* @defgroup Component-MemoryNameSystem MemoryNameSystem
* @ingroup RobotAPI-Components
* A description of the component ArMemMemoryNameSystem.
* A description of the component MemoryNameSystem.
*
* @class ArMemMemoryNameSystem
* @ingroup Component-ArMemMemoryNameSystem
* @brief Brief description of class ArMemMemoryNameSystem.
* @class MemoryNameSystem
* @ingroup Component-MemoryNameSystem
* @brief Brief description of class MemoryNameSystem.
*
* Detailed description of class ArMemMemoryNameSystem.
* Detailed description of class MemoryNameSystem.
*/
class ArMemMemoryNameSystem :
class MemoryNameSystem :
virtual public armarx::Component
, virtual public armem::mns::ComponentPluginUser
, virtual public LightweightRemoteGuiComponentPluginUser
......
source/RobotAPI/components/armem/MemoryNameSystem/test/CMakeLists.txt 0 → 100644
+ 5
− 0
View file @ 6df454b7
# Libs required for the tests
SET(LIBS ${LIBS} ArmarXCore MemoryNameSystem)
armarx_add_test(MemoryNameSystemTest MemoryNameSystemTest.cpp "${LIBS}")
source/RobotAPI/components/armem/ArMemMemoryNameSystem/test/ArMemMemoryNameSystemTest.cpp → source/RobotAPI/components/armem/MemoryNameSystem/test/MemoryNameSystemTest.cpp
+ 4
− 4
View file @ 6df454b7
......@@ -13,25 +13,25 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package RobotAPI::ArmarXObjects::ArMemMemoryNameSystem
* @package RobotAPI::ArmarXObjects::MemoryNameSystem
* @author Rainer Kartmann ( rainer dot kartmann at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
#define BOOST_TEST_MODULE RobotAPI::ArmarXObjects::ArMemMemoryNameSystem
#define BOOST_TEST_MODULE RobotAPI::ArmarXObjects::MemoryNameSystem
#define ARMARX_BOOST_TEST
#include <RobotAPI/Test.h>
#include "../ArMemMemoryNameSystem.h"
#include "../MemoryNameSystem.h"
#include <iostream>
BOOST_AUTO_TEST_CASE(testExample)
{
armarx::ArMemMemoryNameSystem instance;
armarx::MemoryNameSystem instance;
BOOST_CHECK_EQUAL(true, true);
}
source/RobotAPI/components/armem/ArMemExampleClient/CMakeLists.txt → source/RobotAPI/components/armem/client/ExampleClient/CMakeLists.txt
+ 3
− 3
View file @ 6df454b7
armarx_component_set_name("ArMemExampleClient")
armarx_component_set_name("ExampleClient")
find_package(IVT QUIET)
armarx_build_if(IVT_FOUND "IVT not available")
......@@ -11,11 +11,11 @@ set(COMPONENT_LIBS
)
set(SOURCES
ArMemExampleClient.cpp
ExampleClient.cpp
)
set(HEADERS
ArMemExampleClient.h
ExampleClient.h
)
armarx_add_component("${SOURCES}" "${HEADERS}")
......
source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp → source/RobotAPI/components/armem/client/ExampleClient/ExampleClient.cpp
+ 25
− 25
View file @ 6df454b7
......@@ -13,14 +13,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package RobotAPI::ArmarXObjects::ArMemExampleClient
* @package RobotAPI::ArmarXObjects::ExampleClient
* @author Rainer Kartmann ( rainer dot kartmann at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
#include "ArMemExampleClient.h"
#include "ExampleClient.h"
#include <SimoxUtility/color/cmaps.h>
......@@ -32,19 +32,19 @@
#include <RobotAPI/libraries/armem/client/query/query_fns.h>
#include <RobotAPI/libraries/armem/core/ice_conversions.h>
#include <RobotAPI/components/armem/ArMemExampleMemory/aron/ExampleData.aron.generated.h>
#include <RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.aron.generated.h>
namespace armarx
{
ArMemExampleClientPropertyDefinitions::ArMemExampleClientPropertyDefinitions(std::string prefix) :
ExampleClientPropertyDefinitions::ExampleClientPropertyDefinitions(std::string prefix) :
armarx::ComponentPropertyDefinitions(prefix)
{
}
armarx::PropertyDefinitionsPtr ArMemExampleClient::createPropertyDefinitions()
armarx::PropertyDefinitionsPtr ExampleClient::createPropertyDefinitions()
{
armarx::PropertyDefinitionsPtr defs = new ArMemExampleClientPropertyDefinitions(getConfigIdentifier());
armarx::PropertyDefinitionsPtr defs = new ExampleClientPropertyDefinitions(getConfigIdentifier());
defs->topic(debugObserver);
......@@ -53,18 +53,18 @@ namespace armarx
return defs;
}
std::string ArMemExampleClient::getDefaultName() const
std::string ExampleClient::getDefaultName() const
{
return "ArMemExampleClient";
return "ExampleClient";
}
void ArMemExampleClient::onInitComponent()
void ExampleClient::onInitComponent()
{
}
void ArMemExampleClient::onConnectComponent()
void ExampleClient::onConnectComponent()
{
createRemoteGuiTab();
RemoteGui_startRunningTask();
......@@ -90,26 +90,26 @@ namespace armarx
ARMARX_INFO << "Entity " << entityID << " was updated by " << snapshotIDs.size() << " snapshots.";
});
// Using a member function:
memoryReader.subscribe(entityID, this, &ArMemExampleClient::example_entityUpdated);
memoryReader.subscribe(entityID, this, &ExampleClient::example_entityUpdated);
task = new RunningTask<ArMemExampleClient>(this, &ArMemExampleClient::run);
task = new RunningTask<ExampleClient>(this, &ExampleClient::run);
task->start();
}
void ArMemExampleClient::onDisconnectComponent()
void ExampleClient::onDisconnectComponent()
{
task->stop();
}
void ArMemExampleClient::onExitComponent()
void ExampleClient::onExitComponent()
{
}
void ArMemExampleClient::run()
void ExampleClient::run()
{
ARMARX_IMPORTANT << "Running example.";
......@@ -142,7 +142,7 @@ namespace armarx
}
armem::MemoryID ArMemExampleClient::addProviderSegment()
armem::MemoryID ExampleClient::addProviderSegment()
{
armem::data::AddSegmentInput input;
input.coreSegmentName = "ExampleModality";
......@@ -155,7 +155,7 @@ namespace armarx
return armem::MemoryID(result.segmentID);
}
armem::MemoryID ArMemExampleClient::commitSingleSnapshot(const armem::MemoryID& entityID)
armem::MemoryID ExampleClient::commitSingleSnapshot(const armem::MemoryID& entityID)
{
// Prepare the update with some empty instances.
armem::EntityUpdate update;
......@@ -178,7 +178,7 @@ namespace armarx
return updateResult.snapshotID;
}
void ArMemExampleClient::commitMultipleSnapshots(const armem::MemoryID& entityID, int num)
void ExampleClient::commitMultipleSnapshots(const armem::MemoryID& entityID, int num)
{
// Commit a number of updates with different timestamps and number of instances.
armem::Commit commit;
......@@ -202,7 +202,7 @@ namespace armarx
}
void ArMemExampleClient::queryLatestSnapshot(const armem::MemoryID& entityID)
void ExampleClient::queryLatestSnapshot(const armem::MemoryID& entityID)
{
ARMARX_IMPORTANT
<< "Querying latest snapshot: "
......@@ -262,7 +262,7 @@ namespace armarx
}
}
void ArMemExampleClient::queryExactSnapshot(const armem::MemoryID& snapshotID)
void ExampleClient::queryExactSnapshot(const armem::MemoryID& snapshotID)
{
ARMARX_IMPORTANT
<< "Querying exact smapshot: "
......@@ -297,7 +297,7 @@ namespace armarx
}
void ArMemExampleClient::commitExampleData()
void ExampleClient::commitExampleData()
{
ARMARX_IMPORTANT << "Adding segment " << "ExampleData" << "/" << getName();
......@@ -376,7 +376,7 @@ namespace armarx
}
}
void ArMemExampleClient::queryExampleData()
void ExampleClient::queryExampleData()
{
// Query all entities from provider.
armem::client::query::Builder qb;
......@@ -400,7 +400,7 @@ namespace armarx
void ArMemExampleClient::example_entityUpdated(const armem::MemoryID& subscriptionID, const std::vector<armem::MemoryID>& snapshotIDs)
void ExampleClient::example_entityUpdated(const armem::MemoryID& subscriptionID, const std::vector<armem::MemoryID>& snapshotIDs)
{
std::stringstream ss;
ss << "example_entity got updated: " << subscriptionID << "\n";
......@@ -414,7 +414,7 @@ namespace armarx
}
void ArMemExampleClient::createRemoteGuiTab()
void ExampleClient::createRemoteGuiTab()
{
using namespace armarx::RemoteGui::Client;
......@@ -427,7 +427,7 @@ namespace armarx
RemoteGui_createTab(getName(), root, &tab);
}
void ArMemExampleClient::RemoteGui_update()
void ExampleClient::RemoteGui_update()
{
if (tab.rebuild.exchange(false))
{
......
source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h → source/RobotAPI/components/armem/client/ExampleClient/ExampleClient.h
+ 13
− 13
View file @ 6df454b7
......@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package RobotAPI::ArmarXObjects::ArMemExampleClient
* @package RobotAPI::ArmarXObjects::ExampleClient
* @author Rainer Kartmann ( rainer dot kartmann at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
......@@ -40,29 +40,29 @@
namespace armarx
{
/**
* @class ArMemExampleClientPropertyDefinitions
* @brief Property definitions of `ArMemExampleClient`.
* @class ExampleClientPropertyDefinitions
* @brief Property definitions of `ExampleClient`.
*/
class ArMemExampleClientPropertyDefinitions :
class ExampleClientPropertyDefinitions :
public armarx::ComponentPropertyDefinitions
{
public:
ArMemExampleClientPropertyDefinitions(std::string prefix);
ExampleClientPropertyDefinitions(std::string prefix);
};
/**
* @defgroup Component-ArMemExampleClient ArMemExampleClient
* @defgroup Component-ExampleClient ExampleClient
* @ingroup RobotAPI-Components
* A description of the component ArMemExampleClient.
* A description of the component ExampleClient.
*
* @class ArMemExampleClient
* @ingroup Component-ArMemExampleClient
* @brief Brief description of class ArMemExampleClient.
* @class ExampleClient
* @ingroup Component-ExampleClient
* @brief Brief description of class ExampleClient.
*
* Detailed description of class ArMemExampleClient.
* Detailed description of class ExampleClient.
*/
class ArMemExampleClient :
class ExampleClient :
virtual public armarx::Component,
virtual public armarx::armem::client::ComponentPluginUser,
virtual public LightweightRemoteGuiComponentPluginUser
......@@ -114,7 +114,7 @@ namespace armarx
private:
armarx::RunningTask<ArMemExampleClient>::pointer_type task;
armarx::RunningTask<ExampleClient>::pointer_type task;
armarx::DebugObserverInterfacePrx debugObserver;
......
source/RobotAPI/components/armem/ArMemExampleMemory/CMakeLists.txt → source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt
+ 3
− 3
View file @ 6df454b7
armarx_component_set_name("ArMemExampleMemory")
armarx_component_set_name("ExampleMemory")
find_package(IVT QUIET)
armarx_build_if(IVT_FOUND "IVT not available")
......@@ -14,10 +14,10 @@ set(COMPONENT_LIBS
)
set(SOURCES
ArMemExampleMemory.cpp
ExampleMemory.cpp
)
set(HEADERS
ArMemExampleMemory.h
ExampleMemory.h
)
......
source/RobotAPI/components/armem/ArMemExampleMemory/ArMemExampleMemory.cpp → source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp
+ 15
− 20
View file @ 6df454b7
......@@ -13,14 +13,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package RobotAPI::ArmarXObjects::ArMemExampleMemory
* @package RobotAPI::ArmarXObjects::ExampleMemory
* @author Rainer Kartmann ( rainer dot kartmann at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
#include "ArMemExampleMemory.h"
#include "ExampleMemory.h"
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
......@@ -29,19 +29,14 @@
#include <RobotAPI/libraries/armem/core/error.h>
#include <RobotAPI/libraries/armem/server/MemoryRemoteGui.h>
#include <RobotAPI/components/armem/ArMemExampleMemory/aron/ExampleData.aron.generated.h>
#include <RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.aron.generated.h>
namespace armarx
{
ArMemExampleMemoryPropertyDefinitions::ArMemExampleMemoryPropertyDefinitions(std::string prefix) :
armarx::ComponentPropertyDefinitions(prefix)
armarx::PropertyDefinitionsPtr ExampleMemory::createPropertyDefinitions()
{
}
armarx::PropertyDefinitionsPtr ArMemExampleMemory::createPropertyDefinitions()
{
armarx::PropertyDefinitionsPtr defs = new ArMemExampleMemoryPropertyDefinitions(getConfigIdentifier());
armarx::PropertyDefinitionsPtr defs = new ComponentPropertyDefinitions(getConfigIdentifier());
defs->topic(debugObserver);
......@@ -58,12 +53,12 @@ namespace armarx
}
std::string ArMemExampleMemory::getDefaultName() const
std::string ExampleMemory::getDefaultName() const
{
return "ArMemExampleMemory";
return "ExampleMemory";
}
void ArMemExampleMemory::onInitComponent()
void ExampleMemory::onInitComponent()
{
memory.name() = p.memoryName;
......@@ -77,17 +72,17 @@ namespace armarx
memory.addCoreSegments(p.core.defaultCoreSegments);
}
void ArMemExampleMemory::onConnectComponent()
void ExampleMemory::onConnectComponent()
{
RemoteGui__createTab();
RemoteGui_startRunningTask();
}
void ArMemExampleMemory::onDisconnectComponent()
void ExampleMemory::onDisconnectComponent()
{
}
void ArMemExampleMemory::onExitComponent()
void ExampleMemory::onExitComponent()
{
}
......@@ -95,7 +90,7 @@ namespace armarx
// WRITING
armem::data::AddSegmentsResult ArMemExampleMemory::addSegments(const armem::data::AddSegmentsInput& input, const Ice::Current&)
armem::data::AddSegmentsResult ExampleMemory::addSegments(const armem::data::AddSegmentsInput& input, const Ice::Current&)
{
// This function is overloaded to trigger the remote gui rebuild.
armem::data::AddSegmentsResult result = ComponentPluginUser::addSegments(input, p.core.addOnUsage);
......@@ -104,7 +99,7 @@ namespace armarx
}
armem::data::CommitResult ArMemExampleMemory::commit(const armem::data::Commit& commit, const Ice::Current&)
armem::data::CommitResult ExampleMemory::commit(const armem::data::Commit& commit, const Ice::Current&)
{
// This function is overloaded to trigger the remote gui rebuild.
armem::data::CommitResult result = ComponentPluginUser::commit(commit);
......@@ -121,7 +116,7 @@ namespace armarx
// REMOTE GUI
void ArMemExampleMemory::RemoteGui__createTab()
void ExampleMemory::RemoteGui__createTab()
{
using namespace armarx::RemoteGui::Client;
......@@ -135,7 +130,7 @@ namespace armarx
}
void ArMemExampleMemory::RemoteGui_update()
void ExampleMemory::RemoteGui_update()
{
if (tab.rebuild.exchange(false))
{
......
source/RobotAPI/components/armem/ArMemExampleMemory/ArMemExampleMemory.h → source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.h
+ 8
− 21
View file @ 6df454b7
......@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package RobotAPI::ArmarXObjects::ArMemExampleMemory
* @package RobotAPI::ArmarXObjects::ExampleMemory
* @author Rainer Kartmann ( rainer dot kartmann at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
......@@ -35,30 +35,17 @@
namespace armarx
{
/**
* @class ArMemExampleMemoryPropertyDefinitions
* @brief Property definitions of `ArMemExampleMemory`.
*/
class ArMemExampleMemoryPropertyDefinitions :
public armarx::ComponentPropertyDefinitions
{
public:
ArMemExampleMemoryPropertyDefinitions(std::string prefix);
};
/**
* @defgroup Component-ArMemExampleMemory ArMemExampleMemory
* @defgroup Component-ExampleMemory ExampleMemory
* @ingroup RobotAPI-Components
* A description of the component ArMemExampleMemory.
* A description of the component ExampleMemory.
*
* @class ArMemExampleMemory
* @ingroup Component-ArMemExampleMemory
* @brief Brief description of class ArMemExampleMemory.
* @class ExampleMemory
* @ingroup Component-ExampleMemory
* @brief Brief description of class ExampleMemory.
*
* Detailed description of class ArMemExampleMemory.
* Detailed description of class ExampleMemory.
*/
class ArMemExampleMemory :
class ExampleMemory :
virtual public armarx::Component
, virtual public armem::server::ComponentPluginUser
, virtual public LightweightRemoteGuiComponentPluginUser
......
source/RobotAPI/components/armem/server/ExampleMemory/test/CMakeLists.txt 0 → 100644
+ 5
− 0
View file @ 6df454b7
# Libs required for the tests
SET(LIBS ${LIBS} ArmarXCore ExampleMemory)
armarx_add_test(ExampleMemoryTest ExampleMemoryTest.cpp "${LIBS}")
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment