From 9116e92d08337c4d541e0650ff2773a990bd730f Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Thu, 9 Apr 2020 13:45:00 +0200 Subject: [PATCH] minor cleanup, fixing warnings, improving comments --- core/include/moveit/task_constructor/stage_p.h | 4 +++- core/src/stage.cpp | 4 ++-- visualization/motion_planning_tasks/src/task_list_model.cpp | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/include/moveit/task_constructor/stage_p.h b/core/include/moveit/task_constructor/stage_p.h index 47798af8..e2386267 100644 --- a/core/include/moveit/task_constructor/stage_p.h +++ b/core/include/moveit/task_constructor/stage_p.h @@ -164,7 +164,7 @@ protected: std::string name_; PropertyMap properties_; - // the stage's pull interfaces, created as required + // pull interfaces, created by the stage as required InterfacePtr starts_; InterfacePtr ends_; @@ -184,6 +184,8 @@ private: ContainerBase* parent_; // owning parent container_type::iterator it_; // iterator into parent's children_ list referring to this + // push interfaces, assigned by the parent container + // linking to previous/next sibling's pull interfaces InterfaceWeakPtr prev_ends_; // interface to be used for sendBackward() InterfaceWeakPtr next_starts_; // interface to be used for sendForward() diff --git a/core/src/stage.cpp b/core/src/stage.cpp index c48186db..3a65f9a2 100644 --- a/core/src/stage.cpp +++ b/core/src/stage.cpp @@ -563,7 +563,7 @@ PropagatingForwardPrivate::PropagatingForwardPrivate(PropagatingForward* me, con PropagatingForward::PropagatingForward(const std::string& name) : PropagatingEitherWay(new PropagatingForwardPrivate(this, name)) {} -void PropagatingForward::computeBackward(const InterfaceState& to) { +void PropagatingForward::computeBackward(const InterfaceState& /* to */) { assert(false); // This should never be called } @@ -576,7 +576,7 @@ PropagatingBackwardPrivate::PropagatingBackwardPrivate(PropagatingBackward* me, PropagatingBackward::PropagatingBackward(const std::string& name) : PropagatingEitherWay(new PropagatingBackwardPrivate(this, name)) {} -void PropagatingBackward::computeForward(const InterfaceState& from) { +void PropagatingBackward::computeForward(const InterfaceState& /* from */) { assert(false); // This should never be called } diff --git a/visualization/motion_planning_tasks/src/task_list_model.cpp b/visualization/motion_planning_tasks/src/task_list_model.cpp index 55c41fb7..31a57a3d 100644 --- a/visualization/motion_planning_tasks/src/task_list_model.cpp +++ b/visualization/motion_planning_tasks/src/task_list_model.cpp @@ -125,8 +125,6 @@ QVariant BaseTaskModel::flowIcon(moveit::task_constructor::InterfaceFlags f) { static const QIcon FORWARD_ICON = icons::FORWARD.icon(); static const QIcon BACKWARD_ICON = icons::BACKWARD.icon(); static const QIcon GENERATE_ICON = icons::GENERATE.icon(); - // might be needed for graphical setup of tasks - // static const QIcon BOTHWAY_ICON = icons::BOTHWAY.icon(); if (f == InterfaceFlags(CONNECT)) return CONNECT_ICON;