Cambio constructor por metodo estatico.

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

diff --git a/viewer/main.cpp b/viewer/main.cpp
index 1346f75c066d3d6d4b3c8e0ee78f115f42b5220e..a7bb9245b20a5e7691025fe76ca7c2d3e480d641 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
        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("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("Ir al Padre", Gtk::Stock::GO_BACK), 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);
        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);


@@ -136,7 +136,7 @@ void nuevo_arbol ()
                        it = lst.begin ();
                        uint i = 0;
                        while (it != lst.end ()) {
                        it = lst.begin ();
                        uint i = 0;
                        while (it != lst.end ()) {

-                               ClaveFija c(*it, i);
+                               ClaveFija c(*it);

 
                                double l = Random::Double (0.0f, 1.0f);
                                std::cout << l << " >= " << paltas << std::endl;
 
                                double l = Random::Double (0.0f, 1.0f);
                                std::cout << l << " >= " << paltas << std::endl;


@@ -157,7 +157,7 @@ void nuevo_arbol ()
                                                otro++;
                                                j++;
                                        }
                                                otro++;
                                                j++;
                                        }

-                                       ClaveFija c(*otro, 0);
+                                       ClaveFija c(*otro);

 
                                        tree->DelKey (c);
                                        std::string sss = c;
 
                                        tree->DelKey (c);
                                        std::string sss = c;


@@ -174,7 +174,7 @@ void nuevo_arbol ()
 
                        it = lst.begin ();
                        while (it != lst.end ()) {
 
                        it = lst.begin ();
                        while (it != lst.end ()) {

-                               ClaveVariable c(*it, 0);
+                               ClaveVariable c(*it);

 
                                try {
                                        tree->AddKey (c);
 
                                try {
                                        tree->AddKey (c);


@@ -200,23 +200,43 @@ void agregar_clave ()
                d.run();
                return;
        }
                d.run();
                return;
        }

-       KeyDialog d("Agregar", true);
+       KeyDialog d("Agregar");

        if (d.run () == Gtk::RESPONSE_OK)
        {
                Glib::ustring str_key = d.key();
                Glib::ustring str_val = d.val();
                if (tree->type() == BTree::KEY_FIXED)
                {
        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()), atoi(str_val.c_str()));
+                       ClaveFija c(atoi(str_key.c_str()));

                        tree->AddKey(c);
                }
                else
                {
                        tree->AddKey(c);
                }
                else
                {

-                       ClaveVariable c(str_key, atoi(str_val.c_str()));
+                       ClaveVariable c(str_key);

                        tree->AddKey(c);
                }
                        tree->AddKey(c);
                }

-               delete tree->last_selected;
-               tree->AddNode (0);
+
+               /* Muestro la clave agregada */
+               BTreeFindResult* result = 0;
+               Clave *c = NULL;
+               if (tree->type() == BTree::KEY_FIXED) {
+                       c = new ClaveFija (atoi(str_key.c_str()));
+                       result = tree->FindKey(*c);
+               } else {
+                       c = new ClaveVariable (str_key);
+                       result = tree->FindKey(*c);
+               }
+               if (result) {
+                       tree->Clear ();
+                       tree->AddNode(result->node);
+                       tree->HighliteKey (*c);
+                       delete result;
+               } else {
+                       delete tree->last_selected;
+                       tree->last_selected = NULL;
+                       tree->AddNode (0);
+               }
+               if (c) delete c;

                real_canvas->scroll_to (0, 0);
        }
 }
                real_canvas->scroll_to (0, 0);
        }
 }


@@ -236,17 +256,16 @@ void borrar_clave ()
                Glib::ustring str_key = d.key();
                if (tree->type() == BTree::KEY_FIXED)
                {
                Glib::ustring str_key = d.key();
                if (tree->type() == BTree::KEY_FIXED)
                {

-                       ClaveFija c(atoi(str_key.c_str()), 0);
+                       ClaveFija c(atoi(str_key.c_str()));

                        tree->DelKey(c);
                }
                else
                {
                        tree->DelKey(c);
                }
                else
                {

-                       ClaveVariable c(str_key, 0);
+                       ClaveVariable c(str_key);

                        tree->DelKey(c);
                }
                delete tree->last_selected;
                tree->AddNode (0);
                        tree->DelKey(c);
                }
                delete tree->last_selected;
                tree->AddNode (0);

-               real_canvas->scroll_to (0, 0);

        }
 }
 
        }
 }
 


@@ -281,12 +300,12 @@ void buscar_clave ()
                        Glib::ustring str_key = d.key();
                        if (tree->type() == BTree::KEY_FIXED)
                        {
                        Glib::ustring str_key = d.key();
                        if (tree->type() == BTree::KEY_FIXED)
                        {

-                               c = new ClaveFija (atoi(str_key.c_str()), 0);
+                               c = new ClaveFija (atoi(str_key.c_str()));

                                result = tree->FindKey(*c);
                        }
                        else
                        {
                                result = tree->FindKey(*c);
                        }
                        else
                        {

-                               c = new ClaveVariable (str_key, 0);
+                               c = new ClaveVariable (str_key);

                                result = tree->FindKey(*c);
                        }
                        if (result)
                                result = tree->FindKey(*c);
                        }
                        if (result)