Skip to content

Commit

Permalink
Merge pull request #41 from jrl-umi3218/pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
[pre-commit.ci] pre-commit autoupdate
  • Loading branch information
arntanguy authored Mar 14, 2024
2 parents cdd045c + 2bdade0 commit 185bd59
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
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
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
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

0 comments on commit 185bd59

Please sign in to comment.