Reorganizo vista principal.

TODO : Crear una clase Ventana para contener todo esto y no tener
que usar variables globales.

diff --git a/viewer/main.cpp b/viewer/main.cpp
index 0c5d01a7c3ffbed51767c4a4316ff1bd117ebd33..692bed8f037f51a776e27cef37d9bc578d372632 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -33,9 +33,10 @@ void zoom_out ();
 void zoom_in ();
 void zoom_normal ();
 
 void zoom_in ();
 void zoom_normal ();
 

-ViewBTree *tree;
+Glib::RefPtr<ViewBTree> tree;

 ViewDebug *vdebug;
 Gnome::Canvas::Canvas *real_canvas;
 ViewDebug *vdebug;
 Gnome::Canvas::Canvas *real_canvas;

+ViewProperties *real_frame;

 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {


@@ -47,15 +48,13 @@ int main(int argc, char *argv[])
        Gtk::HBox hbox;
        Gtk::VBox vbox;
 
        Gtk::HBox hbox;
        Gtk::VBox vbox;
 

-       ViewProperties frame;

        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;
        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;

+       ViewProperties frame;
+       ViewDebug debug;

 
 

-       ViewBTree canvas_grp (canvas.root (), "test.idx");
-       ViewDebug debug (&canvas_grp);
-
-       tree = &canvas_grp;

        real_canvas = &canvas;
        real_canvas = &canvas;

+       real_frame = &frame;

        vdebug = &debug;
 
        canvas.set_scroll_region (0, 0, 5000, 5000);
        vdebug = &debug;
 
        canvas.set_scroll_region (0, 0, 5000, 5000);


@@ -91,7 +90,6 @@ int main(int argc, char *argv[])
        window.show_all ();
 
        /* Conecto el Canvas con el Frame */
        window.show_all ();
 
        /* Conecto el Canvas con el Frame */

-       canvas_grp.signal_selected ().connect ( sigc::mem_fun (frame, &ViewProperties::ShowItem) );

        Gtk::Main::run(window);
                                                            
        return 0;
        Gtk::Main::run(window);
                                                            
        return 0;


@@ -102,6 +100,9 @@ void nuevo_arbol ()
        NewTreeDialog d;
        if (d.run () == Gtk::RESPONSE_OK) {
                uint tot = d.getAmount ();
        NewTreeDialog d;
        if (d.run () == Gtk::RESPONSE_OK) {
                uint tot = d.getAmount ();

+               tree = Glib::RefPtr<ViewBTree>(new ViewBTree (real_canvas->root(), "test.idx", d.getBlockSize ()));
+               tree->signal_selected ().connect ( sigc::mem_fun (*real_frame, &ViewProperties::ShowItem) );
+               vdebug->SetTree (tree);

                for (uint i=0; i <= tot; i++) {
                        ClaveFija c(i);
 
                for (uint i=0; i <= tot; i++) {
                        ClaveFija c(i);