X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/0d72fb12dc9a570be45e2f25320ac49f604c3ed2..101179f2d7bcc4de75c326d3e9d01694c84d07ca:/Constructor/src/workplace.cpp?ds=sidebyside

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 62757d2..94e3934 100644
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -23,39 +23,47 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 			get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
 		}
 		
+	if ( *logica ) {	
+		std::list<CItem *>::iterator j = listaItems->begin();
+		while ( j != listaItems->end() ) {
+			(*j)->update_logic_position();
+			(*j)->draw_connectors();
+			j++;
+		}
+	}
 	
-	Glib::RefPtr<Gdk::GC> gc = get_style()->get_black_gc();
-	Gdk::Color color;
-	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);
+		if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+			get_item(temp.store_id)->get_in_logic_connect_position(w,z);
+			get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);
+			draw_line(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);
+		if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+			get_item(temp.store_id)->get_out_logic_connect_position(w,z);
+			get_logic_item(temp.logic_id)->get_in_logic_connect_position(a, b);
+			draw_line(w, z, a, b);
+		}
 		i++;
 	}
-	
 	return true;
 }
 
 void WorkPlace::delete_item(int _id)
 {
+	delete_line(_id);
 	CItem::logic_connect = false;
 	std::list<CItem*>::iterator i = listaItems->begin();
 	while ( i != listaItems->end() ){
 	CItem *temp = *i;
 		if ( temp->get_id() == _id ){
-			delete_line(_id);
 			listaItems->erase(i);
 			delete temp;
 			break;
@@ -66,45 +74,78 @@ void WorkPlace::delete_item(int _id)
 	while ( i != lista_logic_Items->end() ){
 	CItem *temp = *i;
 		if ( temp->get_id() == _id ){
-			delete_line(_id);
 			lista_logic_Items->erase(i);
 			delete temp;
 			break;
 		}
 		i++;
 	}
-	
+	CItem::gate_id = -1;	
 }
 
 CItem* WorkPlace::get_logic_item(int _id)
 {
 	std::list<CItem *>::iterator i = lista_logic_Items->begin();
 	while ( i != lista_logic_Items->end() ){
-		CItem *temp = *i;
-		if ( temp->get_id() == _id ) 
-			return temp;
+		if ( (*i)->get_id() == _id ) 
+			return *i;
+		i++;
+	}
+	return NULL;
+}
+
+CItem *WorkPlace::get_item(int _id)
+{
+	std::list<CItem *>::iterator i = listaItems->begin();
+	while ( i != listaItems->end() ){
+		if ( (*i)->get_id() == _id ) 
+			return *i;
 		i++;
 	}
 	return NULL;
 }
 
+	
 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 ) {
-			lista_lineas_in.erase(i);
-			i = lista_lineas_in.begin();
-		}
+		if (get_item( (*i).store_id ) != NULL)
+			if ( get_item( (*i).store_id )->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 ) {
-			lista_lineas_out.erase(i);
-			i = lista_lineas_out.begin();
-		}
+
+	i = lista_lineas_in.begin();
+	while ( i != lista_lineas_in.end() ){
+		if ( get_logic_item((*i).logic_id) != NULL)
+			if ( get_logic_item((*i).logic_id)->get_id() == _id) {
+				lista_lineas_in.erase(i);
+				i = lista_lineas_in.begin();
+			}
 		i++;
+	}
+
+	std::list<t_line>::iterator j = lista_lineas_out.begin();
+	while ( j != lista_lineas_out.end() ){
+		if ( get_item((*j).store_id) != NULL )
+			if ( get_item((*j).store_id)->get_id() == _id ) {
+				lista_lineas_out.erase(j);
+				j = lista_lineas_out.begin();
+			}
+		j++;
+	}	
+
+	j = lista_lineas_out.begin();
+	while ( j != lista_lineas_out.end() ){
+		if ( get_logic_item((*j).logic_id) != NULL )
+			if ( get_logic_item((*j).logic_id)->get_id() == _id ) {
+				lista_lineas_out.erase(j);
+				j = lista_lineas_out.begin();
+			}
+		j++;
 	}	
 }
 
@@ -115,4 +156,15 @@ 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++;
+	}
+}
+		
+void WorkPlace::draw_line(int x1, int y1, int x2, int y2)
+{
+	get_window()->draw_line (get_style()->get_black_gc(), x1, y1, x1, y2);
+	get_window()->draw_line (get_style()->get_black_gc(), x1, y2, x2, y2);
 }