X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ee2cb3d6c26ae319d20bde28f415393e96611ece..68e6923fe644c24ab285dc79134682cff1276b9f:/Constructor/src/exclusa.cpp

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index ea152b3..ee75ed5 100644
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -3,6 +3,10 @@
 
 Exclusa::Exclusa(int orientacion)
 {
+	in_x = x + 48;
+	in_y = y;
+	out_x = in_x;
+	out_y = y + 32;
 	imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_h.png");
 	imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_s.png");
 	null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");
@@ -35,17 +39,23 @@ Exclusa::~Exclusa()
 
 bool Exclusa::on_button_press_event(GdkEventButton *event)
 {
-	GdkEventExpose e;
 	t_line tmp_line;
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
 		combo_entry->set_text(name);
 		WorkPlace::pointed = ID;
-		if (CItem::logic_connect) {
-			tmp_line.logic =  workplace->get_logic_item(CItem::quien);
-			tmp_line.store = this;
-			workplace->lista_lineas.push_back(tmp_line);
-			workplace->on_expose_event(&e);
-		}	
+		if (CItem::logic_connect && CItem::gate_id != -1) {
+			if ( detect_click_position(event->x, 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_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();
+			}
+		}
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
@@ -55,10 +65,18 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
 		switch (imgActual) {
 			case 1:
 				image = imageS;
+				in_x = x + image->get_width();
+				in_y = y + image->get_height()/2;
+				out_x = x;
+				out_y = in_y;
 				break;
 			default: 
 				imgActual = 0;
 				image = imageN;			
+				in_x = x + image->get_width()/2;
+				in_y = y;
+				out_x = in_x;
+				out_y = y +image->get_height();
 		}
 		set_size_request(image->get_width(),image->get_height());		
 		image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
@@ -73,7 +91,7 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
 		if (estado) exclusa_pty_wnd->rd_btn_open->set_active(true);
 		exclusa_pty_wnd->show();
 	}
-	workplace->on_expose_event(&e);
+	workplace->queue_draw();
 	return true;
 }
 
@@ -194,22 +212,56 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
 	}
 	return UNDEF;
 }
+	
+void Exclusa::set_default_connector()
+{
+	connect_vec[0].type = UNDEF;
+	connect_vec[1].type = UNDEF;
+}
 
-void Exclusa::get_logic_connect_position(int& _a, int& _b)
+void Exclusa::get_in_logic_connect_position(int& _a, int& _b)
+{
+	_a = in_x;
+	_b = in_y;
+}
+
+void Exclusa::get_out_logic_connect_position(int& _a, int& _b)
+{
+	_a = out_x;
+	_b = out_y;
+}
+	
+ConnectorType Exclusa::detect_click_position(int _a, int _b)
 {
 	switch (imgActual) {
-		case 0: 
-			_a = x + image->get_width()/2;
-			_b = y;
+		case 0:
+			if ( (_a <= image->get_width()/2+10)&&(_a>=image->get_width()/2-10)&&(_b<=16)&&(_b >= 0) )
+				return IN;
+			if ( (_a <= image->get_width()/2+10)&&(_a>=image->get_width()/2-10)&&(_b<=32)&&(_b > 16) )
+				return OUT;
 			break;
-		case 1: 
-			_a = x + image->get_width();
-			_b = y + image->get_height()/2;
-	}
+		case 1:
+			if ( (_a <=32)&&(_a> 16)&&(_b<=image->get_height()/2+10)&&(_b >= image->get_height()/2-10) )
+				return IN;
+			if ( (_a <= 16)&&(_a>=0)&&(_b<=image->get_height()/2+10)&&(_b >= image->get_height()/2-10) )
+				return OUT;
+		}
+		return UNDEF;
 }
-	
-void Exclusa::set_default_connector()
+
+void Exclusa::update_logic_position()
 {
-	connect_vec[0].type = UNDEF;
-	connect_vec[1].type = UNDEF;
+	switch (imgActual) {
+		case 1:
+			in_x = x + image->get_width();
+			in_y = y + image->get_height()/2;
+			out_x = x;
+			out_y = in_y;
+			break;
+		case 0: 
+			in_x = x + image->get_width()/2;
+			in_y = y;
+			out_x = in_x;
+			out_y = y +image->get_height();
+	}
 }