X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/e0a805d3947c6bce53f1b2a0ffef837822ee3012..1e454706fe6a1edf98043888def20b2a84e83ff2:/Constructor/exclusa.cpp?ds=sidebyside diff --git a/Constructor/exclusa.cpp b/Constructor/exclusa.cpp index c0348f8..b759ea7 100644 --- a/Constructor/exclusa.cpp +++ b/Constructor/exclusa.cpp @@ -14,6 +14,12 @@ Exclusa::Exclusa() ref->get_widget_derived("exclusa_pty_wnd",exclusa_pty_wnd); exclusa_pty_wnd->exclusa = this; name = "exclusa"; + + Connector temp; + temp.id_dest = -1; + temp.type = UNDEF; + connect_vec.push_back(temp); + connect_vec.push_back(temp); } Exclusa::~Exclusa() @@ -55,6 +61,16 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) return true; } +void Exclusa::set_estado(bool _state) +{ + estado = _state; +} + +bool Exclusa::get_estado() +{ + return estado; +} + void Exclusa::on_menu_popup_rotar() { GdkEventButton event; @@ -98,24 +114,54 @@ bool Exclusa::check_connection() { switch (get_img_actual()) { case 0: - if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+10) && - is_other_occupied_area( get_position_x()-10, get_position_y() + 10) ) - 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: - if ( is_other_occupied_area( get_position_x()+10, get_position_y()-10 ) && - is_other_occupied_area( get_position_x()+get_image()->get_width()-10, get_position_y()+get_image()->get_height()+10) ) - 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; } -void Exclusa::set_estado(bool _state) +ConnectorType Exclusa::get_connector_type(int _a, int _b) { - estado = _state; + 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; } -bool Exclusa::get_estado() +void Exclusa::set_default_connector() { - return estado; + connect_vec[0].type = UNDEF; + connect_vec[1].type = UNDEF; }