X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/663eccb7e27110aba6c79648c38254a7a5737bca..3314f9284024c7bb9e618f310ca467a93990922d:/Constructor/src/exclusa.cpp diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp index a7c4583..048dd6c 100644 --- a/Constructor/src/exclusa.cpp +++ b/Constructor/src/exclusa.cpp @@ -1,5 +1,6 @@ #include "exclusa.h" #include "exclusaptywnd.h" +#include "not.h" Exclusa::Exclusa(int orientacion) { @@ -41,10 +42,10 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) { t_line tmp_line; if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) { + WorkPlace::pointed = ID; 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 && 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(); @@ -52,11 +53,21 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) tmp_line.store_id = ID; workplace->lista_lineas_in.push_back(tmp_line); workplace->queue_draw(); - } 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(); + } 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()) { + workplace->get_logic_item(CItem::gate_id)->set_in_connected(true); + tmp_line.logic_id = CItem::gate_id; + 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.store_id = ID; + workplace->lista_lineas_out.push_back(tmp_line); + workplace->queue_draw(); + } } CItem::gate_id = -1; }