Varios cambios:

[z.facultad/75.42/plaqui.git] / Constructor / src / exclusa.cpp

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index 365b6e45675355de3b1a6a41659f028849952ad6..ee75ed5dc76096cc9ad9b23cee0adcc998334c62 100644 (file)
--- 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 ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                combo_entry->set_text(name);
                WorkPlace::pointed = ID;

-               if (CItem::logic_connect) {
+               if (CItem::logic_connect && CItem::gate_id != -1) {

                        if ( detect_click_position(event->x, event->y) == IN) {
                        if ( detect_click_position(event->x, event->y) == IN) {

-                               tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-                               tmp_line.store = this;
+                               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) {  
                                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;
+                               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();
                        }
                                workplace->lista_lineas_out.push_back(tmp_line);
                                workplace->queue_draw();
                        }


@@ -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();
        }
                if (estado) exclusa_pty_wnd->rd_btn_open->set_active(true);
                exclusa_pty_wnd->show();
        }

-       CItem::logic_connect =false;

        workplace->queue_draw();
        return true;
 }
        workplace->queue_draw();
        return true;
 }