X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/1b0eeb678671fcdb63eacc94a828cfcac62b0fa3..f4eaa9c2418b7084cb973100495fb8290e1c4075:/viewer/main.cpp?ds=sidebyside diff --git a/viewer/main.cpp b/viewer/main.cpp index f7e4d5d..89b66bc 100644 --- a/viewer/main.cpp +++ b/viewer/main.cpp @@ -118,7 +118,8 @@ void nuevo_arbol () double paltas = bajas / (double)altas; int type = d.getKeyType (); - tree = Glib::RefPtr(new ViewBTree (real_canvas->root(), "test.idx", d.getBlockSize (), type)); + int atype = d.getTreeType (); + tree = Glib::RefPtr(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 lst; @@ -129,7 +130,7 @@ void nuevo_arbol () it = lst.begin (); uint i = 0; while (it != lst.end ()) { - ClaveFija c(*it); + ClaveFija c(*it, 0); double l = Random::Double (0.0f, 1.0f); std::cout << l << " >= " << paltas << std::endl; @@ -150,7 +151,7 @@ void nuevo_arbol () otro++; j++; } - ClaveFija c(*otro); + ClaveFija c(*otro, 0); tree->DelKey (c); std::string sss = c; @@ -167,7 +168,7 @@ void nuevo_arbol () it = lst.begin (); while (it != lst.end ()) { - ClaveVariable c(*it); + ClaveVariable c(*it, 0); try { tree->AddKey (c); @@ -199,12 +200,12 @@ void agregar_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->AddKey(c); } else { - ClaveVariable c(str_key); + ClaveVariable c(str_key, 0); tree->AddKey(c); } delete tree->last_selected; @@ -228,12 +229,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; @@ -261,12 +262,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)