Mas linda la muestra RAW en la GUI.

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

diff --git a/viewer/main.cpp b/viewer/main.cpp
index fc8782b898d989e2f287e1a1b94e3f4aa9a48d88..89b66bc278701842b037e8cdfa57765600791022 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -8,6 +8,7 @@
 #include "view_btree.h"
 #include "view_properties.h"
 #include "new_tree_dialog.h"
 #include "view_btree.h"
 #include "view_properties.h"
 #include "new_tree_dialog.h"

+#include "key_dialog.h"

 #include "view_debug.h"
 
 using namespace Gnome::Canvas;
 #include "view_debug.h"
 
 using namespace Gnome::Canvas;


@@ -20,7 +21,12 @@ using namespace Gnome::Canvas;
 "      <separator/>"
 "      <menuitem action='Salir'/>"
 "    </menu>"
 "      <separator/>"
 "      <menuitem action='Salir'/>"
 "    </menu>"

-"   <menu action='MenuZoom'>"
+"    <menu action='MenuKey'>"
+"      <menuitem action='Agregar Clave'/>"
+"      <menuitem action='Borrar Clave'/>"
+"      <menuitem action='Buscar Clave'/>"
+"    </menu>"
+"    <menu action='MenuZoom'>"

 "      <menuitem action='Alejar'/>"
 "      <menuitem action='Acercar'/>"
 "      <separator/>"
 "      <menuitem action='Alejar'/>"
 "      <menuitem action='Acercar'/>"
 "      <separator/>"


@@ -30,12 +36,14 @@ using namespace Gnome::Canvas;
 "</ui>";
 
 void nuevo_arbol ();
 "</ui>";
 
 void nuevo_arbol ();

+void agregar_clave ();
+void borrar_clave ();
+void buscar_clave ();

 void zoom_out ();
 void zoom_in ();
 void zoom_normal ();
 
 Glib::RefPtr<ViewBTree> tree;
 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;
 


@@ -46,30 +54,32 @@ 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);
 
        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::Main::quit);
+       actiongroup->add( Gtk::Action::create("Salir", Gtk::Stock::QUIT), Gtk::AccelKey ("<control>q"), &Gtk::Main::quit);
+       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("Buscar Clave", Gtk::Stock::FIND), Gtk::AccelKey ("<control>f"), &buscar_clave);

        actiongroup->add( Gtk::Action::create("MenuZoom", "_Zoom"));
        actiongroup->add( Gtk::Action::create("Alejar", Gtk::Stock::ZOOM_OUT), Gtk::AccelKey ("<control>z"), &zoom_out );
        actiongroup->add( Gtk::Action::create("Acercar", Gtk::Stock::ZOOM_IN), Gtk::AccelKey ("<control>x"), &zoom_in);
        actiongroup->add( Gtk::Action::create("MenuZoom", "_Zoom"));
        actiongroup->add( Gtk::Action::create("Alejar", Gtk::Stock::ZOOM_OUT), Gtk::AccelKey ("<control>z"), &zoom_out );
        actiongroup->add( Gtk::Action::create("Acercar", Gtk::Stock::ZOOM_IN), Gtk::AccelKey ("<control>x"), &zoom_in);


@@ -108,9 +118,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;


@@ -120,14 +130,17 @@ 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);
+                               ClaveFija c(*it, 0);

 
                                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. */


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

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

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


@@ -155,16 +168,125 @@ void nuevo_arbol ()
 
                        it = lst.begin ();
                        while (it != lst.end ()) {
 
                        it = lst.begin ();
                        while (it != lst.end ()) {

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

 
 

-                               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);
+       }
+}
+
+void agregar_clave ()
+{
+       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;
+       }
+       KeyDialog d("Agregar");
+       if (d.run () == Gtk::RESPONSE_OK)
+       {
+               Glib::ustring str_key = d.key();
+               if (tree->type() == BTree::KEY_FIXED)
+               {
+                       ClaveFija c(atoi(str_key.c_str()), 0);
+                       tree->AddKey(c);
+               }
+               else
+               {
+                       ClaveVariable c(str_key, 0);
+                       tree->AddKey(c);
+               }
+               delete tree->last_selected;
+               tree->AddNode (0);
+               real_canvas->scroll_to (0, 0);
+       }
+}
+
+void borrar_clave ()
+{
+       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;
+       }
+       KeyDialog d("Borrar");
+       if (d.run () == Gtk::RESPONSE_OK)
+       {
+               Glib::ustring str_key = d.key();
+               if (tree->type() == BTree::KEY_FIXED)
+               {
+                       ClaveFija c(atoi(str_key.c_str()), 0);
+                       tree->DelKey(c);
+               }
+               else
+               {
+                       ClaveVariable c(str_key, 0);
+                       tree->DelKey(c);
+               }
+               delete tree->last_selected;
+               tree->AddNode (0);
+               real_canvas->scroll_to (0, 0);
+       }
+}
+
+void buscar_clave ()
+{
+       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;
+       }
+       KeyDialog d("Buscar");
+       while (true) // Repite hasta que se encuentre algo o se cancele
+       {
+               if (d.run () == Gtk::RESPONSE_OK)
+               {
+                       BTreeFindResult* result = 0;
+                       Clave *c = NULL;
+                       Glib::ustring str_key = d.key();
+                       if (tree->type() == BTree::KEY_FIXED)
+                       {
+                               c = new ClaveFija (atoi(str_key.c_str()), 0);
+                               result = tree->FindKey(*c);
+                       }
+                       else
+                       {
+                               c = new ClaveVariable (str_key, 0);
+                               result = tree->FindKey(*c);
+                       }
+                       if (result)
+                       {
+                               tree->Clear ();
+                               tree->AddNode(result->node);
+                               tree->HighliteKey (*c);
+                               delete result;
+                               delete c;
+                               real_canvas->scroll_to (0, 0);
+                               return; // Encontramos, salimos
+                       }
+                       if (c) delete c;
+                       Gtk::MessageDialog msg("Clave no encontrada!", false,
+                                       Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
+                       msg.run();
+                       // Seguimos intentando
+               }
+               else return; // Cancelaron, salimos

        }
 }
 
        }
 }