-Se conectan como trompada!!!!!

[z.facultad/75.42/plaqui.git] / Constructor / union.cpp

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index 1311bd509c7336bb479da53d58ae1de6d140a7f1..c2bef0c32f9ad2e89b52ad1acd692715f6e743ca 100644 (file)
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -87,9 +87,18 @@ 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";
+       Glib::ustring  con0, con1, con2, c_type;
+       if (is_union){
+               con0 = "\t\t\t<entrada>"+get_other_name(connect_vec[0].id_dest)+"</entrada>\n";
+               con1 = "\t\t\t<entrada>"+get_other_name(connect_vec[1].id_dest)+"</entrada>\n";
+               con2 = "\t\t\t<salida>"+get_other_name(connect_vec[2].id_dest)+"</salida>\n";
+               c_type = "\t\t<tipo>union</tipo>\n";
+       } else {
+               con0 = "\t\t\t<salida>"+get_other_name(connect_vec[0].id_dest)+"</salida>\n";
+               con1 = "\t\t\t<salida>"+get_other_name(connect_vec[1].id_dest)+"</salida>\n";
+               con2 = "\t\t\t<entrada>"+get_other_name(connect_vec[2].id_dest)+"</entrada>\n";         
+               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);
@@ -100,6 +109,7 @@ void Union::save(FILE *archivo)
        dato += c_id;
        dato += "\">\n";
        dato += c_type;
+       dato += "\t\t<conector>\n"+con0+con1+con2+"\t\t</conector>\n";
        dato += c_caudal;
        dato += c_img;
        dato += c_x; 
@@ -110,36 +120,45 @@ void Union::save(FILE *archivo)
 
 bool Union::check_connection()
 {
+       CItem * _item0, *_item1, *_item2;
        ConnectorType temp0, temp1, temp2;
        switch (get_img_actual()) {
                        case 0:
-                               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);
+                               temp0 = is_other_connection_area( get_position_x() - 5, get_position_y() +16, &_item0);
+                               temp1 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item1);
+                               temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+5, &_item2);
                                break;
                        case 1:
-                               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);
+                               temp2 = is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()/2, &_item2);
+                               temp0 = is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()-5, &_item0);
+                               temp1 = is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()+get_image()->get_height()+5,& _item1);
                                break;
                        case 2:
-                               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);
+                               temp1 = is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16,& _item1);
+                               temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()/2, get_position_y()-5, &_item2);
+                               temp0 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16, &_item0);
                                break;
                        case 3:
-                               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);
+                               temp1 = is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item1);
+                               temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()/2,& _item0);
+                               temp0 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5, &_item1);
        }
        if ( is_union ) {
-               if ( temp0 == OUT && temp1 == OUT && temp2 == IN ) 
+               if ( temp0 == OUT && temp1 == OUT && temp2 == IN ) {
+                       connect_vec[0].id_dest = _item0->get_id();
+                       connect_vec[1].id_dest = _item1->get_id();
+                       connect_vec[2].id_dest = _item2->get_id();
                        return (is_connected = true);
+               }
        } else {
-               if ( temp0 == IN && temp1 == IN && temp2 == OUT )
+               if ( temp0 == IN && temp1 == IN && temp2 == OUT ) {
+                       connect_vec[0].id_dest = _item0->get_id();
+                       connect_vec[1].id_dest = _item1->get_id();
+                       connect_vec[2].id_dest = _item2->get_id();
                        return (is_connected = true);
+               }
        }
-       return false;
+       return is_connected;
 }
 
 ConnectorType Union::get_connector_type(int _a, int _b)