X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/663eccb7e27110aba6c79648c38254a7a5737bca..08b5e1548c364c96cdd2ce4661f886d8ee24799a:/Constructor/src/exclusa.cpp

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index a7c4583..fda8a88 100644
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -1,5 +1,6 @@
 #include "exclusa.h"
 #include "exclusaptywnd.h"
+#include "not.h"
 
 Exclusa::Exclusa(int orientacion)
 {
@@ -41,22 +42,32 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
 {
 	t_line tmp_line;
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
+		WorkPlace::pointed = ID;
 		list_pointed->push_back(name);
 		combo_entry->set_popdown_strings(*list_pointed);
 		combo_entry->get_entry()->set_text (name);
-		WorkPlace::pointed = ID;
 		if (CItem::logic_connect && CItem::gate_id != -1) {
-			if ( detect_click_position((int)event->x, (int)event->y) == IN) {
-				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
+			if ( detect_click_position((int)event->x, (int)event->y) == IN && !workplace->get_logic_item(CItem::gate_id)->get_out_logic_connect()) {
+				tmp_line.logic_id =  CItem::gate_id;
 				workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
 				tmp_line.store_id = ID;
 				workplace->lista_lineas_in.push_back(tmp_line);
 				workplace->queue_draw();	
-			} else if (detect_click_position((int)event->x, (int)event->y) == OUT) {	
-				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
-				tmp_line.store_id = ID;
-				workplace->lista_lineas_out.push_back(tmp_line);
-				workplace->queue_draw();
+			} else if (detect_click_position((int)event->x, (int)event->y) == OUT )  { 
+				if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
+					if (!dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {
+						workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
+						tmp_line.logic_id =  CItem::gate_id;
+						tmp_line.store_id = ID;
+						workplace->lista_lineas_out.push_back(tmp_line);
+						workplace->queue_draw();
+					}
+				} else {
+					tmp_line.logic_id =  CItem::gate_id;
+					tmp_line.store_id = ID;
+					workplace->lista_lineas_out.push_back(tmp_line);
+					workplace->queue_draw();
+				}					
 			}
 			CItem::gate_id = -1;
 		}
@@ -177,9 +188,7 @@ bool Exclusa::check_connection()
 	}
 	if ( aux1 != UNDEF && aux2 != UNDEF ) {
 		if (!is_connected) {
-			//aux = connect_vec[0].type; 
-			// Aca van invertidos los tipos de entrada/salida
-			connect_vec[0].type = aux2; //connect_vec[1].type;
+			connect_vec[0].type = aux2; 
 			connect_vec[1].type = aux1;
 		}
 		connect_vec[0].id_dest = _item0->get_id();
@@ -194,7 +203,7 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
 	CItem *_item;
 	switch (imgActual) {
 		case 1:
-			if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ){  //arriba
+			if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > y ) ){  //arriba
 				if ( is_connected ) return connect_vec[0].type;			
 				connect_vec[1].type = is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
 				switch ( connect_vec[1].type ) {
@@ -233,7 +242,7 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
 			}
 		break;
 		case 0: 
-			if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )){ //izquierda
+			if ((_a <= x+10 )&&(_a > x) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )){ //izquierda
 				if ( is_connected ) return connect_vec[0].type;			
 				connect_vec[1].type = is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
 				switch ( connect_vec[1].type ) {