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 f73897becd32175475bf3aef01fb4c89b4721b9d..89b66bc278701842b037e8cdfa57765600791022 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -44,7 +44,6 @@ void zoom_in ();
 void zoom_normal ();
 
 Glib::RefPtr<ViewBTree> tree;
 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,24 +54,22 @@ 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();
 
 
        Glib::RefPtr<Gtk::ActionGroup> actiongroup = Gtk::ActionGroup::create();
 


@@ -121,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;


@@ -133,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. */


@@ -151,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;


@@ -168,16 +168,20 @@ 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);

        }
 }
 
        }
 }
 


@@ -196,16 +200,17 @@ void agregar_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()));
+                       ClaveFija c(atoi(str_key.c_str()), 0);

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

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

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

+               real_canvas->scroll_to (0, 0);

        }
 }
 
        }
 }
 


@@ -224,16 +229,17 @@ 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()));
+                       ClaveFija c(atoi(str_key.c_str()), 0);

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

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

                        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);

        }
 }
 
        }
 }
 


@@ -256,12 +262,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()));
+                               c = new ClaveFija (atoi(str_key.c_str()), 0);

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

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

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


@@ -270,6 +276,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;