X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/20f30a0ae955fb71428ab382aeaf025a5f93b7e1..8ee9c826deb1d04eda5ac916707fd6d2dc0463f6:/Constructor/src/cistern.cpp?ds=inline diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp index 3240c3d..8ba4e45 100644 --- a/Constructor/src/cistern.cpp +++ b/Constructor/src/cistern.cpp @@ -52,24 +52,37 @@ bool Cistern::on_button_press_event(GdkEventButton *event) combo_entry->set_popdown_strings(*list_pointed); combo_entry->get_entry()->set_text (name); if (CItem::logic_connect && CItem::gate_id != -1) { - if ( detect_click_position((int)event->x, (int)event->y) == IN && !workplace->get_logic_item(CItem::gate_id)->get_out_logic_connect()){ - 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_out.push_back(tmp_line); - workplace->queue_draw(); + if ( detect_click_position((int)event->x, (int)event->y) == IN){ + if (dynamic_cast(workplace->get_logic_item(CItem::gate_id))) { + 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.cistern_out1 = true; + tmp_line.store_id = ID; + workplace->lista_lineas_out.push_back(tmp_line); + workplace->queue_draw(); + } + } else { + tmp_line.logic_id = CItem::gate_id; + tmp_line.cistern_out1 = true; + tmp_line.store_id = ID; + workplace->lista_lineas_out.push_back(tmp_line); + 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_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; + tmp_line.cistern_out1 = false; workplace->lista_lineas_out.push_back(tmp_line); workplace->queue_draw(); } } else { tmp_line.logic_id = CItem::gate_id; tmp_line.store_id = ID; + tmp_line.cistern_out1 = false; workplace->lista_lineas_out.push_back(tmp_line); workplace->queue_draw(); }