El Transmitter ya anda bien (se puede escuchar con un nc -p [puerto] -l -u :).

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

diff --git a/Constructor/exclusa.cpp b/Constructor/exclusa.cpp
index b759ea7649450e25c5bf48465126740336deffa7..f615e4de0ada37a269ab2cae145ae6d366ae7d81 100644 (file)
--- a/Constructor/exclusa.cpp
+++ b/Constructor/exclusa.cpp
@@ -91,6 +91,15 @@ void Exclusa::save(FILE *archivo)
 {
        char c_id[50], c_est[50], c_x[50], c_y[50], c_img[50];
        int est;
 {
        char c_id[50], c_est[50], c_x[50], c_y[50], c_img[50];
        int est;

+       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);
        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);


@@ -102,6 +111,7 @@ void Exclusa::save(FILE *archivo)
        dato = "\t<exclusa nombre=\""+name+"\" id=\"";
        dato += c_id;
        dato += "\">\n";
        dato = "\t<exclusa nombre=\""+name+"\" id=\"";
        dato += c_id;
        dato += "\">\n";

+       dato += "\t\t<conector>\n"+con0 + con1+"\t\t</conector>\n";

        dato += c_img;
        dato += c_est;
        dato += c_x; 
        dato += c_img;
        dato += c_est;
        dato += c_x; 


@@ -112,48 +122,57 @@ void Exclusa::save(FILE *archivo)
 
 bool Exclusa::check_connection()
 {
 
 bool Exclusa::check_connection()
 {

+       ConnectorType aux;
+       CItem *_item0, *_item1;

        switch (get_img_actual()) {
                        case 0:
        switch (get_img_actual()) {
                        case 0:

-                               connect_vec[0].type =  is_other_connection_area( get_position_x()+16, get_position_y()-5);
-                               connect_vec[1].type = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5);
+                               connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0); //izquierda
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16,& _item1); //derecha

                        break;          
                        case 1:
                        break;          
                        case 1:

-                               connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16);
-                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16);
+                               connect_vec[0].type =  is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0); // arriba
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item1); //abajo

        }
        }

-       if ( connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF )
+       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) );
                return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );

-       else return false;
+       }
+       else return is_connected;

 }
 
 ConnectorType Exclusa::get_connector_type(int _a, int _b)
 {
 }
 
 ConnectorType Exclusa::get_connector_type(int _a, int _b)
 {

+       CItem * _item;

        if ( ! is_connected ) {
                switch (imgActual) {
                        case 0:
        if ( ! is_connected ) {
                switch (imgActual) {
                        case 0:

-                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) )  //arriba
-                                       return is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5); //pregunto que hay abajo
-                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 ))//abajo
-                                       return is_other_connection_area( get_position_x()+16, get_position_y()-5);//pregunto que hay arriba.
-                               break;
-                       case 1: 

                                if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
                                if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda

-                                       return is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16);//pregunto por la derecha
+                                       return is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha

                                if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha
                                if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha

-                                       return is_other_connection_area(get_position_x()-5, get_position_y()+16); //pregunto por la izquierda.
+                                       return is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda.
+                               break;
+                       case 1: 
+                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) )  //arriba
+                                       return is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
+                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 ))//abajo
+                                       return is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item);//pregunto que hay arriba.

                }
        } else {
                switch (imgActual) {
                        case 0: 
                }
        } else {
                switch (imgActual) {
                        case 0: 

-                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ) //arriba
+                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda

                                        return connect_vec[0].type;
                                        return connect_vec[0].type;

-                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) //abajo
+                               if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha

                                        return connect_vec[1].type;
                                break;
                        case 1:
                                        return connect_vec[1].type;
                                break;
                        case 1:

-                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
+                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ) //arriba

                                        return connect_vec[0].type;
                                        return connect_vec[0].type;

-                               if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha
+                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) //abajo

                                        return connect_vec[1].type;
                }
        }
                                        return connect_vec[1].type;
                }
        }