X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/5042b6492969385725852d3cf90959abb52a7398..fb8d2fb83534b0ca76f81e6d107e38d002642a46:/Constructor/src/pump.cpp?ds=sidebyside diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp index 7526f6b..48435cc 100644 --- a/Constructor/src/pump.cpp +++ b/Constructor/src/pump.cpp @@ -32,6 +32,7 @@ Pump::Pump(int orientacion) connect_vec.push_back(temp); } + Pump::~Pump() { } @@ -40,17 +41,19 @@ bool Pump::on_button_press_event(GdkEventButton *event) { t_line tmp_line; if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) { - combo_entry->set_text(name); + list_pointed->push_back(name); + combo_entry->set_popdown_strings(*list_pointed); + combo_entry->get_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 { - 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(); }