Merge pull request #31 from qualisys/update_to_1.24

Update to RTSDK 1.24
qualisys · Dec 1, 2022 · fa5bd07 · fa5bd07
2 parents cea1da6 + 81dfe17
commit fa5bd07
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/RTClientExample/OutputSettings.cpp b/RTClientExample/OutputSettings.cpp
@@ -650,6 +650,11 @@ void COutput::Print6DOFSettings(CRTProtocol* poRTProtocol)
             }
             else
             {
+                if (nMajorVersion > 1 || nMinorVersion > 23)
+                {
+                    std::string enabledAsStr = bodiesSettings[iBody].enabled ? "True" : "False";
+                    printf("  Enabled:               %s\n", enabledAsStr.c_str());
+                }
                 printf("  Color:                 R=%.2X G=%.2X B=%.2X\n", color & 0xff, (color >> 8) & 0xff, (color >> 16) & 0xff);
                 printf("  Bone length tolerance: %f\n", bodiesSettings[iBody].boneLengthTolerance);
                 printf("  Max residual:          %f\n", bodiesSettings[iBody].maxResidual);

diff --git a/RTClientExample/RTClientExample.cpp b/RTClientExample/RTClientExample.cpp
@@ -1,7 +1,7 @@
 #include "Operations.h"
 
 #define LATEST_SELECTABLE_MAJOR_VERSION 1
-#define LATEST_SELECTABLE_MINOR_VERSION 22
+#define LATEST_SELECTABLE_MINOR_VERSION 24
 #define PROGRAM_VERSION 0
 
 int main(int argc, char **argv)

diff --git a/RTPacket.h b/RTPacket.h
@@ -14,7 +14,7 @@
 #endif
 
 #define MAJOR_VERSION           1
-#define MINOR_VERSION           23
+#define MINOR_VERSION           24
 
 class DLL_EXPORT CRTPacket
 {

diff --git a/RTProtocol.cpp b/RTProtocol.cpp
@@ -3211,6 +3211,16 @@ bool CRTProtocol::Read6DOFSettings(bool &bDataAvailable)
                 }
                 s6DOFBodySettings.name = oXML.GetChildData();
 
+                if (mnMajorVersion > 1 || mnMinorVersion > 23)
+                {
+                    if (!oXML.FindChildElem("Enabled"))
+                    {
+                        s6DOFBodySettings.enabled = true;
+                    }
+                    s6DOFBodySettings.enabled = oXML.GetChildData() == "true" ? true : false;
+                }
+
+
                 if (!oXML.FindChildElem("Color"))
                 {
                     return false;
@@ -5826,7 +5836,6 @@ bool CRTProtocol::SetForceSettings(
     return false;
 } // SetForceSettings
 
-
 bool CRTProtocol::Set6DOFBodySettings(std::vector<SSettings6DOFBody> settings)
 {
     if (mnMajorVersion == 1 && mnMinorVersion < 21)
@@ -5848,6 +5857,7 @@ bool CRTProtocol::Set6DOFBodySettings(std::vector<SSettings6DOFBody> settings)
         oXML.AddElem("Body");
         oXML.IntoElem();
         oXML.AddElem("Name", body.name.c_str());
+        oXML.AddElem("Enabled", body.enabled ? "true" : "false");
         oXML.AddElem("Color");
         oXML.AddAttrib("R", std::to_string(body.color & 0xff).c_str());
         oXML.AddAttrib("G", std::to_string((body.color >> 8) & 0xff).c_str());

diff --git a/RTProtocol.h b/RTProtocol.h
@@ -390,6 +390,7 @@ class DLL_EXPORT CRTProtocol
     struct SSettings6DOFBody
     {
         std::string           name;
+        bool                  enabled;
         uint32_t              color;
         std::string           filterPreset;
         float                 maxResidual;