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 3b89a38acf488f5f7e18b3a8ddb2b150dfb26f78..89b66bc278701842b037e8cdfa57765600791022 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -118,7 +118,8 @@ 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) );
                if (type == BTree::KEY_FIXED) {
                        std::list<int> lst;
                tree->signal_selected ().connect ( sigc::mem_fun (*real_frame, &ViewProperties::ShowItem) );
                if (type == BTree::KEY_FIXED) {
                        std::list<int> lst;


@@ -129,12 +130,16 @@ 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++;
                                } else {
                                        /* Tengo que borrar una clave entre 0 e "i" de la lista
                                        i++;
                                } else {
                                        /* Tengo que borrar una clave entre 0 e "i" de la lista


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


@@ -163,9 +168,13 @@ 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);
+                               try {
+                                       tree->AddKey (c);
+                               } catch (Exception *e) {
+                                       std::cout << "====== " << (std::string)c << e->Message () << std::endl;
+                               }

                                it++;
                        }
                }
                                it++;
                        }
                }


@@ -191,12 +200,12 @@ 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->AddKey(c);
                }
                delete tree->last_selected;


@@ -220,12 +229,12 @@ 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->DelKey(c);
                }
                delete tree->last_selected;


@@ -253,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)