]> git.llucax.com Git - z.facultad/75.42/plaqui.git/blobdiff - Constructor/src/pump.cpp
Varios cambios:
[z.facultad/75.42/plaqui.git] / Constructor / src / pump.cpp
index 9d2a95a0bc6e416cbbf747d4f53e50a229e26cfb..8fd4e0504fcff0ee2e12c62902482ba3898dc4a8 100644 (file)
@@ -42,15 +42,15 @@ bool Pump::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 Pump::on_button_press_event(GdkEventButton *event)
                pump_pty_wnd->txt_pump_name->set_text( name );
                pump_pty_wnd->show();
        }               
                pump_pty_wnd->txt_pump_name->set_text( name );
                pump_pty_wnd->show();
        }               
-       CItem::logic_connect =false;
        workplace->queue_draw();
        return true;
 }
        workplace->queue_draw();
        return true;
 }