From: Ricardo Markiewicz <rmarkie@fi.uba.ar>
Date: Sat, 29 Oct 2005 17:57:22 +0000 (+0000)
Subject: Muevo el canvas a 0,0 luego.
X-Git-Tag: 1_0-pre1~2
X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/commitdiff_plain/62a1e1a38321f11eeb36f8e2ade9bc0ee91084b4?ds=sidebyside

Muevo el canvas a 0,0 luego.
---

diff --git a/viewer/main.cpp b/viewer/main.cpp
index f73897b..1cee643 100644
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -44,7 +44,6 @@ void zoom_in ();
 void zoom_normal ();
 
 Glib::RefPtr<ViewBTree> tree;
-ViewDebug *vdebug;
 Gnome::Canvas::Canvas *real_canvas;
 ViewProperties *real_frame;
 
@@ -55,24 +54,21 @@ int main(int argc, char *argv[])
 	Gnome::Canvas::init ();
 
 	Gtk::Window window;
-	Gtk::HBox hbox;
+	Gtk::VBox hbox;
 	Gtk::VBox vbox;
 
 	Gtk::ScrolledWindow area;
 	Gnome::Canvas::Canvas canvas;
 	ViewProperties frame;
-	ViewDebug debug;
 
 	real_canvas = &canvas;
 	real_frame = &frame;
-	vdebug = &debug;
 
 	canvas.set_scroll_region (0, 0, 100, 100);
 	area.add (canvas);
 
-	hbox.pack_start (frame, false, false, 10);
 	hbox.pack_start (area);
-	hbox.pack_end (debug, false, true, 10);
+	hbox.pack_end (frame, true, true, 10);
 
 	Glib::RefPtr<Gtk::ActionGroup> actiongroup = Gtk::ActionGroup::create();
 
@@ -123,7 +119,6 @@ void nuevo_arbol ()
 		int type = d.getKeyType ();
 		tree = Glib::RefPtr<ViewBTree>(new ViewBTree (real_canvas->root(), "test.idx", d.getBlockSize (), type));
 		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;
@@ -140,7 +135,6 @@ void nuevo_arbol ()
 				if (l >= paltas) {
 					tree->AddKey (c);
 					i++;
-					vdebug->AddKey (c);
 				} else {
 					/* Tengo que borrar una clave entre 0 e "i" de la lista
 					 * porque son las que ya agregue. */
@@ -171,13 +165,13 @@ void nuevo_arbol ()
 				ClaveVariable c(*it);
 
 				tree->AddKey (c);
-				vdebug->AddKey (c);
 				it++;
 			}
 		}
 		tree->AddNode (0);
 		double x1, x2, y1, y2;
 		tree->get_bounds (x1, y1, x2, y2);
+		real_canvas->scroll_to (0, 0);
 	}
 }
 
@@ -206,6 +200,7 @@ void agregar_clave ()
 		}
 		delete tree->last_selected;
 		tree->AddNode (0);
+		real_canvas->scroll_to (0, 0);
 	}
 }
 
@@ -234,6 +229,7 @@ void borrar_clave ()
 		}
 		delete tree->last_selected;
 		tree->AddNode (0);
+		real_canvas->scroll_to (0, 0);
 	}
 }
 
@@ -270,6 +266,8 @@ void buscar_clave ()
 				tree->AddNode(result->node);
 				tree->HighliteKey (*c);
 				delete result;
+				delete c;
+				real_canvas->scroll_to (0, 0);
 				return; // Encontramos, salimos
 			}
 			if (c) delete c;