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 : SetImageSettings() #73

Merged
merged 5 commits into from
Feb 3, 2025
Merged

[Feature Branch] - CMarkup --> Tinyxml2 : SetImageSettings() #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce12148
Saving progress.
OliverGlandberger Jan 30, 2025
835948b
Merge branch 'create_tinyxml2_serializer_deserializer' into tinyxml2_…
OliverGlandberger Jan 30, 2025
2d91a53
Added 'SetForceSettings' function.
OliverGlandberger Jan 30, 2025
cb36633
Remove unnecessary explicit string-construction.
OliverGlandberger Jan 30, 2025
b72d5df
Merge branch 'create_tinyxml2_serializer_deserializer' into tinyxml2_…
qjgn Jan 30, 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 @@ -2779,7 +2779,7 @@ bool CRTProtocol::SetImageSettings(
const unsigned int* pnWidth, const unsigned int* pnHeight, const float* pfLeftCrop,
const float* pfTopCrop, const float* pfRightCrop, const float* pfBottomCrop)
{
auto serializer = CMarkupSerializer(mnMajorVersion, mnMinorVersion);
CTinyxml2Serializer serializer (mnMajorVersion, mnMinorVersion);
auto message = serializer.SetImageSettings(
nCameraID, pbEnable, peFormat,
pnWidth, pnHeight, pfLeftCrop,
Expand Down
110 changes: 64 additions & 46 deletions Tinyxml2Serializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,21 @@

using namespace qualisys_cpp_sdk;

void CTinyxml2Serializer::AddXMLElementBool(tinyxml2::XMLDocument* oXML, const char* tTag, const bool* pbValue, const char* tTrue, const char* tFalse)
void CTinyxml2Serializer::AddXMLElementBool(tinyxml2::XMLElement& parent, const char* tTag, const bool* pbValue, tinyxml2::XMLDocument& oXML)
{
//if (pbValue)
//{
// oXML->AddElem(tTag, *pbValue ? tTrue : tFalse);
//}
if (pbValue)
{
tinyxml2::XMLElement* pElement = oXML.NewElement(tTag);
pElement->SetText(*pbValue ? "True" : "False");
parent.InsertEndChild(pElement);
}
}

void CTinyxml2Serializer::AddXMLElementBool(tinyxml2::XMLDocument* oXML, const char* tTag, const bool pbValue, const char* tTrue, const char* tFalse)
void CTinyxml2Serializer::AddXMLElementBool(tinyxml2::XMLElement& parent, const char* tTag, const bool pbValue, tinyxml2::XMLDocument& oXML)
{
//oXML->AddElem(tTag, pbValue ? tTrue : tFalse);
tinyxml2::XMLElement* pElement = oXML.NewElement(tTag);
pElement->SetText(pbValue ? "True" : "False");
parent.InsertEndChild(pElement);
}

void CTinyxml2Serializer::AddXMLElementInt(tinyxml2::XMLDocument* oXML, const char* tTag, const int* pnValue)
Expand Down Expand Up @@ -223,7 +227,6 @@ namespace
};
str.erase(std::remove_if(str.begin(), str.end(), isInvalidChar), str.end());
}

}

