Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
Change-Id: Id9ee127a5f895b1848b00b5720fc2d287b93badb
  • Loading branch information
ev-mp committed Nov 18, 2018
2 parents 423bf19 + c1be270 commit 0fc8499
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Information about the Intel® RealSense™ technology at [realsense.intel.com](h
| **[Depth Quality Tool](./tools/depth-quality)** | This application allows you to test the camera’s depth quality, including: standard deviation from plane fit, normalized RMS – the subpixel accuracy, distance accuracy and fill rate. You should be able to easily get and interpret several of the depth quality metrics and record and save the data for offline analysis. |[**Depth.Quality.Tool.exe**](https://github.com/IntelRealSense/librealsense/releases) |
| **[Debug Tools](./tools/)** | Device enumeration, FW logger, etc as can be seen at the tools directory | Included in [**Intel.RealSense.SDK.exe**](https://github.com/IntelRealSense/librealsense/releases)|
| **[Code Samples](./examples)** |These simple examples demonstrate how to easily use the SDK to include code snippets that access the camera into your applications. Check some of the [**C++ examples**](./examples) including capture, pointcloud and more and basic [**C examples**](./examples/C) | Included in [**Intel.RealSense.SDK.exe**](https://github.com/IntelRealSense/librealsense/releases) |
| **[Wrappers](https://github.com/IntelRealSense/librealsense/tree/development/wrappers)** | [Python](./wrappers/python), [C#/.NET](./wrappers/csharp), [Node.js](./wrappers/nodejs) API, as well as integration with the following 3rd-party technologies: [ROS](https://github.com/intel-ros/realsense/releases), [ROS2](https://github.com/intel/ros2_intel_realsense), [LabVIEW](./wrappers/labview), [OpenCV](./wrappers/opencv), [PCL](./wrappers/pcl), [Unity](./wrappers/unity), [Matlab](./wrappers/matlab) and more to come, including OpenNI. | |
| **[Wrappers](https://github.com/IntelRealSense/librealsense/tree/development/wrappers)** | [Python](./wrappers/python), [C#/.NET](./wrappers/csharp), [Node.js](./wrappers/nodejs) API, as well as integration with the following 3rd-party technologies: [ROS](https://github.com/intel-ros/realsense/releases), [ROS2](https://github.com/intel/ros2_intel_realsense), [LabVIEW](./wrappers/labview), [OpenCV](./wrappers/opencv), [PCL](./wrappers/pcl), [Unity](./wrappers/unity), [Matlab](./wrappers/matlab), 🆕[OpenNI](./wrappers/openni2), 🆕[UnrealEngine4](./wrappers/unrealengine4) and more to come. | |


## Ready to Hack!
Expand Down
2 changes: 2 additions & 0 deletions tools/convert/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@ Console app for converting ROS-bag files to various formats (currently supported

## Usage

**Example**: If you have `1.bag` recorded from the Viewer or from API, copy it next to `rs-convert.exe` (for Windows), launch the command line and enter: `rs-convert.exe -v test -i 1.bag`. This will generate one `.csv` file for each frame inside the `.bag` file.

Several converters can be used simultaneously, e.g.:
`rs-convert -i some.bag -p some_dir/some_file_prefix -r some_another_dir/some_another_file_prefix`
2 changes: 1 addition & 1 deletion wrappers/python/examples/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

These Examples demonstrate how to use the python wrapper of the SDK.

## List of Exmples:
## List of Examples:

1. [Tutorial 1](./python-tutorial-1-depth.py) - Demonstrates how to start streaming depth frames from the camera and display the image in the console as an ASCII art.
2. [NumPy and OpenCV](./opencv_viewer_example.py) - Example of rendering depth and color images using the help of OpenCV and Numpy
Expand Down
1 change: 0 additions & 1 deletion wrappers/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def __len__(self):
'Intended Audience :: Education',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: Apache Software License',
'Operating System :: MacOS',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX',
'Operating System :: Unix',
Expand Down

0 comments on commit 0fc8499

Please sign in to comment.