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

[pre-commit.ci] pre-commit autoupdate #41

Merged
merged 2 commits into from
Mar 14, 2024
Merged

[pre-commit.ci] pre-commit autoupdate #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c32fa8
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Mar 12, 2024
2bdade0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 12, 2024
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repos:
- id: check-useless-excludes
- id: check-hooks-apply
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v17.0.6
rev: v18.1.1
hooks:
- id: clang-format
'types_or': [c++, c]
Expand Down
3 changes: 1 addition & 2 deletions mc_rtc_rviz_panel/src/FormElement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,8 +557,7 @@ void DataComboInput::update_values()
auto dataIn = data_;
for(const auto & k : resolved_ref_) { dataIn = dataIn(k, mc_rtc::Configuration{}); }
auto values = dataIn.size() ? dataIn : std::vector<std::string>{};
std::sort(values.begin(), values.end(),
[](const std::string & lhs, const std::string & rhs)
std::sort(values.begin(), values.end(), [](const std::string & lhs, const std::string & rhs)
{ return QString::compare(lhs.c_str(), rhs.c_str(), Qt::CaseInsensitive) < 0; });
if(values_ != values)
{
Expand Down
10 changes: 5 additions & 5 deletions mc_rtc_rviz_panel/src/TransformInteractiveMarkerWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ TransformInteractiveMarkerWidget::TransformInteractiveMarkerWidget(const ClientW
bool control_position,
ClientWidget * label)
: InteractiveMarkerWidget(
params,
requestId,
server,
make6DMarker(id2name(params.id), makeAxisMarker(0.15 * 0.9), control_position, control_orientation),
label),
params,
requestId,
server,
make6DMarker(id2name(params.id), makeAxisMarker(0.15 * 0.9), control_position, control_orientation),
label),
control_orientation_(control_orientation), control_position_(control_position)
{
}
Expand Down
Loading