Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature Branch] - CMarkup --> Tinyxml2 : DeserializeEyeTrackerSettings() #74

Merged
merged 6 commits into from
Feb 3, 2025
Merged

[Feature Branch] - CMarkup --> Tinyxml2 : DeserializeEyeTrackerSettings() #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c640e38
Implemented CTinyxml2Deserializer::DeserializeEyeTrackerSettings, CTi…
qjgn Jan 30, 2025
8e6f166
formatted else
qjgn Jan 30, 2025
8cfaa4f
removed extra include
qjgn Jan 30, 2025
0689c4b
Merge branch 'create_tinyxml2_serializer_deserializer' into deseriali…
qjgn Jan 30, 2025
73b2a13
use static_cast
qjgn Jan 30, 2025
bd84637
Merge branch 'create_tinyxml2_serializer_deserializer' into deseriali…
OliverGlandberger Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RTProtocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,7 +1773,7 @@ bool CRTProtocol::ReadEyeTrackerSettings(bool& bDataAvailable)
return false;
}

auto deserializer = CMarkupDeserializer(data, mnMajorVersion, mnMinorVersion);
CTinyxml2Deserializer deserializer(data, mnMajorVersion, mnMinorVersion);
return deserializer.DeserializeEyeTrackerSettings(mvsEyeTrackerSettings, bDataAvailable);
}

Expand Down
109 changes: 57 additions & 52 deletions Tinyxml2Serializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,30 +229,31 @@ namespace
}
}

bool CTinyxml2Deserializer::ReadXmlBool(tinyxml2::XMLDocument* xml, const std::string& element, bool& value) const
bool CTinyxml2Deserializer::ReadXmlBool(tinyxml2::XMLElement* xml, const std::string& element, bool& value) const
{
//if (!xml->FindChildElem(element.c_str()))
//{
// return false;
//}
auto xmlElem = xml->FirstChildElement(element.c_str());
if (!xmlElem)
{
return false;
}

//auto str = xml->GetChildData();
//RemoveInvalidChars(str);
//str = ToLower(str);
auto str = std::string(xmlElem->GetText());
RemoveInvalidChars(str);
str = ToLower(str);

//if (str == "true")
//{
// value = true;
//}
//else if (str == "false")
//{
// value = false;
//}
//else
//{
// // Don't change value, just report error.
// return false;
//}
if (str == "true")
{
value = true;
}
else if (str == "false")
{
value = false;
}
else
{
// Don't change value, just report error.
return false;
}

return true;
}
Expand Down Expand Up @@ -287,8 +288,9 @@ SRotation CTinyxml2Deserializer::ReadXMLRotation(tinyxml2::XMLDocument& xml, con
}

CTinyxml2Deserializer::CTinyxml2Deserializer(const char* pData, std::uint32_t pMajorVersion, std::uint32_t pMinorVersion)
: mnMajorVersion(pMajorVersion), mnMinorVersion(pMinorVersion), maErrorStr{ 0 }, oXML(pData)
: mnMajorVersion(pMajorVersion), mnMinorVersion(pMinorVersion), maErrorStr{ 0 }
{
oXML.Parse(pData);
}

bool CTinyxml2Deserializer::DeserializeGeneralSettings(SSettingsGeneral& pGeneralSettings)
Expand Down Expand Up @@ -1961,45 +1963,48 @@ bool CTinyxml2Deserializer::DeserializeGazeVectorSettings(std::vector<SGazeVecto

bool CTinyxml2Deserializer::DeserializeEyeTrackerSettings(std::vector<SEyeTracker>& pEyeTrackerSettings, bool& pDataAvailable)
{
//pDataAvailable = false;
pDataAvailable = false;

//pEyeTrackerSettings.clear();
pEyeTrackerSettings.clear();

//if (!oXML.FindChildElem("Eye_Tracker"))
//{
// return true; // NO eye tracker data available.
//}
//oXML.IntoElem();

//std::string tEyeTrackerName;
auto rootElem = oXML.RootElement();
if (!rootElem)
{
return true;
}

//int nEyeTrackerCount = 0;
tinyxml2::XMLElement* eyeTrackerElem = rootElem->FirstChildElement("Eye_Tracker");

//while (oXML.FindChildElem("Device"))
//{
// oXML.IntoElem();
if (!eyeTrackerElem)
{
return true; // NO eye tracker data available.
}

// if (!oXML.FindChildElem("Name"))
// {
// return false;
// }
// tEyeTrackerName = oXML.GetChildData();
for (auto deviceElem = eyeTrackerElem->FirstChildElement("Device"); deviceElem != nullptr; deviceElem = deviceElem->NextSiblingElement("Device"))
{
std::string name;
if (auto nameElem = deviceElem->FirstChildElement("Name"))
{
name = nameElem->GetText();
}
else
{
return false;
}

// float frequency = 0;
// if (oXML.FindChildElem("Frequency"))
// {
// frequency = (float)atof(oXML.GetChildData().c_str());
// }
float frequency = 0;
if (auto frequencyElem = deviceElem->FirstChildElement("Frequency"))
{
frequency = static_cast<float>(atof(frequencyElem->GetText()));
}

// bool hwSync = false;
// ReadXmlBool(&oXML, "Hardware_Sync", hwSync);
bool hwSync = false;
ReadXmlBool(deviceElem, "Hardware_Sync", hwSync);

// pEyeTrackerSettings.push_back({ tEyeTrackerName, frequency, hwSync });
// nEyeTrackerCount++;
// oXML.OutOfElem(); // Vector
//}
pEyeTrackerSettings.push_back({ name, frequency, hwSync });
}

//pDataAvailable = true;
pDataAvailable = true;
return true;
} // ReadEyeTrackerSettings

Expand Down
2 changes: 1 addition & 1 deletion Tinyxml2Serializer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace qualisys_cpp_sdk {
static bool ParseString(const std::string& str, float& value);
static bool ParseString(const std::string& str, double& value);
static bool ParseString(const std::string& str, bool& value);
bool ReadXmlBool(tinyxml2::XMLDocument* xml, const std::string& element, bool& value) const;
bool ReadXmlBool(tinyxml2::XMLElement* xml, const std::string& element, bool& value) const;
SPosition ReadXMLPosition(tinyxml2::XMLDocument& xml, const std::string& element);
SRotation ReadXMLRotation(tinyxml2::XMLDocument& xml, const std::string& element);
bool ReadXMLDegreesOfFreedom(tinyxml2::XMLDocument& xml, const std::string& element, std::vector<SDegreeOfFreedom>& degreesOfFreedom);
Expand Down