X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fe35ed0badc6a1a01237027effb74b82acbdb9e5..9075115540d133ca048025e719884121007b9e87:/Constructor/src/exclusa.cpp

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index 71475d6..5eb4ead 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,25 +42,39 @@ 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;
 		}
+		Glib::ustring text;
+		if(estado) text = name+"  Estado: ABIERTO";
+		else text = name+"  Estado: CERRADO";
+		status_bar->push ( text, 0);		
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){