Fixed #4 added to support user version of tree

Author: sea5kg

.travis.yml

@@ -18,6 +18,7 @@ addons:
 script:
   - ./build_simple.sh
   - ./wsjcpp-obj-tree --example -o some.wsjcpp-obj-tree
+  - ./wsjcpp-obj-tree --random 1000 -o random.wsjcpp-obj-tree
   - ./wsjcpp-obj-tree -i some.wsjcpp-obj-tree -o some2.wsjcpp-obj-tree
   - rm some.wsjcpp-obj-tree && rm some2.wsjcpp-obj-tree
   - cd unit-tests.wsjcpp

src/wsjcpp_obj_tree.cpp

@@ -72,11 +72,24 @@ void WsjcppObjTreeNode::setId(uint32_t nId) {
 
 WsjcppObjTree::WsjcppObjTree() {
     m_nLastId = 0;
+    m_nUserVersion = 0;
     TAG = "WsjcppObjTree";
 }
 
 // ---------------------------------------------------------------------
 
+void WsjcppObjTree::setUserVersionOfTree(uint32_t nUserVersion) {
+    m_nUserVersion = nUserVersion;
+}
+
+// ---------------------------------------------------------------------
+
+uint32_t WsjcppObjTree::getUserVersionOfTree() {
+    return m_nUserVersion;
+}
+
+// ---------------------------------------------------------------------
+
 WsjcppObjTree::~WsjcppObjTree() {
     clearNodes();
     std::map<uint16_t, IFabricWsjcppObjTreeNode*>::iterator it;
@@ -111,6 +124,11 @@ bool WsjcppObjTree::readTreeFromFile(const std::string &sFilename, std::string &
         return false;
     }
 
+    // just a user version for usebillity
+    if (!this->readUInt32(f, m_nUserVersion, sError)) {
+        return false;
+    }
+
     uint32_t nTreeSize = 0;
     if (!this->readUInt32(f, nTreeSize, sError)) {
         return false;
@@ -182,7 +200,9 @@ bool WsjcppObjTree::writeTreeToFile(const std::string &sFilename, std::string &s
     static const std::string sFileHeader = "WSJCPP-OBJ-TREE-FILE";
     f.write(sFileHeader.c_str(), sFileHeader.length());
 
-    // m_nLastId
+    // just a user version for usebillity
+    this->writeUInt32(f, m_nUserVersion);
+    
     int nTreeSize = m_vNodes.size();
     this->writeUInt32(f, nTreeSize);
     this->writeUInt32(f, m_nLastId);
@@ -292,7 +312,7 @@ int WsjcppObjTree::getRoots(std::vector<WsjcppObjTreeNode *> &vRoots) {
 
 std::string WsjcppObjTree::toString() { // for printing
     std::string sIntent = "";
-    return toStringRecoursiveChilds(nullptr, sIntent);
+    return "Root (ver: " + std::to_string(m_nUserVersion) + ")\n" + toStringRecoursiveChilds(nullptr, sIntent);
 }
 
 // ---------------------------------------------------------------------

src/wsjcpp_obj_tree.h

@@ -74,6 +74,8 @@ class WsjcppObjTree {
     public:
         WsjcppObjTree();
         ~WsjcppObjTree();
+        void setUserVersionOfTree(uint32_t nUserVersion);
+        uint32_t getUserVersionOfTree();
 
         bool readTreeFromFile(const std::string &sFilename, std::string &sError);
         bool writeTreeToFile(const std::string &sFilename, std::string &sError);
@@ -117,6 +119,7 @@ class WsjcppObjTree {
 
     private:
         std::string TAG;
+        uint32_t m_nUserVersion;
         std::vector<WsjcppObjTreeNode *> m_vNodes;
         uint32_t m_nLastId; // Need for future if will be implemented function of remove nodes
         std::map<uint16_t, IFabricWsjcppObjTreeNode*> m_mapFabricTreeNode;

unit-tests.wsjcpp/data/readtreetest/example1.obj-tree

@@ -18,6 +18,7 @@ void UnitTestWriteTree::init() {
 class CompStruct : public WsjcppObjTree {
     public:
         CompStruct() {
+            setUserVersionOfTree(1);
             addSupportType<WsjcppObjTreeNodeString>();
             addSupportType<WsjcppObjTreeNodeInteger>();
             addSupportType<WsjcppObjTreeNodeFloat>();
@@ -73,7 +74,7 @@ bool UnitTestWriteTree::run() {
     int nBufferSize = 0;
     WsjcppCore::readFileToBuffer(sFilename, &pBuffer, nBufferSize);
 
-    compareN(bTestSuccess, "write to file", nBufferSize, 316);
+    compareN(bTestSuccess, "write to file", nBufferSize, 320);
 
     return bTestSuccess;
 }