X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/6fcc8fcf6b98f413f813904fe0f078d2782fb9d5..cc77948bedbd851e009ad3b8a421dea93c3ceeff:/Constructor/src/or.cpp?ds=sidebyside

diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp
index a96d48f..ee96e22 100644
--- a/Constructor/src/or.cpp
+++ b/Constructor/src/or.cpp
@@ -74,6 +74,11 @@ bool Or::on_button_press_event(GdkEventButton *event)
 		list_pointed->push_back(name);
 		combo_entry->set_popdown_strings(*list_pointed);
 		combo_entry->get_entry()->set_text (name);
+		char f[20];
+		Glib::ustring text;
+		sprintf(f,"  Conector OUT = %d",out_connected);
+		text = name+f;
+		status_bar->push ( text, 0);
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -164,7 +169,7 @@ bool Or::check_connection()
 	t_logic_connector temp;
 	std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
 	while ( i != workplace->lista_lineas_in.end() ) {
-		if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+		if ( (*i).logic_id== ID ) {
 			temp.type = OUT;
 			temp.name_dest = workplace->get_item((*i).store_id)->get_name();
 			vec_connector.push_back(temp);
@@ -175,7 +180,7 @@ bool Or::check_connection()
 
 	i = workplace->lista_lineas_out.begin();
 	while ( i != workplace->lista_lineas_out.end() ) {
-		if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+		if ( (*i).logic_id== ID ) {
 			temp.type = IN;
 			temp.name_dest = workplace->get_item((*i).store_id)->get_name();
 			vec_connector.push_back(temp);
@@ -184,8 +189,28 @@ bool Or::check_connection()
 		i++;
 	}
 
-	
-	return true;// out_connected;
+	i = workplace->lista_lineas_logic.begin();
+	while ( i != workplace->lista_lineas_logic.end() ) {
+		if ( (*i).logic_id == ID ) {
+			temp.type = OUT;
+			temp.name_dest = workplace->get_logic_item((*i).store_id)->get_name();
+			vec_connector.push_back(temp);
+			cant_in++;
+		}
+		i++;
+	}
+
+	i = workplace->lista_lineas_logic.begin();
+	while ( i != workplace->lista_lineas_logic.end() ) {
+		if ( (*i).store_id == ID ) {
+			temp.type = IN;
+			temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name();
+			vec_connector.push_back(temp);
+			cant_out++;
+		}
+		i++;
+	}
+	return true;
 }
 
 ConnectorType Or::detect_click_position(int _a, int _b)