Mejora Makefile principal para que compile el viewer también.

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

diff --git a/viewer/view_btree.cpp b/viewer/view_btree.cpp
index f62e931a0f3d098f8fe880e1ce84ac6ccdd2d6b6..3fba848252c01d506c56fcc8a30093cceb366847 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -1,94 +1,73 @@
 
 #include "view_btree.h"
 #include "view_btree_data.h"
-               
+#include <sigc++/slot.h>
+
 double ViewBTree::byte_to_pixels = 0;
+double ViewBTree::node_width = 0;
+double ViewBTree::node_height = 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, uint block_size, int type):Canvas::Group (*parent, 0, 0),
+       BTree (filename, block_size, 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);
-
-               AddKey (c);
-       }
-
-       byte_to_pixels  = NODE_WIDTH/64; // TODO : 64 == BlockSize
+       /* 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;
 
-       AddNode (0);
+       last_selected = NULL;
 }
 
-void ViewBTree::AddNode (uint num)
+void ViewBTree::AddNode (uint num, uint padre)
 {
-       /* Muestro la raiz */
-       double y = 0;
        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);
 
-       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;
-
-       std::list<uint> childs = vnode->getChilds ();
-       std::list<uint>::iterator hit = childs.begin ();
-       while (hit != childs.end ()) {
-               AddNode (*hit);
-               hit++;
-       }
+       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_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::cout << next << std::endl;
+       AddNode (next, num);
+}
+
+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;
+       vnode->SetSelected (true);
+
+       m_signal_selected (data, node_h);
 }
 
-ViewNode::ViewNode (Canvas::Group *parent, uint num, BTreeNodeHeader &header, std::list<BTreeData *> &keys)
-       : Canvas::Group (*parent)
+ViewBTree::type_signal_selected ViewBTree::signal_selected ()
 {
-       double header_w = ViewBTree::byte_to_pixels * sizeof (BTreeNodeHeader);
-
-       /* Fondo */
-       Canvas::Rect *fondo = new Canvas::Rect (*this, 0, 0, NODE_WIDTH, NODE_HEIGHT);
-       fondo->property_fill_color() = "gray";
-       fondo->property_outline_color() = "black";
-
-       /* Header */
-       Canvas::Rect *h = new Canvas::Rect (*this, 0, 0, header_w, NODE_HEIGHT);
-       h->property_fill_color() = "blue";
-       h->property_outline_color() = "black";
-
-       /* Numero de nodo */
-       std::string node_num;
-       std::stringstream ss;
-       ss << num;
-       ss >> node_num;
-       new Canvas::Text (*this, header_w/2, NODE_HEIGHT/2, node_num);
-
-       double x = header_w;
-
-       std::list<BTreeData *>::iterator it = keys.begin ();
-       while (it != keys.end ()) {
-               BTreeData *data = (*it);
-               double w = ViewBTree::byte_to_pixels * data->Size ();
-
-               ViewBTreeData *v = ViewBTreeData::Create (data, this, x, 0, w+x, NODE_HEIGHT);
-
-               x += w;
-               it++;
-
-               if (!dynamic_cast<BTreeLeafData *>(data)) {
-                       /* Si no es un dato de una hoja, tiene hijos */
-                       hijos.push_back (data->getChild ());
-               }
-       }
+       return m_signal_selected;
 }