Fix en conversion a string.

[z.facultad/75.52/treemulator.git] / viewer / view_btree.cpp

diff --git a/viewer/view_btree.cpp b/viewer/view_btree.cpp
index 582b776a95d3eea51ccdb902976e163bae67e1ff..d8bc219961376bd9052667997a00913202410629 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -1,6 +1,9 @@
 
 #include "view_btree.h"
 #include "view_btree_data.h"
 
 #include "view_btree.h"
 #include "view_btree_data.h"

+#include <sigc++/slot.h>
+
+double ViewBTree::byte_to_pixels = 0;

 
 ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group (*parent, 0, 0),
        BTree (filename, 64)
 
 ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group (*parent, 0, 0),
        BTree (filename, 64)


@@ -14,34 +17,68 @@ ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group
                AddKey (c);
        }
 
                AddKey (c);
        }
 

+       byte_to_pixels  = NODE_WIDTH/64; // TODO : 64 == BlockSize
+
+       AddNode (0);
+}
+
+void ViewBTree::AddNode (uint num)
+{
+       if (node_placed[num]) {
+               std::cout << "WARNING : Tratando de agregar de nuevo el nodo " << num << std::endl;
+               return;
+       }
+
+       node_placed[num] = true;

        /* 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";

 
 

-       int byte_to_pixels  = NODE_WIDTH/64; // TODO : 64 == BlockSize
+       if (num == 0) {
+               max_level = node_h.level;
+       } else {
+               y = (max_level - node_h.level)*(NODE_HEIGHT+10);
+       }

 
 

-       /* Ahora pongo el lugar que opcupa el header */
-       double header_w = byte_to_pixels * sizeof (BTreeNodeHeader);
-       double x = 0;
+       std::list<BTreeData *> keys = ReadKeys (node, node_h);

 
 

-       Canvas::Rect *view_header = new Canvas::Rect (*this, x, 0, x+header_w, NODE_HEIGHT);
-       x += header_w;
+       ViewNode *vnode = new ViewNode (this, num, node_h, keys);
+       vnode->property_y () = y;
+       vnode->property_x () = pos_x[node_h.level];
+       pos_x[node_h.level] += NODE_WIDTH+10;
+       vnode->signal_selected().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_selected) );

 
 

-       std::list<BTreeData *>::iterator it = keys.begin ();
-       while (it != keys.end ()) {
-               BTreeData *data = (*it);
-               double w = byte_to_pixels * data->Size ();
+       std::list<uint> childs = vnode->getChilds ();
+       std::list<uint>::iterator hit = childs.begin ();
+       while (hit != childs.end ()) {
+               if ((*hit) == 0) {
+                       std::cout << "WARNING : Referencia a 0 encontrada!!" << std::endl;
+                       hit = childs.end ();
+                       continue;
+               }
+               AddNode (*hit);
+               hit++;
+       }
+}

 
 

-               ViewBTreeData::Create (data, this, x, 0, w+x, NODE_HEIGHT);
+void ViewBTree::on_item_selected (BTreeData *data, uint num)
+{
+       BTreeNodeHeader node_h;
+       uchar *node;
+       
+       node = ReadBlock (num);
+       ReadNodoHeader (node, &node_h);
+       delete [] node;

 
 

-               x += w;
-               it++;
-       }
+       std::cout << "Emit SignalSelected" << std::endl;
+       m_signal_selected (data, node_h);
+}

 
 

+ViewBTree::type_signal_selected ViewBTree::signal_selected ()
+{
+       return m_signal_selected;

 }
 
 }