comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-12 07:06:11 -05:00
Code Issues Projects Releases Wiki Activity

DataTree refactoring, load/save functions almost ready

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-01-09 20:56:43 -05:00
parent 7c68f142ed
commit faa87fcd10
4 changed files with 248 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/AppFrame.cpp
View File

@ -185,13 +185,13 @@ void AppFrame::OnMenu(wxCommandEvent& event) {
if (saveFileDialog.ShowModal() == wxID_CANCEL) { if (saveFileDialog.ShowModal() == wxID_CANCEL) {
return; return;
} }
// saveFileDialog.GetPath(); saveSession(saveFileDialog.GetPath().ToStdString());
} else if (event.GetId() == wxID_OPEN) { } else if (event.GetId() == wxID_OPEN) {
wxFileDialog openFileDialog(this, _("Open XML Session file"), "", "","XML files (*.xml)|*.xml", wxFD_OPEN|wxFD_FILE_MUST_EXIST); wxFileDialog openFileDialog(this, _("Open XML Session file"), "", "","XML files (*.xml)|*.xml", wxFD_OPEN|wxFD_FILE_MUST_EXIST);
if (openFileDialog.ShowModal() == wxID_CANCEL) { if (openFileDialog.ShowModal() == wxID_CANCEL) {
return; return;
} }
// openFileDialog.GetPath(); loadSession(openFileDialog.GetPath().ToStdString());
} else if (event.GetId() == wxID_SAVEAS) { } else if (event.GetId() == wxID_SAVEAS) {
} else if (event.GetId() == wxID_EXIT) { } else if (event.GetId() == wxID_EXIT) {
Close(false); Close(false);
@ -304,30 +304,81 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
void AppFrame::saveSession(std::string fileName) { void AppFrame::saveSession(std::string fileName) {
DataTree s("cubicsdr_session"); DataTree s("cubicsdr_session");
DataNode &header = s.rootNode().newChild("header"); DataNode *header = s.rootNode()->newChild("header");
header.newChild("version") = std::string(CUBICSDR_VERSION); *header->newChild("version") = std::string(CUBICSDR_VERSION);
header.newChild("center_freq") = wxGetApp().getFrequency(); *header->newChild("center_freq") = wxGetApp().getFrequency();
header.newChild("offset") = wxGetApp().getOffset(); *header->newChild("offset") = wxGetApp().getOffset();
DataNode &demods = s.rootNode().newChild("demodulators"); DataNode *demods = s.rootNode()->newChild("demodulators");
std::vector<DemodulatorInstance *> &instances = wxGetApp().getDemodMgr().getDemodulators(); std::vector<DemodulatorInstance *> &instances = wxGetApp().getDemodMgr().getDemodulators();
std::vector<DemodulatorInstance *>::iterator instance_i; std::vector<DemodulatorInstance *>::iterator instance_i;
for (instance_i = instances.begin(); instance_i != instances.end(); instance_i++) { for (instance_i = instances.begin(); instance_i != instances.end(); instance_i++) {
DataNode &demod = demods.newChild("demodulator"); DataNode *demod = demods->newChild("demodulator");
demod.newChild("bandwidth") = (long)(*instance_i)->getBandwidth(); *demod->newChild("bandwidth") = (*instance_i)->getBandwidth();
demod.newChild("frequency") = (long long)(*instance_i)->getFrequency(); *demod->newChild("frequency") = (*instance_i)->getFrequency();
demod.newChild("type") = (int)(*instance_i)->getDemodulatorType(); *demod->newChild("type") = (*instance_i)->getDemodulatorType();
if ((*instance_i)->isSquelchEnabled()) { *demod->newChild("squelch_level") = (*instance_i)->getSquelchLevel();
demod.newChild("squelch") = (*instance_i)->getSquelchLevel(); *demod->newChild("squelch_enabled") = (*instance_i)->isSquelchEnabled()?1:0;
demod.newChild("squelch_enabled") = (char)1; *demod->newChild("stereo") = (*instance_i)->isStereo()?1:0;
} *demod->newChild("output_device") = outputDevices[(*instance_i)->getOutputDevice()].name;
demod.newChild("stereo") = (char)(*instance_i)->isStereo();
demod.newChild("output_device") = outputDevices[(*instance_i)->getOutputDevice()].name;
} }
s.SaveToFileXML(fileName); s.SaveToFileXML(fileName);
} }
bool AppFrame::loadSession(std::string fileName) { bool AppFrame::loadSession(std::string fileName) {
DataTree l;
if (!l.LoadFromFileXML(fileName)) {
return false;
}
// wxGetApp().getDemodMgr().terminateAll();
try {
DataNode *header = l.rootNode()->getNext("header");
std::string version = *header->getNext("version");
long long center_freq = *header->getNext("center_freq");
long long offset = *header->getNext("offset");
std::cout << "Loading " << version << " session file" << std::endl;
std::cout << "\tCenter Frequency: " << center_freq << std::endl;
std::cout << "\tOffset: " << offset << std::endl;
DataNode *demodulators = l.rootNode()->getNext("demodulators");
while (demodulators->hasAnother("demodulator")) {
DataNode *demod = demodulators->getNext("demodulator");
if (!demod->hasAnother("bandwidth") || !demod->hasAnother("frequency")) {
continue;
}
long bandwidth = *demod->getNext("bandwidth");
long long freq = *demod->getNext("frequency");
int type = demod->hasAnother("type")?*demod->getNext("type"):DEMOD_TYPE_FM;
float squelch_level = demod->hasAnother("squelch_level")?(float)*demod->getNext("squelch_level"):0;
int squelch_enabled = demod->hasAnother("squelch_enabled")?(int)*demod->getNext("squelch_enabled"):0;
int stereo = demod->hasAnother("stereo")?(int)*demod->getNext("stereo"):0;
std::string output_device = demod->hasAnother("output_device")?*demod->getNext("output_device"):"";
std::cout << "\tFound demodulator at frequency " << freq << " type " << type << std::endl;
std::cout << "\t\tBandwidth: " << bandwidth << std::endl;
std::cout << "\t\tSquelch Level: " << squelch_level << std::endl;
std::cout << "\t\tSquelch Enabled: " << (squelch_enabled?"true":"false") << std::endl;
std::cout << "\t\tStereo: " << (stereo?"true":"false") << std::endl;
std::cout << "\t\tOutput Device: " << output_device << std::endl;
}
} catch (DataInvalidChildException &e) {
std::cout << e.what() << std::endl;
return false;
} catch (DataTypeMismatchException &e) {
std::cout << e.what() << std::endl;
return false;
}
} }

28
src/audio/AudioThread.cpp
View File

@ -10,8 +10,8 @@ std::map<int, std::thread *> AudioThread::deviceThread;
#endif #endif
AudioThread::AudioThread(AudioThreadInputQueue *inputQueue, DemodulatorThreadCommandQueue* threadQueueNotify) : AudioThread::AudioThread(AudioThreadInputQueue *inputQueue, DemodulatorThreadCommandQueue* threadQueueNotify) :
currentInput(NULL), inputQueue(inputQueue), audioQueuePtr(0), underflowCount(0), terminated(false), active(false), outputDevice(-1), gain(1.0), threadQueueNotify( currentInput(NULL), inputQueue(inputQueue), audioQueuePtr(0), underflowCount(0), terminated(false), active(false), outputDevice(-1), gain(
threadQueueNotify) { 1.0), threadQueueNotify(threadQueueNotify) {
#ifdef __APPLE__ #ifdef __APPLE__
boundThreads = new std::vector<AudioThread *>; boundThreads = new std::vector<AudioThread *>;
#endif #endif
@ -368,7 +368,7 @@ void AudioThread::threadMain() {
return; return;
} }
setupDevice((outputDevice.load() == -1)?(dac.getDefaultOutputDevice()):outputDevice.load()); setupDevice((outputDevice.load() == -1) ? (dac.getDefaultOutputDevice()) : outputDevice.load());
std::cout << "Audio thread started." << std::endl; std::cout << "Audio thread started." << std::endl;
@ -391,24 +391,27 @@ void AudioThread::threadMain() {
deviceController[parameters.deviceId]->removeThread(this); deviceController[parameters.deviceId]->removeThread(this);
} else { } else {
try { try {
dac.stopStream(); if (dac.isStreamOpen()) {
dac.closeStream(); if (dac.isStreamRunning()) {
dac.stopStream();
}
dac.closeStream();
}
} catch (RtAudioError& e) { } catch (RtAudioError& e) {
e.printMessage(); e.printMessage();
} }
} }
#else #else
try { try {
// Stop the stream if (dac.isStreamOpen()) {
dac.stopStream(); if (dac.isStreamRunning()) {
dac.closeStream(); dac.stopStream();
}
dac.closeStream();
}
} catch (RtAudioError& e) { } catch (RtAudioError& e) {
e.printMessage(); e.printMessage();
} }
if (dac.isStreamOpen()) {
dac.closeStream();
}
#endif #endif
std::cout << "Audio thread done." << std::endl; std::cout << "Audio thread done." << std::endl;
@ -454,7 +457,6 @@ void AudioThread::setActive(bool state) {
active = state; active = state;
} }
AudioThreadCommandQueue *AudioThread::getCommandQueue() { AudioThreadCommandQueue *AudioThread::getCommandQueue() {
return &cmdQueue; return &cmdQueue;
} }

