Fix en conversion a string.

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

diff --git a/viewer/view_btree.cpp b/viewer/view_btree.cpp
index a73f396c3bfa4ef0458a918e9e34b89df34190a5..d8bc219961376bd9052667997a00913202410629 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -1,6 +1,9 @@
 
 #include "view_btree.h"
 #include "view_btree_data.h"
 
 #include "view_btree.h"
 #include "view_btree_data.h"

+#include <sigc++/slot.h>
+
+double ViewBTree::byte_to_pixels = 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):Canvas::Group (*parent, 0, 0),
        BTree (filename, 64)


@@ -14,9 +17,6 @@ ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group
                AddKey (c);
        }
 
                AddKey (c);
        }
 

-       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
 
        AddNode (0);
        byte_to_pixels  = NODE_WIDTH/64; // TODO : 64 == BlockSize
 
        AddNode (0);


@@ -24,6 +24,12 @@ ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group
 
 void ViewBTree::AddNode (uint num)
 {
 
 void ViewBTree::AddNode (uint num)
 {

+       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);
        /* Muestro la raiz */
        double y = 0;
        uchar *node = ReadBlock (num);


@@ -39,45 +45,40 @@ void ViewBTree::AddNode (uint num)
 
        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;
-
-       Canvas::Rect *view_header = new Canvas::Rect (*this, x, y, x+header_w, y+NODE_HEIGHT);
-       view_header->property_fill_color() = "blue";
-
-       /* 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);
-
-       x += header_w;
-
-       /* 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 ();
-
-               ViewBTreeData *v = ViewBTreeData::Create (data, this, x, y, w+x, y+NODE_HEIGHT);
-
-               x += w;
-               it++;
-
-               if (dynamic_cast<BTreeChildData *>(data)) {
-                       BTreeChildData *child = dynamic_cast<BTreeChildData *>(data);
-                       hijos.push_back (child->getChild ());
+       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;
+       vnode->signal_selected().connect ( sigc::mem_fun (*this, &ViewBTree::on_item_selected) );
+
+       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;

                }
                }

-       }
-
-
-       std::list<uint>::iterator hit = hijos.begin ();
-       while (hit != hijos.end ()) {

                AddNode (*hit);
                hit++;
        }
 }
 
                AddNode (*hit);
                hit++;
        }
 }
 

+void ViewBTree::on_item_selected (BTreeData *data, uint num)
+{
+       BTreeNodeHeader node_h;
+       uchar *node;
+       
+       node = ReadBlock (num);
+       ReadNodoHeader (node, &node_h);
+       delete [] node;
+
+       std::cout << "Emit SignalSelected" << std::endl;
+       m_signal_selected (data, node_h);
+}
+
+ViewBTree::type_signal_selected ViewBTree::signal_selected ()
+{
+       return m_signal_selected;
+}
+