* Se mejora la deteccion de conexiones en el constructor

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

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index 90f8645b2e887d384c65aa4f7f79b840233f4c70..680ce43b797dcf2bb4e461ae413c7b76bcc4c6ad 100644 (file)
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -158,48 +158,52 @@ void Exclusa::save(FILE *archivo)
 
 bool Exclusa::check_connection()
 {
 
 bool Exclusa::check_connection()
 {

-       ConnectorType aux;
+       ConnectorType aux, aux1, aux2;

        CItem *_item0, *_item1;
        switch (get_img_actual()) {
        CItem *_item0, *_item1;
        switch (get_img_actual()) {

-                       case 0:
-                               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:
-                               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
+               case 0:
+                       aux1 = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0); //izquierda
+                       aux2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16,& _item1); //derecha
+               break;          
+               case 1:
+                       aux1 =  is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0); // arriba
+                       aux2 = 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 ) {
-               aux = connect_vec[0].type; 
-               connect_vec[0].type = connect_vec[1].type;
-               connect_vec[1].type = aux;
+       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[1].type = aux1;
+               }

                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) );
        }
                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;
+       return is_connected = false;

 }
 
 ConnectorType Exclusa::get_connector_type(int _a, int _b)
 {
        CItem *_item;
        switch (imgActual) {
 }
 
 ConnectorType Exclusa::get_connector_type(int _a, int _b)
 {
        CItem *_item;
        switch (imgActual) {

-               case 0:
+               case 1:

                        if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ){  //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 ) {
                                        case IN: 
                        if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ){  //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 ) {
                                        case IN: 

-                                       connect_vec[1] = OUT;
-                                       connect_vec[0] = IN;            
+                                       connect_vec[1].type = OUT;
+                                       connect_vec[0].type = IN;               

                                        break;
                                        case OUT:
                                        break;
                                        case OUT:

-                                       connect_vec[1] = IN;
-                                       connect_vec[0] = OUT;           
+                                       connect_vec[1].type = IN;
+                                       connect_vec[0].type = OUT;              

                                        break;
                                        case UNDEF:
                                        return UNDEF;
                                }
                                        break;
                                        case UNDEF:
                                        return UNDEF;
                                }

+                               is_connected = true;

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


@@ -208,31 +212,32 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
                                connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba.
                                switch ( connect_vec[0].type ) {
                                        case IN: 
                                connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba.
                                switch ( connect_vec[0].type ) {
                                        case IN: 

-                                       connect_vec[0] = OUT;
-                                       connect_vec[1] = IN;            
+                                       connect_vec[0].type = OUT;
+                                       connect_vec[1].type = IN;               

                                        break;
                                        case OUT:
                                        break;
                                        case OUT:

-                                       connect_vec[0] = IN;
-                                       connect_vec[1] = OUT;           
+                                       connect_vec[0].type = IN;
+                                       connect_vec[1].type = OUT;              

                                        break;
                                        case UNDEF:
                                        return UNDEF;
                                }
                                        break;
                                        case UNDEF:
                                        return UNDEF;
                                }

+                               is_connected = true;

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

-               case 1: 
+               case 0: 

                        if ((_a <= x+10 )&&(_a > 0) && (_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 ) {
                                        case IN: 
                        if ((_a <= x+10 )&&(_a > 0) && (_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 ) {
                                        case IN: 

-                                       connect_vec[1] = OUT;
-                                       connect_vec[0] = IN;            
+                                       connect_vec[1].type = OUT;
+                                       connect_vec[0].type = IN;               

                                        break;
                                        case OUT:
                                        break;
                                        case OUT:

-                                       connect_vec[1] = IN;
-                                       connect_vec[0] = OUT;           
+                                       connect_vec[1].type = IN;
+                                       connect_vec[0].type = OUT;              

                                        break;
                                        case UNDEF:
                                        return UNDEF;
                                        break;
                                        case UNDEF:
                                        return UNDEF;


@@ -245,12 +250,12 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
                                connect_vec[0].type =   is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda. 
                                switch ( connect_vec[0].type ) {
                                        case IN: 
                                connect_vec[0].type =   is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda. 
                                switch ( connect_vec[0].type ) {
                                        case IN: 

-                                       connect_vec[0] = OUT;
-                                       connect_vec[1] = IN;            
+                                       connect_vec[0].type = OUT;
+                                       connect_vec[1].type = IN;               

                                        break;
                                        case OUT:
                                        break;
                                        case OUT:

-                                       connect_vec[0] = IN;
-                                       connect_vec[1] = OUT;           
+                                       connect_vec[0].type = IN;
+                                       connect_vec[1].type = OUT;              

                                        break;
                                        case UNDEF:
                                        return UNDEF;
                                        break;
                                        case UNDEF:
                                        return UNDEF;