Merge branch '158-realsense_playback'

cwi-dis · Nov 28, 2024 · 7907154 · 7907154
2 parents 775a4e8 + 7063b23
commit 7907154
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ vcpkg_installed/
 .vscode/
 .cachedgitversion.txt
 __pycache__/
+tmp/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -101,7 +101,56 @@
         "valarray": "cpp",
         "__hash_table": "cpp",
         "queue": "cpp",
-        "future": "cpp"
+        "future": "cpp",
+        "print": "cpp",
+        "stack": "cpp",
+        "text_encoding": "cpp",
+        "execution": "cpp",
+        "cfenv": "cpp",
+        "coroutine": "cpp",
+        "csignal": "cpp",
+        "filesystem": "cpp",
+        "scoped_allocator": "cpp",
+        "stdfloat": "cpp",
+        "unordered_set": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp"
     },
-    "cmake.ctest.allowParallelJobs": true
+    "cmake.ctest.allowParallelJobs": true,
+    "terminal.integrated.profiles.windows": {
+
+        "PowerShell": {
+            "source": "PowerShell",
+            "icon": "terminal-powershell",
+            "args": [
+                "-noexit",
+                "-file",
+                "${workspaceFolder}\\scripts\\activate.ps1"
+            ]
+        },
+        "Command Prompt": {
+            "path": [
+                "${env:windir}\\Sysnative\\cmd.exe",
+                "${env:windir}\\System32\\cmd.exe"
+            ],
+            "args": [],
+            "icon": "terminal-cmd"
+        },
+        "Git Bash": {
+            "source": "Git Bash"
+        }
+    }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Implemented recording while capturing for both Realsense and Kinect (#139)
 - Glfw is now used via normal dependencies, no longer slurped (#123)
 - `cwipc_forward` can now serve streams to multiple connections at the same time (#151)
+- Major improvements to realsense_playback (#158)
 
 ## [7.5.3] - 2024-04-30
 

diff --git a/cwipc_realsense2 b/cwipc_realsense2
diff --git a/cwipc_util b/cwipc_util
diff --git a/scripts/activate.ps1 b/scripts/activate.ps1
@@ -22,6 +22,11 @@ if (Test-Path -Path $candidate1BinDir) {
     $binDir = $buildDir + "\bin"
 }
 Write-Output "binDir = " + $binDir
+$binDirExists = Test-Path $binDir
+if (-Not $binDirExists) {
+    Write-Output "binDir does not exist. Not enabling venv"
+    exit
+}
 $Env:CWIPC_LIBRARY_DIR = $binDir
 $Env:PATH = $binDir + ";" + $Env:PATH
 Write-Output $Env:PATH
+18 −9		include/cwipc_realsense2/private/RS2Camera.hpp
+1 −0		include/cwipc_realsense2/private/RS2Capture.hpp
+3 −1		include/cwipc_realsense2/private/RS2Config.hpp
+5 −1		include/cwipc_realsense2/private/RS2PlaybackCamera.hpp
+1 −0		include/cwipc_realsense2/private/RS2PlaybackCapture.hpp
+151 −65		src/RS2Camera.cpp
+26 −17		src/RS2Capture.cpp
+11 −1		src/RS2Config.cpp
+10 −10		src/RS2PlaybackCamera.cpp
+20 −1		src/RS2PlaybackCapture.cpp
+22 −3		python/cwipc/io/visualizer.py
+1 −1		python/cwipc/scripts/_scriptsupport.py
+6 −0		python/cwipc/scripts/cwipc_register.py
+1 −1		python/cwipc/scripts/cwipc_timing.py
+4 −0		python/cwipc/scripts/cwipc_view.py
+19 −13		python/cwipc/util.py