From a6a9c4bb313d9fe7d717f364e13d10455fd76d0a Mon Sep 17 00:00:00 2001
From: Firat Yusuf Duran <uzivy@student.kit.edu>
Date: Thu, 15 Aug 2024 23:39:29 +0200
Subject: [PATCH] revert aron event type
---
source/RobotAPI/interface/aron/Aron.ice | 14 +-
.../aron/codegeneration/CMakeLists.txt | 2 -
.../codewriter/cpp/generator/Factory.cpp | 3 -
.../cpp/generator/primitive/Event.cpp | 89 -----------
.../cpp/generator/primitive/Event.h | 49 ------
.../codegeneration/typereader/xml/Factory.cpp | 10 --
.../codegeneration/typereader/xml/Factory.h | 1 -
.../libraries/aron/core/CMakeLists.txt | 4 -
.../RobotAPI/libraries/aron/core/Descriptor.h | 2 -
.../aron/core/data/variant/Factory.cpp | 2 -
.../aron/core/data/variant/primitive/All.h | 1 -
.../core/data/variant/primitive/Event.cpp | 146 ------------------
.../aron/core/data/variant/primitive/Event.h | 82 ----------
.../aron/core/data/visitor/RecursiveVisitor.h | 6 -
.../aron/core/data/visitor/Visitor.h | 6 -
.../data/visitor/variant/VariantVisitor.cpp | 38 -----
.../data/visitor/variant/VariantVisitor.h | 11 --
.../aron/core/type/variant/Factory.cpp | 3 -
.../core/type/variant/forward_declarations.h | 1 -
.../aron/core/type/variant/primitive/All.h | 1 -
.../core/type/variant/primitive/Event.cpp | 62 --------
.../aron/core/type/variant/primitive/Event.h | 53 -------
.../aron/core/type/visitor/Visitor.h | 3 -
.../manager/SkillManagerComponentPlugin.cpp | 6 +-
24 files changed, 3 insertions(+), 592 deletions(-)
delete mode 100644 source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.cpp
delete mode 100644 source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.h
delete mode 100644 source/RobotAPI/libraries/aron/core/data/variant/primitive/Event.cpp
delete mode 100644 source/RobotAPI/libraries/aron/core/data/variant/primitive/Event.h
delete mode 100644 source/RobotAPI/libraries/aron/core/type/variant/primitive/Event.cpp
delete mode 100644 source/RobotAPI/libraries/aron/core/type/variant/primitive/Event.h
diff --git a/source/RobotAPI/interface/aron/Aron.ice b/source/RobotAPI/interface/aron/Aron.ice
index 2715f4725..f06217c34 100644
--- a/source/RobotAPI/interface/aron/Aron.ice
+++ b/source/RobotAPI/interface/aron/Aron.ice
@@ -10,14 +10,12 @@
* will follow). Updated version object as str comparison is more expensive that int
* comparison. Further added TypeName object to unify typeAsString creation and use
* sizeof instead of fixed types (only for C++ builtin types for now).
- * - Update 4.0.0: Add new type and data "Event" for event token handling. Aron data "Event" is just
- * a dummy data since the value bears no significance.
**/
#include <ArmarXCore/interface/core/BasicTypes.ice>
// Those macros stay defined
-#define ARON_MAJOR 4 // ice interface changes
+#define ARON_MAJOR 3 // ice interface changes
#define ARON_MINOR 0 // aron header changes
#define ARON_PATCH 0 // aron cpp changes
@@ -289,11 +287,6 @@ module armarx
{
optional(4) bool defaultValue; // <value>
};
-
- class Event extends GenericType
- {
- optional(5) bool defaultValue; // <value>
- };
};
};
@@ -367,11 +360,6 @@ module armarx
bool value;
};
- class Event extends GenericData
- {
- bool value;
- };
-
// useful for memory ice_conversions
sequence<Dict> AronDictSeq;
sequence<Dict> DictSeq;
diff --git a/source/RobotAPI/libraries/aron/codegeneration/CMakeLists.txt b/source/RobotAPI/libraries/aron/codegeneration/CMakeLists.txt
index 684e282f7..a89c63b19 100644
--- a/source/RobotAPI/libraries/aron/codegeneration/CMakeLists.txt
+++ b/source/RobotAPI/libraries/aron/codegeneration/CMakeLists.txt
@@ -47,7 +47,6 @@ set(LIB_FILES
codegenerator/codewriter/cpp/generator/primitive/Double.cpp
codegenerator/codewriter/cpp/generator/primitive/String.cpp
codegenerator/codewriter/cpp/generator/primitive/Bool.cpp
- codegenerator/codewriter/cpp/generator/primitive/Event.cpp
codegenerator/codewriter/cpp/generator/any/AnyObject.cpp
codegenerator/codewriter/cpp/generator/Factory.cpp
)
@@ -98,7 +97,6 @@ set(LIB_HEADERS
codegenerator/codewriter/cpp/generator/primitive/Double.h
codegenerator/codewriter/cpp/generator/primitive/String.h
codegenerator/codewriter/cpp/generator/primitive/Bool.h
- codegenerator/codewriter/cpp/generator/primitive/Event.h
codegenerator/codewriter/cpp/generator/primitive/All.h
codegenerator/codewriter/cpp/generator/any/AnyObject.h
codegenerator/codewriter/cpp/generator/any/All.h
diff --git a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Factory.cpp b/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Factory.cpp
index 12c7a544e..4fc47f01c 100644
--- a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Factory.cpp
@@ -26,9 +26,7 @@
// Header
#include "Factory.h"
#include <memory>
-#include "RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.h"
#include "RobotAPI/libraries/aron/core/Descriptor.h"
-#include "RobotAPI/libraries/aron/core/type/variant/primitive/Event.h"
// ArmarX
#include "All.h"
@@ -61,7 +59,6 @@ namespace armarx::aron::codegenerator::cpp
case type::Descriptor::BOOL: return std::make_unique<generator::Bool>(dynamic_cast<const type::Bool&>(n));
case type::Descriptor::ANY_OBJECT: return std::make_unique<generator::AnyObject>(dynamic_cast<const type::AnyObject&>(n));
case type::Descriptor::UNKNOWN: break;
- case type::Descriptor::EVENT: return std::make_unique<generator::Event>(dynamic_cast<const type::Event&>(n));
}
throw error::AronEOFException(__PRETTY_FUNCTION__);
}
diff --git a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.cpp b/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.cpp
deleted file mode 100644
index cd417bc9f..000000000
--- a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * This file is part of ArmarX.
- *
- * Copyright (C) 2012-2016, High Performance Humanoid Technologies (H2T),
- * Karlsruhe Institute of Technology (KIT), all rights reserved.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @author Firat-Yusuf-Duran (uzivy at student dot kit dot edu)
- * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
- * GNU General Public License
- */
-
-#include "Event.h"
-
-#include <SimoxUtility/meta/type_name.h>
-#include <RobotAPI/interface/aron/Aron.h>
-
-namespace armarx::aron::codegenerator::cpp::generator
-{
- /* constructors */
- Event::Event(const type::Event& e) :
- detail::PrimitiveGenerator<type::Event, Event>(
- "event",
- "event",
- simox::meta::get_type_name<data::dto::Event>(),
- simox::meta::get_type_name<type::dto::Event>(),
- e)
- {
- }
-
- /* virtual implementations */
- std::pair<std::vector<std::pair<std::string, std::string>>, bool>
- Event::getCtorInitializers(const std::string& name) const
- {
- if (auto def = type.getDefaultValue(); def.has_value())
- {
- return {{{name, std::to_string(*def)}}, true};
- }
- return {{}, false};
- }
-
- CppBlockPtr
- Event::getWriteTypeBlock(const std::string& typeAccessor,
- const std::string& accessor,
- const Path& p,
- std::string& variantAccessor) const
- {
- CppBlockPtr b = std::make_shared<CppBlock>();
- std::string escaped_accessor = EscapeAccessor(accessor);
- variantAccessor = ARON_VARIANT_RETURN_ACCESSOR + "_" + escaped_accessor;
-
- std::string defaultValue = type.getDefaultValue().has_value()
- ? std::to_string(*type.getDefaultValue())
- : "std::nullopt";
-
- b->addLine("auto " + variantAccessor + " = " + ARON_WRITER_ACCESSOR + ".writeEvent(" +
- defaultValue + ", " + conversion::Maybe2CppString.at(type.getMaybe()) + ", " +
- "armarx::aron::Path(" + ARON_PATH_ACCESSOR + ", {" +
- simox::alg::join(p.getPath(), ", ") + "})); // of " + typeAccessor);
- return b;
- }
-
- CppBlockPtr
- Event::getResetHardBlock(const std::string& cppAccessor) const
- {
- CppBlockPtr block_if_data = std::make_shared<CppBlock>();
- block_if_data->addLine(cppAccessor + " = false;");
- return resolveMaybeResetHardBlock(block_if_data, cppAccessor);
- }
-
- CppBlockPtr
- Event::getResetSoftBlock(const std::string& cppAccessor) const
- {
- auto block_if_data = std::make_shared<CppBlock>();
- block_if_data->addLine(cppAccessor + " = false;");
- return this->resolveMaybeResetSoftBlock(block_if_data, cppAccessor);
- }
-} // namespace armarx::aron::codegenerator::cpp::generator
diff --git a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.h b/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.h
deleted file mode 100644
index 8b947af86..000000000
--- a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Event.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is part of ArmarX.
- *
- * Copyright (C) 2012-2016, High Performance Humanoid Technologies (H2T),
- * Karlsruhe Institute of Technology (KIT), all rights reserved.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @author Firat-Yusuf-Duran (uzivy at student dot kit dot edu)
- * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
- * GNU General Public License
- */
-
-#pragma once
-
-#include <RobotAPI/libraries/aron/core/type/variant/primitive/Event.h>
-
-#include "../detail/PrimitiveGenerator.h"
-
-namespace armarx::aron::codegenerator::cpp::generator
-{
- class Event : public detail::PrimitiveGenerator<type::Event, Event>
- {
- public:
- /* constructors */
- Event(const type::Event& e);
- virtual ~Event() = default;
-
- /* virtual implementations */
- std::pair<std::vector<std::pair<std::string, std::string>>, bool>
- getCtorInitializers(const std::string&) const final;
- CppBlockPtr getWriteTypeBlock(const std::string& typeAccessor,
- const std::string& cppAccessor,
- const Path& p,
- std::string& variantAccessor) const final;
- CppBlockPtr getResetSoftBlock(const std::string& cppAccessor) const final;
- CppBlockPtr getResetHardBlock(const std::string& cppAccessor) const final;
- };
-} // namespace armarx::aron::codegenerator::cpp::generator
diff --git a/source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.cpp b/source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.cpp
index f325fa1ae..1719491cc 100644
--- a/source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.cpp
@@ -32,7 +32,6 @@
// ArmarX
#include <ArmarXCore/core/time/DateTime.h>
-#include "RobotAPI/libraries/aron/core/type/variant/primitive/Event.h"
#include <RobotAPI/libraries/aron/core/type/variant/All.h>
#include "Data.h"
@@ -147,20 +146,11 @@ namespace armarx::aron::typereader::xml
return createAnyObject(nodeToUse, path);
case type::Descriptor::UNKNOWN:
return findExistingObject(nodeToUse.name(), path);
- case type::Descriptor::EVENT:
- return createEvent(nodeToUse, path);
}
throw aron::error::AronEOFException(__PRETTY_FUNCTION__);
}
- type::VariantPtr
- ReaderFactory::createEvent(const RapidXmlReaderNode& node, const Path& path) const
- {
- auto o = std::make_shared<type::Event>(path);
- return o;
- }
-
type::VariantPtr
ReaderFactory::findExistingObject(const std::string& name, const Path& path) const
{
diff --git a/source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.h b/source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.h
index 7c11bdc2a..4771cdb4b 100644
--- a/source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.h
+++ b/source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.h
@@ -83,7 +83,6 @@ namespace armarx::aron::typereader::xml
type::VariantPtr createDouble(const RapidXmlReaderNode& node, const Path& path) const;
type::VariantPtr createString(const RapidXmlReaderNode& node, const Path& path) const;
type::VariantPtr createBool(const RapidXmlReaderNode& node, const Path& path) const;
- type::VariantPtr createEvent(const RapidXmlReaderNode& node, const Path& path) const;
type::VariantPtr createAnyObject(const RapidXmlReaderNode& node, const Path& path) const;
diff --git a/source/RobotAPI/libraries/aron/core/CMakeLists.txt b/source/RobotAPI/libraries/aron/core/CMakeLists.txt
index fa0f42b03..863fc5e6e 100644
--- a/source/RobotAPI/libraries/aron/core/CMakeLists.txt
+++ b/source/RobotAPI/libraries/aron/core/CMakeLists.txt
@@ -35,7 +35,6 @@ set(LIB_FILES
data/variant/primitive/Double.cpp
data/variant/primitive/String.cpp
data/variant/primitive/Bool.cpp
- data/variant/primitive/Event.cpp
data/variant/Factory.cpp
type/variant/Variant.cpp
@@ -63,7 +62,6 @@ set(LIB_FILES
type/variant/primitive/Double.cpp
type/variant/primitive/String.cpp
type/variant/primitive/Bool.cpp
- type/variant/primitive/Event.cpp
type/variant/any/AnyObject.cpp
type/variant/Factory.cpp
@@ -133,7 +131,6 @@ set(LIB_HEADERS
data/variant/primitive/Double.h
data/variant/primitive/String.h
data/variant/primitive/Bool.h
- data/variant/primitive/Event.h
data/variant/primitive/All.h
data/variant/All.h
@@ -168,7 +165,6 @@ set(LIB_HEADERS
type/variant/primitive/Double.h
type/variant/primitive/String.h
type/variant/primitive/Bool.h
- type/variant/primitive/Event.h
type/variant/primitive/All.h
type/variant/any/AnyObject.h
type/variant/any/All.h
diff --git a/source/RobotAPI/libraries/aron/core/Descriptor.h b/source/RobotAPI/libraries/aron/core/Descriptor.h
index 6951a27e6..5b386f583 100644
--- a/source/RobotAPI/libraries/aron/core/Descriptor.h
+++ b/source/RobotAPI/libraries/aron/core/Descriptor.h
@@ -92,7 +92,6 @@ namespace armarx::aron::type
DOUBLE,
BOOL,
STRING,
- EVENT,
ANY_OBJECT,
UNKNOWN = -1
};
@@ -202,7 +201,6 @@ namespace armarx::aron::data
DOUBLE,
STRING,
BOOL,
- EVENT,
UNKNOWN = -1
};
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp b/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
index 8832e98c6..0a2410893 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
@@ -91,8 +91,6 @@ namespace armarx::aron::data
path);
case data::Descriptor::UNKNOWN:
break;
- case data::Descriptor::EVENT:
- return std::make_unique<data::Event>(data::dto::EventPtr::dynamicCast(aron), path);
}
throw error::ValueNotValidException(
__PRETTY_FUNCTION__, "", std::to_string((int)descriptor), path);
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/All.h b/source/RobotAPI/libraries/aron/core/data/variant/primitive/All.h
index ca3131f55..c6fcdf6c4 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/All.h
+++ b/source/RobotAPI/libraries/aron/core/data/variant/primitive/All.h
@@ -5,7 +5,6 @@
#include "Float.h"
#include "Double.h"
#include "String.h"
-#include "Event.h"
#include "Bool.h"
namespace armarx::aron::data
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Event.cpp b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Event.cpp
deleted file mode 100644
index 851ed0394..000000000
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Event.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * This file is part of ArmarX.
- *
- * Copyright (C) 2012-2016, High Performance Humanoid Technologies (H2T),
- * Karlsruhe Institute of Technology (KIT), all rights reserved.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @author Fabian Peller-Konrad (fabian dot peller-konrad at kit dot edu)
- * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
- * GNU General Public License
- */
-
-#include "Event.h"
-#include <RobotAPI/interface/aron/Aron.h>
-
-namespace armarx::aron::data
-{
- /* constructors */
- Event::Event(const data::dto::EventPtr& o, const Path& path) :
- detail::PrimitiveVariant<data::dto::Event, bool, Event>::PrimitiveVariant(
- o,
- data::Descriptor::EVENT,
- path)
- {
- }
-
- Event::Event(const Path& path) :
- detail::PrimitiveVariant<data::dto::Event, bool, Event>::PrimitiveVariant(
- data::Descriptor::EVENT,
- path)
- {
- }
-
- Event::Event(const bool d, const Path& path) :
- detail::PrimitiveVariant<data::dto::Event, bool, Event>::PrimitiveVariant(
- d,
- data::Descriptor::EVENT,
- path)
- {
- }
-
- /* operators */
- bool
- Event::operator==(const Event& other) const
- {
- const auto& otherAron = other.toEventDTO();
- if (aron->value != otherAron->value)
- {
- return false;
- }
- return true;
- }
-
- bool
- Event::operator==(const EventPtr& other) const
- {
- if (!other)
- {
- return false;
- }
- return *this == *other;
- }
-
- /* static methods */
- EventPtr
- Event::FromEventDTO(const data::dto::EventPtr& aron)
- {
- if (!aron)
- {
- return nullptr;
- }
- return std::make_shared<Event>(aron);
- }
-
- data::dto::EventPtr
- Event::ToEventDTO(const EventPtr& navigator)
- {
- return navigator ? navigator->toEventDTO() : nullptr;
- }
-
- /* public member functions */
- data::dto::EventPtr
- Event::toEventDTO() const
- {
- return aron;
- }
-
- /* virtual implementations */
- void
- Event::fromString(const std::string& setter)
- {
- if (setter == "true" || setter == "1" || setter == "yes")
- {
- setValue(true);
- }
- else if (setter == "false" || setter == "0" || setter == "no")
- {
- setValue(false);
- }
- else
- {
- ARMARX_TRACE;
- throw error::AronException(__PRETTY_FUNCTION__,
- "Could not set from string. Got: '" + setter + "'");
- }
- }
-
- std::string
- Event::getShortName() const
- {
- return "Event";
- }
-
- std::string
- Event::getFullName() const
- {
- return "armarx::aron::data::Event";
- }
-
- bool
- Event::fullfillsType(const type::VariantPtr& type) const
- {
- if (!type)
- return true;
- return type->getDescriptor() == type::Descriptor::EVENT;
- }
-
- type::VariantPtr
- Event::recalculateType() const
- {
- ARMARX_TRACE;
- throw error::NotImplementedYetException(__PRETTY_FUNCTION__);
- //return std::make_shared<type::Bool>(getPath());
- }
-} // namespace armarx::aron::data
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Event.h b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Event.h
deleted file mode 100644
index 06fdc9352..000000000
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Event.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * This file is part of ArmarX.
- *
- * Copyright (C) 2012-2016, High Performance Humanoid Technologies (H2T),
- * Karlsruhe Institute of Technology (KIT), all rights reserved.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @author Firat Yusuf Duran (uzivy at student dot kit dot edu)
- * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
- * GNU General Public License
- */
-
-#pragma once
-
-// STD/STL
-#include <memory>
-#include <RobotAPI/interface/aron/Aron.h>
-
-// Base class
-#include "../detail/PrimitiveVariant.h"
-
-// ArmarX
-#include "../../../type/variant/primitive/Event.h"
-
-namespace armarx::aron::data
-{
-
- class Event;
- typedef std::shared_ptr<Event> EventPtr;
-
- class Event :
- public detail::PrimitiveVariant<data::dto::Event, bool, Event>
- {
- public:
- /* constructors */
- Event(const Path& = Path());
- Event(const data::dto::EventPtr&, const Path& = Path());
- Event(const bool, const Path& = Path());
-
- // operators
- using detail::PrimitiveVariant<data::dto::Event, bool, Event>::operator==;
-
- bool operator==(const Event& other) const override;
- bool operator==(const EventPtr&) const override;
-
- // static methods
- static EventPtr FromEventDTO(const data::dto::EventPtr& aron);
- static data::dto::EventPtr ToEventDTO(const EventPtr& navigator);
-
- // class methods
- data::dto::EventPtr toEventDTO() const;
-
- /* virtual implementations */
- void fromString(const std::string& setter) override;
-
- std::string getShortName() const override;
- std::string getFullName() const override;
-
- type::VariantPtr recalculateType() const override;
- bool fullfillsType(const type::VariantPtr&) const override;
- };
-}
-
-namespace armarx::aron
-{
- template<typename... _Args>
- aron::data::EventPtr make_event(_Args&&... args)
- {
- return std::make_shared<aron::data::Event>(args...);
- }
-}
diff --git a/source/RobotAPI/libraries/aron/core/data/visitor/RecursiveVisitor.h b/source/RobotAPI/libraries/aron/core/data/visitor/RecursiveVisitor.h
index 4e2e7f792..b9a817f59 100644
--- a/source/RobotAPI/libraries/aron/core/data/visitor/RecursiveVisitor.h
+++ b/source/RobotAPI/libraries/aron/core/data/visitor/RecursiveVisitor.h
@@ -57,7 +57,6 @@ namespace armarx::aron::data
virtual void visitDouble(Input& element) {};
virtual void visitBool(Input& element) {};
virtual void visitString(Input& element) {};
- virtual void visitEvent(Input& element) {};
virtual void visitUnknown(Input& element)
{
if (!element)
@@ -118,7 +117,6 @@ namespace armarx::aron::data
virtual void visitDouble(DataInput& elementData, TypeInput& elementType) {};
virtual void visitBool(DataInput& elementData, TypeInput& elementType) {};
virtual void visitString(DataInput& elementData, TypeInput& elementType) {};
- virtual void visitEvent(DataInput& elementData, TypeInput& elementType) {};
virtual void visitAnyObject(DataInput& elementData, TypeInput& elementType) {};
virtual void visitUnknown(DataInput& elementData, TypeInput& elementType)
{
@@ -188,8 +186,6 @@ namespace armarx::aron::data
return v.visitBool(o);
case data::Descriptor::UNKNOWN:
return v.visitUnknown(o);
- case data::Descriptor::EVENT:
- return v.visitEvent(o);
}
}
@@ -287,8 +283,6 @@ namespace armarx::aron::data
return v.visitIntEnum(o, t);
case type::Descriptor::UNKNOWN:
return v.visitUnknown(o, t);
- case type::Descriptor::EVENT:
- return v.visitEvent(o, t);
}
}
}
diff --git a/source/RobotAPI/libraries/aron/core/data/visitor/Visitor.h b/source/RobotAPI/libraries/aron/core/data/visitor/Visitor.h
index 225fa9360..d7c62f104 100644
--- a/source/RobotAPI/libraries/aron/core/data/visitor/Visitor.h
+++ b/source/RobotAPI/libraries/aron/core/data/visitor/Visitor.h
@@ -74,7 +74,6 @@ namespace armarx::aron::data
virtual void visitDouble(Input&) {};
virtual void visitBool(Input&) {};
virtual void visitString(Input&) {};
- virtual void visitEvent(Input&) {};
virtual void visitUnknown(Input&) { throw error::AronException(__PRETTY_FUNCTION__, "Unknown type in visitor."); }
virtual ~Visitor() = default;
};
@@ -106,7 +105,6 @@ namespace armarx::aron::data
virtual void visitBool(DataInput&, TypeInput&) {};
virtual void visitString(DataInput&, TypeInput&) {};
virtual void visitAnyObject(DataInput&, TypeInput&) {};
- virtual void visitEvent(DataInput&, TypeInput&) {};
virtual void visitUnknown(DataInput&, TypeInput&) { throw error::AronException(__PRETTY_FUNCTION__, "Unknown type in visitor."); }
virtual ~TypedVisitor() = default;
};
@@ -148,8 +146,6 @@ namespace armarx::aron::data
return v.visitBool(o);
case data::Descriptor::UNKNOWN:
return v.visitUnknown(o);
- case data::Descriptor::EVENT:
- return v.visitEvent(o);
}
}
@@ -203,8 +199,6 @@ namespace armarx::aron::data
return v.visitIntEnum(o, t);
case type::Descriptor::UNKNOWN:
return v.visitUnknown(o, t);
- case type::Descriptor::EVENT:
- return v.visitEvent(o, t);
}
}
}
diff --git a/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp b/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp
index 74707158e..1fd13aea4 100644
--- a/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp
@@ -23,7 +23,6 @@
// Header
#include "VariantVisitor.h"
-#include "RobotAPI/libraries/aron/core/data/variant/primitive/Event.h"
#include "RobotAPI/libraries/aron/core/type/variant/forward_declarations.h"
#include "../../variant/All.h"
@@ -102,12 +101,6 @@ namespace armarx::aron::data
visitAronVariant(aron);
}
- void ConstVariantVisitor::visitEvent(Input& i)
- {
- auto aron = data::Event::DynamicCastAndCheck(i);
- visitAronVariant(aron);
- }
-
void ConstVariantVisitor::visitAronVariant(const data::DictPtr&) {}
void ConstVariantVisitor::visitAronVariant(const data::ListPtr&) {}
void ConstVariantVisitor::visitAronVariant(const data::NDArrayPtr&) {}
@@ -117,7 +110,6 @@ namespace armarx::aron::data
void ConstVariantVisitor::visitAronVariant(const data::DoublePtr&) {}
void ConstVariantVisitor::visitAronVariant(const data::BoolPtr&) {}
void ConstVariantVisitor::visitAronVariant(const data::StringPtr&) {}
- void ConstVariantVisitor::visitAronVariant(const data::EventPtr&) {}
/****************************************************************************
@@ -258,13 +250,6 @@ namespace armarx::aron::data
visitAronVariant(d, t);
}
- void ConstTypedVariantVisitor::visitEvent(DataInput& i, TypeInput& j)
- {
- auto d = data::Event::DynamicCastAndCheck(i);
- auto t = type::Event::DynamicCastAndCheck(j);
- visitAronVariant(d, t);
- }
-
void ConstTypedVariantVisitor::visitAronVariant(const data::DictPtr&, const type::ObjectPtr&) {}
void ConstTypedVariantVisitor::visitAronVariant(const data::DictPtr&, const type::DictPtr&) {}
void ConstTypedVariantVisitor::visitAronVariant(const data::ListPtr&, const type::ListPtr&) {}
@@ -282,7 +267,6 @@ namespace armarx::aron::data
void ConstTypedVariantVisitor::visitAronVariant(const data::DoublePtr&, const type::DoublePtr&) {}
void ConstTypedVariantVisitor::visitAronVariant(const data::BoolPtr&, const type::BoolPtr&) {}
void ConstTypedVariantVisitor::visitAronVariant(const data::StringPtr&, const type::StringPtr&) {}
- void ConstTypedVariantVisitor::visitAronVariant(const data::EventPtr&, const type::EventPtr&) {}
@@ -382,12 +366,6 @@ namespace armarx::aron::data
visitAronVariant(aron);
}
- void RecursiveConstVariantVisitor::visitEvent(Input& i)
- {
- auto aron = data::Event::DynamicCastAndCheck(i);
- visitAronVariant(aron);
- }
-
void RecursiveConstVariantVisitor::visitAronVariantOnEnter(const data::DictPtr&) {}
void RecursiveConstVariantVisitor::visitAronVariantOnEnter(const data::ListPtr&) {}
void RecursiveConstVariantVisitor::visitAronVariantOnExit(const data::DictPtr&) {}
@@ -399,7 +377,6 @@ namespace armarx::aron::data
void RecursiveConstVariantVisitor::visitAronVariant(const data::DoublePtr&) {}
void RecursiveConstVariantVisitor::visitAronVariant(const data::BoolPtr&) {}
void RecursiveConstVariantVisitor::visitAronVariant(const data::StringPtr&) {}
- void RecursiveConstVariantVisitor::visitAronVariant(const data::EventPtr&) {}
@@ -487,12 +464,6 @@ namespace armarx::aron::data
visitAronVariant(aron);
}
- void RecursiveVariantVisitor::visitEvent(Input& i)
- {
- auto aron = data::Event::DynamicCastAndCheck(i);
- visitAronVariant(aron);
- }
-
void RecursiveVariantVisitor::visitAronVariantOnEnter(data::DictPtr&) {}
void RecursiveVariantVisitor::visitAronVariantOnEnter(data::ListPtr&) {}
void RecursiveVariantVisitor::visitAronVariantOnExit(data::DictPtr&) {}
@@ -504,7 +475,6 @@ namespace armarx::aron::data
void RecursiveVariantVisitor::visitAronVariant(data::DoublePtr&) {}
void RecursiveVariantVisitor::visitAronVariant(data::BoolPtr&) {}
void RecursiveVariantVisitor::visitAronVariant(data::StringPtr&) {}
- void RecursiveVariantVisitor::visitAronVariant(data::EventPtr&) {}
/****************************************************************************
@@ -822,13 +792,6 @@ namespace armarx::aron::data
visitAronVariant(d, t);
}
- void RecursiveConstTypedVariantVisitor::visitEvent(DataInput& i, TypeInput& j)
- {
- auto d = data::Event::DynamicCastAndCheck(i);
- auto t = type::Event::DynamicCastAndCheck(j);
- visitAronVariant(d, t);
- }
-
// see above
void RecursiveConstTypedVariantVisitor::visitAronVariantOnEnter(const data::DictPtr&, const type::ObjectPtr&) {}
@@ -853,5 +816,4 @@ namespace armarx::aron::data
void RecursiveConstTypedVariantVisitor::visitAronVariant(const data::DoublePtr&, const type::DoublePtr&) {}
void RecursiveConstTypedVariantVisitor::visitAronVariant(const data::BoolPtr&, const type::BoolPtr&) {}
void RecursiveConstTypedVariantVisitor::visitAronVariant(const data::StringPtr&, const type::StringPtr&) {}
- void RecursiveConstTypedVariantVisitor::visitAronVariant(const data::EventPtr&, const type::EventPtr&) {}
}
diff --git a/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.h b/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.h
index 54378b16a..726adfd34 100644
--- a/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.h
+++ b/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.h
@@ -26,7 +26,6 @@
#include <map>
#include <string>
#include <vector>
-#include "RobotAPI/libraries/aron/core/data/variant/primitive/Event.h"
#include "../RecursiveVisitor.h"
#include "../../variant/forward_declarations.h"
@@ -54,7 +53,6 @@ namespace armarx::aron::data
void visitDouble(Input& i) override;
void visitBool(Input& i) override;
void visitString(Input& i) override;
- void visitEvent(Input& i) override;
// Use these if you do not want to cast manually
virtual void visitAronVariant(const data::DictPtr&);
@@ -66,7 +64,6 @@ namespace armarx::aron::data
virtual void visitAronVariant(const data::DoublePtr&);
virtual void visitAronVariant(const data::BoolPtr&);
virtual void visitAronVariant(const data::StringPtr&);
- virtual void visitAronVariant(const data::EventPtr&);
};
/**
@@ -96,7 +93,6 @@ namespace armarx::aron::data
void visitDouble(DataInput&, TypeInput&) override;
void visitBool(DataInput&, TypeInput&) override;
void visitString(DataInput&, TypeInput&) override;
- void visitEvent(DataInput&, TypeInput&) override;
// see above
virtual void visitAronVariant(const data::DictPtr&, const type::ObjectPtr&);
@@ -116,7 +112,6 @@ namespace armarx::aron::data
virtual void visitAronVariant(const data::DoublePtr&, const type::DoublePtr&);
virtual void visitAronVariant(const data::BoolPtr&, const type::BoolPtr&);
virtual void visitAronVariant(const data::StringPtr&, const type::StringPtr&);
- virtual void visitAronVariant(const data::EventPtr&, const type::EventPtr&);
};
/**
@@ -142,7 +137,6 @@ namespace armarx::aron::data
void visitDouble(Input& i) override;
void visitBool(Input& i) override;
void visitString(Input& i) override;
- void visitEvent(Input& i) override;
virtual void visitAronVariantOnEnter(const data::DictPtr&);
virtual void visitAronVariantOnExit(const data::DictPtr&);
@@ -155,7 +149,6 @@ namespace armarx::aron::data
virtual void visitAronVariant(const data::DoublePtr&);
virtual void visitAronVariant(const data::BoolPtr&);
virtual void visitAronVariant(const data::StringPtr&);
- virtual void visitAronVariant(const data::EventPtr&);
};
/**
@@ -179,7 +172,6 @@ namespace armarx::aron::data
void visitDouble(Input& i) override;
void visitBool(Input& i) override;
void visitString(Input& i) override;
- void visitEvent(Input& i) override;
virtual void visitAronVariantOnEnter(data::DictPtr&);
virtual void visitAronVariantOnExit(data::DictPtr&);
@@ -192,7 +184,6 @@ namespace armarx::aron::data
virtual void visitAronVariant(data::DoublePtr&);
virtual void visitAronVariant(data::BoolPtr&);
virtual void visitAronVariant(data::StringPtr&);
- virtual void visitAronVariant(data::EventPtr&);
};
/**
@@ -243,7 +234,6 @@ namespace armarx::aron::data
void visitDouble(DataInput&, TypeInput&) override;
void visitBool(DataInput&, TypeInput&) override;
void visitString(DataInput&, TypeInput&) override;
- void visitEvent(DataInput&, TypeInput&) override;
// see above
virtual void visitAronVariantOnEnter(const data::DictPtr&, const type::ObjectPtr&);
@@ -268,6 +258,5 @@ namespace armarx::aron::data
virtual void visitAronVariant(const data::DoublePtr&, const type::DoublePtr&);
virtual void visitAronVariant(const data::BoolPtr&, const type::BoolPtr&);
virtual void visitAronVariant(const data::StringPtr&, const type::StringPtr&);
- virtual void visitAronVariant(const data::EventPtr&, const type::EventPtr&);
};
}
diff --git a/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp b/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
index 112538ce7..8a1aa195d 100644
--- a/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
@@ -29,7 +29,6 @@
// ArmarX
#include "RobotAPI/libraries/aron/core/Descriptor.h"
-#include "RobotAPI/libraries/aron/core/type/variant/primitive/Event.h"
#include <RobotAPI/interface/aron/Aron.h>
#include <RobotAPI/libraries/aron/core/type/variant/All.h>
@@ -114,8 +113,6 @@ namespace armarx::aron::type
dynamic_cast<const type::dto::AnyObject&>(aron), path);
case type::Descriptor::UNKNOWN:
break;
- case type::Descriptor::EVENT:
- return std::make_unique<type::Event>(dynamic_cast<const type::dto::Event&>(aron), path);
}
throw error::ValueNotValidException(
__PRETTY_FUNCTION__,
diff --git a/source/RobotAPI/libraries/aron/core/type/variant/forward_declarations.h b/source/RobotAPI/libraries/aron/core/type/variant/forward_declarations.h
index 4eb29c54a..19d29c04e 100644
--- a/source/RobotAPI/libraries/aron/core/type/variant/forward_declarations.h
+++ b/source/RobotAPI/libraries/aron/core/type/variant/forward_declarations.h
@@ -30,7 +30,6 @@ namespace armarx::aron::type
using DoublePtr = std::shared_ptr<class Double>;
using StringPtr = std::shared_ptr<class String>;
using BoolPtr = std::shared_ptr<class Bool>;
- using EventPtr = std::shared_ptr<class Event>;
using AnyObjectPtr = std::shared_ptr<class AnyObject>;
diff --git a/source/RobotAPI/libraries/aron/core/type/variant/primitive/All.h b/source/RobotAPI/libraries/aron/core/type/variant/primitive/All.h
index 3095861f9..2b739568e 100644
--- a/source/RobotAPI/libraries/aron/core/type/variant/primitive/All.h
+++ b/source/RobotAPI/libraries/aron/core/type/variant/primitive/All.h
@@ -6,7 +6,6 @@
#include "Double.h"
#include "String.h"
#include "Bool.h"
-#include "Event.h"
/**
* A convenience header to include all primitive aron files (full include, not forward declared)
diff --git a/source/RobotAPI/libraries/aron/core/type/variant/primitive/Event.cpp b/source/RobotAPI/libraries/aron/core/type/variant/primitive/Event.cpp
deleted file mode 100644
index 015e7c7b4..000000000
--- a/source/RobotAPI/libraries/aron/core/type/variant/primitive/Event.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * This file is part of ArmarX.
- *
- * Copyright (C) 2012-2016, High Performance Humanoid Technologies (H2T),
- * Karlsruhe Institute of Technology (KIT), all rights reserved.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @author Firat-Yusuf-Duran (uzivy at student dot kit dot edu)
- * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
- * GNU General Public License
- */
-
-
-// STD/STL
-#include <string>
-#include <RobotAPI/interface/aron/Aron.h>
-
-// Header
-#include "Event.h"
-
-namespace armarx::aron::type
-{
- /* constructors */
- Event::Event(const Path& path) : Base(type::Descriptor::EVENT, path)
- {
- }
-
- Event::Event(const type::dto::Event& o, const Path& path) :
- Base(o, type::Descriptor::EVENT, path)
- {
- }
-
- type::dto::EventPtr
- Event::toEventDTO() const
- {
- return this->aron;
- }
-
- /* virtual implementations */
- std::string
- Event::getShortName() const
- {
- return "Event";
- }
-
- std::string
- Event::getFullName() const
- {
- return "armarx::aron::type::Event";
- }
-} // namespace armarx::aron::type
diff --git a/source/RobotAPI/libraries/aron/core/type/variant/primitive/Event.h b/source/RobotAPI/libraries/aron/core/type/variant/primitive/Event.h
deleted file mode 100644
index a5a49349d..000000000
--- a/source/RobotAPI/libraries/aron/core/type/variant/primitive/Event.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of ArmarX.
- *
- * Copyright (C) 2012-2016, High Performance Humanoid Technologies (H2T),
- * Karlsruhe Institute of Technology (KIT), all rights reserved.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @author Firat-Yusuf-Duran (uzivy at student dot kit dot edu)
- * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
- * GNU General Public License
- */
-
-#pragma once
-
-// STD/STL
-#include <string>
-#include <RobotAPI/interface/aron/Aron.h>
-
-// Base class
-#include "../detail/PrimitiveVariant.h"
-
-namespace armarx::aron::type
-{
- /**
- * @brief The Event class. It represents the event type
- */
- class Event : public detail::PrimitiveVariant<type::dto::Event, Event, bool>
- {
- public:
- using Base = detail::PrimitiveVariant<type::dto::Event, Event, bool>;
-
- /* constructors */
- Event(const Path& = Path());
- Event(const type::dto::Event&, const Path& = Path());
-
- type::dto::EventPtr toEventDTO() const;
-
- /* virtual implementations */
- virtual std::string getShortName() const override;
- virtual std::string getFullName() const override;
- };
-} // namespace armarx::aron::type
diff --git a/source/RobotAPI/libraries/aron/core/type/visitor/Visitor.h b/source/RobotAPI/libraries/aron/core/type/visitor/Visitor.h
index fca0a2242..9dfe2057d 100644
--- a/source/RobotAPI/libraries/aron/core/type/visitor/Visitor.h
+++ b/source/RobotAPI/libraries/aron/core/type/visitor/Visitor.h
@@ -82,8 +82,6 @@ namespace armarx::aron::type
return v.visitIntEnum(t);
case type::Descriptor::UNKNOWN:
return v.visitUnknown(t);
- case type::Descriptor::EVENT:
- return v.visitEvent(t);
}
}
@@ -127,7 +125,6 @@ namespace armarx::aron::type
virtual void visitBool(Input&) {};
virtual void visitString(Input&) {};
virtual void visitAnyObject(Input&) {};
- virtual void visitEvent(Input&) {};
virtual void visitUnknown(Input&) { throw error::AronException(__PRETTY_FUNCTION__, "Unknown type in visitor."); }
virtual ~Visitor() = default;
};
diff --git a/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp b/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
index eaed29607..a31c15b7c 100644
--- a/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
@@ -34,7 +34,6 @@
#include "RobotAPI/libraries/aron/core/data/variant/container/Dict.h"
#include "RobotAPI/libraries/aron/core/type/variant/container/Object.h"
#include "RobotAPI/libraries/aron/core/type/variant/forward_declarations.h"
-#include "RobotAPI/libraries/aron/core/type/variant/primitive/Event.h"
#include "RobotAPI/libraries/skills/core/FluxioNode.h"
#include "RobotAPI/libraries/skills/core/FluxioParameter.h"
#include "RobotAPI/libraries/skills/core/FluxioProfile.h"
@@ -85,9 +84,8 @@ namespace armarx::plugins
const auto& baseTypesPtr = std::make_shared<aron::type::Object>();
const std::string& keyName = "BaseTypesNamespace";
baseTypesPtr->setObjectName(keyName);
- const auto& eventTypePtr = std::make_shared<aron::type::Event>();
- // const auto& eventTypePtr = std::make_shared<aron::type::Object>();
- // eventTypePtr->setObjectName("Event");
+ const auto& eventTypePtr = std::make_shared<aron::type::Object>();
+ eventTypePtr->setObjectName("Event");
baseTypesPtr->addMemberType("Event", eventTypePtr);
const auto& testBoolTypePtr = std::make_shared<aron::type::Bool>();
baseTypesPtr->addMemberType("Bool", testBoolTypePtr);
--
GitLab