Agrego algunos hijos de cada nodo.

diff --git a/viewer/view_btree.cpp b/viewer/view_btree.cpp
index 582b776a95d3eea51ccdb902976e163bae67e1ff..a73f396c3bfa4ef0458a918e9e34b89df34190a5 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -14,34 +14,70 @@ ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group
                AddKey (c);
        }
 
                AddKey (c);
        }
 

+       Canvas::Rect *rect = new Canvas::Rect (*this, 0, 0, NODE_WIDTH, NODE_HEIGHT);
+       rect->property_fill_color() = "gray";
+
+       byte_to_pixels  = NODE_WIDTH/64; // TODO : 64 == BlockSize
+
+       AddNode (0);
+}
+
+void ViewBTree::AddNode (uint num)
+{

        /* Muestro la raiz */
        /* Muestro la raiz */

-       uchar *node = ReadBlock (0);
+       double y = 0;
+       uchar *node = ReadBlock (num);
+

        BTreeNodeHeader node_h;
        ReadNodoHeader (node, &node_h);
        BTreeNodeHeader node_h;
        ReadNodoHeader (node, &node_h);

-       std::list<BTreeData *> keys = ReadKeys (node, node_h);

 
 

-       Canvas::Rect *rect = new Canvas::Rect (*this, 0, 0, NODE_WIDTH, NODE_HEIGHT);
-       rect->property_fill_color() = "gray";
+       if (num == 0) {
+               max_level = node_h.level;
+       } else {
+               y = (max_level - node_h.level)*(NODE_HEIGHT+10);
+       }

 
 

-       int byte_to_pixels  = NODE_WIDTH/64; // TODO : 64 == BlockSize
+       std::list<BTreeData *> keys = ReadKeys (node, node_h);

 
 

-       /* Ahora pongo el lugar que opcupa el header */

        double header_w = byte_to_pixels * sizeof (BTreeNodeHeader);
        double x = 0;
 
        double header_w = byte_to_pixels * sizeof (BTreeNodeHeader);
        double x = 0;
 

-       Canvas::Rect *view_header = new Canvas::Rect (*this, x, 0, x+header_w, NODE_HEIGHT);
+       Canvas::Rect *view_header = new Canvas::Rect (*this, x, y, x+header_w, y+NODE_HEIGHT);
+       view_header->property_fill_color() = "blue";
+
+       /* Numero de nodo */
+       std::string node_num;
+       std::stringstream ss;
+       ss << num;
+       ss >> node_num;
+       new Canvas::Text (*this, header_w/2, y+NODE_HEIGHT/2, node_num);
+

        x += header_w;
 
        x += header_w;
 

+       /* Cuento los hijos para saber como centrarlos más adelante */
+       std::list<uint> hijos;
+       

        std::list<BTreeData *>::iterator it = keys.begin ();
        while (it != keys.end ()) {
                BTreeData *data = (*it);
                double w = byte_to_pixels * data->Size ();
 
        std::list<BTreeData *>::iterator it = keys.begin ();
        while (it != keys.end ()) {
                BTreeData *data = (*it);
                double w = byte_to_pixels * data->Size ();
 

-               ViewBTreeData::Create (data, this, x, 0, w+x, NODE_HEIGHT);
+               ViewBTreeData *v = ViewBTreeData::Create (data, this, x, y, w+x, y+NODE_HEIGHT);

 
                x += w;
                it++;
 
                x += w;
                it++;

+
+               if (dynamic_cast<BTreeChildData *>(data)) {
+                       BTreeChildData *child = dynamic_cast<BTreeChildData *>(data);
+                       hijos.push_back (child->getChild ());
+               }

        }
 
        }
 

+
+       std::list<uint>::iterator hit = hijos.begin ();
+       while (hit != hijos.end ()) {
+               AddNode (*hit);
+               hit++;
+       }

 }
 
 }
 

diff --git a/viewer/view_btree.h b/viewer/view_btree.h
index 918a377d5b05f90bba1153d9e0394386b4162615..a03af2bb070e43fca995b1d05c1fcb3d4ec6dd50 100644 (file)
--- a/viewer/view_btree.h
+++ b/viewer/view_btree.h
@@ -16,6 +16,12 @@ class ViewBTree : public Canvas::Group, public BTree {
        public:
                ViewBTree (Canvas::Group *parent, std::string filename);
 
        public:
                ViewBTree (Canvas::Group *parent, std::string filename);
 

+       protected:
+               int byte_to_pixels;
+               int max_level; /* Lo saco de la raiz */
+
+               void AddNode (uint num);
+

 };
 
 #endif
 };
 
 #endif