[azure-kinect-sensor-sdk] Fix missing header files and adapt to new version of imgui (#40812)

This commit is contained in:
jim wang 2024-09-08 18:36:00 +00:00 committed by GitHub
parent d68fea8eae
commit 59ab5cf205
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 100 additions and 2 deletions

View File

@ -11,3 +11,47 @@ index 4289f71..407e912 100644
}
ImGui::EndChild();
diff --git a/tools/k4aviewer/k4asourceselectiondockcontrol.cpp b/tools/k4aviewer/k4asourceselectiondockcontrol.cpp
index 812608b..31e961d 100644
--- a/tools/k4aviewer/k4asourceselectiondockcontrol.cpp
+++ b/tools/k4aviewer/k4asourceselectiondockcontrol.cpp
@@ -34,7 +34,7 @@ K4ASourceSelectionDockControl::K4ASourceSelectionDockControl()
K4ADockControlStatus K4ASourceSelectionDockControl::Show()
{
- ImGui::SetNextTreeNodeOpen(true, ImGuiCond_FirstUseEver);
+ ImGui::SetNextItemOpen(true, ImGuiCond_FirstUseEver);
if (ImGui::TreeNode("Open Device"))
{
ImGuiExtensions::K4AComboBox("Device S/N",
diff --git a/tools/k4aviewer/k4adevicedockcontrol.cpp b/tools/k4aviewer/k4adevicedockcontrol.cpp
index 8fe5687..6d1e95a 100644
--- a/tools/k4aviewer/k4adevicedockcontrol.cpp
+++ b/tools/k4aviewer/k4adevicedockcontrol.cpp
@@ -333,7 +333,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
if (m_firstRun || depthEnabledStateChanged)
{
- ImGui::SetNextTreeNodeOpen(m_config.EnableDepthCamera);
+ ImGui::SetNextItemOpen(m_config.EnableDepthCamera);
}
ImGui::Indent();
@@ -376,7 +376,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
if (m_firstRun || colorEnableStateChanged)
{
- ImGui::SetNextTreeNodeOpen(m_config.EnableColorCamera);
+ ImGui::SetNextItemOpen(m_config.EnableColorCamera);
}
ImGui::Indent();
@@ -710,7 +710,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
if (m_firstRun && (m_syncInConnected || m_syncOutConnected))
{
- ImGui::SetNextTreeNodeOpen(true);
+ ImGui::SetNextItemOpen(true);
}
if (ImGui::TreeNode("External Sync"))
{

View File

@ -0,0 +1,48 @@
diff --git a/tools/k4aviewer/k4aaudiochanneldatagraph.h b/tools/k4aviewer/k4aaudiochanneldatagraph.h
index 9aede89..56d2c77 100644
--- a/tools/k4aviewer/k4aaudiochanneldatagraph.h
+++ b/tools/k4aviewer/k4aaudiochanneldatagraph.h
@@ -7,6 +7,7 @@
// System headers
//
#include <array>
+#include <string>
// Library headers
//
diff --git a/tools/k4aviewer/k4aaudiowindow.h b/tools/k4aviewer/k4aaudiowindow.h
index 87b63b3..fcfc86e 100644
--- a/tools/k4aviewer/k4aaudiowindow.h
+++ b/tools/k4aviewer/k4aaudiowindow.h
@@ -8,6 +8,7 @@
//
#include <array>
#include <memory>
+#include <string>
// Library headers
//
diff --git a/tools/k4aviewer/k4amicrophonelistener.cpp b/tools/k4aviewer/k4amicrophonelistener.cpp
index db7b546..8baa05c 100644
--- a/tools/k4aviewer/k4amicrophonelistener.cpp
+++ b/tools/k4aviewer/k4amicrophonelistener.cpp
@@ -8,6 +8,7 @@
// System headers
//
#include <regex>
+#include <string>
// Library headers
//
diff --git a/tools/k4aviewer/perfcounter.h b/tools/k4aviewer/perfcounter.h
index b39e721..c3e28d2 100644
--- a/tools/k4aviewer/perfcounter.h
+++ b/tools/k4aviewer/perfcounter.h
@@ -13,6 +13,7 @@
#include <mutex>
#include <numeric>
#include <ratio>
+#include <string>
// Library headers
//

View File

@ -11,6 +11,7 @@ vcpkg_from_github(
fix-linux.patch
fix-calibration-c.patch
fix-build-imgui.patch
fix-header.patch
)
vcpkg_find_acquire_program(PYTHON3)

View File

@ -1,7 +1,7 @@
{
"name": "azure-kinect-sensor-sdk",
"version": "1.4.1",
"port-version": 6,
"port-version": 7,
"description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
"homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
"supports": "linux | windows",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a684e03aa0836ede2caba93683bee3fd3d1ed15f",
"version": "1.4.1",
"port-version": 7
},
{
"git-tree": "f5fbd0b39a805bc47da22f4bc462bec175518ae1",
"version": "1.4.1",

View File

@ -470,7 +470,7 @@
},
"azure-kinect-sensor-sdk": {
"baseline": "1.4.1",
"port-version": 6
"port-version": 7
},
"azure-macro-utils-c": {
"baseline": "2022-01-21",