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 1180c939fd4332d3e871604712840392d26ed2a3..43491870f07dea25e295773d1ef5b9f39ce2e814 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -5,57 +5,47 @@
 
 double ViewBTree::byte_to_pixels = 0;
 double ViewBTree::node_width = 0;
 
 double ViewBTree::byte_to_pixels = 0;
 double ViewBTree::node_width = 0;

+double ViewBTree::node_height = 0;

 
 

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

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

-       node_width = 3 * block_size; // 64 == blocksize
-       byte_to_pixels  = node_width/block_size; // TODO : 64 == BlockSize
+       node_width = 5 * block_size;
+       node_height = node_width/10;
+       byte_to_pixels  = node_width/block_size;

 
        last_selected = NULL;
 }
 
 
        last_selected = NULL;
 }
 

-void ViewBTree::AddNode (uint num)
+void ViewBTree::AddNode (uint num, uint padre)

 {
 {

-       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 */
-       double y = 0;

        uchar *node = ReadBlock (num);
 
        BTreeNodeHeader node_h;
        ReadNodoHeader (node, &node_h);
 
        uchar *node = ReadBlock (num);
 
        BTreeNodeHeader node_h;
        ReadNodoHeader (node, &node_h);
 

-       if (num == 0) {
-               max_level = node_h.level;
-       } else {
-               y = (max_level - node_h.level)*(NODE_HEIGHT+10);
-       }
-

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

-       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] += ViewBTree::node_width+10;
+       ViewNode *vnode = new ViewNode (this, num, padre, node_h, keys);
+       vnode->property_y () = 10;
+       vnode->property_x () = 10;
+

        vnode->signal_selected().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_selected) );
        vnode->signal_selected().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_selected) );

+       vnode->signal_activated().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_activated) );
+
+       last_selected = vnode;
+}
+
+void ViewBTree::on_item_activated (BTreeData *data, uint num, ViewNode *vnode)
+{
+       last_selected = NULL;
+
+       uint next = data->GetChild ();
+       delete vnode;

 
 

-       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++;
-       }
+       std::cout << next << std::endl;
+       AddNode (next, num);

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


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


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