X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fdff87853fcabe0b987f2706aad0e78503fa2058..663eccb7e27110aba6c79648c38254a7a5737bca:/Constructor/src/exclusa.cpp?ds=sidebyside diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp index 90f8645..a7c4583 100644 --- a/Constructor/src/exclusa.cpp +++ b/Constructor/src/exclusa.cpp @@ -48,6 +48,7 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) if (CItem::logic_connect && CItem::gate_id != -1) { if ( detect_click_position((int)event->x, (int)event->y) == IN) { tmp_line.logic_id = workplace->get_logic_item(CItem::gate_id)->get_id(); + workplace->get_logic_item(CItem::gate_id)->set_out_connected(true); tmp_line.store_id = ID; workplace->lista_lineas_in.push_back(tmp_line); workplace->queue_draw(); @@ -57,7 +58,12 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) workplace->lista_lineas_out.push_back(tmp_line); workplace->queue_draw(); } + CItem::gate_id = -1; } + Glib::ustring text; + if(estado) text = name+" Estado: ABIERTO"; + else text = name+" Estado: CERRADO"; + status_bar->push ( text, 0); } if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){ @@ -158,48 +164,52 @@ void Exclusa::save(FILE *archivo) bool Exclusa::check_connection() { - ConnectorType aux; + ConnectorType aux, aux1, aux2; CItem *_item0, *_item1; switch (get_img_actual()) { - case 0: - connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0); //izquierda - connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16,& _item1); //derecha - break; - case 1: - connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0); // arriba - connect_vec[1].type = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item1); //abajo + case 0: + aux1 = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0); //izquierda + aux2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16,& _item1); //derecha + break; + case 1: + aux1 = is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0); // arriba + aux2 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item1); //abajo } - if ( connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF ) { - aux = connect_vec[0].type; - connect_vec[0].type = connect_vec[1].type; - connect_vec[1].type = aux; + if ( aux1 != UNDEF && aux2 != UNDEF ) { + if (!is_connected) { + //aux = connect_vec[0].type; + // Aca van invertidos los tipos de entrada/salida + connect_vec[0].type = aux2; //connect_vec[1].type; + connect_vec[1].type = aux1; + } connect_vec[0].id_dest = _item0->get_id(); connect_vec[1].id_dest = _item1->get_id(); return ( is_connected = (connect_vec[0].type != connect_vec[1].type) ); } - else return is_connected; + return is_connected = false; } ConnectorType Exclusa::get_connector_type(int _a, int _b) { CItem *_item; switch (imgActual) { - case 0: + case 1: if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ){ //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 ) { case IN: - connect_vec[1] = OUT; - connect_vec[0] = IN; + connect_vec[1].type = OUT; + connect_vec[0].type = IN; break; case OUT: - connect_vec[1] = IN; - connect_vec[0] = OUT; + connect_vec[1].type = IN; + connect_vec[0].type = OUT; break; case UNDEF: return UNDEF; } + is_connected = true; return connect_vec[0].type; } @@ -208,31 +218,32 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b) connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba. switch ( connect_vec[0].type ) { case IN: - connect_vec[0] = OUT; - connect_vec[1] = IN; + connect_vec[0].type = OUT; + connect_vec[1].type = IN; break; case OUT: - connect_vec[0] = IN; - connect_vec[1] = OUT; + connect_vec[0].type = IN; + connect_vec[1].type = OUT; break; case UNDEF: return UNDEF; } + is_connected = true; return connect_vec[1].type; } break; - case 1: + case 0: if ((_a <= x+10 )&&(_a > 0) && (_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 ) { case IN: - connect_vec[1] = OUT; - connect_vec[0] = IN; + connect_vec[1].type = OUT; + connect_vec[0].type = IN; break; case OUT: - connect_vec[1] = IN; - connect_vec[0] = OUT; + connect_vec[1].type = IN; + connect_vec[0].type = OUT; break; case UNDEF: return UNDEF; @@ -245,12 +256,12 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b) connect_vec[0].type = is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda. switch ( connect_vec[0].type ) { case IN: - connect_vec[0] = OUT; - connect_vec[1] = IN; + connect_vec[0].type = OUT; + connect_vec[1].type = IN; break; case OUT: - connect_vec[0] = IN; - connect_vec[1] = OUT; + connect_vec[0].type = IN; + connect_vec[1].type = OUT; break; case UNDEF: return UNDEF;