Bugfix del test.sh para que no 'oculte' errores por SIGSEGV.

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

diff --git a/viewer/view_btree.cpp b/viewer/view_btree.cpp
index 6bdcb67d391579fa568586339c5d281b89b1c896..43491870f07dea25e295773d1ef5b9f39ce2e814 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -8,7 +8,7 @@ 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),
 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)
+       BTree (filename, block_size, BTree::TYPE_UNIQUE, type)

 {
        /* Cada bytes lo hago de 5 units de ancho */
        node_width = 5 * block_size;
 {
        /* Cada bytes lo hago de 5 units de ancho */
        node_width = 5 * block_size;


@@ -41,7 +41,7 @@ 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;


@@ -61,7 +61,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 +70,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);
+}
+