X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fc802b7aea75e90b19cd22d3e5e752620a416af8..fcb9be87ec554676a7140f4e75ea07f69a33974b:/Constructor/src/exclusa.cpp?ds=inline diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp index 365b6e4..7c70848 100644 --- a/Constructor/src/exclusa.cpp +++ b/Constructor/src/exclusa.cpp @@ -43,15 +43,15 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) { combo_entry->set_text(name); WorkPlace::pointed = ID; - if (CItem::logic_connect) { - if ( detect_click_position(event->x, event->y) == IN) { - tmp_line.logic = workplace->get_logic_item(CItem::gate_id); - tmp_line.store = this; + 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(); + tmp_line.store_id = ID; workplace->lista_lineas_in.push_back(tmp_line); workplace->queue_draw(); - } else if (detect_click_position(event->x, event->y) == OUT) { - tmp_line.logic = workplace->get_logic_item(CItem::gate_id); - tmp_line.store = this; + } else if (detect_click_position((int)event->x, (int)event->y) == OUT) { + tmp_line.logic_id = workplace->get_logic_item(CItem::gate_id)->get_id(); + tmp_line.store_id = ID; workplace->lista_lineas_out.push_back(tmp_line); workplace->queue_draw(); } @@ -65,10 +65,10 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) switch (imgActual) { case 1: image = imageS; - in_x = x + image->get_width(); - in_y = y + image->get_height()/2; - out_x = x; - out_y = in_y; + in_x = x + image->get_width()-5; + in_y = y + image->get_height()/2-5; + out_x = x+5; + out_y = in_y+10; break; default: imgActual = 0; @@ -91,7 +91,6 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) if (estado) exclusa_pty_wnd->rd_btn_open->set_active(true); exclusa_pty_wnd->show(); } - CItem::logic_connect =false; workplace->queue_draw(); return true; }