Paso el block_data a BTree en lugar de Clave.

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

diff --git a/viewer/view_btree.cpp b/viewer/view_btree.cpp
index 6bdcb67d391579fa568586339c5d281b89b1c896..eb2e067249ff5bcdaa1fa6a8a7ea74eaa6a88f50 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -7,19 +7,36 @@ double ViewBTree::byte_to_pixels = 0;
 double ViewBTree::node_width = 0;
 double ViewBTree::node_height = 0;
 
 double ViewBTree::node_width = 0;
 double ViewBTree::node_height = 0;
 

-ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename, uint block_size, int type):Canvas::Group (*parent, 0, 0),
-       BTree (filename, block_size, type)
+ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename, uint block_size, int tree_type, int type):Canvas::Group (*parent, 0, 0),
+       BTree (filename, block_size, tree_type, type)

 {
        /* Cada bytes lo hago de 5 units de ancho */
 {
        /* Cada bytes lo hago de 5 units de ancho */

-       node_width = 5 * block_size;
-       node_height = node_width/10;
+       node_width = 4 * block_size;
+       node_height = 50;

        byte_to_pixels  = node_width/block_size;
 
        last_selected = NULL;
        byte_to_pixels  = node_width/block_size;
 
        last_selected = NULL;

+       last_visited = 0;
+}
+
+void ViewBTree::GoBack ()
+{
+       uint l = back.top ();
+       back.pop ();
+
+       Clear ();
+       AddNode (l, 1);

 }
 
 void ViewBTree::AddNode (uint num, uint padre)
 {
 }
 
 void ViewBTree::AddNode (uint num, uint padre)
 {

+       /* Hack de ultima hora :P */
+       if (padre == 0)
+               /* evito quedar en circulo :D */
+               back.push (last_visited);
+
+       last_visited = num;
+

        uchar *node = ReadBlock (num);
 
        BTreeNodeHeader node_h;
        uchar *node = ReadBlock (num);
 
        BTreeNodeHeader node_h;


@@ -41,11 +58,11 @@ void ViewBTree::on_item_activated (BTreeData *data, uint num, ViewNode *vnode)
 {
        last_selected = NULL;
 
 {
        last_selected = NULL;
 

-       uint next = data->getChild ();
+       uint next = data->GetChild ();

        delete vnode;
 
        std::cout << next << std::endl;
        delete vnode;
 
        std::cout << next << std::endl;

-       AddNode (next, num);
+       AddNode (next, 0);

 }
 
 void ViewBTree::on_item_selected (BTreeData *data, uint num, ViewNode *vnode)
 }
 
 void ViewBTree::on_item_selected (BTreeData *data, uint num, ViewNode *vnode)


@@ -61,7 +78,6 @@ void ViewBTree::on_item_selected (BTreeData *data, uint num, ViewNode *vnode)
                if (vnode != last_selected)
                        last_selected->SetSelected (false);
        last_selected = vnode;
                if (vnode != last_selected)
                        last_selected->SetSelected (false);
        last_selected = vnode;

-       vnode->SetSelected (true);

 
        m_signal_selected (data, node_h);
 }
 
        m_signal_selected (data, node_h);
 }


@@ -71,3 +87,14 @@ ViewBTree::type_signal_selected ViewBTree::signal_selected ()
        return m_signal_selected;
 }
 
        return m_signal_selected;
 }
 

+void ViewBTree::Clear ()
+{
+       if (last_selected)
+               delete last_selected;
+}
+
+void ViewBTree::HighliteKey (Clave &k)
+{
+       last_selected->HighliteKey (k);
+}
+