X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fc802b7aea75e90b19cd22d3e5e752620a416af8..8e0b92d947f09e5e4c00f49218aa1ba9ebc4dcb3:/Constructor/src/cistern.cpp

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index 5ad6ecb..147cc5b 100644
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -3,7 +3,7 @@
 
 Cistern::Cistern(int orientacion)
 {
-	in_x = x;
+	in_x = x+5;
 	in_y = y+16;
 	out_x = x + 48;
 	out_y = y + 64;
@@ -46,15 +46,15 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
 		combo_entry->set_text(name);
 		WorkPlace::pointed = ID;
-		if (CItem::logic_connect) {
-			if ( detect_click_position(event->x, event->y) == IN ){
-				tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-				tmp_line.store = this;
+		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();
+				tmp_line.store_id = ID;
 				workplace->lista_lineas_in.push_back(tmp_line);
 				workplace->queue_draw();
-			} else if (detect_click_position(event->x, event->y) == OUT) { 
-				tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-				tmp_line.store = this;
+			} 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();
 			}
@@ -68,7 +68,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 		switch (imgActual) {
 			case 1:
 				image = imageO;
-				in_x = x + image->get_width();
+				in_x = x + image->get_width()-5;
 				in_y = y + 16;
 				out_x = x+16;
 				out_y = y + image->get_height();
@@ -76,7 +76,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 			default: 
 				imgActual = 0;
 				image = imageE;			
-				in_x = x;
+				in_x = x+5;
 				in_y = y+16;
 				out_x = x + image->get_width() -16;
 				out_y = y + image->get_height();
@@ -96,7 +96,6 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 		cistern_pty_wnd->txt_cistern_name->set_text( name );
 		cistern_pty_wnd->show();
 	}		
-	CItem::logic_connect =false;
 	workplace->queue_draw();
 	return true;
 }