Skip to content
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

Jump to bottom

Modified gitignore to avoid tracking .DS_Store MacOS files and also r… #2705

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −4
Open

Modified gitignore to avoid tracking .DS_Store MacOS files and also r… #2705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,6 @@ _autosummary
# source dependencies (see moveit2.repos)
moveit_msgs
moveit_resources

# ignore macos generated files
.DS_Store
2 changes: 1 addition & 1 deletion moveit_core/collision_detection/src/collision_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void CollisionResult::print() const
for (const auto& contact : contacts)
{
RCLCPP_DEBUG_STREAM_THROTTLE(getLogger(), clock, LOG_THROTTLE_PERIOD,
"\t" << contact.first.first << ", " << contact.first.second);
'\t' << contact.first.first << ", " << contact.first.second);
}
#pragma GCC diagnostic pop
}
Expand Down
2 changes: 1 addition & 1 deletion moveit_core/collision_detection/src/collision_tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void getCollisionMarkersFromContacts(visualization_msgs::msg::MarkerArray& arr,
{
for (const auto& contact : collision.second)
{
std::string ns_name = contact.body_name_1 + "=" + contact.body_name_2;
std::string ns_name = contact.body_name_1 + '=' + contact.body_name_2;
if (ns_counts.find(ns_name) == ns_counts.end())
{
ns_counts[ns_name] = 0;
Expand Down
2 changes: 1 addition & 1 deletion moveit_setup_assistant/moveit_setup_srdf_plugins/src/default_collisions_widget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void DefaultCollisionsWidget::onInit()
fraction_spinbox_ = new QSpinBox(this);
fraction_spinbox_->setRange(1, 100);
fraction_spinbox_->setValue(95);
fraction_spinbox_->setSuffix("%");
fraction_spinbox_->setSuffix('%');
buttons_layout->addWidget(fraction_spinbox_);

// Generate Button
Expand Down
2 changes: 1 addition & 1 deletion moveit_setup_assistant/moveit_setup_srdf_plugins/src/group_meta_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ void GroupMetaConfig::collectVariables(std::vector<TemplateVariable>& variables)

// add a linebreak if we have more than one entry
if (!kinematics_parameters_files_block.empty())
kinematics_parameters_files_block += "\n";
kinematics_parameters_files_block += '\n';

std::string line = " <rosparam command=\"load\" ns=\"" + groups.first + "\" file=\"" +
groups.second.kinematics_parameters_file_ + "\"/>";
Expand Down
Loading