From 83e094a16283971304e0a0a336fc166a6dbadec4 Mon Sep 17 00:00:00 2001 From: Oliver Glandberger Date: Tue, 18 Feb 2025 14:11:37 +0100 Subject: [PATCH 1/4] Remove private unused variable from RTPacket.h, remove unused 'this' sent into lambda function now replaced with ampersand, and fixed issues in SkeletonParametersTests which gave warnings/errors when compiling with clang. --- RTPacket.h | 1 - SettingsDeserializer.cpp | 2 +- Tests/SkeletonParametersTests.cpp | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/RTPacket.h b/RTPacket.h index 7b4c225..b0df3b2 100644 --- a/RTPacket.h +++ b/RTPacket.h @@ -312,7 +312,6 @@ class DLL_EXPORT CRTPacket std::vector mpTimecodeData; std::vector mpSkeletonData; unsigned int mnComponentCount; - EComponentType meComponentType; unsigned int mn2DCameraCount; unsigned int mn2DLinCameraCount; unsigned int mnImageCameraCount; diff --git a/SettingsDeserializer.cpp b/SettingsDeserializer.cpp index 6a0bf62..78f1701 100644 --- a/SettingsDeserializer.cpp +++ b/SettingsDeserializer.cpp @@ -264,7 +264,7 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS &generalSettings.eReprocessingActions }; - auto AddFlagFromBoolElement = [this](Deserializer& parent, const char* elementName, EProcessingActions flag, + auto AddFlagFromBoolElement = [&](Deserializer& parent, const char* elementName, EProcessingActions flag, EProcessingActions& target) -> bool { bool value; diff --git a/Tests/SkeletonParametersTests.cpp b/Tests/SkeletonParametersTests.cpp index 7815a5f..5e04682 100644 --- a/Tests/SkeletonParametersTests.cpp +++ b/Tests/SkeletonParametersTests.cpp @@ -85,13 +85,13 @@ namespace std::vector CreateDummySkeletonsNonHierarchical() { - auto segmentsSkeleton1 = std::vector{ + auto segmentsSkeleton1 = std::vector({ { 0, 0.0f, 1.0f, 2.0f, 0.707000017f, -0.707000017f, 0.0f, 0.0f, "segment1", -1, -1 }, { 0, 3.0f, 4.0f, 5.0f, 0.707000017f, 0.707000017f, 0.0f, 0.0f, "segment3", 0, 1 } - }; - auto segmentsSkeleton2 = std::vector{ + }); + auto segmentsSkeleton2 = std::vector({ { 0, 0.0f, 1.0f, 2.0f, 0.707000017f, 0.0f, 0.707000017f, 0.0f, "segment2", -1, -1 } - }; + }); CRTProtocol::SSettingsSkeleton skeleton1 = { "skeleton1", segmentsSkeleton1 }; CRTProtocol::SSettingsSkeleton skeleton2 = { "skeleton2", segmentsSkeleton2 }; From 08f3ed8ec2d282eaf21af418a9102ae14a749362 Mon Sep 17 00:00:00 2001 From: Oliver Glandberger Date: Tue, 18 Feb 2025 14:14:26 +0100 Subject: [PATCH 2/4] Add additional parenthesis to subobject. --- Tests/SkeletonParametersTests.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/SkeletonParametersTests.cpp b/Tests/SkeletonParametersTests.cpp index 5e04682..2f64ef0 100644 --- a/Tests/SkeletonParametersTests.cpp +++ b/Tests/SkeletonParametersTests.cpp @@ -86,11 +86,11 @@ namespace std::vector CreateDummySkeletonsNonHierarchical() { auto segmentsSkeleton1 = std::vector({ - { 0, 0.0f, 1.0f, 2.0f, 0.707000017f, -0.707000017f, 0.0f, 0.0f, "segment1", -1, -1 }, - { 0, 3.0f, 4.0f, 5.0f, 0.707000017f, 0.707000017f, 0.0f, 0.0f, "segment3", 0, 1 } + { { 0, 0.0f, 1.0f, 2.0f, 0.707000017f, -0.707000017f, 0.0f, 0.0f }, "segment1", -1, -1 }, + { { 0, 3.0f, 4.0f, 5.0f, 0.707000017f, 0.707000017f, 0.0f, 0.0f }, "segment3", 0, 1 } }); auto segmentsSkeleton2 = std::vector({ - { 0, 0.0f, 1.0f, 2.0f, 0.707000017f, 0.0f, 0.707000017f, 0.0f, "segment2", -1, -1 } + { { 0, 0.0f, 1.0f, 2.0f, 0.707000017f, 0.0f, 0.707000017f, 0.0f }, "segment2", -1, -1 } }); CRTProtocol::SSettingsSkeleton skeleton1 = { "skeleton1", segmentsSkeleton1 }; From 76bcb0c91087438086bc2b5224ae08d45f086190 Mon Sep 17 00:00:00 2001 From: Oliver Glandberger Date: Tue, 18 Feb 2025 14:57:52 +0100 Subject: [PATCH 3/4] Remove unnecessary ampersand in lambda. --- SettingsDeserializer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsDeserializer.cpp b/SettingsDeserializer.cpp index 78f1701..7b9f83a 100644 --- a/SettingsDeserializer.cpp +++ b/SettingsDeserializer.cpp @@ -264,7 +264,7 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS &generalSettings.eReprocessingActions }; - auto AddFlagFromBoolElement = [&](Deserializer& parent, const char* elementName, EProcessingActions flag, + auto AddFlagFromBoolElement = [](Deserializer& parent, const char* elementName, EProcessingActions flag, EProcessingActions& target) -> bool { bool value; From 58bb53fd5b3fa05b98eecad657ed32e8051f5bd8 Mon Sep 17 00:00:00 2001 From: Oliver Glandberger Date: Tue, 18 Feb 2025 15:38:00 +0100 Subject: [PATCH 4/4] Rename lambda to not have a capital letter at the start. --- SettingsDeserializer.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/SettingsDeserializer.cpp b/SettingsDeserializer.cpp index 7b9f83a..4331296 100644 --- a/SettingsDeserializer.cpp +++ b/SettingsDeserializer.cpp @@ -264,7 +264,7 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS &generalSettings.eReprocessingActions }; - auto AddFlagFromBoolElement = [](Deserializer& parent, const char* elementName, EProcessingActions flag, + auto addFlagFromBoolElement = [](Deserializer& parent, const char* elementName, EProcessingActions flag, EProcessingActions& target) -> bool { bool value; @@ -293,7 +293,7 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS if (mMajorVersion > 1 || mMinorVersion > 13) { - if (!AddFlagFromBoolElement(processingElem, "PreProcessing2D", ProcessingPreProcess2D, + if (!addFlagFromBoolElement(processingElem, "PreProcessing2D", ProcessingPreProcess2D, *processingActions[i])) { return false; @@ -318,36 +318,36 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS if (i != 1) //Not RtProcessingSettings { - if (!AddFlagFromBoolElement(processingElem, "TwinSystemMerge", ProcessingTwinSystemMerge, + if (!addFlagFromBoolElement(processingElem, "TwinSystemMerge", ProcessingTwinSystemMerge, *processingActions[i])) { return false; } - if (!AddFlagFromBoolElement(processingElem, "SplineFill", ProcessingSplineFill, *processingActions[i])) + if (!addFlagFromBoolElement(processingElem, "SplineFill", ProcessingSplineFill, *processingActions[i])) { return false; } } - if (!AddFlagFromBoolElement(processingElem, "AIM", ProcessingAIM, *processingActions[i])) + if (!addFlagFromBoolElement(processingElem, "AIM", ProcessingAIM, *processingActions[i])) { return false; } - if (!AddFlagFromBoolElement(processingElem, "Track6DOF", Processing6DOFTracking, *processingActions[i])) + if (!addFlagFromBoolElement(processingElem, "Track6DOF", Processing6DOFTracking, *processingActions[i])) { return false; } - if (!AddFlagFromBoolElement(processingElem, "ForceData", ProcessingForceData, *processingActions[i])) + if (!addFlagFromBoolElement(processingElem, "ForceData", ProcessingForceData, *processingActions[i])) { return false; } if (mMajorVersion > 1 || mMinorVersion > 11) { - if (!AddFlagFromBoolElement(processingElem, "GazeVector", ProcessingGazeVector, *processingActions[i])) + if (!addFlagFromBoolElement(processingElem, "GazeVector", ProcessingGazeVector, *processingActions[i])) { return false; } @@ -355,17 +355,17 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS if (i != 1) //Not RtProcessingSettings { - if (!AddFlagFromBoolElement(processingElem, "ExportTSV", ProcessingExportTSV, *processingActions[i])) + if (!addFlagFromBoolElement(processingElem, "ExportTSV", ProcessingExportTSV, *processingActions[i])) { return false; } - if (!AddFlagFromBoolElement(processingElem, "ExportC3D", ProcessingExportC3D, *processingActions[i])) + if (!addFlagFromBoolElement(processingElem, "ExportC3D", ProcessingExportC3D, *processingActions[i])) { return false; } - if (!AddFlagFromBoolElement(processingElem, "ExportMatlabFile", ProcessingExportMatlabFile, + if (!addFlagFromBoolElement(processingElem, "ExportMatlabFile", ProcessingExportMatlabFile, *processingActions[i])) { return false; @@ -373,7 +373,7 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS if (mMajorVersion > 1 || mMinorVersion > 11) { - if (!AddFlagFromBoolElement(processingElem, "ExportAviFile", ProcessingExportAviFile, + if (!addFlagFromBoolElement(processingElem, "ExportAviFile", ProcessingExportAviFile, *processingActions[i])) { return false;