Se agrega diagrama de clases del modelo.

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

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index 5eb4eadc90c5585bdb179aa5beda09cdfbdd37e5..fda8a88b7e73b314aea9ea5ac376bb2461b47268 100644 (file)
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -188,9 +188,7 @@ bool Exclusa::check_connection()
        }
        if ( aux1 != UNDEF && aux2 != UNDEF ) {
                if (!is_connected) {
        }
        if ( aux1 != UNDEF && aux2 != UNDEF ) {
                if (!is_connected) {

-                       //aux = connect_vec[0].type; 
-                       // Aca van invertidos los tipos de entrada/salida
-                       connect_vec[0].type = aux2; //connect_vec[1].type;
+                       connect_vec[0].type = aux2; 

                        connect_vec[1].type = aux1;
                }
                connect_vec[0].id_dest = _item0->get_id();
                        connect_vec[1].type = aux1;
                }
                connect_vec[0].id_dest = _item0->get_id();


@@ -205,7 +203,7 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
        CItem *_item;
        switch (imgActual) {
                case 1:
        CItem *_item;
        switch (imgActual) {
                case 1:

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

                                if ( is_connected ) return connect_vec[0].type;                 
                                connect_vec[1].type = is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
                                switch ( connect_vec[1].type ) {
                                if ( is_connected ) return connect_vec[0].type;                 
                                connect_vec[1].type = is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
                                switch ( connect_vec[1].type ) {


@@ -244,7 +242,7 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
                        }
                break;
                case 0: 
                        }
                break;
                case 0: 

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

                                if ( is_connected ) return connect_vec[0].type;                 
                                connect_vec[1].type = is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
                                switch ( connect_vec[1].type ) {
                                if ( is_connected ) return connect_vec[0].type;                 
                                connect_vec[1].type = is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
                                switch ( connect_vec[1].type ) {