X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/7f099f6374e9606735fb9766b51b5e86d83de815..43fc1b3f57852f2af098fa7411e83220015aaa6f:/Constructor/exclusa.cpp

diff --git a/Constructor/exclusa.cpp b/Constructor/exclusa.cpp
index 516f689..e8547d6 100644
--- a/Constructor/exclusa.cpp
+++ b/Constructor/exclusa.cpp
@@ -55,6 +55,16 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
 	return true;
 }
 
+void Exclusa::set_estado(bool _state)
+{
+	estado = _state;
+}
+
+bool Exclusa::get_estado()
+{
+	return estado;
+}
+
 void Exclusa::on_menu_popup_rotar()
 {
 	GdkEventButton event; 
@@ -98,24 +108,29 @@ bool Exclusa::check_connection()
 {
 	switch (get_img_actual()) {
 			case 0:
-				if ( is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+10) && 
-					 is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y() - 10) )
+				if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16) && 
+					 is_other_connection_area( get_position_x()-5, get_position_y() + 16) )
 					return true;				
 				break;
 			case 1:
-				if ( is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()/2) && 
-					 is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()/2) )
+				if ( is_other_connection_area( get_position_x()+16, get_position_y()-5 ) && 
+					 is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5) )
 				return true;
 	}
 	return false;
 }
 
-void Exclusa::set_estado(bool _state)
+bool Exclusa::is_connection_area(int _a, int _b)
 {
-	estado = _state;
-}
-
-bool Exclusa::get_estado()
-{
-	return estado;
+	switch (imgActual){
+		case 0: 
+			if ( ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) ||
+				 ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) )
+				return true;
+		case 1:
+			if ( ((_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 )) ||
+				 ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) )
+				return true;
+	}
+	return false;
 }