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 582b776a95d3eea51ccdb902976e163bae67e1ff..43491870f07dea25e295773d1ef5b9f39ce2e814 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -1,47 +1,83 @@
 
 #include "view_btree.h"
 #include "view_btree_data.h"
+#include <sigc++/slot.h>
 
-ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group (*parent, 0, 0),
-       BTree (filename, 64)
+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, int type):Canvas::Group (*parent, 0, 0),
+       BTree (filename, block_size, BTree::TYPE_UNIQUE, type)
 {
-       /* TODO : hace que el arbol se abra de un archivo ya creado o que se
-        * cree afuera
-        */
-       for (int i=0; i<=64; i++) {
-               ClaveFija c(i);
+       /* Cada bytes lo hago de 5 units de ancho */
+       node_width = 5 * block_size;
+       node_height = node_width/10;
+       byte_to_pixels  = node_width/block_size;
+
+       last_selected = NULL;
+}
 
-               AddKey (c);
-       }
+void ViewBTree::AddNode (uint num, uint padre)
+{
+       uchar *node = ReadBlock (num);
 
-       /* Muestro la raiz */
-       uchar *node = ReadBlock (0);
        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";
+       ViewNode *vnode = new ViewNode (this, num, padre, node_h, keys);
+       vnode->property_y () = 10;
+       vnode->property_x () = 10;
 
-       int byte_to_pixels  = NODE_WIDTH/64; // TODO : 64 == BlockSize
+       vnode->signal_selected().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_selected) );
+       vnode->signal_activated().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_activated) );
 
-       /* Ahora pongo el lugar que opcupa el header */
-       double header_w = byte_to_pixels * sizeof (BTreeNodeHeader);
-       double x = 0;
+       last_selected = vnode;
+}
 
-       Canvas::Rect *view_header = new Canvas::Rect (*this, x, 0, x+header_w, NODE_HEIGHT);
-       x += header_w;
+void ViewBTree::on_item_activated (BTreeData *data, uint num, ViewNode *vnode)
+{
+       last_selected = NULL;
 
-       std::list<BTreeData *>::iterator it = keys.begin ();
-       while (it != keys.end ()) {
-               BTreeData *data = (*it);
-               double w = byte_to_pixels * data->Size ();
+       uint next = data->GetChild ();
+       delete vnode;
 
-               ViewBTreeData::Create (data, this, x, 0, w+x, NODE_HEIGHT);
+       std::cout << next << std::endl;
+       AddNode (next, num);
+}
 
-               x += w;
-               it++;
-       }
+void ViewBTree::on_item_selected (BTreeData *data, uint num, ViewNode *vnode)
+{
+       BTreeNodeHeader node_h;
+       uchar *node;
+       
+       node = ReadBlock (num);
+       ReadNodoHeader (node, &node_h);
+       delete [] node;
 
+       if (last_selected)
+               if (vnode != last_selected)
+                       last_selected->SetSelected (false);
+       last_selected = vnode;
+
+       m_signal_selected (data, node_h);
+}
+
+ViewBTree::type_signal_selected ViewBTree::signal_selected ()
+{
+       return m_signal_selected;
+}
+
+void ViewBTree::Clear ()
+{
+       if (last_selected)
+               delete last_selected;
+}
+
+void ViewBTree::HighliteKey (Clave &k)
+{
+       last_selected->HighliteKey (k);
 }