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

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

diff --git a/Constructor/conduct.cpp b/Constructor/conduct.cpp
index 2a582fb9f82fc8c432276bbc97063a4aa284c74c..c2ca140992ac9995c3b0bfb0ea33c42cd4c9ec5d 100644 (file)
--- a/Constructor/conduct.cpp
+++ b/Constructor/conduct.cpp
@@ -9,6 +9,12 @@ Conduct::Conduct()
        image = imageN;
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Tubo");
+       name="tubo";
+       Connector temp;
+       temp.id_dest = -1;
+       temp.type = UNDEF;
+       connect_vec.push_back(temp);
+       connect_vec.push_back(temp);
 }
 
 Conduct::~Conduct()
@@ -90,14 +96,67 @@ bool Conduct::check_connection()
 {
        switch (get_img_actual()) {
                        case 0:
-                               if ( is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+10) && 
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y() - 10) )
-                                       return true;                            
+                               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:
+                               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);
+       }
+       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;
+}
+
+ConnectorType Conduct::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 ( is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()/2) && 
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()/2) )
+                               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 Conduct::is_connection_area(int _a, int _b)
+{
+       switch (imgActual){
+               case 0:
+                       if ( ((_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 )) ||
+                                ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) )
+                               return true;
+               case 1:
+                       if ( ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) ||
+                                ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) )
                                return true;
        }
        return false;
 }
+*/