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 f73897becd32175475bf3aef01fb4c89b4721b9d..a7bb9245b20a5e7691025fe76ca7c2d3e480d641 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -21,6 +21,9 @@ using namespace Gnome::Canvas;
 "      <separator/>"
 "      <menuitem action='Salir'/>"
 "    </menu>"
 "      <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'/>"
 "    <menu action='MenuKey'>"
 "      <menuitem action='Agregar Clave'/>"
 "      <menuitem action='Borrar Clave'/>"


@@ -38,13 +41,13 @@ using namespace Gnome::Canvas;
 void nuevo_arbol ();
 void agregar_clave ();
 void borrar_clave ();
 void nuevo_arbol ();
 void agregar_clave ();
 void borrar_clave ();

+void ir_al_padre ();

 void buscar_clave ();
 void zoom_out ();
 void zoom_in ();
 void zoom_normal ();
 
 Glib::RefPtr<ViewBTree> tree;
 void buscar_clave ();
 void zoom_out ();
 void zoom_in ();
 void zoom_normal ();
 
 Glib::RefPtr<ViewBTree> tree;

-ViewDebug *vdebug;

 Gnome::Canvas::Canvas *real_canvas;
 ViewProperties *real_frame;
 
 Gnome::Canvas::Canvas *real_canvas;
 ViewProperties *real_frame;
 


@@ -55,30 +58,30 @@ int main(int argc, char *argv[])
        Gnome::Canvas::init ();
 
        Gtk::Window window;
        Gnome::Canvas::init ();
 
        Gtk::Window window;

-       Gtk::HBox hbox;
+       Gtk::VBox hbox;

        Gtk::VBox vbox;
 
        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;
        ViewProperties frame;
        Gtk::VBox vbox;
 
        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;
        ViewProperties frame;

-       ViewDebug debug;

 
        real_canvas = &canvas;
        real_frame = &frame;
 
        real_canvas = &canvas;
        real_frame = &frame;

-       vdebug = &debug;

 
        canvas.set_scroll_region (0, 0, 100, 100);
        area.add (canvas);
 
 
        canvas.set_scroll_region (0, 0, 100, 100);
        area.add (canvas);
 

-       hbox.pack_start (frame, false, false, 10);

        hbox.pack_start (area);
        hbox.pack_start (area);

-       hbox.pack_end (debug, false, true, 10);
+       hbox.pack_start (frame, false, false, 10);
+       frame.set_size_request (200, 200);

 
        Glib::RefPtr<Gtk::ActionGroup> actiongroup = Gtk::ActionGroup::create();
 
        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);
 
        Glib::RefPtr<Gtk::ActionGroup> actiongroup = Gtk::ActionGroup::create();
 
        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::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);


@@ -121,9 +124,9 @@ void nuevo_arbol ()
                double paltas = bajas / (double)altas;
 
                int type = d.getKeyType ();
                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) );
                tree->signal_selected ().connect ( sigc::mem_fun (*real_frame, &ViewProperties::ShowItem) );

-               vdebug->SetTree (tree);

                if (type == BTree::KEY_FIXED) {
                        std::list<int> lst;
                        std::list<int>::iterator it;
                if (type == BTree::KEY_FIXED) {
                        std::list<int> lst;
                        std::list<int>::iterator it;


@@ -138,9 +141,12 @@ void nuevo_arbol ()
                                double l = Random::Double (0.0f, 1.0f);
                                std::cout << l << " >= " << paltas << std::endl;
                                if (l >= paltas) {
                                double l = Random::Double (0.0f, 1.0f);
                                std::cout << l << " >= " << paltas << std::endl;
                                if (l >= paltas) {

-                                       tree->AddKey (c);
+                                       try {
+                                               tree->AddKey (c);
+                                       } catch (Exception *e) {
+                                               std::cout << "====== " << (std::string)c << e->Message () << std::endl;
+                                       }

                                        i++;
                                        i++;

-                                       vdebug->AddKey (c);

                                } else {
                                        /* Tengo que borrar una clave entre 0 e "i" de la lista
                                         * porque son las que ya agregue. */
                                } else {
                                        /* Tengo que borrar una clave entre 0 e "i" de la lista
                                         * porque son las que ya agregue. */


@@ -170,14 +176,18 @@ void nuevo_arbol ()
                        while (it != lst.end ()) {
                                ClaveVariable c(*it);
 
                        while (it != lst.end ()) {
                                ClaveVariable c(*it);
 

-                               tree->AddKey (c);
-                               vdebug->AddKey (c);
+                               try {
+                                       tree->AddKey (c);
+                               } catch (Exception *e) {
+                                       std::cout << "====== " << (std::string)c << e->Message () << std::endl;
+                               }

                                it++;
                        }
                }
                tree->AddNode (0);
                double x1, x2, y1, y2;
                tree->get_bounds (x1, y1, x2, y2);
                                it++;
                        }
                }
                tree->AddNode (0);
                double x1, x2, y1, y2;
                tree->get_bounds (x1, y1, x2, y2);

+               real_canvas->scroll_to (0, 0);

        }
 }
 
        }
 }
 


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


@@ -204,8 +215,29 @@ void agregar_clave ()
                        ClaveVariable c(str_key);
                        tree->AddKey(c);
                }
                        ClaveVariable c(str_key);
                        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);

        }
 }
 
        }
 }
 


@@ -237,6 +269,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)
 void buscar_clave ()
 {
        if (!tree)


@@ -270,6 +314,8 @@ void buscar_clave ()
                                tree->AddNode(result->node);
                                tree->HighliteKey (*c);
                                delete result;
                                tree->AddNode(result->node);
                                tree->HighliteKey (*c);
                                delete result;

+                               delete c;
+                               real_canvas->scroll_to (0, 0);

                                return; // Encontramos, salimos
                        }
                        if (c) delete c;
                                return; // Encontramos, salimos
                        }
                        if (c) delete c;