186
src/util/DataTree.cpp
View File

@ -89,7 +89,7 @@ void DataElement::set(const char *data_in, long size_in) {
} }
void DataElement::set(const char *data_in) { void DataElement::set(const char *data_in) {
data_type = DATA_VOID; data_type = DATA_STRING;
data_init(strlen(data_in) + 1); data_init(strlen(data_in) + 1);
memcpy(data_val, data_in, data_size); memcpy(data_val, data_in, data_size);
} }
@ -176,7 +176,13 @@ return; \
std::cout << "Warning, data type mismatch requested size for '" << #datatype << "(" << sizeof(datatype) << ")' < data size '" << data_size << "'; possible loss of data."; \ std::cout << "Warning, data type mismatch requested size for '" << #datatype << "(" << sizeof(datatype) << ")' < data size '" << data_size << "'; possible loss of data."; \
} \ } \
memset(&val_out, 0, sizeof(datatype)); \ memset(&val_out, 0, sizeof(datatype)); \
memcpy(&val_out, data_val, (sizeof(datatype) < data_size) ? sizeof(datatype) : data_size); \ if (sizeof(datatype) > 4 && data_size <= 4) { \
int v = 0; memcpy(&v,data_val,data_size); \
val_out = (datatype)v; \
return; \
} else { \
memcpy(&val_out, data_val, (sizeof(datatype) < data_size) ? sizeof(datatype) : data_size); \
} \
return; \ return; \
} \ } \
memcpy(&val_out, data_val, data_size); \ memcpy(&val_out, data_val, data_size); \
@ -301,7 +307,7 @@ DataElementGetNumericVectorDef(DATA_LONGDOUBLE_VECTOR, long double, DATA_DOUBLE_
long DataElement::getSerializedSize() { long DataElement::getSerializedSize() {
return sizeof(unsigned char) + sizeof(unsigned int) + data_size; return sizeof(int) + sizeof(long) + data_size;
} }
long DataElement::getSerialized(char **ser_str) { long DataElement::getSerialized(char **ser_str) {
@ -313,10 +319,10 @@ long DataElement::getSerialized(char **ser_str) {
ser_pointer = *ser_str; ser_pointer = *ser_str;
memcpy(ser_pointer, &data_type, sizeof(unsigned char)); memcpy(ser_pointer, &data_type, sizeof(int));
ser_pointer += sizeof(unsigned char); ser_pointer += sizeof(int);
memcpy(ser_pointer, &data_size, sizeof(unsigned int)); memcpy(ser_pointer, &data_size, sizeof(long));
ser_pointer += sizeof(unsigned int); ser_pointer += sizeof(long);
memcpy(ser_pointer, data_val, data_size); memcpy(ser_pointer, data_val, data_size);
return ser_size; return ser_size;
@ -357,20 +363,20 @@ void DataNode::setName(const char *name_in) {
node_name = name_in; node_name = name_in;
} }
DataElement & DataNode::element() { DataElement *DataNode::element() {
return data_elem; return &data_elem;
} }
DataNode &DataNode::newChild(const char *name_in) { DataNode *DataNode::newChild(const char *name_in) {
children.push_back(new DataNode(name_in)); children.push_back(new DataNode(name_in));
childmap[name_in].push_back(children.back()); childmap[name_in].push_back(children.back());
children.back()->setParentNode(*this); children.back()->setParentNode(*this);
return *children.back(); return children.back();
} }
DataNode &DataNode::child(const char *name_in, int index) throw (DataInvalidChildException) { DataNode *DataNode::child(const char *name_in, int index) throw (DataInvalidChildException) {
DataNode *child_ret; DataNode *child_ret;
child_ret = childmap[name_in][index]; child_ret = childmap[name_in][index];
@ -381,10 +387,10 @@ DataNode &DataNode::child(const char *name_in, int index) throw (DataInvalidChil
throw(DataInvalidChildException(error_str.str().c_str())); throw(DataInvalidChildException(error_str.str().c_str()));
} }
return *child_ret; return child_ret;
} }
DataNode &DataNode::child(int index) throw (DataInvalidChildException) { DataNode *DataNode::child(int index) throw (DataInvalidChildException) {
DataNode *child_ret; DataNode *child_ret;
@ -396,7 +402,7 @@ DataNode &DataNode::child(int index) throw (DataInvalidChildException) {
throw(DataInvalidChildException(error_str.str().c_str())); throw(DataInvalidChildException(error_str.str().c_str()));
} }
return *child_ret; return child_ret;
} }
int DataNode::numChildren() { int DataNode::numChildren() {
@ -415,11 +421,11 @@ bool DataNode::hasAnother(const char *name_in) {
return childmap[name_in].size() != childmap_ptr[name_in]; return childmap[name_in].size() != childmap_ptr[name_in];
} }
DataNode & DataNode::getNext() throw (DataInvalidChildException) { DataNode *DataNode::getNext() throw (DataInvalidChildException) {
return child(ptr++); return child(ptr++);
} }
DataNode &DataNode::getNext(const char *name_in) throw (DataInvalidChildException) { DataNode *DataNode::getNext(const char *name_in) throw (DataInvalidChildException) {
return child(name_in, childmap_ptr[name_in]++); return child(name_in, childmap_ptr[name_in]++);
} }
@ -445,8 +451,8 @@ DataTree::~DataTree() {
} }
; ;
DataNode & DataTree::rootNode() { DataNode *DataTree::rootNode() {
return dn_root; return &dn_root;
} }
std::string trim(std::string& s, const std::string& drop = " ") { std::string trim(std::string& s, const std::string& drop = " ") {
@ -491,15 +497,15 @@ void DataTree::decodeXMLText(DataNode *elem, const char *src_text, DT_FloatingPo
tmp_stream << in_text; tmp_stream << in_text;
tmp_stream >> tmp_llong; tmp_stream >> tmp_llong;
tmp_int = tmp_llong; tmp_int = (int)tmp_llong;
tmp_long = tmp_llong; tmp_long = (long)tmp_llong;
if (tmp_int == tmp_llong) { if (tmp_int == tmp_llong) {
elem->element().set((int) tmp_int); elem->element()->set(tmp_int);
} else if (tmp_long == tmp_llong) { } else if (tmp_long == tmp_llong) {
elem->element().set((long) tmp_int); elem->element()->set(tmp_long);
} else { } else {
elem->element().set((long long) tmp_long); elem->element()->set(tmp_llong);
} }
} else if (in_text.find_first_not_of("0123456789.e+-") == string::npos) { } else if (in_text.find_first_not_of("0123456789.e+-") == string::npos) {
tmp_stream << in_text; tmp_stream << in_text;
@ -507,11 +513,11 @@ void DataTree::decodeXMLText(DataNode *elem, const char *src_text, DT_FloatingPo
if (fpp == USE_FLOAT) { if (fpp == USE_FLOAT) {
tmp_stream >> tmp_float; tmp_stream >> tmp_float;
elem->element().set((float) tmp_float); elem->element()->set((float) tmp_float);
} else { } else {
tmp_stream >> tmp_double; tmp_stream >> tmp_double;
elem->element().set((double) tmp_double); elem->element()->set((double) tmp_double);
} }
} else if (in_text.find_first_not_of("0123456789- ") == string::npos) { } else if (in_text.find_first_not_of("0123456789- ") == string::npos) {
tmp_stream << in_text; tmp_stream << in_text;
@ -542,7 +548,7 @@ void DataTree::decodeXMLText(DataNode *elem, const char *src_text, DT_FloatingPo
tmp_charvect.push_back(*tmp_llongvect_i); tmp_charvect.push_back(*tmp_llongvect_i);
} }
tmp_llongvect.clear(); tmp_llongvect.clear();
elem->element().set(tmp_charvect); elem->element()->set(tmp_charvect);
tmp_charvect.clear(); tmp_charvect.clear();
} else if (vInts) { } else if (vInts) {
@ -550,17 +556,17 @@ void DataTree::decodeXMLText(DataNode *elem, const char *src_text, DT_FloatingPo
tmp_intvect.push_back(*tmp_llongvect_i); tmp_intvect.push_back(*tmp_llongvect_i);
} }
tmp_llongvect.clear(); tmp_llongvect.clear();
elem->element().set(tmp_intvect); elem->element()->set(tmp_intvect);
tmp_intvect.clear(); tmp_intvect.clear();
} else if (vLongs) { } else if (vLongs) {
for (tmp_llongvect_i = tmp_llongvect.begin(); tmp_llongvect_i != tmp_llongvect.end(); tmp_llongvect_i++) { for (tmp_llongvect_i = tmp_llongvect.begin(); tmp_llongvect_i != tmp_llongvect.end(); tmp_llongvect_i++) {
tmp_longvect.push_back(*tmp_llongvect_i); tmp_longvect.push_back(*tmp_llongvect_i);
} }
tmp_llongvect.clear(); tmp_llongvect.clear();
elem->element().set(tmp_longvect); elem->element()->set(tmp_longvect);
tmp_longvect.clear(); tmp_longvect.clear();
} else { } else {
elem->element().set(tmp_llongvect); elem->element()->set(tmp_llongvect);
} }
} else if (in_text.find_first_not_of("0123456789.e-+ ") == string::npos) { } else if (in_text.find_first_not_of("0123456789.e-+ ") == string::npos) {
tmp_stream << in_text; tmp_stream << in_text;
@ -583,12 +589,12 @@ void DataTree::decodeXMLText(DataNode *elem, const char *src_text, DT_FloatingPo
} }
if (fpp == USE_FLOAT) { if (fpp == USE_FLOAT) {
elem->element().set(tmp_floatvect); elem->element()->set(tmp_floatvect);
} else { } else {
elem->element().set(tmp_doublevect); elem->element()->set(tmp_doublevect);
} }
} else { } else {
elem->element().set(src_text); elem->element()->set(src_text);
// printf( "Unhandled DataTree XML Field: [%s]", tmp_str.c_str() ); // printf( "Unhandled DataTree XML Field: [%s]", tmp_str.c_str() );
} }
@ -606,7 +612,7 @@ void DataTree::setFromXML(DataNode *elem, TiXmlNode *elxml, bool root_node, DT_F
case TiXmlNode::ELEMENT: case TiXmlNode::ELEMENT:
if (!root_node) if (!root_node)
elem = &elem->newChild(elxml->Value()); elem = elem->newChild(elxml->Value());
const TiXmlAttribute *attribs; const TiXmlAttribute *attribs;
attribs = elxml->ToElement()->FirstAttribute(); attribs = elxml->ToElement()->FirstAttribute();
@ -617,7 +623,7 @@ void DataTree::setFromXML(DataNode *elem, TiXmlNode *elxml, bool root_node, DT_F
string attrName("@"); string attrName("@");
attrName.append(attribs->Name()); attrName.append(attribs->Name());
decodeXMLText(&elem->newChild(attrName.c_str()), attribs->Value(), fpp); decodeXMLText(elem->newChild(attrName.c_str()), attribs->Value(), fpp);
attribs = attribs->Next(); attribs = attribs->Next();
} }
@ -674,7 +680,7 @@ void DataTree::setFromXML(DataNode *elem, TiXmlNode *elxml, bool root_node, DT_F
} }
} }
elem->element().set(tmp_strvect); elem->element()->set(tmp_strvect);
return; return;
} }
@ -693,7 +699,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
elem->rewind(); elem->rewind();
while (elem->hasAnother()) { while (elem->hasAnother()) {
child = &elem->getNext(); child = elem->getNext();
std::string nodeName = child->getName(); std::string nodeName = child->getName();
@ -738,11 +744,11 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
unsigned long tmp_ulong; unsigned long tmp_ulong;
long long tmp_llong; long long tmp_llong;
switch (child->element().getDataType()) { switch (child->element()->getDataType()) {
case DATA_NULL: case DATA_NULL:
break; break;
case DATA_VOID: case DATA_VOID:
child->element().get(&tmp_pstr); child->element()->get(&tmp_pstr);
// following badgerfish xml->json and xml->ruby convention for attributes.. // following badgerfish xml->json and xml->ruby convention for attributes..
if (nodeName.substr(0, 1) == string("@")) { if (nodeName.substr(0, 1) == string("@")) {
elxml->SetAttribute(nodeName.substr(1).c_str(), tmp_pstr); elxml->SetAttribute(nodeName.substr(1).c_str(), tmp_pstr);
@ -755,7 +761,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
delete tmp_pstr; delete tmp_pstr;
break; break;
case DATA_CHAR: case DATA_CHAR:
child->element().get(tmp_char); child->element()->get(tmp_char);
tmp_stream.str(""); tmp_stream.str("");
@ -765,7 +771,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_UCHAR: case DATA_UCHAR:
child->element().get(tmp_uchar); child->element()->get(tmp_uchar);
tmp_stream.str(""); tmp_stream.str("");
@ -775,7 +781,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_INT: case DATA_INT:
child->element().get(tmp_int); child->element()->get(tmp_int);
tmp_stream.str(""); tmp_stream.str("");
@ -785,7 +791,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_UINT: case DATA_UINT:
child->element().get(tmp_uint); child->element()->get(tmp_uint);
tmp_stream.str(""); tmp_stream.str("");
@ -795,7 +801,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_LONG: case DATA_LONG:
child->element().get(tmp_long); child->element()->get(tmp_long);
tmp_stream.str(""); tmp_stream.str("");
@ -805,7 +811,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_ULONG: case DATA_ULONG:
child->element().get(tmp_ulong); child->element()->get(tmp_ulong);
tmp_stream.str(""); tmp_stream.str("");
@ -815,7 +821,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_LONGLONG: case DATA_LONGLONG:
child->element().get(tmp_llong); child->element()->get(tmp_llong);
tmp_stream.str(""); tmp_stream.str("");
@ -825,7 +831,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_FLOAT: case DATA_FLOAT:
child->element().get(tmp_float); child->element()->get(tmp_float);
tmp_stream.str(""); tmp_stream.str("");
@ -835,7 +841,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_DOUBLE: case DATA_DOUBLE:
child->element().get(tmp_double); child->element()->get(tmp_double);
tmp_stream.str(""); tmp_stream.str("");
@ -845,7 +851,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_LONGDOUBLE: case DATA_LONGDOUBLE:
child->element().get(tmp_ldouble); child->element()->get(tmp_ldouble);
tmp_stream.str(""); tmp_stream.str("");
@ -855,7 +861,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
element->LinkEndChild(text); element->LinkEndChild(text);
break; break;
case DATA_STRING: case DATA_STRING:
child->element().get(tmp); child->element()->get(tmp);
if (nodeName.substr(0, 1) == string("@")) { if (nodeName.substr(0, 1) == string("@")) {
elxml->SetAttribute(nodeName.substr(1).c_str(), tmp.c_str()); elxml->SetAttribute(nodeName.substr(1).c_str(), tmp.c_str());
delete element; delete element;
@ -867,7 +873,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
break; break;
case DATA_STR_VECTOR: case DATA_STR_VECTOR:
child->element().get(tmp_stringvect); child->element()->get(tmp_stringvect);
tmp_stream.str(""); tmp_stream.str("");
@ -881,7 +887,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_stringvect.clear(); tmp_stringvect.clear();
break; break;
case DATA_CHAR_VECTOR: case DATA_CHAR_VECTOR:
child->element().get(tmp_charvect); child->element()->get(tmp_charvect);
tmp_stream.str(""); tmp_stream.str("");
@ -896,7 +902,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_charvect.clear(); tmp_charvect.clear();
break; break;
case DATA_UCHAR_VECTOR: case DATA_UCHAR_VECTOR:
child->element().get(tmp_ucharvect); child->element()->get(tmp_ucharvect);
tmp_stream.str(""); tmp_stream.str("");
@ -911,7 +917,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_ucharvect.clear(); tmp_ucharvect.clear();
break; break;
case DATA_INT_VECTOR: case DATA_INT_VECTOR:
child->element().get(tmp_intvect); child->element()->get(tmp_intvect);
tmp_stream.str(""); tmp_stream.str("");
@ -926,7 +932,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_intvect.clear(); tmp_intvect.clear();
break; break;
case DATA_UINT_VECTOR: case DATA_UINT_VECTOR:
child->element().get(tmp_uintvect); child->element()->get(tmp_uintvect);
tmp_stream.str(""); tmp_stream.str("");
@ -941,7 +947,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_uintvect.clear(); tmp_uintvect.clear();
break; break;
case DATA_LONG_VECTOR: case DATA_LONG_VECTOR:
child->element().get(tmp_longvect); child->element()->get(tmp_longvect);
tmp_stream.str(""); tmp_stream.str("");
@ -956,7 +962,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_longvect.clear(); tmp_longvect.clear();
break; break;
case DATA_ULONG_VECTOR: case DATA_ULONG_VECTOR:
child->element().get(tmp_ulongvect); child->element()->get(tmp_ulongvect);
tmp_stream.str(""); tmp_stream.str("");
@ -971,7 +977,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_ulongvect.clear(); tmp_ulongvect.clear();
break; break;
case DATA_LONGLONG_VECTOR: case DATA_LONGLONG_VECTOR:
child->element().get(tmp_llongvect); child->element()->get(tmp_llongvect);
tmp_stream.str(""); tmp_stream.str("");
@ -986,7 +992,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_llongvect.clear(); tmp_llongvect.clear();
break; break;
case DATA_FLOAT_VECTOR: case DATA_FLOAT_VECTOR:
child->element().get(tmp_floatvect); child->element()->get(tmp_floatvect);
tmp_stream.str(""); tmp_stream.str("");
@ -1001,7 +1007,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
tmp_floatvect.clear(); tmp_floatvect.clear();
break; break;
case DATA_DOUBLE_VECTOR: case DATA_DOUBLE_VECTOR:
child->element().get(tmp_doublevect); child->element()->get(tmp_doublevect);
tmp_stream.str(""); tmp_stream.str("");
@ -1035,7 +1041,7 @@ void DataTree::printXML() /* get serialized size + return node names header */
TiXmlDeclaration * decl = new TiXmlDeclaration("1.0", "", ""); TiXmlDeclaration * decl = new TiXmlDeclaration("1.0", "", "");
doc.LinkEndChild(decl); doc.LinkEndChild(decl);
DataNode *root = &rootNode(); DataNode *root = rootNode();
string rootName = root->getName(); string rootName = root->getName();
@ -1089,22 +1095,22 @@ long DataTree::getSerializedSize(DataElement &de_node_names, bool debug) /* get
/* add on the size of the name index and number of children */ /* add on the size of the name index and number of children */
total_size += de_name_index_size; total_size += de_name_index_size;
total_size += de_num_children_size; total_size += de_num_children_size;
total_size += dn_stack.top()->element().getSerializedSize(); total_size += dn_stack.top()->element()->getSerializedSize();
/* debug output */ /* debug output */
if (debug) { if (debug) {
for (unsigned int i = 0; i < dn_stack.size() - 1; i++) for (unsigned int i = 0; i < dn_stack.size() - 1; i++)
cout << "--"; cout << "--";
cout << (dn_stack.top()->getName().empty() ? "NULL" : dn_stack.top()->getName()) << "(" << dn_stack.top()->element().getSerializedSize() cout << (dn_stack.top()->getName().empty() ? "NULL" : dn_stack.top()->getName()) << "(" << dn_stack.top()->element()->getSerializedSize()
<< ")"; << ")";
cout << " type: " << dn_stack.top()->element().getDataType() << endl; cout << " type: " << dn_stack.top()->element()->getDataType() << endl;
//cout << " index: " << name_index << endl; //cout << " index: " << name_index << endl;
} }
/* end debug output */ /* end debug output */
/* if it has children, traverse into them */ /* if it has children, traverse into them */
if (dn_stack.top()->hasAnother()) { if (dn_stack.top()->hasAnother()) {
dn_stack.push(&dn_stack.top()->getNext()); dn_stack.push(dn_stack.top()->getNext());
dn_stack.top()->rewind(); dn_stack.top()->rewind();
} else { } else {
/* no more children, back out until we have children, then add next child to the top */ /* no more children, back out until we have children, then add next child to the top */
@ -1117,7 +1123,7 @@ long DataTree::getSerializedSize(DataElement &de_node_names, bool debug) /* get
} }
if (!dn_stack.empty()) { if (!dn_stack.empty()) {
dn_stack.push(&dn_stack.top()->getNext()); dn_stack.push(dn_stack.top()->getNext());
dn_stack.top()->rewind(); dn_stack.top()->rewind();
} }
} }
@ -1142,12 +1148,12 @@ void DataNode::findAll(const char *name_in, vector<DataNode *> &node_list_out) {
while (!dn_stack.empty()) { while (!dn_stack.empty()) {
while (dn_stack.top()->hasAnother(name_in)) { while (dn_stack.top()->hasAnother(name_in)) {
node_list_out.push_back(&dn_stack.top()->getNext(name_in)); node_list_out.push_back(dn_stack.top()->getNext(name_in));
} }
/* if it has children, traverse into them */ /* if it has children, traverse into them */
if (dn_stack.top()->hasAnother()) { if (dn_stack.top()->hasAnother()) {
dn_stack.push(&dn_stack.top()->getNext()); dn_stack.push(dn_stack.top()->getNext());
dn_stack.top()->rewind(); dn_stack.top()->rewind();
} else { } else {
/* no more children, back out until we have children, then add next child to the top */ /* no more children, back out until we have children, then add next child to the top */
@ -1160,7 +1166,7 @@ void DataNode::findAll(const char *name_in, vector<DataNode *> &node_list_out) {
} }
if (!dn_stack.empty()) { if (!dn_stack.empty()) {
dn_stack.push(&dn_stack.top()->getNext()); dn_stack.push(dn_stack.top()->getNext());
dn_stack.top()->rewind(); dn_stack.top()->rewind();
} }
} }
@ -1232,11 +1238,11 @@ long DataTree::getSerialized(char **ser_str, bool debug) {
de_name_index_serialized_size = de_name_index.getSerializedSize(); de_name_index_serialized_size = de_name_index.getSerializedSize();
de_num_children_serialized_size = de_num_children.getSerializedSize(); de_num_children_serialized_size = de_num_children.getSerializedSize();
element_serialized_size = dn_stack.top()->element().getSerializedSize(); element_serialized_size = dn_stack.top()->element()->getSerializedSize();
de_name_index.getSerialized(&de_name_index_serialized); de_name_index.getSerialized(&de_name_index_serialized);
de_num_children.getSerialized(&de_num_children_serialized); de_num_children.getSerialized(&de_num_children_serialized);
dn_stack.top()->element().getSerialized(&element_serialized); dn_stack.top()->element()->getSerialized(&element_serialized);
/* add on the name index and number of children */ /* add on the name index and number of children */
memcpy(data_out + data_ptr, de_name_index_serialized, de_name_index_serialized_size); memcpy(data_out + data_ptr, de_name_index_serialized, de_name_index_serialized_size);
@ -1255,7 +1261,7 @@ long DataTree::getSerialized(char **ser_str, bool debug) {
/* if it has children, traverse into them */ /* if it has children, traverse into them */
if (dn_stack.top()->hasAnother()) { if (dn_stack.top()->hasAnother()) {
dn_stack.push(&dn_stack.top()->getNext()); dn_stack.push(dn_stack.top()->getNext());
dn_stack.top()->rewind(); dn_stack.top()->rewind();
} else { } else {
/* no more children, back out until we have children, then add next child to the top */ /* no more children, back out until we have children, then add next child to the top */
@ -1268,7 +1274,7 @@ long DataTree::getSerialized(char **ser_str, bool debug) {
} }
if (!dn_stack.empty()) { if (!dn_stack.empty()) {
dn_stack.push(&dn_stack.top()->getNext()); dn_stack.push(dn_stack.top()->getNext());
dn_stack.top()->rewind(); dn_stack.top()->rewind();
} }
} }
@ -1316,14 +1322,14 @@ void DataTree::setSerialized(char *ser_str, bool debug) {
de_num_children.get(num_children); de_num_children.get(num_children);
/* pull the node's element */ /* pull the node's element */
dn_stack.top()->element().setSerialized(ser_str + data_ptr); dn_stack.top()->element()->setSerialized(ser_str + data_ptr);
data_ptr += dn_stack.top()->element().getSerializedSize(); data_ptr += dn_stack.top()->element()->getSerializedSize();
/* debug output */ /* debug output */
if (debug) { if (debug) {
for (unsigned int i = 0; i < dn_stack.size() - 1; i++) for (unsigned int i = 0; i < dn_stack.size() - 1; i++)
cout << "--"; cout << "--";
cout << (name_index ? node_names[name_index - 1] : "NULL") << "(" << dn_stack.top()->element().getSerializedSize() << ")"; cout << (name_index ? node_names[name_index - 1] : "NULL") << "(" << dn_stack.top()->element()->getSerializedSize() << ")";
cout << " index: " << name_index << endl; cout << " index: " << name_index << endl;
} }
/* end debug output */ /* end debug output */
@ -1344,7 +1350,7 @@ void DataTree::setSerialized(char *ser_str, bool debug) {
de_name_index.setSerialized(ser_str + data_ptr); /* peek at the new child name but don't increment pointer */ de_name_index.setSerialized(ser_str + data_ptr); /* peek at the new child name but don't increment pointer */
de_name_index.get(name_index); de_name_index.get(name_index);
/* add this child onto the top of the stack */ /* add this child onto the top of the stack */
dn_stack.push(&dn_stack.top()->newChild((name_index ? node_names[name_index - 1] : string("")).c_str())); dn_stack.push(dn_stack.top()->newChild((name_index ? node_names[name_index - 1] : string("")).c_str()));
dn_childcount_stack.top()--; /* decrement to count the new child */ dn_childcount_stack.top()--; /* decrement to count the new child */
} }
else /* No children, move on to the next sibling */ else /* No children, move on to the next sibling */
@ -1355,7 +1361,7 @@ void DataTree::setSerialized(char *ser_str, bool debug) {
de_name_index.get(name_index); de_name_index.get(name_index);
dn_stack.pop(); dn_stack.pop();
dn_stack.push(&dn_stack.top()->newChild((name_index ? node_names[name_index - 1] : string("")).c_str())); /* create the next sibling and throw it on the stack */ dn_stack.push(dn_stack.top()->newChild((name_index ? node_names[name_index - 1] : string("")).c_str())); /* create the next sibling and throw it on the stack */
dn_childcount_stack.top()--; /* decrement to count the new sibling */ dn_childcount_stack.top()--; /* decrement to count the new sibling */
} }
else /* This is the last sibling, move up the stack and find the next */ else /* This is the last sibling, move up the stack and find the next */
@ -1367,7 +1373,7 @@ void DataTree::setSerialized(char *ser_str, bool debug) {
de_name_index.get(name_index); de_name_index.get(name_index);
dn_stack.pop(); dn_stack.pop();
dn_stack.push(&dn_stack.top()->newChild((name_index ? node_names[name_index - 1] : string("")).c_str())); /* throw it on the stack */ dn_stack.push(dn_stack.top()->newChild((name_index ? node_names[name_index - 1] : string("")).c_str())); /* throw it on the stack */
dn_childcount_stack.top()--; /* count it */ dn_childcount_stack.top()--; /* count it */
break break
; } ; }
@ -1398,9 +1404,9 @@ bool DataTree::LoadFromFileXML(const std::string& filename, DT_FloatingPointPoli
return false; return false;
} }
rootNode().setName(xml_root_node->ToElement()->Value()); rootNode()->setName(xml_root_node->ToElement()->Value());
setFromXML(&rootNode(), xml_root_node, true, fpp); setFromXML(rootNode(), xml_root_node, true, fpp);
return true; return true;
} }
@ -1410,13 +1416,13 @@ bool DataTree::SaveToFileXML(const std::string& filename) {
TiXmlDeclaration * decl = new TiXmlDeclaration("1.0", "", ""); TiXmlDeclaration * decl = new TiXmlDeclaration("1.0", "", "");
doc.LinkEndChild(decl); doc.LinkEndChild(decl);
string rootName = rootNode().getName(); string rootName = rootNode()->getName();
TiXmlElement *element = new TiXmlElement(rootName.empty() ? "root" : rootName.c_str()); TiXmlElement *element = new TiXmlElement(rootName.empty() ? "root" : rootName.c_str());
doc.LinkEndChild(element); doc.LinkEndChild(element);
nodeToXML(&rootNode(), element); nodeToXML(rootNode(), element);
doc.SaveFile(filename.c_str()); doc.SaveFile(filename.c_str());
@ -1489,11 +1495,11 @@ bool DataTree::SaveToFile(const std::string& filename, bool compress, int compre
compress = false; compress = false;
} }
#endif #endif
DataNode &header = dtHeader.rootNode(); DataNode *header = dtHeader.rootNode();
header ^ "version" = 1.0f; *header->newChild("version") = 1.0f;
header ^ "compression" = string(compress ? "FastLZ" : "none"); *header->newChild("compression") = string(compress ? "FastLZ" : "none");
header ^ "uncompressed_size" = dataSize; *header->newChild("uncompressed_size") = dataSize;
headerSize = dtHeader.getSerialized(&hdr_serialized); headerSize = dtHeader.getSerialized(&hdr_serialized);
@ -1533,10 +1539,10 @@ bool DataTree::LoadFromFile(const std::string& filename) {
DataTree dtHeader; DataTree dtHeader;
dtHeader.setSerialized(hdr_serialized); dtHeader.setSerialized(hdr_serialized);
DataNode &header = dtHeader.rootNode(); DataNode *header = dtHeader.rootNode();
string compressionType = header["compression"]; string compressionType = *header->getNext("compression");
dataSize = header["uncompressed_size"]; dataSize = *header->getNext("uncompressed_size");
bool uncompress = false; bool uncompress = false;
#if USE_FASTLZ #if USE_FASTLZ

139
src/util/DataTree.h
View File

@ -51,23 +51,22 @@ using namespace std;
#define DATA_LONG 5 #define DATA_LONG 5
#define DATA_ULONG 6 #define DATA_ULONG 6
#define DATA_LONGLONG 7 #define DATA_LONGLONG 7
#define DATA_ULONGLONG 8 #define DATA_FLOAT 8
#define DATA_FLOAT 9 #define DATA_DOUBLE 9
#define DATA_DOUBLE 10 #define DATA_LONGDOUBLE 10
#define DATA_LONGDOUBLE 11 #define DATA_STRING 11
#define DATA_STRING 12 #define DATA_STR_VECTOR 12
#define DATA_STR_VECTOR 13 #define DATA_CHAR_VECTOR 13
#define DATA_CHAR_VECTOR 14 #define DATA_UCHAR_VECTOR 14
#define DATA_UCHAR_VECTOR 15 #define DATA_INT_VECTOR 15
#define DATA_INT_VECTOR 16 #define DATA_UINT_VECTOR 16
#define DATA_UINT_VECTOR 17 #define DATA_LONG_VECTOR 17
#define DATA_LONG_VECTOR 18 #define DATA_ULONG_VECTOR 18
#define DATA_ULONG_VECTOR 19 #define DATA_LONGLONG_VECTOR 19
#define DATA_LONGLONG_VECTOR 20 #define DATA_FLOAT_VECTOR 20
#define DATA_FLOAT_VECTOR 21 #define DATA_DOUBLE_VECTOR 21
#define DATA_DOUBLE_VECTOR 22 #define DATA_LONGDOUBLE_VECTOR 22
#define DATA_LONGDOUBLE_VECTOR 23 #define DATA_VOID 23
#define DATA_VOID 24
/* map comparison function */ /* map comparison function */
@ -119,9 +118,9 @@ public:
class DataElement class DataElement
{ {
private: private:
unsigned char data_type; int data_type;
unsigned int data_size; long data_size;
unsigned int unit_size; int unit_size;
char *data_val; char *data_val;
@ -244,74 +243,74 @@ public:
int numChildren(); /* Number of children */ int numChildren(); /* Number of children */
int numChildren(const char *name_in); /* Number of children named 'name_in' */ int numChildren(const char *name_in); /* Number of children named 'name_in' */
DataElement &element(); /* DataElement at this node */ DataElement *element(); /* DataElement at this node */
DataNode &newChild(const char *name_in); DataNode *newChild(const char *name_in);
DataNode &child(const char *name_in, int index = 0) throw (DataInvalidChildException); DataNode *child(const char *name_in, int index = 0) throw (DataInvalidChildException);
DataNode &child(int index) throw (DataInvalidChildException); DataNode *child(int index) throw (DataInvalidChildException);
bool hasAnother(const char *name_in); /* useful for while() loops in conjunction with getNext() */ bool hasAnother(const char *name_in); /* useful for while() loops in conjunction with getNext() */
bool hasAnother(); bool hasAnother();
DataNode &getNext(const char *name_in) throw (DataInvalidChildException); /* get next of specified name */ DataNode *getNext(const char *name_in) throw (DataInvalidChildException); /* get next of specified name */
DataNode &getNext() throw (DataInvalidChildException); /* get next child */ DataNode *getNext() throw (DataInvalidChildException); /* get next child */
void rewind(const char *name_in); /* rewind specific */ void rewind(const char *name_in); /* rewind specific */
void rewind(); /* rewind generic */ void rewind(); /* rewind generic */
void findAll(const char *name_in, vector<DataNode *> &node_list_out); void findAll(const char *name_in, vector<DataNode *> &node_list_out);
operator string () { string s; element().get(s); return s; } operator string () { string s; element()->get(s); return s; }
operator char () { char v; element().get(v); return v; } operator char () { char v; element()->get(v); return v; }
operator unsigned char () { unsigned char v; element().get(v); return v; } operator unsigned char () { unsigned char v; element()->get(v); return v; }
operator int () { int v; element().get(v); return v; } operator int () { int v; element()->get(v); return v; }
operator unsigned int () { unsigned int v; element().get(v); return v; } operator unsigned int () { unsigned int v; element()->get(v); return v; }
operator long () { long v; element().get(v); return v; } operator long () { long v; element()->get(v); return v; }
operator unsigned long () { unsigned long v; element().get(v); return v; } operator unsigned long () { unsigned long v; element()->get(v); return v; }
operator long long () { long long v; element().get(v); return v; } operator long long () { long long v; element()->get(v); return v; }
operator float () { float v; element().get(v); return v; } operator float () { float v; element()->get(v); return v; }
operator double () { double v; element().get(v); return v; } operator double () { double v; element()->get(v); return v; }
operator long double () { long double v; element().get(v); return v; } operator long double () { long double v; element()->get(v); return v; }
operator vector<char> () { vector<char> v; element().get(v); return v; } operator vector<char> () { vector<char> v; element()->get(v); return v; }
operator vector<unsigned char> () { vector<unsigned char> v; element().get(v); return v; } operator vector<unsigned char> () { vector<unsigned char> v; element()->get(v); return v; }
operator vector<int> () { vector<int> v; element().get(v); return v; } operator vector<int> () { vector<int> v; element()->get(v); return v; }
operator vector<unsigned int> () { vector<unsigned int> v; element().get(v); return v; } operator vector<unsigned int> () { vector<unsigned int> v; element()->get(v); return v; }
operator vector<long> () { vector<long> v; element().get(v); return v; } operator vector<long> () { vector<long> v; element()->get(v); return v; }
operator vector<unsigned long> () { vector<unsigned long> v; element().get(v); return v; } operator vector<unsigned long> () { vector<unsigned long> v; element()->get(v); return v; }
operator vector<float> () { vector<float> v; element().get(v); return v; } operator vector<float> () { vector<float> v; element()->get(v); return v; }
operator vector<double> () { vector<double> v; element().get(v); return v; } operator vector<double> () { vector<double> v; element()->get(v); return v; }
operator vector<long double> () { vector<long double> v; element().get(v); return v; } operator vector<long double> () { vector<long double> v; element()->get(v); return v; }
const string &operator= (const string &s) { element().set(s); return s; } const string &operator= (const string &s) { element()->set(s); return s; }
char operator= (char i) { element().set(i); return i; } char operator= (char i) { element()->set(i); return i; }
unsigned char operator= (unsigned char i) { element().set(i); return i; } unsigned char operator= (unsigned char i) { element()->set(i); return i; }
int operator= (int i) { element().set(i); return i; } int operator= (int i) { element()->set(i); return i; }
unsigned int operator= (unsigned int i) { element().set(i); return i; } unsigned int operator= (unsigned int i) { element()->set(i); return i; }
long operator= (long i) { element().set(i); return i; } long operator= (long i) { element()->set(i); return i; }
unsigned long operator= (unsigned long i) { element().set(i); return i; } unsigned long operator= (unsigned long i) { element()->set(i); return i; }
long long operator= (long long i) { element().set(i); return i; } long long operator= (long long i) { element()->set(i); return i; }
float operator= (float i) { element().set(i); return i; } float operator= (float i) { element()->set(i); return i; }
double operator= (double i) { element().set(i); return i; } double operator= (double i) { element()->set(i); return i; }
long double operator= (long double i) { element().set(i); return i; } long double operator= (long double i) { element()->set(i); return i; }
vector<char> &operator= (vector<char> &v) { element().set(v); return v; } vector<char> &operator= (vector<char> &v) { element()->set(v); return v; }
vector<unsigned char> &operator= (vector<unsigned char> &v) { element().set(v); return v; } vector<unsigned char> &operator= (vector<unsigned char> &v) { element()->set(v); return v; }
vector<int> &operator= (vector<int> &v) { element().set(v); return v; } vector<int> &operator= (vector<int> &v) { element()->set(v); return v; }
vector<unsigned int> &operator= (vector<unsigned int> &v) { element().set(v); return v; } vector<unsigned int> &operator= (vector<unsigned int> &v) { element()->set(v); return v; }
vector<long> &operator= (vector<long> &v) { element().set(v); return v; } vector<long> &operator= (vector<long> &v) { element()->set(v); return v; }
vector<unsigned long> &operator= (vector<unsigned long> &v) { element().set(v); return v; } vector<unsigned long> &operator= (vector<unsigned long> &v) { element()->set(v); return v; }
vector<float> &operator= (vector<float> &v) { element().set(v); return v; } vector<float> &operator= (vector<float> &v) { element()->set(v); return v; }
vector<double> &operator= (vector<double> &v) { element().set(v); return v; } vector<double> &operator= (vector<double> &v) { element()->set(v); return v; }
vector<long double> &operator= (vector<long double> &v) { element().set(v); return v; } vector<long double> &operator= (vector<long double> &v) { element()->set(v); return v; }
DataNode &operator[] (const char *name_in) { return getNext(name_in); } DataNode *operator[] (const char *name_in) { return getNext(name_in); }
DataNode &operator[] (int idx) { return child(idx); } DataNode *operator[] (int idx) { return child(idx); }
bool operator() (const char *name_in) { return hasAnother(name_in); } bool operator() (const char *name_in) { return hasAnother(name_in); }
bool operator() () { return hasAnother(); } bool operator() () { return hasAnother(); }
DataNode &operator ^(const char *name_in) { return newChild(name_in); } DataNode *operator ^(const char *name_in) { return newChild(name_in); }
}; };
@ -333,7 +332,7 @@ public:
DataTree(); DataTree();
~DataTree(); ~DataTree();
DataNode &rootNode(); DataNode *rootNode();
void nodeToXML(DataNode *elem, TiXmlElement *elxml); void nodeToXML(DataNode *elem, TiXmlElement *elxml);
void setFromXML(DataNode *elem, TiXmlNode *elxml, bool root_node=true, DT_FloatingPointPolicy fpp=USE_FLOAT); void setFromXML(DataNode *elem, TiXmlNode *elxml, bool root_node=true, DT_FloatingPointPolicy fpp=USE_FLOAT);