X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/07b9abd79bb3f097d8bf67d217d077a7da4b1e46..6983220ff84632481c1628720fe15b8f3ac1c9cb:/Constructor/splitter.cpp

diff --git a/Constructor/splitter.cpp b/Constructor/splitter.cpp
index c7ca0e6..c228db6 100644
--- a/Constructor/splitter.cpp
+++ b/Constructor/splitter.cpp
@@ -12,6 +12,11 @@ Splitter::Splitter()
 	set_size_request(image->get_width(), image->get_height());
 	property_wnd->set_title("Propiedades del Codo");	
 	name = "codo";
+	Connector temp;
+	temp.id_dest = -1;
+	temp.type = UNDEF;
+	connect_vec.push_back(temp);
+	connect_vec.push_back(temp);
 }
 
 Splitter::~Splitter()
@@ -75,6 +80,15 @@ void Splitter::on_menu_popup_propiedades()
 void Splitter::save(FILE *archivo)
 {
 	char c_id[50], c_caudal[50], c_x[50], c_y[50], c_img[50];
+	Glib::ustring  con0, con1;
+	if (connect_vec[0].type == IN)
+		con0 = "\t\t\t<entrada>"+get_other_name(connect_vec[0].id_dest)+"</entrada>\n";
+	else
+		con0 = "\t\t\t<salida>"+get_other_name(connect_vec[0].id_dest)+"</salida>\n";
+	if (connect_vec[1].type == IN) 
+		con1 = "\t\t\t<entrada>"+get_other_name(connect_vec[1].id_dest)+"</entrada>\n";
+	else
+		con1 = "\t\t\t<salida>"+get_other_name(connect_vec[1].id_dest)+"</salida>\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);
@@ -85,6 +99,7 @@ void Splitter::save(FILE *archivo)
 	dato += c_id;
 	dato += "\">\n";
 	dato += c_caudal;
+	dato += "\t\t<conector>\n"+con0 + con1+"\t\t</conector>\n";
 	dato += c_img;
 	dato += c_x; 
 	dato += c_y;
@@ -94,45 +109,97 @@ void Splitter::save(FILE *archivo)
 
 bool Splitter::check_connection()
 {
+	ConnectorType aux;
+	CItem *_item0, *_item1;
 	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()-16, +get_position_y()+get_image()->get_height() + 5) )
-					return true;				
+				connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0); //arriba-izquierda h
+				connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5, &_item1);//abajo-derecha v
 				break;	
 			case 1:
-				if ( is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5) && 
-					 is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16) )
-					return true;
+				connect_vec[0].type = is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5,& _item0);//arriba-derecha v
+				connect_vec[1].type = is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16, &_item1);//abajo-izquierda h
 				break;
 			case 2:
-				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()-16) )
-					return true;
+				connect_vec[1].type = is_other_connection_area( get_position_x() + 16, get_position_y() - 5, &_item1);//arriba-izquierda v
+				connect_vec[0].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height() - 16, &_item0); //abajo-derecha h
 				break;
 			case 3:
-				if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16) &&
-					 is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5) )
-					return true;
+				connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16,& _item1);//arriba-derecha h
+				connect_vec[0].type = is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5, &_item0); //abajo-izquierda v
 	}
-	return false;
+	if (connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF) {
+		aux = connect_vec[0].type; 
+		connect_vec[0].type = connect_vec[1].type;
+		connect_vec[1].type = aux;
+		connect_vec[0].id_dest = _item0->get_id();
+		connect_vec[1].id_dest = _item1->get_id();
+		return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );
+	}
+	else return is_connected;
 }
 
-bool Splitter::is_connection_area(int _a, int _b)
+ConnectorType Splitter::get_connector_type(int _a, int _b)
 {
-	switch (imgActual) {
-		case 0: if ( ( (_a <= x+10)&&(_a > x) && (_b <=y+22)&&(_b>=y+10) ) ||
-						 ( (_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 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()-10)&&(_b>=y+image->get_height()-22) ) )
-						return true;
-		case 2: if ( ( (_a <= x+22)&&(_a >= x+10) && (_b <=y+10)&&(_b > y) ) ||
-						 ( (_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 true;
-		case 3: if ( ( (_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <=y+22)&&(_b>=y+10) ) ||
-						 ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) )
-						return true;
+	CItem *_item;
+	if ( ! is_connected ) {
+		switch (imgActual) {
+			case 0: 
+				if ( (_a <= x+10)&&(_a > x) && (_b <=y+22)&&(_b>=y+10) ) // arriba - izquierda h
+					return is_other_connection_area (get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5, &_item);
+				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) )//abajo-derecha v
+					return is_other_connection_area( get_position_x()-5, get_position_y()+16,& _item);
+				break;
+			case 1:
+				 if ( (_a <= x+image->get_width()-10)&&(_a >= x+image->get_width()-22) && (_b <=y+10)&&(_b > y) ) //arriba-derecha v
+					 return  is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16, &_item);
+				 if ( (_a <= x+10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b>=y+image->get_height()-22) ) // abajo-izquierda h
+					 return is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5, &_item);
+				 break;
+			case 2:
+				if ( (_a <= x+22)&&(_a >= x+10) && (_b <=y+10)&&(_b > y) ) //arriba-izquierda v
+					return is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height() - 16, &_item); 
+				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) ) // abajo-derecha h
+					return is_other_connection_area( get_position_x() + 16, get_position_y() - 5,& _item);
+				break;
+			case 3:
+				if ( (_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <=y+22)&&(_b>=y+10) ) //arriba-derecha h
+					return is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5, &_item);
+				if ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) // abajo-izquierda v
+					return is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16,& _item);
+		}
+	} else {
+		switch (imgActual) {
+			case 0: 
+				if ( (_a <= x+10)&&(_a > x) && (_b <=y+22)&&(_b>=y+10) ) // arriba - izquierda h
+					return connect_vec[0].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) )//abajo-derecha v
+					return connect_vec[1].type;
+				break;
+			case 1:
+				 if ( (_a <= x+image->get_width()-10)&&(_a >= x+image->get_width()-22) && (_b <=y+10)&&(_b > y) ) //arriba-derecha v
+					 return  connect_vec[0].type;
+				 if ( (_a <= x+10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b>=y+image->get_height()-22) ) // abajo-izquierda h
+					 return connect_vec[1].type;
+				 break;
+			case 2:
+				if ( (_a <= x+22)&&(_a >= x+10) && (_b <=y+10)&&(_b > y) ) //arriba-izquierda v
+					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) ) // abajo-derecha h
+					return connect_vec[0].type;
+				break;
+			case 3:
+				if ( (_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <=y+22)&&(_b>=y+10) ) //arriba-derecha h
+					return connect_vec[1].type;
+				if ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) // abajo-izquierda v
+					return connect_vec[0].type;
+		}
 	}
-	return false;
+	return UNDEF;
+}	
+
+void Splitter::set_default_connector()
+{
+	connect_vec[0].type = UNDEF;
+	connect_vec[1].type = UNDEF;
 }