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 f62e931a0f3d098f8fe880e1ce84ac6ccdd2d6b6..d8bc219961376bd9052667997a00913202410629 100644 (file)
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -1,7 +1,8 @@
 
 #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),
 double ViewBTree::byte_to_pixels = 0;
 
 ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group (*parent, 0, 0),


@@ -23,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);


@@ -42,53 +49,36 @@ void ViewBTree::AddNode (uint num)
        vnode->property_y () = y;
        vnode->property_x () = pos_x[node_h.level];
        pos_x[node_h.level] += NODE_WIDTH+10;
        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 ()) {
 
        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++;
        }
 }
 
                AddNode (*hit);
                hit++;
        }
 }
 

-ViewNode::ViewNode (Canvas::Group *parent, uint num, BTreeNodeHeader &header, std::list<BTreeData *> &keys)
-       : Canvas::Group (*parent)
+void ViewBTree::on_item_selected (BTreeData *data, uint num)

 {
 {

-       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);
+       BTreeNodeHeader node_h;
+       uchar *node;
+       
+       node = ReadBlock (num);
+       ReadNodoHeader (node, &node_h);
+       delete [] node;

 
 

-               x += w;
-               it++;
+       std::cout << "Emit SignalSelected" << std::endl;
+       m_signal_selected (data, node_h);
+}

 
 

-               if (!dynamic_cast<BTreeLeafData *>(data)) {
-                       /* Si no es un dato de una hoja, tiene hijos */
-                       hijos.push_back (data->getChild ());
-               }
-       }
+ViewBTree::type_signal_selected ViewBTree::signal_selected ()
+{
+       return m_signal_selected;

 }
 
 }