Refactoring para unificar nomenclaturas.

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

diff --git a/viewer/view_btree.cpp b/viewer/view_btree.cpp
index a73f396c3bfa4ef0458a918e9e34b89df34190a5..3fba848252c01d506c56fcc8a30093cceb366847 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -1,83 +1,73 @@
 
 #include "view_btree.h"
 #include "view_btree_data.h"
 
 #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)
-{
-       /* 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);
-       }
+double ViewBTree::byte_to_pixels = 0;
+double ViewBTree::node_width = 0;
+double ViewBTree::node_height = 0;

 
 

-       Canvas::Rect *rect = new Canvas::Rect (*this, 0, 0, NODE_WIDTH, NODE_HEIGHT);
-       rect->property_fill_color() = "gray";
-
-       byte_to_pixels  = NODE_WIDTH/64; // TODO : 64 == BlockSize
+ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename, uint block_size, int type):Canvas::Group (*parent, 0, 0),
+       BTree (filename, block_size, type)
+{
+       /* 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);
 
        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);
 

-       double header_w = byte_to_pixels * sizeof (BTreeNodeHeader);
-       double x = 0;
+       ViewNode *vnode = new ViewNode (this, num, padre, node_h, keys);
+       vnode->property_y () = 10;
+       vnode->property_x () = 10;

 
 

-       Canvas::Rect *view_header = new Canvas::Rect (*this, x, y, x+header_w, y+NODE_HEIGHT);
-       view_header->property_fill_color() = "blue";
+       vnode->signal_selected().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_selected) );
+       vnode->signal_activated().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_activated) );

 
 

-       /* Numero de nodo */
-       std::string node_num;
-       std::stringstream ss;
-       ss << num;
-       ss >> node_num;
-       new Canvas::Text (*this, header_w/2, y+NODE_HEIGHT/2, node_num);
+       last_selected = vnode;
+}

 
 

-       x += header_w;
+void ViewBTree::on_item_activated (BTreeData *data, uint num, ViewNode *vnode)
+{
+       last_selected = NULL;

 
 

-       /* Cuento los hijos para saber como centrarlos más adelante */
-       std::list<uint> hijos;
-       
-       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 *v = ViewBTreeData::Create (data, this, x, y, w+x, y+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 (dynamic_cast<BTreeChildData *>(data)) {
-                       BTreeChildData *child = dynamic_cast<BTreeChildData *>(data);
-                       hijos.push_back (child->getChild ());
-               }
-       }
+       if (last_selected)
+               if (vnode != last_selected)
+                       last_selected->SetSelected (false);
+       last_selected = vnode;
+       vnode->SetSelected (true);

 
 

+       m_signal_selected (data, node_h);
+}

 
 

-       std::list<uint>::iterator hit = hijos.begin ();
-       while (hit != hijos.end ()) {
-               AddNode (*hit);
-               hit++;
-       }
+ViewBTree::type_signal_selected ViewBTree::signal_selected ()
+{
+       return m_signal_selected;

 }
 
 }