From: Ricardo Markiewicz <rmarkie@fi.uba.ar>
Date: Tue, 27 Sep 2005 14:35:50 +0000 (+0000)
Subject: Reorganizo vista principal.
X-Git-Tag: 1_0-pre1~85
X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/commitdiff_plain/9da5dd5cf325e359f0e2ba0624e641199e8be52a?ds=sidebyside

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 0c5d01a..692bed8 100644
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -33,9 +33,10 @@ void zoom_out ();
 void zoom_in ();
 void zoom_normal ();
 
-ViewBTree *tree;
+Glib::RefPtr<ViewBTree> tree;
 ViewDebug *vdebug;
 Gnome::Canvas::Canvas *real_canvas;
+ViewProperties *real_frame;
 
 int main(int argc, char *argv[])
 {
@@ -47,15 +48,13 @@ int main(int argc, char *argv[])
 	Gtk::HBox hbox;
 	Gtk::VBox vbox;
 
-	ViewProperties frame;
 	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_frame = &frame;
 	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 */
-	canvas_grp.signal_selected ().connect ( sigc::mem_fun (frame, &ViewProperties::ShowItem) );
 	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 ();
+		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);