X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/551d0c744aaa1e33f000efb66b6f3f042966d21f..a9318661e45dfb9853c6aba811670571a5ec3ea2:/Constructor/union.cpp?ds=sidebyside

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index 3de8b90..f5b6d98 100644
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -11,6 +11,7 @@ Union::Union()
 	image = imageN;
 	set_size_request(image->get_width(), image->get_height());
 	property_wnd->set_title("Propiedades del Empalme");
+	name = "union";
 }
 
 Union::~Union()
@@ -96,28 +97,51 @@ bool Union::check_connection()
 {
 	switch (get_img_actual()) {
 			case 0:
-				if ( is_other_occupied_area( get_position_x() - 10, get_position_y() +10) &&
- 					 is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+10) &&
-					 is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+10) )
+				if ( is_other_connection_area( get_position_x() - 5, get_position_y() +16) &&
+ 					 is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16) &&
+					 is_other_connection_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+5) )
 					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()-10) &&
-					 is_other_occupied_area( get_position_x()+get_image()->get_width()-10, get_position_y()+get_image()->get_height()+10) )
+				if ( is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()/2) &&
+					 is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()-5) &&
+					 is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()+get_image()->get_height()+5) )
 					return true;				
 				break;
 			case 2:
-				if ( is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()-10) &&
-					 is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()-10) &&
-					 is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()-10) )
+				if ( is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16) &&
+					 is_other_connection_area( get_position_x()+get_image()->get_width()/2, get_position_y()-5) &&
+					 is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16) )
 					return true;
 				break;
 			case 3:
-				if ( is_other_occupied_area( get_position_x()+10, get_position_y()-10) &&
-					 is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()/2) &&
-					 is_other_occupied_area( get_position_x()+10, get_position_y()+get_image()->get_height()+10) )
+				if ( is_other_connection_area( get_position_x()+16, get_position_y()-5) &&
+					 is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()/2) &&
+					 is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5) )
 					return true;
 	}
 	return false;	
 }
+
+bool Union::is_connection_area(int _a, int _b)
+{
+	switch ( imgActual) {
+		case 0: if ( ((_a <= x+10) && (_a > x+1) && (_b<= y + 22) && (_b >= y+10)) ||
+						  ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+22) && (_b >= y+10)) ||
+						  ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+image->get_height()-1)&&(_b >= y+image->get_height()-10)) )
+						return true;
+		case 1: if ( ((_a <= x+image->get_width()-10) && (_a >= x+image->get_width() -22) && (_b<= y + 10) && (_b > y )) ||
+						  ((_a <= x +10) && (_a > x )&&(_b <= y+image->get_height()/2+5 ) && (_b >= y+image->get_height()/2-5)) ||
+						  ((_a <= x+image->get_width() - 10)&&( _a>= x+image->get_width()-22) && (_b<=y+image->get_height()-1)&&(_b >= y+image->get_height()-10)) )
+						return true;
+		case 2: if ( ((_a <= x+10) && (_a > x) && (_b<= y+image->get_height()-10) && (_b >= y+image->get_height()-22)) ||
+						  ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+image->get_height()-10) && (_b >= y+image->get_height()-22)) ||
+						  ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+10)&&(_b > y)) )
+						return true;
+		case 3: if ( ((_a <= x+22) && (_a >= x+10) && (_b<= y + 10) && (_b > y )) ||
+						  ((_a <= x+22) && (_a >= x+10 )&&(_b <= y+image->get_height()-1 ) && (_b >= y+image->get_height()-10)) ||
+						  ((_a <= x+image->get_width() -1)&&( _a>= x+image->get_width()-10) && (_b<=y+image->get_height()/2+5)&&(_b >= y+image->get_height()/2-5)) )
+						return true;
+	}
+	return false;
+}