X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/7f099f6374e9606735fb9766b51b5e86d83de815..f53d095dd5ffb5afacf5c6f9a23d6cf1985fc237:/Constructor/conduct.cpp diff --git a/Constructor/conduct.cpp b/Constructor/conduct.cpp index e02cae0..1e5bde3 100644 --- a/Constructor/conduct.cpp +++ b/Constructor/conduct.cpp @@ -10,6 +10,11 @@ Conduct::Conduct() 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() @@ -91,14 +96,57 @@ 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) ) - return true; + 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 false; + return UNDEF; +} +/*si no estoy conectado pregunto por el del otro lado, y ahi puedo setear los dos + *si ya estoy devuelvo. +*/ + +void Conduct::set_default_connector() +{ + connect_vec[0].type = UNDEF; + connect_vec[1].type = UNDEF; }