X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/7f099f6374e9606735fb9766b51b5e86d83de815..3a8788fb198a1e0590823745f39fbff81056db09:/Constructor/union.cpp

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index cb0a6c4..d0955bb 100644
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -11,6 +11,9 @@ Union::Union()
 	image = imageN;
 	set_size_request(image->get_width(), image->get_height());
 	property_wnd->set_title("Propiedades del Empalme");
+	property_wnd->rd_btn_division->property_visible() = true;
+	property_wnd->rd_btn_union->property_visible() = true;
+	property_wnd->lb_type->property_visible() = true;
 	name = "union";
 }
 
@@ -52,6 +55,7 @@ bool Union::on_button_press_event(GdkEventButton *event)
 	if ((event->type == GDK_2BUTTON_PRESS) && ( event->button == 1)){
 		property_wnd->spin_caudal->set_value( caudal_max );
 		property_wnd->txt_item_name->set_text( name );
+		if (is_union) property_wnd->rd_btn_union->set_active(true);
 		property_wnd->show();
 	}
 	return true;
@@ -76,20 +80,24 @@ void Union::on_menu_popup_propiedades()
 void Union::save(FILE *archivo)
 {
 	char c_id[50], c_caudal[50], c_x[50], c_y[50], c_img[50];
+	Glib::ustring c_type;	
+	if ( is_union ) c_type = "\t\t<tipo>union</tipo>\n";
+	else c_type = "\t\t<tipo>division</tipo>\n";
 	sprintf(c_x,"\t\t<x>%d</x>\n",x);
 	sprintf(c_y,"\t\t<y>%d</y>\n",y);
 	sprintf(c_id,"%d",ID);
 	sprintf(c_caudal,"\t\t<caudal>%.2f</caudal>\n", caudal_max);
 	sprintf(c_img,"\t\t<orientacion>%d</orientacion>\n",imgActual);
 	Glib::ustring dato;
-	dato = "\t<union nombre=\""+name+"\" id=\"";
+	dato = "\t<empalme nombre=\""+name+"\" id=\"";
 	dato += c_id;
 	dato += "\">\n";
+	dato += c_type;
 	dato += c_caudal;
 	dato += c_img;
 	dato += c_x; 
 	dato += c_y;
-	dato += "\t</union>\n";
+	dato += "\t</empalme>\n";
 	fprintf(archivo,dato.c_str());	
 }
 
@@ -97,28 +105,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;
+}