bool CTinyxml2Deserializer::ReadXmlBool(tinyxml2::XMLDocument* xml, const std::string& element, bool& value) const
Expand Down Expand Up @@ -3452,52 +3455,67 @@ std::string CTinyxml2Serializer::SetImageSettings(const unsigned int pCameraId,
const CRTPacket::EImageFormat* peFormat, const unsigned int* pnWidth, const unsigned int* pnHeight,
const float* pfLeftCrop, const float* pfTopCrop, const float* pfRightCrop, const float* pfBottomCrop)
{
//CTinyxml2 oXML;
tinyxml2::XMLDocument oXML;

//oXML.AddElem("QTM_Settings");
//oXML.IntoElem();
//oXML.AddElem("Image");
//oXML.IntoElem();
// Root element
tinyxml2::XMLElement* pRoot = oXML.NewElement("QTM_Settings");
oXML.InsertFirstChild(pRoot);

//oXML.AddElem("Camera");
//oXML.IntoElem();
// Image element
tinyxml2::XMLElement* pImage = oXML.NewElement("Image");
pRoot->InsertEndChild(pImage);

//AddXMLElementUnsignedInt(&oXML, "ID", &pCameraId);
// Camera element
tinyxml2::XMLElement* pCamera = oXML.NewElement("Camera");
pImage->InsertEndChild(pCamera);

//AddXMLElementBool(&oXML, "Enabled", pbEnable);
// ID
AddXMLElementUnsignedInt(*pCamera, "ID", pCameraId, oXML);

//if (peFormat)
//{
// switch (*peFormat)
// {
// case CRTPacket::FormatRawGrayscale:
// oXML.AddElem("Format", "RAWGrayscale");
// break;
// case CRTPacket::FormatRawBGR:
// oXML.AddElem("Format", "RAWBGR");
// break;
// case CRTPacket::FormatJPG:
// oXML.AddElem("Format", "JPG");
// break;
// case CRTPacket::FormatPNG:
// oXML.AddElem("Format", "PNG");
// break;
// }
//}
//AddXMLElementUnsignedInt(&oXML, "Width", pnWidth);
//AddXMLElementUnsignedInt(&oXML, "Height", pnHeight);
//AddXMLElementFloat(&oXML, "Left_Crop", pfLeftCrop);
//AddXMLElementFloat(&oXML, "Top_Crop", pfTopCrop);
//AddXMLElementFloat(&oXML, "Right_Crop", pfRightCrop);
//AddXMLElementFloat(&oXML, "Bottom_Crop", pfBottomCrop);
// Enabled
AddXMLElementBool(*pCamera, "Enabled", pbEnable, oXML);

//oXML.OutOfElem(); // Camera
//oXML.OutOfElem(); // Image
//oXML.OutOfElem(); // QTM_Settings
// Format
if (peFormat)
{
const char* formatStr = nullptr;
switch (*peFormat)
{
case CRTPacket::FormatRawGrayscale:
formatStr = "RAWGrayscale";
break;
case CRTPacket::FormatRawBGR:
formatStr = "RAWBGR";
break;
case CRTPacket::FormatJPG:
formatStr = "JPG";
break;
case CRTPacket::FormatPNG:
formatStr = "PNG";
break;
}

//return oXML.GetDoc();
if (formatStr)
{
tinyxml2::XMLElement* pFormat = oXML.NewElement("Format");
pFormat->SetText(formatStr);
pCamera->InsertEndChild(pFormat);
}
}

return "";
// Other settings
AddXMLElementUnsignedInt(*pCamera, "Width", pnWidth, oXML);
AddXMLElementUnsignedInt(*pCamera, "Height", pnHeight, oXML);
AddXMLElementFloat(*pCamera, "Left_Crop", pfLeftCrop, 6, oXML);
AddXMLElementFloat(*pCamera, "Top_Crop", pfTopCrop, 6, oXML);
AddXMLElementFloat(*pCamera, "Right_Crop", pfRightCrop, 6, oXML);
AddXMLElementFloat(*pCamera, "Bottom_Crop", pfBottomCrop, 6, oXML);

// Convert to string
tinyxml2::XMLPrinter printer;
oXML.Print(&printer);

return printer.CStr();
}

std::string CTinyxml2Serializer::SetForceSettings(const unsigned int pPlateId, const SPoint* pCorner1,
Expand Down
4 changes: 2 additions & 2 deletions Tinyxml2Serializer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ namespace qualisys_cpp_sdk {
private:
std::uint32_t mnMajorVersion;
std::uint32_t mnMinorVersion;
void AddXMLElementBool(tinyxml2::XMLDocument* oXML, const char* tTag, const bool* pbValue, const char* tTrue = "True", const char* tFalse = "False");
void AddXMLElementBool(tinyxml2::XMLDocument* oXML, const char* tTag, const bool bValue, const char* tTrue = "True", const char* tFalse = "False");
void AddXMLElementBool(tinyxml2::XMLElement& parent, const char* tTag, const bool* pbValue, tinyxml2::XMLDocument& oXML);
void AddXMLElementBool(tinyxml2::XMLElement& parent, const char* tTag, const bool pbValue, tinyxml2::XMLDocument& oXML);
void AddXMLElementInt(tinyxml2::XMLDocument* oXML, const char* tTag, const int* pnValue);
void AddXMLElementUnsignedInt(tinyxml2::XMLElement& parent, const char* tTag, const unsigned int nValue, tinyxml2::XMLDocument& oXML);
void AddXMLElementUnsignedInt(tinyxml2::XMLElement& parent, const char* tTag, const unsigned int* pnValue, tinyxml2::XMLDocument& oXML);
Expand Down