X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/0d72fb12dc9a570be45e2f25320ac49f604c3ed2..950f83d0e71dc886fcf5be9889796c5b2a85fa4c:/Constructor/src/workplace.cpp

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 62757d2..64ad9f5 100644
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -29,19 +29,21 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 	color.set_rgb(255,0,0);
 	gc->set_rgb_bg_color(color);
 	get_style()->set_black(color);
-	int w, z;		
+	int a, b, w, z;		
 	std::list<t_line>::iterator i = lista_lineas_in.begin();
 	while ( i != lista_lineas_in.end() ) {
 		t_line temp = *i;
 		temp.store->get_in_logic_connect_position(w,z);
-		get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), w,z);
+		temp.logic->get_out_logic_connect_position(a, b);
+		get_window()->draw_line (get_style()->get_black_gc(), a, b, w,z);
 		i++;
 	}
 	i = lista_lineas_out.begin();
 	while ( i != lista_lineas_out.end() ) {
 		t_line temp = *i;
 		temp.store->get_out_logic_connect_position(w,z);
-		get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), w,z);
+		temp.logic->get_in_logic_connect_position(a, b);
+		get_window()->draw_line (get_style()->get_black_gc(), a, b, w, z);
 		i++;
 	}
 	
@@ -92,20 +94,39 @@ void WorkPlace::delete_line(int _id)
 {
 	std::list<t_line>::iterator i = lista_lineas_in.begin();
 	while ( i != lista_lineas_in.end() ){
-		if ( (*i).store->get_id() == _id || (*i).logic->get_id() == _id ) {
+		if ( (*i).store->get_id() == _id ) {
 			lista_lineas_in.erase(i);
 			i = lista_lineas_in.begin();
 		}
 		i++;
 	}
+
+	i = lista_lineas_in.begin();
+	while ( i != lista_lineas_in.end() ){
+		if ( (*i).logic->get_id() == _id ) {
+			lista_lineas_in.erase(i);
+			i = lista_lineas_in.begin();
+		}
+		i++;
+	}
+
 	i = lista_lineas_out.begin();
 	while ( i != lista_lineas_out.end() ){
-		if ( (*i).store->get_id() == _id || (*i).logic->get_id() == _id ) {
+		if ( (*i).store->get_id() == _id ) {
 			lista_lineas_out.erase(i);
 			i = lista_lineas_out.begin();
 		}
 		i++;
 	}	
+	i = lista_lineas_out.begin();
+	while ( i != lista_lineas_out.end() ){
+		if ( (*i).logic->get_id() == _id ) {
+			lista_lineas_out.erase(i);
+			i = lista_lineas_out.begin();
+		}
+		i++;
+	}	
+
 }
 
 void WorkPlace::update_logic_position()
@@ -115,4 +136,9 @@ void WorkPlace::update_logic_position()
 		(*i)->update_logic_position();
 		i++;
 	}
+	i = lista_logic_Items->begin();
+	while ( i != lista_logic_Items->end() ){
+		(*i)->update_logic_position();
+		i++;
+	}
 }