Merge branch 'master' into 18-alignment

# Conflicts: # .vscode/settings.json # cwipc_util # scripts/activate.sh
cwi-dis · Dec 28, 2023 · d505387 · d505387
2 parents e37893e + b48f60d
commit d505387
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cwipc_realsense2 b/cwipc_realsense2
diff --git a/cwipc_util b/cwipc_util
diff --git a/scripts/activate.sh b/scripts/activate.sh
@@ -17,3 +17,4 @@ source $buildDir/venv/bin/activate
 (cd $buildDir/../cwipc_codec/python && python -m pip install -e .)
 (cd $buildDir/../cwipc_realsense2/python && python -m pip install -e .)
 (cd $buildDir/../cwipc_kinect/python && python -m pip install -e .)
+
+1 −0		CMakeLists.txt
+15 −0		apps/cwipc_rs2playback_grab/CMakeLists.txt
+115 −0		apps/cwipc_rs2playback_grab/cwipc_rs2playback_grab.cpp
+13 −0		include/cwipc_realsense2/api.h
+2 −0		include/cwipc_realsense2/private/RS2Camera.hpp
+4 −3		include/cwipc_realsense2/private/RS2Capture.hpp
+2 −1		include/cwipc_realsense2/private/RS2Config.hpp
+45 −0		include/cwipc_realsense2/private/RS2PlaybackCamera.hpp
+30 −0		include/cwipc_realsense2/private/RS2PlaybackCapture.hpp
+19 −0		python/_cwipc_realsense2/__init__.py
+28 −1		python/test_cwipc_realsense2.py
+4 −0		src/CMakeLists.txt
+5 −1		src/RS2Camera.cpp
+13 −8		src/RS2Capture.cpp
+4 −0		src/RS2Config.cpp
+32 −0		src/RS2PlaybackCamera.cpp
+83 −0		src/RS2PlaybackCapture.cpp
+189 −0		src/cwipc_realsense2.cpp
+ −		tests/fixtures/input/recording/20231227_174509.bag
+71 −0		tests/fixtures/input/recording/cameraconfig.json
+15 −2		python/cwipc/scripts/_scriptsupport.py
+3 −2		python/cwipc/scripts/cwipc_calibrate/livegrabber.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,4 @@ source $buildDir/venv/bin/activate
		(cd $buildDir/../cwipc_codec/python && python -m pip install -e .)
		(cd $buildDir/../cwipc_realsense2/python && python -m pip install -e .)
		(cd $buildDir/../cwipc_kinect/python && python -m pip install -e .)