-Se arregla lo del id cuando se carga una planta

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

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index e2510f6081279d2ca4bf2139bb303d36652f7375..5dd52c863d7f1bf3aadae946200630dd96c234b7 100644 (file)
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -38,13 +38,13 @@ bool Pump::on_button_press_event(GdkEventButton *event)
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                combo_entry->set_text(name);
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                combo_entry->set_text(name);

+               WorkPlace::pointed = ID;

                if (CItem::logic_connect) {
                        tmp_line.logic =  workplace->get_logic_item(CItem::quien);
                        tmp_line.store = this;
                        workplace->lista_lineas.push_back(tmp_line);
                        workplace->on_expose_event(&e);
                }
                if (CItem::logic_connect) {
                        tmp_line.logic =  workplace->get_logic_item(CItem::quien);
                        tmp_line.store = this;
                        workplace->lista_lineas.push_back(tmp_line);
                        workplace->on_expose_event(&e);
                }

-               CItem::logic_connect = false;   

        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){


@@ -73,6 +73,7 @@ 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();
        }               

+       workplace->on_expose_event(&e);

        return true;
 }
 
        return true;
 }
 


@@ -180,3 +181,16 @@ void Pump::set_default_connector()
 {
        connect_vec[0].type = OUT;
 }
 {
        connect_vec[0].type = OUT;
 }

+
+void Pump::get_logic_connect_position(int& _a, int& _b)
+{
+       switch(imgActual) {
+               case 0: 
+                       _a = x + image->get_width() - 10;
+                       _b = y;
+                       break;
+               case 1: 
+                       _a = x + 10;
+                       _b = y;
+       }
+}