X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/1b0eeb678671fcdb63eacc94a828cfcac62b0fa3..555cf8e7b36faa768e40d09665781c468424a91c:/viewer/main.cpp?ds=sidebyside

diff --git a/viewer/main.cpp b/viewer/main.cpp
index f7e4d5d..1346f75 100644
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -21,6 +21,9 @@ using namespace Gnome::Canvas;
 "      <separator/>"
 "      <menuitem action='Salir'/>"
 "    </menu>"
+"    <menu action='MenuNode'>"
+"      <menuitem action='Ir al Padre'/>"
+"    </menu>"
 "    <menu action='MenuKey'>"
 "      <menuitem action='Agregar Clave'/>"
 "      <menuitem action='Borrar Clave'/>"
@@ -38,6 +41,7 @@ using namespace Gnome::Canvas;
 void nuevo_arbol ();
 void agregar_clave ();
 void borrar_clave ();
+void ir_al_padre ();
 void buscar_clave ();
 void zoom_out ();
 void zoom_in ();
@@ -76,6 +80,8 @@ int main(int argc, char *argv[])
 	actiongroup->add( Gtk::Action::create("MenuFile", "_Arbol") );
 	actiongroup->add( Gtk::Action::create("Nuevo", Gtk::Stock::NEW), &nuevo_arbol);
 	actiongroup->add( Gtk::Action::create("Salir", Gtk::Stock::QUIT), Gtk::AccelKey ("<control>q"), &Gtk::Main::quit);
+	actiongroup->add( Gtk::Action::create("MenuNode", "_Nodo") );
+	actiongroup->add( Gtk::Action::create("Ir al Padre", Gtk::Stock::ADD), Gtk::AccelKey ("<control>b"), &ir_al_padre);
 	actiongroup->add( Gtk::Action::create("MenuKey", "_Clave") );
 	actiongroup->add( Gtk::Action::create("Agregar Clave", Gtk::Stock::ADD), Gtk::AccelKey ("<control>a"), &agregar_clave);
 	actiongroup->add( Gtk::Action::create("Borrar Clave", Gtk::Stock::REMOVE), Gtk::AccelKey ("<control>d"), &borrar_clave);
@@ -118,7 +124,8 @@ void nuevo_arbol ()
 		double paltas = bajas / (double)altas;
 
 		int type = d.getKeyType ();
-		tree = Glib::RefPtr<ViewBTree>(new ViewBTree (real_canvas->root(), "test.idx", d.getBlockSize (), type));
+		int atype = d.getTreeType ();
+		tree = Glib::RefPtr<ViewBTree>(new ViewBTree (real_canvas->root(), "test.idx", d.getBlockSize (), atype, type));
 		tree->signal_selected ().connect ( sigc::mem_fun (*real_frame, &ViewProperties::ShowItem) );
 		if (type == BTree::KEY_FIXED) {
 			std::list<int> lst;
@@ -129,7 +136,7 @@ void nuevo_arbol ()
 			it = lst.begin ();
 			uint i = 0;
 			while (it != lst.end ()) {
-				ClaveFija c(*it);
+				ClaveFija c(*it, i);
 
 				double l = Random::Double (0.0f, 1.0f);
 				std::cout << l << " >= " << paltas << std::endl;
@@ -150,7 +157,7 @@ void nuevo_arbol ()
 						otro++;
 						j++;
 					}
-					ClaveFija c(*otro);
+					ClaveFija c(*otro, 0);
 
 					tree->DelKey (c);
 					std::string sss = c;
@@ -167,7 +174,7 @@ void nuevo_arbol ()
 
 			it = lst.begin ();
 			while (it != lst.end ()) {
-				ClaveVariable c(*it);
+				ClaveVariable c(*it, 0);
 
 				try {
 					tree->AddKey (c);
@@ -193,18 +200,19 @@ void agregar_clave ()
 		d.run();
 		return;
 	}
-	KeyDialog d("Agregar");
+	KeyDialog d("Agregar", true);
 	if (d.run () == Gtk::RESPONSE_OK)
 	{
 		Glib::ustring str_key = d.key();
+		Glib::ustring str_val = d.val();
 		if (tree->type() == BTree::KEY_FIXED)
 		{
-			ClaveFija c(atoi(str_key.c_str()));
+			ClaveFija c(atoi(str_key.c_str()), atoi(str_val.c_str()));
 			tree->AddKey(c);
 		}
 		else
 		{
-			ClaveVariable c(str_key);
+			ClaveVariable c(str_key, atoi(str_val.c_str()));
 			tree->AddKey(c);
 		}
 		delete tree->last_selected;
@@ -228,12 +236,12 @@ void borrar_clave ()
 		Glib::ustring str_key = d.key();
 		if (tree->type() == BTree::KEY_FIXED)
 		{
-			ClaveFija c(atoi(str_key.c_str()));
+			ClaveFija c(atoi(str_key.c_str()), 0);
 			tree->DelKey(c);
 		}
 		else
 		{
-			ClaveVariable c(str_key);
+			ClaveVariable c(str_key, 0);
 			tree->DelKey(c);
 		}
 		delete tree->last_selected;
@@ -242,6 +250,18 @@ void borrar_clave ()
 	}
 }
 
+void ir_al_padre ()
+{
+	if (!tree)
+	{
+		Gtk::MessageDialog d("No hay un arbol creado, por favor primero cree un arbol!",
+				false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
+		d.run();
+		return;
+	}
+	tree->GoBack ();
+}
+
 void buscar_clave ()
 {
 	if (!tree)
@@ -261,12 +281,12 @@ void buscar_clave ()
 			Glib::ustring str_key = d.key();
 			if (tree->type() == BTree::KEY_FIXED)
 			{
-				c = new ClaveFija (atoi(str_key.c_str()));
+				c = new ClaveFija (atoi(str_key.c_str()), 0);
 				result = tree->FindKey(*c);
 			}
 			else
 			{
-				c = new ClaveVariable (str_key);
+				c = new ClaveVariable (str_key, 0);
 				result = tree->FindKey(*c);
 			}
 			if (result)