Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
gergondet committed Apr 28, 2022
1 parent 315363e commit 45df983
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions include/mc_control/MCController.h
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ struct MC_CONTROL_DLLAPI MCController
ContactSet contacts_;
/** True if contacts were changed in the previous round */
bool contacts_changed_;
/** Data shown in the contacts' table: R1, R1Surface, R2, R2Surface, DoF, Friction */
using ContactTableDataT = std::tuple<std::string, std::string, std::string, std::string, std::string, double>;
/** Used in GUI display */
std::vector<ContactTableDataT> contacts_table_;
Expand Down
3 changes: 2 additions & 1 deletion src/mc_solver/QPSolver_setContacts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ void QPSolver::setContacts(const std::vector<mc_rbdyn::Contact> & contacts)
{
if(controller_)
{
mc_rtc::log::warning("[MC_RTC_DEPRECATED] Prefer using addContact/removeContact for contacts manipulation");
mc_rtc::log::warning("[MC_RTC_DEPRECATED] Prefer using addContact/removeContact for contacts manipulation instead "
"of QPSolver::setContacts");
controller_->clearContacts();
for(const auto & c : contacts)
{
Expand Down

0 comments on commit 45df983

Please sign in to comment.