X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/3a8788fb198a1e0590823745f39fbff81056db09..31b3e321726d5c3fe720dd216687d3138523714f:/Constructor/union.cpp?ds=inline

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index d0955bb..b7b97bd 100644
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -15,6 +15,13 @@ Union::Union()
 	property_wnd->rd_btn_union->property_visible() = true;
 	property_wnd->lb_type->property_visible() = true;
 	name = "union";
+	Connector temp;
+	temp.id_dest = -1;
+	temp.type = IN;
+	connect_vec.push_back(temp); //izquierda
+	connect_vec.push_back(temp); //derecha
+	temp.type = OUT;
+	connect_vec.push_back(temp); //medio
 }
 
 Union::~Union()
@@ -103,38 +110,78 @@ void Union::save(FILE *archivo)
 
 bool Union::check_connection()
 {
+	ConnectorType temp0, temp1, temp2;
 	switch (get_img_actual()) {
 			case 0:
-				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;				
+				temp0 = is_other_connection_area( get_position_x() - 5, get_position_y() +16);
+				temp1 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16);
+				temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+5);
 				break;
 			case 1:
-				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;				
+				temp2 = is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()/2);
+				temp0 = is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()-5);
+				temp1 =	is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()+get_image()->get_height()+5);
 				break;
 			case 2:
-				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;
+				temp1 = is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16);
+				temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()/2, get_position_y()-5);
+				temp0 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16);
 				break;
 			case 3:
-				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;
+				temp1 = is_other_connection_area( get_position_x()+16, get_position_y()-5);
+				temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()/2);
+				temp0 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5);
 	}
-	return false;	
+	if ( is_union ) {
+		if ( temp0 == OUT && temp1 == OUT && temp2 == IN ) 
+			return (is_connected = true);
+	} else {
+		if ( temp0 == IN && temp1 == IN && temp2 == OUT )
+			return (is_connected = true);
+	}
+	return false;
+}
+
+ConnectorType Union::get_connector_type(int _a, int _b)
+{
+	switch ( imgActual) {
+		case 0: if ((_a <= x+10) && (_a > x+1) && (_b<= y + 22) && (_b >= y+10))
+						return connect_vec[0].type;
+					if ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+22) && (_b >= y+10))
+						return connect_vec[1].type;
+					if ((_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 connect_vec[2].type;
+					break;
+		case 1: if ((_a <= x+image->get_width()-10) && (_a >= x+image->get_width() -22) && (_b<= y + 10) && (_b > y ))
+						return connect_vec[0].type;
+					if ((_a <= x +10) && (_a > x )&&(_b <= y+image->get_height()/2+5 ) && (_b >= y+image->get_height()/2-5))
+						return connect_vec[2].type;
+					if ((_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 connect_vec[1].type;
+					break;
+		case 2: if ((_a <= x+10) && (_a > x) && (_b<= y+image->get_height()-10) && (_b >= y+image->get_height()-22))
+						return connect_vec[1].type;
+					if ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+image->get_height()-10) && (_b >= y+image->get_height()-22))
+						return connect_vec[0].type;
+					if ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+10)&&(_b > y))
+						return connect_vec[2].type;
+					break;
+		case 3: if ((_a <= x+22) && (_a >= x+10) && (_b<= y + 10) && (_b > y ))
+						return connect_vec[1].type;
+					if ((_a <= x+22) && (_a >= x+10 )&&(_b <= y+image->get_height()-1 ) && (_b >= y+image->get_height()-10))
+						return connect_vec[0].type;
+					if ((_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 connect_vec[2].type;
+	}
+	return UNDEF;
 }
 
-bool Union::is_connection_area(int _a, int _b)
+/*
+ConnectorType 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)) ||
+		case 0: if ( ((_a <= x+10) && (_a > x+1) && (_b<= y + 22) && (_b >= y+10))
+						retur
 						  ((_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;
@@ -152,4 +199,4 @@ bool Union::is_connection_area(int _a, int _b)
 						return true;
 	}
 	return false;
-}
+}*/