Skip to content

Commit

Permalink
Format (introlab#43)
Browse files Browse the repository at this point in the history 
* Updated .clang-format

* Adjust trailing whitespace and EOF newline

* Ran clang-format on C++ files

* Ran autopep8 on Python files

* Formatted CMake tabs

* Formatted xml tabs

* Other formatting

* Update opentera-webrtc to formatted version

* Updated opentera-webrtc-teleop-frontend to formatted version

* Update opentera-webrtc-teleop-frontend
  • Loading branch information
@philippewarren
philippewarren authored Mar 25, 2022
1 parent 12c3ea9 commit b11d371
Show file tree
Hide file tree
Showing 118 changed files with 2,192 additions and 2,170 deletions.
67 changes: 44 additions & 23 deletions .clang-format
View file
Original file line number Diff line number Diff line change
@@ -1,72 +1,93 @@
---
# LLVM 12
---
BasedOnStyle: LLVM
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveMacros: AcrossEmptyLinesAndComments
AlignAfterOpenBracket: AlwaysBreak
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignConsecutiveMacros: AcrossComments
AlignEscapedNewlines: Right
AlignOperands: true
AlignTrailingComments: true
AlignOperands: Align
AlignTrailingComments: false
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: true
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortBlocksOnASingleLine: Always
AllowShortCaseLabelsOnASingleLine: false
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: true
BinPackParameters: true
BreakBeforeBinaryOperators: NonAssignment
AttributeMacros: []
BinPackArguments: false
BinPackParameters: false
BitFieldColonSpacing: After
BreakBeforeBraces: Allman
BreakBeforeTernaryOperators: true
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: true
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: BeforeColon
BreakInheritanceList: BeforeColon
BreakStringLiterals: true
ColumnLimit: 90
ColumnLimit: 120
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DeriveLineEnding: false
UseCRLF: false
DerivePointerAlignment: false
DisableFormat: false
EmptyLineBeforeAccessModifier: LogicalBlock
FixNamespaceComments: false
IncludeBlocks: Regroup
ForEachMacros: []
IncludeBlocks: Preserve
IndentCaseBlocks: false
IndentCaseLabels: true
IndentPPDirectives: BeforeHash
IndentExternBlock: NoIndent
IndentGotoLabels: true
IndentPPDirectives: None
IndentWidth: 4
IndentWrappedFunctionNames: false
IndentWrappedFunctionNames: true
KeepEmptyLinesAtTheStartOfBlocks: false
Language: Cpp
MaxEmptyLinesToKeep: 2
MacroBlockBegin: "^QT_BEGIN_NAMESPACE"
MacroBlockEnd: "QT_END_NAMESPACE$"
NamespaceIndentation: All
PointerAlignment: Left
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SortIncludes: false
SortUsingDeclarations: false
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceAroundPointerQualifiers: Default
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesInAngles: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInConditionalStatement: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: c++14
StatementAttributeLikeMacros: [emit]
StatementMacros: [Q_UNUSED, Q_OBJECT]
TabWidth: 4
UseCRLF: false
UseTab: Never

...
2 changes: 1 addition & 1 deletion drawings/GlobalSetup.drawio
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mxfile host="app.diagrams.net" modified="2021-03-30T15:29:38.545Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" etag="AR40H6Jlx_C5xjP6Lc2Y" version="14.5.3" type="device"><diagram id="fH0gUpjxd6TEAPhTNsdL" name="Page-1">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</diagram></mxfile>
<mxfile host="app.diagrams.net" modified="2021-03-30T15:29:38.545Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" etag="AR40H6Jlx_C5xjP6Lc2Y" version="14.5.3" type="device"><diagram id="fH0gUpjxd6TEAPhTNsdL" name="Page-1">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</diagram></mxfile>
1 change: 0 additions & 1 deletion drawings/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@

Open the following URLs with draw.io.
* [GlobalSetup.drawio](https://viewer.diagrams.net/?url=https://github.com/introlab/opentera-webrtc-ros/raw/main/drawings/GlobalSetup.drawio)

97 changes: 49 additions & 48 deletions map_image_generator/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ project(map_image_generator)
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
cv_bridge
geometry_msgs
image_transport
nav_msgs
roscpp
sensor_msgs
std_msgs
tf
rtabmap_ros
message_generation
std_srvs
odas_ros
opentera_webrtc_ros_msgs
cv_bridge
geometry_msgs
image_transport
nav_msgs
roscpp
sensor_msgs
std_msgs
tf
rtabmap_ros
message_generation
std_srvs
odas_ros
opentera_webrtc_ros_msgs
)

## System dependencies are found with CMake's conventions
Expand Down Expand Up @@ -66,9 +66,9 @@ find_package(OpenCV REQUIRED)

## Generate services in the 'srv' folder
add_service_files(
FILES
ImageGoalToMapGoal.srv
ChangeMapView.srv
FILES
ImageGoalToMapGoal.srv
ChangeMapView.srv
)

## Generate actions in the 'action' folder
Expand All @@ -80,9 +80,9 @@ add_service_files(

## Generate added messages and services with any dependencies listed here
generate_messages(
DEPENDENCIES
geometry_msgs
std_msgs
DEPENDENCIES
geometry_msgs
std_msgs
)

################################################
Expand Down Expand Up @@ -128,38 +128,39 @@ catkin_package(
## Specify additional locations of header files
## Your package locations should be listed before other locations
include_directories(
include
${catkin_INCLUDE_DIRS}
include
${catkin_INCLUDE_DIRS}
)

add_executable(map_image_generator
include/map_image_generator/drawers/GlobalPathImageDrawer.h
include/map_image_generator/drawers/GoalImageDrawer.h
include/map_image_generator/drawers/ImageDrawer.h
include/map_image_generator/drawers/LabelImageDrawer.h
include/map_image_generator/drawers/LaserScanImageDrawer.h
include/map_image_generator/drawers/OccupancyGridImageDrawer.h
include/map_image_generator/drawers/RobotImageDrawer.h
include/map_image_generator/drawers/SoundSourceImageDrawer.h
include/map_image_generator/GoalConverter.h
include/map_image_generator/MapImageGenerator.h
include/map_image_generator/MapLabelsConverter.h
include/map_image_generator/Parameters.h
include/map_image_generator/utils.h
src/drawers/GlobalPathImageDrawer.cpp
src/drawers/GoalImageDrawer.cpp
src/drawers/ImageDrawer.cpp
src/drawers/LabelImageDrawer.cpp
src/drawers/LaserScanImageDrawer.cpp
src/drawers/OccupancyGridImageDrawer.cpp
src/drawers/RobotImageDrawer.cpp
src/drawers/SoundSourceImageDrawer.cpp
src/GoalConverter.cpp
src/main.cpp
src/MapImageGenerator.cpp
src/MapLabelsConverter.cpp
src/Parameters.cpp
src/utils.cpp)
include/map_image_generator/drawers/GlobalPathImageDrawer.h
include/map_image_generator/drawers/GoalImageDrawer.h
include/map_image_generator/drawers/ImageDrawer.h
include/map_image_generator/drawers/LabelImageDrawer.h
include/map_image_generator/drawers/LaserScanImageDrawer.h
include/map_image_generator/drawers/OccupancyGridImageDrawer.h
include/map_image_generator/drawers/RobotImageDrawer.h
include/map_image_generator/drawers/SoundSourceImageDrawer.h
include/map_image_generator/GoalConverter.h
include/map_image_generator/MapImageGenerator.h
include/map_image_generator/MapLabelsConverter.h
include/map_image_generator/Parameters.h
include/map_image_generator/utils.h
src/drawers/GlobalPathImageDrawer.cpp
src/drawers/GoalImageDrawer.cpp
src/drawers/ImageDrawer.cpp
src/drawers/LabelImageDrawer.cpp
src/drawers/LaserScanImageDrawer.cpp
src/drawers/OccupancyGridImageDrawer.cpp
src/drawers/RobotImageDrawer.cpp
src/drawers/SoundSourceImageDrawer.cpp
src/GoalConverter.cpp
src/main.cpp
src/MapImageGenerator.cpp
src/MapLabelsConverter.cpp
src/Parameters.cpp
src/utils.cpp
)

target_link_libraries(map_image_generator
${catkin_LIBRARIES}
Expand Down
6 changes: 2 additions & 4 deletions map_image_generator/include/map_image_generator/GoalConverter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ namespace map_image_generator
ros::ServiceServer image_goal_to_map_goal_service;

public:
GoalConverter(const Parameters& parameters, ros::NodeHandle& nodeHandle,
tf::TransformListener& tfListener);
GoalConverter(const Parameters& parameters, ros::NodeHandle& nodeHandle, tf::TransformListener& tfListener);
virtual ~GoalConverter();

private:
bool mapImageGoalCallback(ImageGoalToMapGoal::Request& req,
ImageGoalToMapGoal::Response& res);
bool mapImageGoalCallback(ImageGoalToMapGoal::Request& req, ImageGoalToMapGoal::Response& res);
};
}
#endif
3 changes: 1 addition & 2 deletions map_image_generator/include/map_image_generator/MapImageGenerator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ namespace map_image_generator
cv_bridge::CvImage m_cvImage;

public:
MapImageGenerator(Parameters& parameters, ros::NodeHandle& nodeHandle,
tf::TransformListener& tfListener);
MapImageGenerator(Parameters& parameters, ros::NodeHandle& nodeHandle, tf::TransformListener& tfListener);
virtual ~MapImageGenerator();

void generate(sensor_msgs::Image& sensorImage);
Expand Down
3 changes: 1 addition & 2 deletions map_image_generator/include/map_image_generator/MapLabelsConverter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ namespace map_image_generator
virtual ~MapLabelsConverter();

private:
void
mapLabelsCallback(const visualization_msgs::MarkerArray::ConstPtr& mapLabels);
void mapLabelsCallback(const visualization_msgs::MarkerArray::ConstPtr& mapLabels);
std::vector<std::string> getDesiredLabels();
};
}
Expand Down
Loading

0 comments on commit b11d371

Please sign in to comment.