Mejoro inicialización de BTree*Data.

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

diff --git a/viewer/main.cpp b/viewer/main.cpp
index d5f82abe45b16e891d5f79c188743419321c478d..12a80db09f7e649d5cb992c870ebc1cc1fb8a012 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -7,6 +7,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 "view_debug.h"

 
 using namespace Gnome::Canvas;
 
 
 using namespace Gnome::Canvas;
 


@@ -33,6 +34,7 @@ void zoom_in ();
 void zoom_normal ();
 
 ViewBTree *tree;
 void zoom_normal ();
 
 ViewBTree *tree;

+ViewDebug *vdebug;

 Gnome::Canvas::Canvas *real_canvas;
 
 int main(int argc, char *argv[])
 Gnome::Canvas::Canvas *real_canvas;
 
 int main(int argc, char *argv[])


@@ -50,14 +52,18 @@ int main(int argc, char *argv[])
        Gnome::Canvas::Canvas canvas;
 
        ViewBTree canvas_grp (canvas.root (), "test.idx");
        Gnome::Canvas::Canvas canvas;
 
        ViewBTree canvas_grp (canvas.root (), "test.idx");

+       ViewDebug debug (&canvas_grp);
+

        tree = &canvas_grp;
        real_canvas = &canvas;
        tree = &canvas_grp;
        real_canvas = &canvas;

+       vdebug = &debug;

 
        canvas.set_scroll_region (0, 0, 5000, 5000);
        area.add (canvas);
 
        hbox.pack_start (frame, false, false, 10);
        hbox.pack_start (area);
 
        canvas.set_scroll_region (0, 0, 5000, 5000);
        area.add (canvas);
 
        hbox.pack_start (frame, false, false, 10);
        hbox.pack_start (area);

+       hbox.pack_end (debug, false, true, 10);

 
        Glib::RefPtr<Gtk::ActionGroup> actiongroup = Gtk::ActionGroup::create();
 
 
        Glib::RefPtr<Gtk::ActionGroup> actiongroup = Gtk::ActionGroup::create();
 


@@ -75,9 +81,10 @@ int main(int argc, char *argv[])
        m_refUIManager->add_ui_from_string(ui_info);
        Gtk::Widget* menubar = m_refUIManager->get_widget("/MenuBar");
        menubar->show_all ();
        m_refUIManager->add_ui_from_string(ui_info);
        Gtk::Widget* menubar = m_refUIManager->get_widget("/MenuBar");
        menubar->show_all ();

-       vbox.pack_start (*menubar, false, true, 0);

 
 

+       vbox.pack_start (*menubar, false, true, 0);

        vbox.pack_end (hbox, true, true, 5);
        vbox.pack_end (hbox, true, true, 5);

+

        window.add (vbox);
        window.set_size_request (640, 480);
        window.show_all ();
        window.add (vbox);
        window.set_size_request (640, 480);
        window.show_all ();


@@ -93,10 +100,12 @@ void nuevo_arbol ()
 {
        NewTreeDialog d;
        if (d.run () == Gtk::RESPONSE_OK) {
 {
        NewTreeDialog d;
        if (d.run () == Gtk::RESPONSE_OK) {

-               for (uint i=0; i<=d.getAmount (); i++) {
+               uint tot = d.getAmount ();
+               for (uint i=0; i <= tot; i++) {

                        ClaveFija c(i);
 
                        tree->AddKey (c);
                        ClaveFija c(i);
 
                        tree->AddKey (c);

+                       vdebug->AddKey (c);

                }
                tree->AddNode (0);
        }
                }
                tree->AddNode (0);
        }