X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/2695534342641710721ae3d842915094b384f9db..c9f8c0bc99fea35db2944e60ef14441c2c056746:/Constructor/workplace.cpp

diff --git a/Constructor/workplace.cpp b/Constructor/workplace.cpp
index 11a98d1..418f6b7 100644
--- a/Constructor/workplace.cpp
+++ b/Constructor/workplace.cpp
@@ -2,9 +2,15 @@
 
 WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {
+	refGlade->get_widget_derived("viewport",viewport);
+	viewport->workplace = this;
 }
 
-bool WorkPlace::on_expose_event(GdkEventExpose *e)
+WorkPlace::~WorkPlace()
+{
+}
+
+bool WorkPlace::on_expose_event(GdkEventExpose *event)
 {
 	int x, y;
 	for(x=0; x<get_width(); x+=32) 
@@ -15,28 +21,14 @@ bool WorkPlace::on_expose_event(GdkEventExpose *e)
 			get_window()->draw_point (get_style()->get_black_gc(), x+1,y);
 			get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
 		}
-	//TODO recorer la lista_lineas y dibujar todas		
-	get_window()->draw_line (get_style()->get_black_gc(), temp.x,temp.y,temp.w,temp.z);	
 	return true;
 }
 
-
 bool WorkPlace::on_button_press_event(GdkEventButton *event)
 {
-	std::cout<< temp.x<<"    "<<temp.y<< std::endl;
-	if ( (event->type == GDK_BUTTON_PRESS) && (event->button == 1) ) {
-		get_pointer(temp.x,temp.y);
-		std::cout<< temp.x<<"    "<<temp.y<< std::endl;
-	}
-	return true;
-}
-
-bool WorkPlace::on_button_release_event(GdkEventButton *event)
-{
-	if ( (event->type == GDK_BUTTON_PRESS) && (event->button == 1) ) {
-		get_pointer(temp.w,temp.z);	
-		lista_lineas.push_back(temp);
-		get_window()->draw_line (get_style()->get_black_gc(), temp.x,temp.y,temp.w,temp.z);
+	if ((event->type==GDK_BUTTON_RELEASE) && (event->button ==1)) {
+		get_pointer(viewport->temp.w, viewport->temp.z);	
+		get_window()->draw_line (get_style()->get_black_gc(), viewport->temp.x,viewport->temp.y,viewport->temp.w,viewport->temp.z);
 	}
 	return true;
 }