Skip to content

Commit b82ed21

Browse files
gnawmegnawme
committed
Fix numerous clang-format escapes
1 parent 30086ce commit b82ed21

57 files changed

Lines changed: 145 additions & 203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pc_source/source.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class Model {
5151
if (resolution <= 0)
5252
return assembled_;
5353

54-
auto it =
55-
voxelized_assembled_.find(resolution);
54+
auto it = voxelized_assembled_.find(resolution);
5655
if (it == voxelized_assembled_.end()) {
5756
PointTPtr voxelized(new pcl::PointCloud<PointT>);
5857
pcl::VoxelGrid<PointT> grid_;

‎apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/local_recognizer.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,7 @@ pcl::rec_3d_framework::LocalRecognitionPipeline<Distance, PointInT, FeatureT>::
485485

486486
if (use_cache_) {
487487
std::pair<std::string, int> pair_model_view = std::make_pair(model.id_, view_id);
488-
auto it =
489-
keypoints_cache_.find(pair_model_view);
488+
auto it = keypoints_cache_.find(pair_model_view);
490489

491490
if (it != keypoints_cache_.end()) {
492491
keypoints_cloud = it->second;

‎apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/local_recognizer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class PCL_EXPORTS LocalRecognitionPipeline {
195195
}
196196

197197
public:
198-
LocalRecognitionPipeline() :
198+
LocalRecognitionPipeline()
199199
{
200200
use_cache_ = false;
201201
threshold_accept_model_hypothesis_ = 0.2f;

‎apps/3d_rec_framework/src/tools/openni_frame_source.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace OpenNIFrameSource {
66

77
OpenNIFrameSource::OpenNIFrameSource(const std::string& device_id)
8-
: grabber_(device_id),
8+
: grabber_(device_id)
99
{
1010
std::function<void(const PointCloudConstPtr&)> frame_cb =
1111
[this](const PointCloudConstPtr& cloud) { onNewFrame(cloud); };

‎apps/cloud_composer/include/pcl/apps/cloud_composer/impl/merge_selection.hpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ pcl::cloud_composer::MergeSelection::performTemplatedAction(
7474
input_cloud_item->printNumPoints<PointT>();
7575
// If this cloud hasn't been completely selected
7676
if (!input_data.contains(input_cloud_item)) {
77-
auto input_cloud =
78-
input_cloud_item->data(ItemDataRole::CLOUD_TEMPLATED)
77+
auto input_cloud = input_cloud_item->data(ItemDataRole::CLOUD_TEMPLATED)
7978
.value<typename PointCloud<PointT>::Ptr>();
8079
qDebug() << "Extracting "
8180
<< selected_item_index_map_.value(input_cloud_item)->indices.size()
@@ -102,9 +101,8 @@ pcl::cloud_composer::MergeSelection::performTemplatedAction(
102101
}
103102
// Just concatenate for all fully selected clouds
104103
foreach (const CloudComposerItem* input_item, input_data) {
105-
auto input_cloud =
106-
input_item->data(ItemDataRole::CLOUD_TEMPLATED)
107-
.value<typename PointCloud<PointT>::Ptr>();
104+
auto input_cloud = input_item->data(ItemDataRole::CLOUD_TEMPLATED)
105+
.value<typename PointCloud<PointT>::Ptr>();
108106
*merged_cloud += *input_cloud;
109107
}
110108
CloudItem* cloud_item = CloudItem::createCloudItemFromTemplate<PointT>(

‎apps/cloud_composer/include/pcl/apps/cloud_composer/impl/transform_clouds.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ pcl::cloud_composer::TransformClouds::performTemplatedAction(
6868
foreach (const CloudComposerItem* input_item, input_data) {
6969
qDebug() << "Transforming cloud " << input_item->getId();
7070
QVariant variant = input_item->data(ItemDataRole::CLOUD_TEMPLATED);
71-
auto input_cloud =
72-
variant.value<typename PointCloud<PointT>::Ptr>();
71+
auto input_cloud = variant.value<typename PointCloud<PointT>::Ptr>();
7372

7473
Eigen::Matrix4f transform;
7574
if (transform_map_.contains("AllSelectedClouds"))

‎apps/cloud_composer/include/pcl/apps/cloud_composer/tools/impl/organized_segmentation.hpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ pcl::cloud_composer::OrganizedSegmentationTool::performTemplatedAction(
6666
"item! (input list)";
6767
return output;
6868
}
69-
auto input_cloud =
70-
variant.value<typename PointCloud<PointT>::Ptr>();
69+
auto input_cloud = variant.value<typename PointCloud<PointT>::Ptr>();
7170
if (!input_cloud->isOrganized()) {
7271
qCritical() << "Organized Segmentation requires an organized cloud!";
7372
return output;
@@ -89,14 +88,12 @@ pcl::cloud_composer::OrganizedSegmentationTool::performTemplatedAction(
8988
input_item->getChildren(CloudComposerItem::NORMALS_ITEM);
9089
// Get the normals cloud, we just use the first normals that were found if there are
9190
// more than one
92-
auto input_normals =
93-
normals_list.value(0)
94-
->data(ItemDataRole::CLOUD_TEMPLATED)
95-
.value<pcl::PointCloud<pcl::Normal>::ConstPtr>();
91+
auto input_normals = normals_list.value(0)
92+
->data(ItemDataRole::CLOUD_TEMPLATED)
93+
.value<pcl::PointCloud<pcl::Normal>::ConstPtr>();
9694

9795
QVariant variant = input_item->data(ItemDataRole::CLOUD_TEMPLATED);
98-
auto input_cloud =
99-
variant.value<typename PointCloud<PointT>::Ptr>();
96+
auto input_cloud = variant.value<typename PointCloud<PointT>::Ptr>();
10097

10198
pcl::OrganizedMultiPlaneSegmentation<PointT, pcl::Normal, pcl::Label> mps;
10299
mps.setMinInliers(min_inliers);
@@ -143,7 +140,8 @@ pcl::cloud_composer::OrganizedSegmentationTool::performTemplatedAction(
143140

144141
pcl::IndicesPtr extracted_indices(new pcl::Indices());
145142
for (std::size_t i = 0; i < euclidean_label_indices.size(); i++) {
146-
if (euclidean_label_indices[i].indices.size() >= static_cast<std::size_t>(min_cluster_size)) {
143+
if (euclidean_label_indices[i].indices.size() >=
144+
static_cast<std::size_t>(min_cluster_size)) {
147145
typename PointCloud<PointT>::Ptr cluster(new PointCloud<PointT>);
148146
pcl::copyPointCloud(*input_cloud, euclidean_label_indices[i].indices, *cluster);
149147
qDebug() << "Found cluster with size " << cluster->width;

‎apps/cloud_composer/include/pcl/apps/cloud_composer/tools/impl/supervoxels.hpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,13 @@ pcl::cloud_composer::SupervoxelsTool::performTemplatedAction(
6464
"item! (input list)";
6565
return output;
6666
}
67-
auto input_cloud =
68-
variant.value<typename PointCloud<PointT>::Ptr>();
67+
auto input_cloud = variant.value<typename PointCloud<PointT>::Ptr>();
6968
// TODO: Check if Voxelized
7069
}
7170

7271
foreach (const CloudComposerItem* input_item, input_data) {
7372
QVariant variant = input_item->data(ItemDataRole::CLOUD_TEMPLATED);
74-
auto input_cloud =
75-
variant.value<typename PointCloud<PointT>::Ptr>();
73+
auto input_cloud = variant.value<typename PointCloud<PointT>::Ptr>();
7674

7775
float resolution = parameter_model_->getProperty("Resolution").toFloat();
7876
qDebug() << "Octree resolution = " << resolution;

‎apps/cloud_composer/src/commands.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ pcl::cloud_composer::CloudCommand::CloudCommand(
77
QList<const CloudComposerItem*> input_data, QUndoCommand* parent)
88
: QUndoCommand(parent)
99
, original_data_(std::move(input_data))
10-
,
11-
1210
{}
1311

1412
pcl::cloud_composer::CloudCommand::~CloudCommand()

‎apps/cloud_composer/src/merge_selection.cpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ pcl::cloud_composer::MergeSelection::performAction(ConstItemList input_data,
5353
foreach (const CloudItem* input_cloud_item, selected_item_index_map_.keys()) {
5454
// If this cloud hasn't been completely selected
5555
if (!input_data.contains(input_cloud_item)) {
56-
auto input_cloud =
57-
input_cloud_item->data(ItemDataRole::CLOUD_BLOB)
58-
.value<pcl::PCLPointCloud2::ConstPtr>();
56+
auto input_cloud = input_cloud_item->data(ItemDataRole::CLOUD_BLOB)
57+
.value<pcl::PCLPointCloud2::ConstPtr>();
5958
qDebug() << "Extracting "
6059
<< selected_item_index_map_.value(input_cloud_item)->indices.size()
6160
<< " points out of " << input_cloud->width;
@@ -79,9 +78,9 @@ pcl::cloud_composer::MergeSelection::performAction(ConstItemList input_data,
7978
pose_found = true;
8079
}
8180
auto* new_cloud_item = new CloudItem(input_cloud_item->text(),
82-
original_minus_indices,
83-
source_origin,
84-
source_orientation);
81+
original_minus_indices,
82+
source_origin,
83+
source_orientation);
8584
output.append(new_cloud_item);
8685
pcl::PCLPointCloud2::Ptr temp_cloud = pcl::make_shared<pcl::PCLPointCloud2>();
8786
concatenate(*merged_cloud, *selected_points, *temp_cloud);
@@ -92,9 +91,8 @@ pcl::cloud_composer::MergeSelection::performAction(ConstItemList input_data,
9291
}
9392
// Just concatenate for all fully selected clouds
9493
foreach (const CloudComposerItem* input_item, input_data) {
95-
auto input_cloud =
96-
input_item->data(ItemDataRole::CLOUD_BLOB)
97-
.value<pcl::PCLPointCloud2::ConstPtr>();
94+
auto input_cloud = input_item->data(ItemDataRole::CLOUD_BLOB)
95+
.value<pcl::PCLPointCloud2::ConstPtr>();
9896

9997
pcl::PCLPointCloud2::Ptr temp_cloud = pcl::make_shared<pcl::PCLPointCloud2>();
10098
concatenate(*merged_cloud, *input_cloud, *temp_cloud);

0 commit comments

Comments
 (0)