lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-06 23:15:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source
This commit is contained in:
Bozo the Builder
2025-02-17 07:10:23 -08:00
parent b02292b119
commit 379bac6137
8 changed files with 89 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
opennurbs_xml.cpp
View File

@@ -1822,7 +1822,7 @@ public:
bool GetPropertiesFromTag(const ON_wString& sTag);
bool IsClosingTag(const ON_wString& sTag) const;
ON_XMLNode* GetNodeAtPath(const wchar_t* wszPath, bool bCreate);
ON_XMLProperty* AddProperty(const ON_XMLProperty& prop);
ON_XMLProperty* AddProperty(const ON_XMLProperty& prop, bool add_to_end = false);
void AddEmptyDefaultProperty(void);
ON_XMLProperty* AttachProperty(ON_XMLProperty* pProp);
bool RemoveProperty(const wchar_t* name);
@@ -2219,14 +2219,34 @@ bool ON_XMLNodePrivate::RecurseChildren(ON_XMLRecurseChildrenCallback callback,
return true;
}
ON_XMLProperty* ON_XMLNodePrivate::AddProperty(const ON_XMLProperty& prop)
ON_XMLProperty* ON_XMLNodePrivate::AddProperty(const ON_XMLProperty& prop, bool add_to_end)
{
std::lock_guard<std::recursive_mutex> lg(m_mutex);
auto* prop_copy = new ON_XMLProperty(prop);
prop_copy->_private->_owner = &m_node;
prop_copy->_private->_next = m_first_property;
m_first_property = prop_copy;
if (!add_to_end || nullptr == m_first_property)
{
prop_copy->_private->_next = m_first_property;
m_first_property = prop_copy;
}
else
{
auto last = m_first_property;
prop_copy->_private->_next = nullptr;
//Spin to the end.
while (auto n = last->Next())
{
last = n;
}
ON_ASSERT(nullptr != last);
ON_ASSERT(nullptr == last->Next());
last->_private->_next = prop_copy;
}
return prop_copy;
}
@@ -2610,7 +2630,7 @@ const ON_XMLNode& ON_XMLNode::operator = (const ON_XMLNode& src)
auto pi = src.GetPropertyIterator();
while (nullptr != (pProperty = pi.GetNextProperty()))
{
_private->AddProperty(*pProperty);
_private->AddProperty(*pProperty, true); //Add it to the end so that the order stays the same.
}
// Copy in the children.