Skip to content

Commit 83be527

Browse files
committed
Fix whitespace in all files prior to release
1 parent 05176e9 commit 83be527

18 files changed

+293
-294
lines changed

CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ if(WIN32 AND NOT CYGWIN)
2626
else()
2727
set(DEF_INSTALL_CMAKE_DIR lib/cmake/${PROJECT_NAME})
2828
endif()
29-
set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH
29+
set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH
3030
"Installation directory for CMake files")
3131

32-
# read the version number from the file "VERSION"
32+
# read the version number from the file "VERSION"
3333
file(STRINGS "VERSION" VERSION_CONTENTS)
3434
foreach(LINE ${VERSION_CONTENTS})
3535
string(REGEX REPLACE " |\t" "" LINE ${LINE})
@@ -146,7 +146,7 @@ install(FILES ${PROTO_HEADERS}
146146

147147
# Install the export set for use with the install-tree
148148
install(EXPORT ${PROJECT_NAME}_targets
149-
DESTINATION "${INSTALL_CMAKE_DIR}"
149+
DESTINATION "${INSTALL_CMAKE_DIR}"
150150
COMPONENT dev)
151151

152152
# add a target to generate API documentation with Doxygen
@@ -159,22 +159,22 @@ if(NOT DOXYGEN_FOUND)
159159
message(WARNING "Doxygen could not be found.")
160160

161161
else()
162-
162+
163163
if(NOT EXISTS ${FILTER_PROTO2CPP_PY_PATH}/proto2cpp.py)
164-
164+
165165
message(WARNING "${FILTER_PROTO2CPP_PY_PATH}/proto2cpp.py could not be found.")
166166

167167
else()
168-
168+
169169
set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/doxygen_config.cmake.in)
170170
set(doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
171171

172172
configure_file(${doxyfile_in} ${doxyfile} @ONLY)
173173

174-
ADD_CUSTOM_TARGET(api_doc ALL
174+
ADD_CUSTOM_TARGET(api_doc ALL
175175
COMMAND ${DOXYGEN_EXECUTABLE} ${doxyfile}
176176
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
177-
177+
178178
endif(NOT EXISTS ${FILTER_PROTO2CPP_PY_PATH}/proto2cpp.py)
179-
179+
180180
endif(NOT DOXYGEN_FOUND)

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ Specific errors should be handled as follows:
4343
An additional SensorDataObject is added to the list of objects in SensorData.object
4444
with SensorDataObject.model_internal_object.ground_truth_type set to kTypeGhost.
4545
- False negative:
46-
The object is marked as not seen by the sensor by setting the property
47-
SensorDataObject.model_internal_object.is_seen to false. The implementation
48-
of field-of-view calculation modules should respect this flag and never reset
46+
The object is marked as not seen by the sensor by setting the property
47+
SensorDataObject.model_internal_object.is_seen to false. The implementation
48+
of field-of-view calculation modules should respect this flag and never reset
4949
an object marked as not-seen to seen.
5050

5151

@@ -55,7 +55,7 @@ The version number is defined in InterfaceVersion::version_number in osi_common.
5555

5656
Major:
5757
A change of the major version results in an incompatibility of code and recorded proto messages.
58-
- An existing field with a number changes its meaning
58+
- An existing field with a number changes its meaning
5959
optional double field = 1; -> repeated double field = 1;
6060
Changing the definition of units of a field
6161
- Deleting a field and reusing the field number
@@ -88,11 +88,11 @@ Documentation
8888

8989
Detailed information about installation and usage of OSI can be found in the [Wiki](https://github.com/OpenSimulationInterface/open-simulation-interface/wiki)
9090

91-
In order to generate the doxygen documentation for OSI, please follow the following steps:
91+
In order to generate the doxygen documentation for OSI, please follow the following steps:
9292
1. Install [Doxygen](http://www.stack.nl/~dimitri/doxygen/download.html), set an environmental variable 'doxygen' with the path to the binary file and add it to the PATH variable: `PATH += %doxygen%`.
9393
2. Download the [vg-1.5.0.zip](https://github.com/vgteam/vg/releases/tag/v1.5.0). Unpack and copy the content of folder /vg-1.5.0/contrib/proto2cpp to your desired `<path-to-proto2cpp.py>`
9494
3. Install [graphviz-2.38](http://www.graphviz.org/Download_windows.php ), set an environmental variable 'graphviz' with the path to the binary file and add it to the PATH variable: `PATH += %graphviz%`.
95-
4. From the cmd navigate to the build directory and run:
95+
4. From the cmd navigate to the build directory and run:
9696
```cmd
9797
cmake -DFILTER_PROTO2CPP_PY_PATH=<path-to-proto2cpp.py> <path-to-CMakeLists.txt>
9898
```

doxygen_config.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
PROJECT_NAME = "@CMAKE_PROJECT_NAME@"
33
PROJECT_NUMBER = @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
44

5-
#Set input and output directories
5+
#Set input and output directories
66
INPUT = "@CMAKE_CURRENT_SOURCE_DIR@"
77
INPUT += "@CMAKE_CURRENT_SOURCE_DIR@/README.md"
88

@@ -13,7 +13,7 @@ IMAGE_PATH = "@CMAKE_CURRENT_SOURCE_DIR@/doc/images"
1313

1414
# There is no standard configuration for .proto files documentation.
1515
# A Doxygen filter for .proto files has to be added under the directory doc/.
16-
# proto2cpp.py is an external script. See README.md for more informations.
16+
# proto2cpp.py is an external script. See README.md for more informations.
1717
JAVADOC_AUTOBRIEF = NO
1818
EXTENSION_MAPPING = proto=C
1919
FILE_PATTERNS = *.proto

osi_common.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,4 +375,4 @@ message BaseMoving
375375
// The polygon is defined counter-clockwise.
376376
//
377377
repeated Vector2d base_polygon = 7;
378-
}
378+
}

osi_detectedlandmark.proto

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,14 @@ message DetectedTrafficLight
218218
// Common information of one detected item.
219219
//
220220
optional DetectedItemHeader header = 1;
221-
221+
222222
// The base parameters of the traffic light.
223223
//
224224
// \c BaseStationary::orientation x-axis is view normal of the traffic
225225
// light's icon.
226226
//
227227
optional BaseStationary base = 2;
228-
228+
229229
// The root mean squared error of the base parameters of the detected
230230
// traffic light's geometry. \c TrafficLight::base has to be identical
231231
// for all \c #candidate traffic lights.
@@ -272,7 +272,7 @@ message DetectedRoadMarking
272272
// Common information of one detected item.
273273
//
274274
optional DetectedItemHeader header = 1;
275-
275+
276276
// The base parameters of the road marking.
277277
//
278278
// The orientation of the bounding box \c #base
@@ -292,7 +292,7 @@ message DetectedRoadMarking
292292
// vehicle.
293293
//
294294
optional BaseStationary base = 2;
295-
295+
296296
// The root mean squared error of the base parameters of the detected
297297
// road marking. \c RoadMarking::base has to be identical for
298298
// all \c #candidate road markings.

osi_detectedlane.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ message DetectedLaneBoundary
7878
// distance and approximation error apply as for \c Lane::centerline.
7979
//
8080
repeated LaneBoundary.BoundaryPoint boundary_line = 3;
81-
81+
8282
// The root mean squared error of the \c LaneBoundary.BoundaryPoint
8383
// information from a \c LaneBoundary.
8484
// For each \c #lane_boundary \c LaneBoundary::boundary_line point exact

osi_detectedobject.proto

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ message DetectedStationaryObject
9696
// Common information of one detected item.
9797
//
9898
optional DetectedItemHeader header = 1;
99-
99+
100100
// The base parameters of the stationary object.
101101
//
102102
optional BaseStationary base = 2;
103-
103+
104104
// The root mean squared error of the base parameters of the detected
105105
// stationary object (e.g. landmark). \c StationaryObject::base has to be
106106
// identical for all \c #candidate stationary objects.
@@ -183,7 +183,7 @@ message DetectedMovingObject
183183
// Percentage value of the object width in the corresponding lane.
184184
//
185185
optional double percentage_side_lane_right = 7;
186-
186+
187187
// A list of candidates for this moving object as estimated by the
188188
// sensor (e.g. pedestrian, car).
189189
//
@@ -238,7 +238,7 @@ message DetectedMovingObject
238238
// The description of the moving object (e.g. car).
239239
//
240240
optional MovingObject.Type type = 2;
241-
241+
242242
// Specific information about the classification of the vehicle.
243243
//
244244
//

osi_detectedoccupant.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ message DetectedOccupant
4646
//
4747
optional Occupant.Classification classification = 2;
4848
}
49-
}
49+
}

osi_environment.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,4 +262,4 @@ message EnvironmentalConditions
262262
//
263263
optional uint32 seconds_since_midnight = 1;
264264
}
265-
}
265+
}

osi_featuredata.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,4 +337,4 @@ enum DetectionClassification
337337
// Under-drivable (sign gantry etc.).
338338
//
339339
DETECTION_CLASSIFICATION_UNDERDRIVABLE = 5;
340-
}
340+
}

0 commit comments

Comments
 (0)