(no commit message)

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

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index 365b6e45675355de3b1a6a41659f028849952ad6..7c7084842f10e922dc0ee53c8c094aae0e4f94a1 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 (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;
 }