Se ponen mas simples algunos SigC::bind() :)

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

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index 9d2a95a0bc6e416cbbf747d4f53e50a229e26cfb..9663b0bb0c4d737c9991c81ff52d315de1415926 100644 (file)
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -32,6 +32,7 @@ Pump::Pump(int orientacion)
        connect_vec.push_back(temp);
 }
 
+
 Pump::~Pump()
 {
 }
@@ -42,15 +43,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 (CItem::logic_connect) {
+               if (CItem::logic_connect && CItem::gate_id != -1) {
                        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) {
-                               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();
                        }
@@ -91,7 +92,6 @@ bool Pump::on_button_press_event(GdkEventButton *event)
                pump_pty_wnd->txt_pump_name->set_text( name );
                pump_pty_wnd->show();
        }               
-       CItem::logic_connect =false;
        workplace->queue_draw();
        return true;
 }
@@ -247,3 +247,17 @@ void Pump::update_logic_position()
                        out_y = y + 32;
        }
 }
+
+bool Pump::on_expose_event(GdkEventExpose* event)
+{
+       CItem::on_expose_event(event);
+       Glib::RefPtr<Gdk::Window> window = get_window();
+
+       gc->set_foreground(red);
+       gc->set_background(red);
+       window->draw_rectangle(gc, 1, image->get_width()-32, 0, 32, 16);
+       gc->set_foreground(blue);
+       gc->set_background(blue);
+       window->draw_rectangle(gc, 1, image->get_width()-32, 16, 32, 16);
+       return true;
+}