FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend addChild to allow using first unused index

Browse Source
This commit is contained in:
Thomas Geymayer 2012-10-13 15:07:18 +02:00
parent 1ff3a61de6
commit f5cc151618
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
simgear/props/props.cxx
View File

@ -14,6 +14,7 @@
#include "vectorPropTemplates.hxx"
#include <algorithm>
#include <limits>
#include <sstream>
#include <iomanip>
@ -216,6 +217,26 @@ find_last_child (const char * name, const PropertyList& nodes)
return index;
}
/**
* Get first unused index for child nodes with the given name
*/
static int
first_unused_index( const char * name,
const PropertyList& nodes,
int min_index )
{
const char* nameEnd = name + strlen(name);
for( int index = min_index; index < std::numeric_limits<int>::max(); ++index )
{
if( find_child(name, nameEnd, index, nodes) < 0 )
return index;
}
SG_LOG(SG_GENERAL, SG_ALERT, "Too much nodes: " << name);
return -1;
}
template<typename Itr>
inline SGPropertyNode*
SGPropertyNode::getExistingChild (Itr begin, Itr end, int index, bool create)
@ -858,9 +879,11 @@ SGPropertyNode::getAliasTarget () const
* create a non-const child by name after the last node with the same name.
*/
SGPropertyNode *
SGPropertyNode::addChild (const char * name)
SGPropertyNode::addChild(const char * name, int min_index, bool append)
{
int pos = find_last_child(name, _children)+1;
int pos = append
? std::max(find_last_child(name, _children) + 1, min_index)
: first_unused_index(name, _children, min_index);
SGPropertyNode_ptr node;
node = new SGPropertyNode(name, name + strlen(name), pos, this);

13
simgear/props/props.hxx
View File

@ -748,7 +748,6 @@ public:
*/
static const int LAST_USED_ATTRIBUTE;
/**
* Default constructor.
*/
@ -853,8 +852,18 @@ public:
/**
* Create a child node after the last node with the same name.
*
* @param min_index Minimal index for new node (skips lower indices)
* @param append Whether to simply use the index after the last used index
* or use a lower, unused index if it exists
*/
SGPropertyNode * addChild (const char * name);
SGPropertyNode * addChild ( const char* name,
int min_index = 0,
bool append = true );
SGPropertyNode * addChild ( const std::string& name,
int min_index = 0,
bool append = true )
{ return addChild(name.c_str(), min_index, append); }
/**
* Get a child node by name and index.