cambios drasticos producen cuelgues obvios, etapa de revision, pueden mirarlo libremente

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

diff --git a/Constructor/exclusa.cpp b/Constructor/exclusa.cpp
index e8547d6961c8b31b0a96fe854add2407045bda86..6a386d14d2fc0509bd12be4429427b964b872581 100644 (file)
--- a/Constructor/exclusa.cpp
+++ b/Constructor/exclusa.cpp
@@ -108,19 +108,55 @@ bool Exclusa::check_connection()
 {
        switch (get_img_actual()) {
                        case 0:
 {
        switch (get_img_actual()) {
                        case 0:

-                               if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16) && 
-                                        is_other_connection_area( get_position_x()-5, get_position_y() + 16) )
-                                       return true;                            
-                               break;
+                               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);
+                       break;          

                        case 1:
                        case 1:

-                               if ( is_other_connection_area( get_position_x()+16, get_position_y()-5 ) && 
-                                        is_other_connection_area( get_position_x()+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);
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16);

        }
        }

-       return false;
+       if ( connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF )
+               return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );
+       else return false;

 }
 
 }
 

-bool Exclusa::is_connection_area(int _a, int _b)
+ConnectorType Exclusa::get_connector_type(int _a, int _b)
+{
+       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
+                                       return is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16);//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
+                                       return is_other_connection_area(get_position_x()-5, get_position_y()+16); //pregunto por la izquierda.
+               }
+       } else {
+               switch (imgActual) {
+                       case 0: 
+                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ) //arriba
+                                       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
+                                       return connect_vec[1].type;
+                               break;
+                       case 1:
+                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
+                                       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
+                                       return connect_vec[1].type;
+               }
+       }
+       return UNDEF;
+}
+/*si no estoy conectado pregunto por el del otro lado, y ahi puedo setear los dos
+ *si ya estoy devuelvo.
+*/
+/*bool Exclusa::is_connection_area(int _a, int _b)

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


@@ -134,3 +170,4 @@ bool Exclusa::is_connection_area(int _a, int _b)
        }
        return false;
 }
        }
        return false;
 }

+*/