X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f1f01b21410b676a9c35c93251d5739bb65c711d..HEAD:/Constructor/src/workplace.cpp?ds=inline

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 847aa17..5ebacf7 100644
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -86,7 +86,6 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 					y_offset = -15;
 			}
 			get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);
-			get_logic_item(temp.logic_id)->set_out_connected(true);
 			get_item(temp.store_id)->get_in_logic_connect_position(w,z);
 			draw_line(a+x_offset, b+y_offset, w+item_x_offset, z+item_y_offset, color_in);
 			get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
@@ -114,15 +113,27 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 				case 3:
 					y_offset = 15;
 			}
-			get_item(temp.store_id)->get_out_logic_connect_position(w,z);
-			if (dynamic_cast<Not *>(get_logic_item(temp.logic_id))) 
-				get_logic_item(temp.logic_id)->set_in_connected(true);
+			if ( temp.cistern_out1 ) 
+				get_item(temp.store_id)->get_in_logic_connect_position(w,z);
+			else
+				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+item_y_offset, z+item_y_offset, a+x_offset, b+y_offset,color_out);
 			get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
 		}
 		i++;
 	}
+	
+	i = lista_lineas_logic.begin();
+	while ( i != lista_lineas_logic.end() ) {
+		t_line temp = *i;
+		if ( get_logic_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+			get_logic_item(temp.logic_id)->get_out_logic_connect_position(w,z);
+			get_logic_item(temp.store_id)->get_in_logic_connect_position(a, b);
+			get_window()->draw_line(gc, a, b, w,z);
+		}
+		i++;
+	}
 	return true;
 }
 
@@ -198,48 +209,81 @@ int WorkPlace::get_item_id(const std::string &_s)
 	
 void WorkPlace::delete_line(int _id)
 {
+	/* LINEAS A LAS ENTRADAS DE LOS ITEMS */
+	/*	Borro la linea desde el item eliminado hasta el que este conectado */
 	std::list<t_line>::iterator i = lista_lineas_in.begin();
 	while ( i != lista_lineas_in.end() ){
 		if (get_item( (*i).store_id ) != NULL)
 			if ( get_item( (*i).store_id )->get_id() == _id ) {
+				get_logic_item((*i).logic_id)->set_out_connected(false);	
 				lista_lineas_in.erase(i);
 				i = lista_lineas_in.begin();
 			}
 		i++;
 	}
-
+	
+	/* Borra la linea desde la compuerta eliminada hasta el item conectado a ella */
 	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) {
-				get_logic_item((*i).logic_id)->set_out_connected(false);	
 				lista_lineas_in.erase(i);
 				i = lista_lineas_in.begin();
 			}
 		i++;
 	}
-
+	
+	/* LINEAS A LAS SALIDAS DE LOS ITEMS */
+	/*	Borro la linea desde el item eliminado hasta el que este conectado */
 	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 ) {
+				if (dynamic_cast<Not *>(get_logic_item((*j).logic_id))) 
+					get_logic_item((*j).logic_id)->set_in_connected(false);
 				lista_lineas_out.erase(j);
 				j = lista_lineas_out.begin();
 			}
 		j++;
 	}	
-
+	
+	/* Borra la linea desde la compuerta eliminada hasta el item conectado a ella */
 	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 ) {
-				if (dynamic_cast<Not *>(get_logic_item((*i).logic_id))) 
-					get_logic_item((*j).logic_id)->set_in_connected(false);
 				lista_lineas_out.erase(j);
 				j = lista_lineas_out.begin();
 			}
 		j++;
 	}	
+	
+	/* LINEAS ENTRE COMPUERTAS */
+	/* Borra la linea entre al compuerta eliminada y la que esta conectada a ella en su entrada */
+	std::list<t_line>::iterator k = lista_lineas_logic.begin();
+	while ( k != lista_lineas_logic.end() ){
+		if ( get_logic_item((*k).store_id) != NULL )
+			if ( get_logic_item((*k).store_id)->get_id() == _id ) {
+				get_logic_item((*k).logic_id)->set_out_connected(false);
+				std::cout<< get_logic_item((*k).logic_id)->get_name() <<std::endl;
+				lista_lineas_logic.erase(k);
+				k = lista_lineas_logic.begin();
+			}
+		k++;
+	}	
+	
+	/* Borra la linea entre al compuerta eliminada y la que esta conectada a ella en su salida*/
+	k = lista_lineas_logic.begin();
+	while ( k != lista_lineas_logic.end() ){
+		if ( get_logic_item((*k).logic_id) != NULL )
+			if ( get_logic_item((*k).logic_id)->get_id() == _id ) {
+				if (dynamic_cast<Not *>(get_logic_item((*k).store_id))) 
+					get_logic_item((*k).store_id)->set_in_connected(false);
+				lista_lineas_logic.erase(k);
+				k = lista_lineas_logic.begin();
+			}
+		k++;
+	}	
 }
 
 void WorkPlace::update_logic_position()
@@ -263,3 +307,16 @@ void WorkPlace::draw_line(int x1, int y1, int x2, int y2, Gdk::Color &color)
 	get_window()->draw_line (gc, x1, y1, x1, y2);
 	get_window()->draw_line (gc, x1, y2, x2, y2);
 }
+
+
+bool WorkPlace::chek_name(Glib::ustring _name, int _id)
+{
+	std::list<CItem *>::iterator i;
+	i  = listaItems->begin();
+	while ( i != listaItems->end() ) {
+		if ( (*i)->get_name() == _name && (*i)->get_id() != _id )
+				return true;
+		i++;
+	}
+	return false;
+}