X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/37c9b25e38617bead7998f82531d5e3131a4d7b7..84820a0fe02b9fdd63fb7c28d5a823bfa065c259:/viewer/view_btree.cpp?ds=sidebyside

diff --git a/viewer/view_btree.cpp b/viewer/view_btree.cpp
index f62e931..4fb0839 100644
--- a/viewer/view_btree.cpp
+++ b/viewer/view_btree.cpp
@@ -1,7 +1,8 @@
 
 #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),
@@ -23,6 +24,12 @@ ViewBTree::ViewBTree (Canvas::Group *parent, std::string filename):Canvas::Group
 
 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);
@@ -42,19 +49,44 @@ 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->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;
+		}
 		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;
+}
+
 ViewNode::ViewNode (Canvas::Group *parent, uint num, BTreeNodeHeader &header, std::list<BTreeData *> &keys)
 	: Canvas::Group (*parent)
 {
 	double header_w = ViewBTree::byte_to_pixels * sizeof (BTreeNodeHeader);
+	this->num = num;
 
 	/* Fondo */
 	Canvas::Rect *fondo = new Canvas::Rect (*this, 0, 0, NODE_WIDTH, NODE_HEIGHT);
@@ -81,7 +113,7 @@ ViewNode::ViewNode (Canvas::Group *parent, uint num, BTreeNodeHeader &header, st
 		double w = ViewBTree::byte_to_pixels * data->Size ();
 
 		ViewBTreeData *v = ViewBTreeData::Create (data, this, x, 0, w+x, NODE_HEIGHT);
-
+		v->signal_clicked ().connect ( sigc::mem_fun (this , &ViewNode::on_item_clicked ));
 		x += w;
 		it++;
 
@@ -92,3 +124,13 @@ ViewNode::ViewNode (Canvas::Group *parent, uint num, BTreeNodeHeader &header, st
 	}
 }
 
+void ViewNode::on_item_clicked (BTreeData *data)
+{
+	m_signal_selected (data, num);
+}
+
+ViewNode::type_signal_selected ViewNode::signal_selected ()
+{
+	return m_signal_selected;
+}
+