X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/6fcc8fcf6b98f413f813904fe0f078d2782fb9d5..fc545e363e5352e2a672b0fa6a39facf6dc7d36b:/Constructor/src/exclusa.cpp diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp index 5fc6cee..eb296d6 100644 --- a/Constructor/src/exclusa.cpp +++ b/Constructor/src/exclusa.cpp @@ -55,7 +55,7 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) workplace->queue_draw(); } else if (detect_click_position((int)event->x, (int)event->y) == OUT ) { if (dynamic_cast(workplace->get_logic_item(CItem::gate_id))) { - if (!dynamic_cast(workplace->get_logic_item(CItem::gate_id))->get_out_logic_connect()) { + if (!dynamic_cast(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) { workplace->get_logic_item(CItem::gate_id)->set_in_connected(true); tmp_line.logic_id = CItem::gate_id; tmp_line.store_id = ID; @@ -205,7 +205,7 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b) CItem *_item; switch (imgActual) { case 1: - if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ){ //arriba + if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > y ) ){ //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 ) { @@ -244,7 +244,7 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b) } break; case 0: - if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )){ //izquierda + if ((_a <= x+10 )&&(_a > x) && (_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 ) {